|
|
@@ -245,7 +245,7 @@ public class PlayerController : MonoBehaviour
|
|
|
}
|
|
|
|
|
|
//角色处于可自由活动状态时的通用切换状态逻辑,如Idle、Run状态,以及别的状态结束时准备回到Idle状态前
|
|
|
- public bool CheckPlayerChangeState(PlayerState excludeState)
|
|
|
+ public bool CheckPlayerChangeState(PlayerState excludeState = PlayerState.None)
|
|
|
{
|
|
|
if (!foot.TrigGround)
|
|
|
{
|
|
|
@@ -396,7 +396,7 @@ public class PlayerController : MonoBehaviour
|
|
|
switch (state)
|
|
|
{
|
|
|
case PlayerState.Idle:
|
|
|
- if (CheckPlayerChangeState(state))
|
|
|
+ if (CheckPlayerChangeState(PlayerState.Idle))
|
|
|
{
|
|
|
break;
|
|
|
}
|
|
|
@@ -404,7 +404,7 @@ public class PlayerController : MonoBehaviour
|
|
|
//rb.velocity = Vector3.zero;
|
|
|
break;
|
|
|
case PlayerState.Run:
|
|
|
- if (CheckPlayerChangeState(state))
|
|
|
+ if (CheckPlayerChangeState(PlayerState.Run))
|
|
|
{
|
|
|
break;
|
|
|
}
|
|
|
@@ -468,7 +468,7 @@ public class PlayerController : MonoBehaviour
|
|
|
}
|
|
|
if (foot.TrigGround)
|
|
|
{
|
|
|
- if (CheckPlayerChangeState(state))
|
|
|
+ if (CheckPlayerChangeState())
|
|
|
{
|
|
|
break;
|
|
|
}
|
|
|
@@ -506,7 +506,7 @@ public class PlayerController : MonoBehaviour
|
|
|
case PlayerState.Hurt:
|
|
|
if (hurtKeepTime <= 0)
|
|
|
{
|
|
|
- if (CheckPlayerChangeState(state))
|
|
|
+ if (CheckPlayerChangeState())
|
|
|
{
|
|
|
break;
|
|
|
}
|
|
|
@@ -521,7 +521,7 @@ public class PlayerController : MonoBehaviour
|
|
|
case PlayerState.Attack:
|
|
|
if (attackTime <= 0)
|
|
|
{
|
|
|
- if (CheckPlayerChangeState(state))
|
|
|
+ if (CheckPlayerChangeState())
|
|
|
{
|
|
|
break;
|
|
|
}
|
|
|
@@ -531,7 +531,7 @@ public class PlayerController : MonoBehaviour
|
|
|
case PlayerState.Summon:
|
|
|
if (summonTime <= 0)
|
|
|
{
|
|
|
- if (CheckPlayerChangeState(state))
|
|
|
+ if (CheckPlayerChangeState())
|
|
|
{
|
|
|
break;
|
|
|
}
|
|
|
@@ -541,7 +541,7 @@ public class PlayerController : MonoBehaviour
|
|
|
case PlayerState.Rush:
|
|
|
if (rushTime <= 0)
|
|
|
{
|
|
|
- if (CheckPlayerChangeState(state))
|
|
|
+ if (CheckPlayerChangeState())
|
|
|
{
|
|
|
break;
|
|
|
}
|