Merge pull request #713 from DCGO2/hooperk-suspend-timing

Fix weird timing with When suspended effects

Assets/Scripts/Script/AttackProcess.cs

@@ -97,9 +97,6 @@ public class AttackProcess : MonoBehaviourPunCallbacks
 
         IsAttacking = true;
 
-        // check timing
-        yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.AutoProcessCheck());
-
         GManager.instance.turnStateMachine.IsSelecting = true;
 
         // force to end attack
@@ -154,24 +151,6 @@ public class AttackProcess : MonoBehaviourPunCallbacks
 
             PlayLog.OnAddLog?.Invoke(log);
 
-            /*List<SkillInfo> stackedSkillInfos = new List<SkillInfo>();
-
-            if (GManager.instance.autoProcessing.executingMultipleSkills != null)
-            {
-                if (GManager.instance.autoProcessing.executingMultipleSkills.StackedSkillInfos.Count >= 1)
-                {
-                    foreach (SkillInfo skillInfo in GManager.instance.autoProcessing.executingMultipleSkills.StackedSkillInfos)
-                    {
-                        stackedSkillInfos.Add(skillInfo);
-                    }
-                }
-
-                foreach (SkillInfo skillInfo in stackedSkillInfos)
-                {
-                    GManager.instance.autoProcessing.executingMultipleSkills.StackedSkillInfos.Remove(skillInfo);
-                }
-            }*/
-
             // suspend
             if (!withoutTap)
             {
@@ -205,10 +184,6 @@ public class AttackProcess : MonoBehaviourPunCallbacks
                 }
             }
 
-            // activate cutin effects
-            // yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.RuleProcess());
-            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(true, null));
-
             // callback that is processed before [On Attack]
             if (beforeOnAttackCoroutine != null)
             {
@@ -216,22 +191,10 @@ public class AttackProcess : MonoBehaviourPunCallbacks
             }
 
             // trigger [On Attack] effect
-            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.StackSkillInfos(
+            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.StackSkillInfos(
                 EffectHashtable,
                 EffectTiming.OnAllyAttack));
 
-            // activate cutin effects
-            // yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.RuleProcess());
-            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.TriggeredSkillProcess(true, null));
-
-            /*if (stackedSkillInfos.Count >= 1)
-            {
-                foreach (SkillInfo skillInfo in stackedSkillInfos)
-                {
-                    GManager.instance.autoProcessing.PutStackedSkill(skillInfo);
-                }
-            }*/
-
             GManager.instance.turnStateMachine.IsSelecting = true;
 
             if (AttackingPermanent.TopCard != null)
@@ -249,9 +212,6 @@ public class AttackProcess : MonoBehaviourPunCallbacks
                 }
             }
 
-            // check timing
-            // yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.AutoProcessCheck());
-
             GManager.instance.turnStateMachine.IsSelecting = true;
 
             // force to end attack

Assets/Scripts/Script/CardController.cs

@@ -5186,10 +5186,7 @@ public class SuspendPermanentsClass
 
             #endregion
 
-            if (IsAttack)
-                yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.StackSkillInfos(_hashtable, EffectTiming.OnTappedAnyone));
-            else
-                yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.StackSkillInfos(_hashtable, EffectTiming.OnTappedAnyone));
+            yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.StackSkillInfos(_hashtable, EffectTiming.OnTappedAnyone));
 
             #endregion