diff --git a/Assets/Scripts/Characters/Enemy/States/IdleState.cs b/Assets/Scripts/Characters/Enemy/States/IdleState.cs index 3e16d9a..af611e5 100644 --- a/Assets/Scripts/Characters/Enemy/States/IdleState.cs +++ b/Assets/Scripts/Characters/Enemy/States/IdleState.cs @@ -21,7 +21,7 @@ namespace Characters.Enemy.States if (!_enemy.isServer) return; _enemy.SetSpeedMul(0f); - _enemy.networkAnimator.SetTrigger(DanceAnimHash); + _enemy.networkAnimator.SetTrigger("dance"); } public override void Update() @@ -42,7 +42,7 @@ namespace Characters.Enemy.States if (!_enemy.isServer) return; _entered = false; - _enemy.networkAnimator.ResetTrigger(DanceAnimHash); + _enemy.networkAnimator.ResetTrigger("dance"); _enemy.SetSpeedMul(1f); } } diff --git a/Assets/Scripts/Characters/Enemy/States/PatrolState.cs b/Assets/Scripts/Characters/Enemy/States/PatrolState.cs index 77a35fd..857d964 100644 --- a/Assets/Scripts/Characters/Enemy/States/PatrolState.cs +++ b/Assets/Scripts/Characters/Enemy/States/PatrolState.cs @@ -46,6 +46,8 @@ namespace Characters.Enemy.States if (_enemy.target != null) { _enemy.state = EnemyState.Chase; + + return; } var remainingDistance = _enemy.agent.GetPathRemainingDistance(); diff --git a/Assets/Scripts/Characters/Enemy/States/StunnedState.cs b/Assets/Scripts/Characters/Enemy/States/StunnedState.cs index 5de687e..fb0ca7e 100644 --- a/Assets/Scripts/Characters/Enemy/States/StunnedState.cs +++ b/Assets/Scripts/Characters/Enemy/States/StunnedState.cs @@ -28,7 +28,7 @@ namespace Characters.Enemy.States _enemy.target = null; _enemy.SetSpeedMul(0f); - _enemy.networkAnimator.SetTrigger(StunnedAnimHash); + _enemy.networkAnimator.SetTrigger("stunned"); } if(_enemy.isClient) @@ -43,7 +43,7 @@ namespace Characters.Enemy.States { Debug.Log("Reenter stunned state"); - _enemy.networkAnimator.SetTrigger(StunnedAnimHash); + _enemy.networkAnimator.SetTrigger("stunned"); } public override void Update() @@ -67,7 +67,7 @@ namespace Characters.Enemy.States if (!_enemy.isServer) return; _entered = false; - _enemy.networkAnimator.ResetTrigger(StunnedAnimHash); + _enemy.networkAnimator.ResetTrigger("stunned"); _enemy.SetSpeedMul(1f); _enemy.canAttack = true;