Merge pull request #766 from DCGO2/hooperk-used-blitz

Fix remove UsedBlitz flag which was preventign valid scenarios

Assets/Scripts/Script/AttackProcess.cs

@@ -18,7 +18,6 @@ public class AttackProcess : MonoBehaviourPunCallbacks
     public bool DoSecurityCheck { get; set; } = false;
     public bool IsEndAttack { get; set; } = false;
 
-    public bool UsedBlitz { get; set; } = false;
     public Hashtable EffectHashtable { get; set; } = null;
 
     public Hashtable CounterEffectHashtable { get; set; } = null;

Assets/Scripts/Script/CardEffectCommons/KeyWordEffects/Blitz.cs

@@ -17,10 +17,7 @@ public partial class CardEffectCommons
                 {
                     if (!GManager.instance.attackProcess.IsAttacking)
                     {
-                        if (!GManager.instance.attackProcess.UsedBlitz)
-                        {
-                            return true;
-                        }                                                
+                        return true;                                         
                     }
                 }
             }
@@ -46,8 +43,6 @@ public partial class CardEffectCommons
             selectAttackEffect.SetBeforeOnAttackCoroutine(beforeOnAttackCoroutine);
 
             yield return ContinuousController.instance.StartCoroutine(selectAttackEffect.Activate());
-
-            GManager.instance.attackProcess.UsedBlitz = true;
         }
     }
     #endregion

Assets/Scripts/Script/MemoryObject.cs

@@ -102,7 +102,7 @@ public class MemoryObject : MonoBehaviour
                 }
 
 
-                #region アニメーション
+                #region �ｽA�ｽj�ｽ�ｽ�ｽ[�ｽV�ｽ�ｽ�ｽ�ｽ
                 bool end = false;
                 var sequence = DOTween.Sequence();
 
@@ -122,15 +122,6 @@ public class MemoryObject : MonoBehaviour
                 yield return new WaitWhile(() => !end);
                 end = false;
                 #endregion
-
-                #region setting used blitz
-                if (GManager.instance.attackProcess.UsedBlitz)
-                {
-                    if (GManager.instance.turnStateMachine.gameContext.Memory <= 0)
-                        GManager.instance.attackProcess.UsedBlitz = false;
-                }
-                    
-                #endregion
             }
         }
 

Assets/Scripts/Script/TurnStateMachine.cs

@@ -968,14 +968,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
             ResetMainPhaseParameter();
             #endregion
 
-            #region resetting used blitz
-            if (GManager.instance.attackProcess.UsedBlitz)
-            {
-                if (GManager.instance.turnStateMachine.gameContext.Memory <= 0)
-                    GManager.instance.attackProcess.UsedBlitz = false;
-            }
-            #endregion
-
             yield return GManager.instance.photonWaitController.StartWait("SetMainPhase");
 
             if (gameContext.TurnPhase == GameContext.phase.Main)