|
|
@@ -624,15 +624,13 @@ public class PlayerController : MoveCharacter
|
|
|
}
|
|
|
if (state!=CharacterState.Conduct && nowConductButton != -1 && conductTime >= 0)
|
|
|
{
|
|
|
- if (!conductCanRelease[nowConductButton])
|
|
|
+ CheckTurn();
|
|
|
+ if (conductCanRelease[nowConductButton])
|
|
|
{
|
|
|
- cacheConductId = nowConductButton;
|
|
|
- nowConductButton = -1;
|
|
|
- return false;
|
|
|
+ ChangeState(CharacterState.Conduct);
|
|
|
+ return true;
|
|
|
}
|
|
|
- CheckTurn();
|
|
|
- ChangeState(CharacterState.Conduct);
|
|
|
- return true;
|
|
|
+
|
|
|
}
|
|
|
return false;
|
|
|
}
|