Prechádzať zdrojové kódy

Merge pull request #1462 from DCGO2/hooperk-hybrid-5

Fix compilation issues
x89rt2 2 mesiacov pred
rodič
commit
2ad3f00e29
1 zmenil súbory, kde vykonal 19 pridanie a 13 odobranie
  1. 19 13
      Assets/Scripts/Script/CardController.cs

+ 19 - 13
Assets/Scripts/Script/CardController.cs

@@ -126,8 +126,8 @@ public class PlayCardClass
         bool isTapped,
         bool isTapped,
         SelectCardEffect.Root root,
         SelectCardEffect.Root root,
         bool activateETB,
         bool activateETB,
-        IEnumerator<CardSource> successProcess = null,
-        IEnumerator<CardSource> failedProcess = null)
+        Func<List<CardSource>, IEnumerator> successProcess = null,
+        Func<CardSource, IEnumerator> failedProcess = null)
     {
     {
         if (cardSources != null)
         if (cardSources != null)
         {
         {
@@ -220,8 +220,8 @@ public class PlayCardClass
     int _burstTamerFrameID = -1;
     int _burstTamerFrameID = -1;
     int[] _appFusionFrameIDs = null;
     int[] _appFusionFrameIDs = null;
     bool _isBreedingArea = false;
     bool _isBreedingArea = false;
-    IEnumerator<CardSource> _successProcess;
-    IEnumerator<CardSource> _failedProcess;
+    Func<List<CardSource>, IEnumerator> _successProcess;
+    Func<CardSource, IEnumerator> _failedProcess;
 
 
     public bool isJogress => _jogressEvoRootsFrameIDs != null && _jogressEvoRootsFrameIDs.Length == 2;
     public bool isJogress => _jogressEvoRootsFrameIDs != null && _jogressEvoRootsFrameIDs.Length == 2;
 
 
@@ -957,19 +957,15 @@ public class PlayCardClass
                         {
                         {
                             yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddTrashCard(cardSource));
                             yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddTrashCard(cardSource));
                         }
                         }
-                    }
-
-                    if (_failedProcess != null)
-                    {
-                        yield return ContinuousController.instance.StartCoroutine(_failedProcess(cardSource));
+                        if (_failedProcess != null)
+                        {
+                            yield return ContinuousController.instance.StartCoroutine(_failedProcess(cardSource));
+                        }
                     }
                     }
                 }
                 }
                 else
                 else
                 {
                 {
-                    if (_successProcess != null)
-                    {
-                        yield return ContinuousController.instance.StartCoroutine(_successProcess(cardSource));
-                    }
+                    
                 }
                 }
             }
             }
 
 
@@ -1042,6 +1038,11 @@ public class PlayCardClass
 
 
         yield return ContinuousController.instance.StartCoroutine(playPermanent.PlayPermanent());
         yield return ContinuousController.instance.StartCoroutine(playPermanent.PlayPermanent());
 
 
+        if (_successProcess != null)
+        {
+            yield return ContinuousController.instance.StartCoroutine(_successProcess(permanentCards));
+        }
+
         #endregion
         #endregion
 
 
         #region use option
         #region use option
@@ -1053,6 +1054,11 @@ public class PlayCardClass
 
 
         yield return ContinuousController.instance.StartCoroutine(useOption.UseOption());
         yield return ContinuousController.instance.StartCoroutine(useOption.UseOption());
 
 
+        if (_successProcess != null)
+        {
+            yield return ContinuousController.instance.StartCoroutine(_successProcess(optionCards));
+        }
+
         #endregion
         #endregion
 
 
         #endregion
         #endregion