|
@@ -1282,11 +1282,7 @@ public class PlayerController : MoveCharacter
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
case CharacterState.Weak:
|
|
case CharacterState.Weak:
|
|
|
- if (weakTime <= 0)
|
|
|
|
|
- {
|
|
|
|
|
- ChangeState(CharacterState.Idle);
|
|
|
|
|
- break;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
if (rb.velocity.magnitude > 1)
|
|
if (rb.velocity.magnitude > 1)
|
|
|
{
|
|
{
|
|
|
if (ani.GetCurrentAnimatorClipInfo(0)[0].clip.name != "hitted")
|
|
if (ani.GetCurrentAnimatorClipInfo(0)[0].clip.name != "hitted")
|
|
@@ -1319,9 +1315,15 @@ public class PlayerController : MoveCharacter
|
|
|
ani.Play("weak", 0, 0);
|
|
ani.Play("weak", 0, 0);
|
|
|
aniCollider.Play("Weak", 0, 0);
|
|
aniCollider.Play("Weak", 0, 0);
|
|
|
rb.velocity = Vector3.zero;
|
|
rb.velocity = Vector3.zero;
|
|
|
|
|
+ weakTime = totalWeakTime;
|
|
|
}
|
|
}
|
|
|
rb.velocity = new Vector3(velocityAddition, rb.velocity.y, 0);
|
|
rb.velocity = new Vector3(velocityAddition, rb.velocity.y, 0);
|
|
|
}
|
|
}
|
|
|
|
|
+ if (weakTime <= 0)
|
|
|
|
|
+ {
|
|
|
|
|
+ ChangeState(CharacterState.Idle);
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
break;
|
|
break;
|
|
|
case CharacterState.PullRope:
|
|
case CharacterState.PullRope:
|
|
|
|
|
|