英灵选择框也不会部位

ActionTowerDefense/Assets/Scripts/PlayerController.cs

@@ -592,11 +592,11 @@ public class PlayerController : MoveCharacter
         }
         if (btnTransfiguratePress)
         {
-            if (spirits.hasSpirits > 0)
+            if (spirits.ultimateTimes[spirits.nowSpirit] > 0)
             {
                 Summon((int)spirits.ownSpirits[spirits.nowSpirit] + 3);
+                return true;
             }
-            return true;
         }
         if (isSpiritSummon)
         {

ActionTowerDefense/Assets/Scripts/Spirits/Base_Spirits/SpiritSystem.cs

@@ -168,65 +168,45 @@ public class SpiritSystem : MonoBehaviour
         switch (id)
         {
             case 0:
-                if (p1Spirits.hasSpirits > 0)
+                if (chooseLeft)
                 {
-                    while (true)
+                    curCard1 -= 1;
+                    if (curCard1 == -1)
                     {
-                        if (chooseLeft)
-                        {
-                            curCard1 -= 1;
-                            if (curCard1 == -1)
-                            {
-                                curCard1 = 2;
-                            }
-                        }
-                        else
-                        {
-                            curCard1 += 1;
-                            if (curCard1 == 3)
-                            {
-                                curCard1 = 0;
-                            }
-                        }
-                        if(p1Spirits.ultimateTimes[curCard1] > 0)
-                        {
-                            break;
-                        }
+                        curCard1 = 2;
                     }
-
-                    choose1.transform.position = player1cards[curCard1].transform.position;
-                    p1Spirits.nowSpirit = curCard1;
                 }
+                else
+                {
+                    curCard1 += 1;
+                    if (curCard1 == 3)
+                    {
+                        curCard1 = 0;
+                    }
+                }
+
+                choose1.transform.position = player1cards[curCard1].transform.position;
+                p1Spirits.nowSpirit = curCard1;
                 break;
             case 1:
-                if (p2Spirits.hasSpirits > 0)
+                if (chooseLeft)
                 {
-                    while (true)
+                    curCard2 -= 1;
+                    if (curCard2 == -1)
                     {
-                        if (chooseLeft)
-                        {
-                            curCard2 -= 1;
-                            if (curCard2 == -1)
-                            {
-                                curCard2 = 2;
-                            }
-                        }
-                        else
-                        {
-                            curCard2 += 1;
-                            if (curCard2 == 3)
-                            {
-                                curCard2 = 0;
-                            }
-                        }
-                        if (p2Spirits.ultimateTimes[curCard2] > 0)
-                        {
-                            break;
-                        }
+                        curCard2 = 2;
+                    }
+                }
+                else
+                {
+                    curCard2 += 1;
+                    if (curCard2 == 3)
+                    {
+                        curCard2 = 0;
                     }
-                    choose2.transform.position = player2cards[curCard2].transform.position;
-                    p2Spirits.nowSpirit = curCard2;
                 }
+                choose2.transform.position = player2cards[curCard2].transform.position;
+                p2Spirits.nowSpirit = curCard2;
                 break;
         }
     }
@@ -411,14 +391,6 @@ public class SpiritSystem : MonoBehaviour
                 player2cards[i].GetComponent<Image>().sprite = SpiritTypeToSprite(p2Spirits.ownSpirits[i]);
             }
         }
-        if(p1Spirits.ultimateTimes[p1Spirits.nowSpirit] == 0)
-        {
-            if(p2Spirits != null)
-            {
-                ChangeSpirit(1, true);
-            }
-            ChangeSpirit(0, true);
-        }
     }
 
     //SpiritTypeתͼƬ