修复领导牌不可用的BUG

664235822 · Aug 19, 2018 · 30d3ae0 · 30d3ae0
1 parent 5deb6f6
commit 30d3ae0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/Assets/Scripts/Leader/EnemyLeaderBehavior.cs b/Assets/Scripts/Leader/EnemyLeaderBehavior.cs
@@ -10,12 +10,6 @@ public class EnemyLeaderBehavior : LeaderBehaviorBase
         public override void Play()
         {
             isEnabled = false;
-            CoroutineManager.GetInstance().AddTask(TweenCard.GetInstance().Play(transform));
-            StartCoroutine(LeaderController.GetInstance().EnemyTurnIndicator());
-            EnemyController.GetInstance().Number();
-            PowerController.GetInstance().Number();
-            if (TurnController.GetInstance().isTurned[0])
-                EnemyController.GetInstance().Play(EnemyController.GetInstance().grids[1]);
         }
 
         public override bool IsEnabled
@@ -30,5 +24,4 @@ public override bool IsEnabled
             }
         }
     }
-}
-
+}
diff --git a/Assets/Scripts/Leader/EnemyLeaderBehavior.cs.meta b/Assets/Scripts/Leader/EnemyLeaderBehavior.cs.meta
diff --git a/Assets/Scripts/Leader/PlayerLeaderBehavior.cs.meta b/Assets/Scripts/Leader/PlayerLeaderBehavior.cs.meta
diff --git a/Assets/Scripts/Play/EnemyController.cs b/Assets/Scripts/Play/EnemyController.cs
@@ -153,6 +153,7 @@ public IEnumerator Play(Transform grid)
             if (LeaderController.GetInstance().obj[1].GetComponent<EnemyLeaderBehavior>().IsEnabled)
             {
                 LeaderController.GetInstance().obj[1].GetComponent<EnemyLeaderBehavior>().Play();
+                yield return PlayOver(LeaderController.GetInstance().obj[1].transform);
                 CoroutineManager.GetInstance().Finish();
                 yield break;
             }
@@ -341,13 +342,18 @@ public IEnumerator Play(Transform grid)
                     break;
             }
 
-            yield return TweenCard.GetInstance().Play(card);
+            yield return PlayOver(card);
+            CoroutineManager.GetInstance().Finish();
+        }
+
+        IEnumerator PlayOver(Transform card)
+        {
             StartCoroutine(LeaderController.GetInstance().EnemyTurnIndicator());
+            yield return TweenCard.GetInstance().Play(card);
             Number();
             PowerController.GetInstance().Number();
             if (TurnController.GetInstance().isTurned[0])
                 yield return Play(grids[1]);
-            CoroutineManager.GetInstance().Finish();
         }
     }
 }
diff --git a/Assets/Scripts/Play/GameController.cs b/Assets/Scripts/Play/GameController.cs
@@ -55,7 +55,6 @@ public void StartGame()
                 CoroutineManager.GetInstance().AddTask(TweenMessage.GetInstance().Play("敌方领导牌技能发动\r\n战斗开始时多摸一张牌"));
             }
 
-
             if (offensive)
             {
                 CoroutineManager.GetInstance().AddTask(TweenMessage.GetInstance().Play("你先手"));
@@ -243,7 +242,7 @@ public IEnumerator Turn()
             else
             {
                 yield return TweenMessage.GetInstance().Play("对方先手");
-                CoroutineManager.GetInstance().AddTask(EnemyController.GetInstance().Play(EnemyController.GetInstance().grids[1]));
+                yield return EnemyController.GetInstance().Play(EnemyController.GetInstance().grids[1]));
             }
 
             CoroutineManager.GetInstance().Finish();