working
This commit is contained in:
parent
4e91f448c9
commit
1b2611e5a9
90 changed files with 7029 additions and 2762 deletions
|
@ -43,7 +43,7 @@ public class AttackCAC : MonoBehaviour
|
|||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
if (baseDuckScript.getGameManagerScript().combatPhase)
|
||||
if (GameManager.Instance.fightStarted)
|
||||
{
|
||||
if (canAttack)
|
||||
{
|
||||
|
@ -55,35 +55,21 @@ public class AttackCAC : MonoBehaviour
|
|||
{
|
||||
Vector3 directionToTarget = hit.transform.position - transform.position;
|
||||
float distanceToTarget = directionToTarget.magnitude;
|
||||
if (baseDuckScript.getAttackMode() == 3)
|
||||
{
|
||||
distanceToTarget = Vector3.Distance(baseDuckScript.getArmyManagerScript().getCrownDuck(baseDuckScript.getTeam()).transform.position, hit.transform.position);
|
||||
}
|
||||
|
||||
if (!Physics.Raycast(transform.position, directionToTarget.normalized, distanceToTarget,
|
||||
wallLayer))
|
||||
{
|
||||
if (baseDuckScript.getArmyManagerScript().getArmy(!baseDuckScript.getTeam()).Contains(hit.gameObject))
|
||||
if (ArmyManager.getArmy(!baseDuckScript.getTeam()).Contains(hit.GetComponent<AbstractUnit>()))
|
||||
{
|
||||
if (baseDuckScript.getAttackMode() == 1)
|
||||
{
|
||||
if (baseDuckScript.getArmyManagerScript().getCrownDuck(!baseDuckScript.getTeam()) ==
|
||||
if (ArmyManager.getCrownDuck(!baseDuckScript.getTeam()) ==
|
||||
hit.gameObject)
|
||||
{
|
||||
targetToAttack = hit.gameObject;
|
||||
targetFound = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (baseDuckScript.getAttackMode() == 2 || baseDuckScript.getAttackMode() == 3)
|
||||
{
|
||||
if (distanceToTarget < distanceToChosenTarget)
|
||||
{
|
||||
distanceToChosenTarget = distanceToTarget;
|
||||
targetToAttack = hit.gameObject;
|
||||
targetFound = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -104,8 +90,8 @@ public class AttackCAC : MonoBehaviour
|
|||
private void AttackC(GameObject targetToAttack)
|
||||
{
|
||||
StartCoroutine(coolDown());
|
||||
targetToAttack.GetComponent<BaseDuckScript>().TakeDamage(damage);
|
||||
Debug.Log("Corps à corps");
|
||||
targetToAttack.GetComponent<AbstractUnit>().TakeDamage(damage);
|
||||
Debug.Log("Corps <EFBFBD> corps");
|
||||
ATTACK.Invoke();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue