Commit bc4ab857 authored by 15김민규's avatar 15김민규

순찰거리(patrolRange)가 0보다 클 때만 Idle 상태에서 속도를 얻음. 와리가리 문제 없어질 듯

parent 206d4042
......@@ -23,7 +23,10 @@ public class ArcherIdle : StateMachineBehaviour
patrolSpeed = enemy.patrolSpeed;
enemy.ChangeDir_noOption(NumeratedDir.Left);
enemy.ChangeVelocityX_noOption(enemy.MoveDir * patrolSpeed);
if (patrolRange > 0)
{
enemy.ChangeVelocityX_noOption(enemy.MoveDir * patrolSpeed);
}
}
// OnStateUpdate is called on each Update frame between OnStateEnter and O nStateExit callbacks
......@@ -34,7 +37,7 @@ public class ArcherIdle : StateMachineBehaviour
animator.SetTrigger("TrackTrigger");
return;
}
if (!enemy.MovementLock)
if (!enemy.MovementLock && patrolRange > 0)
{
float span = animatorRoot.position.x - origin.x;
......
......@@ -21,7 +21,9 @@ public class EnemyMeleeIdle : StateMachineBehaviour {
patrolSpeed = enemy.patrolSpeed;
enemy.ChangeDir_noOption(NumeratedDir.Left);
enemy.ChangeVelocityX_noOption(enemy.MoveDir * patrolSpeed);
if (enemy.patrolRange > 0) {
enemy.ChangeVelocityX_noOption(enemy.MoveDir * patrolSpeed);
}
}
// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
......@@ -31,7 +33,7 @@ public class EnemyMeleeIdle : StateMachineBehaviour {
animator.SetTrigger("TrackTrigger");
return;
}
if (!enemy.MovementLock)
if (!enemy.MovementLock && patrolRange > 0)
{
float span = animatorRoot.position.x - origin.x;
......
......@@ -15,7 +15,6 @@ public class Scarecrow : Enemy {
{
if (neverDie)
{
prevHealth = maxHealth;
currHealth = maxHealth;
}
else
......
......@@ -56,6 +56,7 @@ public class EnemyManager : Singleton<EnemyManager>
Transform enemySpots = MapManager.currentRoom.roomInGame.transform.Find("enemy spot");
foreach(Transform enemySpot in enemySpots)
{
if (!enemySpot.gameObject.activeSelf) { continue; }
GameObject enemy = enemySpot.gameObject.GetComponent<enemySpot>().enemyPrefab;
foreach(Transform location in enemySpot)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment