update scripts

This commit is contained in:
2022-04-25 16:23:25 +07:00
parent e1d0bbc1eb
commit 290f5515b7
13 changed files with 120 additions and 47 deletions

View File

@ -25,10 +25,10 @@ public class CharacterFactory : MonoBehaviour
private void Start()
{
var attcNum = SettingsReader.Instance.GetSettings.numOfAttackers;
var defNum = SettingsReader.Instance.GetSettings.numOfDefenders;
var humanDef = SettingsReader.Instance.GetSettings.hasHumanDefender == true ? 1 : 0;
var humanAtc = SettingsReader.Instance.GetSettings.hasHumanAttacker == true ? 1 : 0;
var attcNum = SettingsReader.Instance.GetSettings.NumOfAttackers;
var defNum = SettingsReader.Instance.GetSettings.NumOfDefenders;
var humanDef = SettingsReader.Instance.GetSettings.HasHumanDefender == true ? 1 : 0;
var humanAtc = SettingsReader.Instance.GetSettings.HasHumanAttacker == true ? 1 : 0;
if (humanAtc == 1 && humanDef == 1)
throw new System.ArgumentException("Can be only one human player");
@ -56,6 +56,10 @@ public class CharacterFactory : MonoBehaviour
spawnPoint.position,
Quaternion.identity);
gameobject.SetActive(true);
if (team == Team.Attackers)
gameObject.tag = "Attacker";
else
gameObject.tag = "Defender";
if (typeAi == TypeAI.HumanAI)
{
@ -65,7 +69,7 @@ public class CharacterFactory : MonoBehaviour
else
{
gameobject.GetComponent<NPC>().GetCharacter.Team = team;
gameobject.GetComponent<MovementController>().currentPosition = spawnPoint;
gameobject.GetComponent<MovementController>().CurrentNavPoint = spawnPoint;
Bots.Add(gameobject);
}
}
@ -81,8 +85,8 @@ public class CharacterFactory : MonoBehaviour
else
bot.transform.position = spawnPointsForDefendersTeam[Random.Range(0, spawnPointsForDefendersTeam.Count)].position;
}
var player = Player.GetComponent<Player>();
if (player != null)
Player player;
if (TryGetComponent<Player>(out player))
{
player.ResetCharacter();
if (player.GetCharacter.Team == Team.Attackers)