|
|
@@ -658,8 +658,11 @@ public class PlayerController : MoveCharacter
|
|
|
{
|
|
|
if (cacheSummonTime >= 0 && conductTime <= totalCacheSummonTime)
|
|
|
{
|
|
|
-
|
|
|
CheckTurn();
|
|
|
+ if (!CheckCanSummon(cacheSummonId))
|
|
|
+ {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
Summon(cacheSummonId);
|
|
|
return true;
|
|
|
}
|
|
|
@@ -688,7 +691,7 @@ public class PlayerController : MoveCharacter
|
|
|
isReadyConduct = false;
|
|
|
return true;
|
|
|
}
|
|
|
- if (!isReadyConduct && conductTime >= canConductTime[nowConductButton])
|
|
|
+ if (!isReadyConduct && nowConductButton != -1 && conductTime >= canConductTime[nowConductButton])
|
|
|
{
|
|
|
conductReadyTip.Show();
|
|
|
isReadyConduct = true;
|
|
|
@@ -897,6 +900,7 @@ public class PlayerController : MoveCharacter
|
|
|
else
|
|
|
{
|
|
|
print("À¶Á¿²»×ã");
|
|
|
+ ChangeState(CharacterState.Idle);
|
|
|
}
|
|
|
}
|
|
|
|