|
@@ -607,6 +607,8 @@ public class Demonic : MoveCharacter
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
|
|
|
+ ani.Play("idle", 0, 0);
|
|
|
|
|
+ aniCollider.Play("Idle", 0, 0);
|
|
|
rb.velocity = Vector3.zero;
|
|
rb.velocity = Vector3.zero;
|
|
|
transform.position = origSoulPos;
|
|
transform.position = origSoulPos;
|
|
|
isReturnSoulTower = false;
|
|
isReturnSoulTower = false;
|
|
@@ -633,7 +635,7 @@ public class Demonic : MoveCharacter
|
|
|
to = g;
|
|
to = g;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if (to.transform.position.x < transform.position.x)
|
|
|
|
|
|
|
+ if (to != null && to.transform.position.x < transform.position.x)
|
|
|
{
|
|
{
|
|
|
if (bodyTrans.localScale.x < 0)
|
|
if (bodyTrans.localScale.x < 0)
|
|
|
{
|
|
{
|
|
@@ -692,6 +694,9 @@ public class Demonic : MoveCharacter
|
|
|
case CharacterState.Float:
|
|
case CharacterState.Float:
|
|
|
canMove = true;
|
|
canMove = true;
|
|
|
break;
|
|
break;
|
|
|
|
|
+ case CharacterState.LockSoul:
|
|
|
|
|
+ isReturnSoulTower = true;
|
|
|
|
|
+ break;
|
|
|
default:
|
|
default:
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
@@ -758,8 +763,8 @@ public class Demonic : MoveCharacter
|
|
|
break;
|
|
break;
|
|
|
case CharacterState.LockSoul:
|
|
case CharacterState.LockSoul:
|
|
|
rb.velocity = Vector3.zero;
|
|
rb.velocity = Vector3.zero;
|
|
|
- ani.Play("idle", 0, 0);
|
|
|
|
|
- aniCollider.Play("Idle", 0, 0);
|
|
|
|
|
|
|
+ ani.Play("walk", 0, 0);
|
|
|
|
|
+ aniCollider.Play("Walk", 0, 0);
|
|
|
FaceToEneTower();
|
|
FaceToEneTower();
|
|
|
break;
|
|
break;
|
|
|
default:
|
|
default:
|