removed sync stuff

Assets/Scripts/Script/AutoProcessing.cs

@@ -126,7 +126,6 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
         yield return ContinuousController.instance.StartCoroutine(ShrinkSecurityDigimonDisplay());
 
         GManager.instance.turnStateMachine.IsSelecting = true;
-        GManager.instance.turnStateMachine.isSync = true;
 
         //Rule processing
         yield return ContinuousController.instance.StartCoroutine(RuleProcess());
@@ -138,7 +137,6 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
         yield return ContinuousController.instance.StartCoroutine(TriggeredSkillProcess(false, null));
 
         GManager.instance.turnStateMachine.IsSelecting = false;
-        GManager.instance.turnStateMachine.isSync = false;
     }
     #endregion
 
@@ -678,8 +676,6 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
     {
         if (GManager.instance.turnStateMachine.gameContext.TurnPhase != GameContext.phase.End)
         {
-            GManager.instance.turnStateMachine.isSync = true;
-
             // yield return GManager.instance.photonWaitController.StartWait("EndTurnProcess");
 
             if (GManager.instance.turnStateMachine.Passed && GManager.instance.turnStateMachine.gameContext.TurnPhase == GameContext.phase.Main)
@@ -722,8 +718,6 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
 
             else
             {
-                GManager.instance.turnStateMachine.isSync = false;
-
                 if (GManager.instance.turnStateMachine.gameContext.TurnPhase == GameContext.phase.Main)
                 {
                     StartCoroutine(GManager.instance.turnStateMachine.SetMainPhase());

Assets/Scripts/Script/CardController.cs

@@ -1233,8 +1233,6 @@ public class PlayPermanentClass
 
             yield return ContinuousController.instance.StartCoroutine(card.Owner.brainStormObject.CloseBrainstrorm(card));
 
-            GManager.instance.turnStateMachine.isSync = true;
-
             Permanent permanent = null;
             isEvolution = false;
             List<CardSource> evoRoots = new List<CardSource>();
@@ -1344,8 +1342,6 @@ public class PlayPermanentClass
                             permanent.EnterFieldTurnCount = GManager.instance.turnStateMachine.TurnCount;
                         }
 
-                        GManager.instance.turnStateMachine.isSync = true;
-
                         if (GManager.instance.turnStateMachine.DoneStartGame)
                         {
                             if (!isEvolution)
@@ -1695,8 +1691,6 @@ public class UseOptionClass
 
             card.Init();
 
-            GManager.instance.turnStateMachine.isSync = true;
-
             card.SetFace();
 
             int cost = card.GetCostItself;

Assets/Scripts/Script/MultipleSkills.cs

@@ -54,10 +54,8 @@ public class MultipleSkills : MonoBehaviourPunCallbacks
             }
         }
 
-        GManager.instance.turnStateMachine.isSync = true;
         yield return ContinuousController.instance.StartCoroutine(ActivateMultipleSkills_OnePlayer(TurnPlayerSkillInfos, GManager.instance.turnStateMachine.gameContext.TurnPlayer, CheckNewTriggredSkill_mainStack, skipCondition));
         yield return ContinuousController.instance.StartCoroutine(ActivateMultipleSkills_OnePlayer(NonTurnPlayerSkillInfos, GManager.instance.turnStateMachine.gameContext.NonTurnPlayer, CheckNewTriggredSkill_mainStack, skipCondition));
-        GManager.instance.turnStateMachine.isSync = false;
 
         SkillInfos_used = new List<SkillInfo>();
 

Assets/Scripts/Script/NextPhaseButton.cs

@@ -43,14 +43,12 @@ public class NextPhaseButton : MonoBehaviourPunCallbacks
     {
         TurnStateMachine turnStateMachine = GManager.instance.turnStateMachine;
 
-        if (!turnStateMachine.isSync && !turnStateMachine.IsSelecting && !turnStateMachine.isExecuting && !turnStateMachine.isSecurityCehck)
+        if (!turnStateMachine.IsSelecting && !turnStateMachine.isExecuting && !turnStateMachine.isSecurityCehck)
         {
             if (turnStateMachine.gameContext.TurnPlayer.isYou)
             {
                 if (turnStateMachine.gameContext.TurnPhase == GameContext.phase.Breeding || turnStateMachine.gameContext.TurnPhase == GameContext.phase.Main)
                 {
-                    GManager.instance.turnStateMachine.isSync = true;
-
                     switch (turnStateMachine.gameContext.TurnPhase)
                     {
                         case GameContext.phase.Breeding:
@@ -107,7 +105,7 @@ public class NextPhaseButton : MonoBehaviourPunCallbacks
                     {
                         if (GManager.instance.turnStateMachine.gameContext.TurnPlayer.isYou)
                         {
-                            if (!GManager.instance.attackProcess.IsAttacking && !GManager.instance.turnStateMachine.isSync && !GManager.instance.turnStateMachine.IsSelecting && !GManager.instance.turnStateMachine.isExecuting && !GManager.instance.turnStateMachine.isSecurityCehck)
+                            if (!GManager.instance.attackProcess.IsAttacking && !GManager.instance.turnStateMachine.IsSelecting && !GManager.instance.turnStateMachine.isExecuting && !GManager.instance.turnStateMachine.isSecurityCehck)
                             {
                                 switch (GManager.instance.turnStateMachine.gameContext.TurnPhase)
                                 {

Assets/Scripts/Script/PhotonWaitController.cs

@@ -184,6 +184,11 @@ public class PhotonWaitController : MonoBehaviour
 
     public IEnumerator Wait(string key)
     {
+        if (true)
+        {
+            yield break;
+        }
+
         StartCoroutine(SetWaitingText("Syncing"));
 
         Debug.Log($"Start Waiting:{key}");

Assets/Scripts/Script/SelectAssemblyClass.cs

@@ -154,8 +154,6 @@ public class SelectAssemblyClass : MonoBehaviourPunCallbacks
     #region Select
     public IEnumerator Select(CardSource card)
     {
-        GManager.instance.turnStateMachine.isSync = true;
-
         selectedAssemblyCards = new List<CardSource>();
 
         playCard = card;
@@ -200,8 +198,6 @@ public class SelectAssemblyClass : MonoBehaviourPunCallbacks
         }
 
         GManager.instance.GetComponent<Effects>().OffShowCard2();
-
-        GManager.instance.turnStateMachine.isSync = false;
     }
     #endregion
 

Assets/Scripts/Script/SelectDigiXrosClass.cs

@@ -358,8 +358,6 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
     #region Select
     public IEnumerator Select(CardSource card)
     {
-        GManager.instance.turnStateMachine.isSync = true;
-
         selectedDigicrossCards = new List<CardSource>();
 
         playCard = card;
@@ -563,8 +561,6 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
         }
 
         GManager.instance.GetComponent<Effects>().OffShowCard2();
-
-        GManager.instance.turnStateMachine.isSync = false;
     }
     #endregion
 

Assets/Scripts/Script/TurnStateMachine.cs

@@ -19,9 +19,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
     //Wheteher Selecting some card
     public bool IsSelecting = false;
 
-    //Synchronization
-    public bool isSync;
-
     //Effects in use
     public bool isExecuting;
 
@@ -560,11 +557,9 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
         gameContext.TurnPlayer.TurnCount++;
 
-        isSync = true;
         gameContext.TurnPhase = GameContext.phase.Active;
         Debug.Log($"{gameContext.TurnPlayer}:Start Turn({TurnCount}th Turn)");
         yield return GManager.instance.photonWaitController.StartWait("StartTrun");
-        isSync = false;
 
         GManager.instance.showTurnPlayerObject.ShowTurnPlayer(gameContext.TurnPlayer);
 
@@ -595,8 +590,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
             yield break;
         }
 
-        isSync = true;
-
         #region Unsuspend
 
         #region Untap permanents in play
@@ -677,12 +670,8 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
         PlayLog.OnAddLog?.Invoke($"\nDraw Phase:\n{gameContext.TurnPlayer.PlayerName}\n");
         #endregion
 
-        isSync = true;
         gameContext.TurnPhase = GameContext.phase.Draw;
         yield return GManager.instance.photonWaitController.StartWait("DrawPhase");
-        isSync = false;
-
-        isSync = true;
 
         #region ドロー
         if (TurnCount != 1)
@@ -731,10 +720,9 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
         PlayLog.OnAddLog?.Invoke($"\nBreeding Phase:\n{gameContext.TurnPlayer.PlayerName}\n");
         #endregion
 
-        isSync = true;
         gameContext.TurnPhase = GameContext.phase.Breeding;
         yield return GManager.instance.photonWaitController.StartWait("BreedingPhase");
-        isSync = false;
+
         IsSelecting = false;
 
         if (gameContext.TurnPlayer.CanHatch || gameContext.TurnPlayer.CanMove)
@@ -915,7 +903,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
         OffFieldCardTarget(gameContext.TurnPlayer);
         #endregion
 
-        isSync = true;
         gameContext.TurnPhase = GameContext.phase.Main;
         Debug.Log($"{gameContext.TurnPlayer}:Main Phase");
         yield return GManager.instance.photonWaitController.StartWait("MainPhase");
@@ -930,8 +917,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
         // Automatic processing check timing
         yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.AutoProcessCheck());
 
-        isSync = false;
-
         bool CanSelect()
         {
             //You can play cards from your hand.
@@ -1197,26 +1182,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
             }
 
             ResetUI();
-
-            _timer = 0f;
-
-            while (true)
-            {
-                yield return null;
-                _timer += Time.deltaTime;
-
-                if (!GManager.instance.commandText.gameObject.activeSelf)
-                {
-                    break;
-                }
-
-                if (_timer >= 0.6f)
-                {
-                    GManager.instance.commandText.gameObject.SetActive(false);
-                }
-            }
-
-            yield return new WaitWhile(() => GManager.instance.commandText.gameObject.activeSelf);
             #endregion
 
             #region Use activation effect
@@ -1246,8 +1211,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
             #region play cards
             else if (PlayCard != null)
             {
-                isSync = true;
-
                 yield return StartCoroutine(GManager.instance.GetComponent<Effects>().DeleteHandCardEffectCoroutine(PlayCard));
 
                 yield return StartCoroutine(GManager.instance.GetComponent<Effects>().ShowUseHandCardEffect_PlayCard(PlayCard));
@@ -1292,7 +1255,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                 yield return StartCoroutine(playCard.PlayCard());
 
-                isSync = false;
             }
             #endregion
 
@@ -1388,7 +1350,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
             #endregion
 
             IsSelecting = false;
-            isSync = false;
+
             PlayCard = null;
             TargetFrameID = -1;
             JogressEvoRootsFrameIDs = new int[0];
@@ -1404,13 +1366,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
     #region Added main phase operations
     public IEnumerator SetMainPhase()
     {
-        if (isSync)
-        {
-            yield break;
-        }
-
-        yield return new WaitWhile(() => isSync);
-
         if (gameContext.TurnPhase != GameContext.phase.Main)
         {
             yield break;
@@ -1478,9 +1433,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
         yield return new WaitWhile(() => GManager.instance.commandText.gameObject.activeSelf);
         #endregion
 
-        // added
-        yield return new WaitWhile(() => isSync);
-
         #region Click/drag operation
         if (gameContext.TurnPlayer.isYou)
         {
@@ -1496,11 +1448,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                     IEnumerator OnClick_Select()
                     {
-                        if (isSync)
-                        {
-                            yield break;
-                        }
-
                         IsSelecting = true;
 
                         #region Reset cards in other places
@@ -1793,11 +1740,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                             #region ドラッグ開始
                             void OnBeginDragAction(FieldPermanentCard fieldPermanentCard2)
                             {
-                                if (isSync)
-                                {
-                                    return;
-                                }
-
                                 if (gameContext.TurnPlayer.FieldPermanentObjects.Count((fieldPermanentCard3) => fieldPermanentCard3.fieldUnitCommandPanel.isActive()) == 0)
                                 {
                                     #region 手札のカードをリセット
@@ -1865,11 +1807,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                             #region ドラッグ中
                             void OnDragAction(FieldPermanentCard fieldPermanentCard2, List<DropArea> dropAreas)
                             {
-                                if (isSync)
-                                {
-                                    StartCoroutine(SetMainPhase());
-                                }
-
                                 fieldPermanentCard2.CloseCommandPanel();
 
                                 TargetArrow targetArrow = null;
@@ -1945,11 +1882,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                             #region ドラッグ終了
                             void OnEndDragAction(FieldPermanentCard fieldPermanentCard2, List<DropArea> dropAreas)
                             {
-                                if (isSync)
-                                {
-                                    StartCoroutine(SetMainPhase());
-                                }
-
                                 IsSelecting = false;
 
                                 TargetArrow targetArrow = null;
@@ -2067,11 +1999,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                     #region At the start of drag
                     void BeginDrag(HandCard handCard1)
                     {
-                        if (isSync)
-                        {
-                            //return;
-                        }
-
                         if (gameContext.TurnPlayer.FieldPermanentObjects.Count((_fieldPermanentCard1) => _fieldPermanentCard1.fieldUnitCommandPanel.isActive()) == 0)
                         {
                             IsSelecting = true;
@@ -2175,11 +2102,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                     #region At the end of drag
                     void OnDropCard(List<DropArea> dropAreas)
                     {
-                        if (isSync)
-                        {
-                            StartCoroutine(Return());
-                        }
-
                         if (gameContext.TurnPlayer.FieldPermanentObjects.Count((_fieldPermanentCard1) => _fieldPermanentCard1.fieldUnitCommandPanel.isActive()) == 0)
                         {
                             foreach (FieldPermanentCard fieldPermanentCard in gameContext.TurnPlayer.FieldPermanentObjects)
@@ -2288,8 +2210,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                                                         IEnumerator SelectWheterToJogress()
                                                         {
-                                                            isSync = true;
-
                                                             yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().MoveToExecuteCardEffect_SetPosition(handCard.cardSource, Pos));
                                                             handCard.transform.position = handCard.cardSource.Owner.brainStormObject.BrainStormHandCards[0].transform.position;
 
@@ -2337,8 +2257,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                                                         IEnumerator SelectWheterToBurst()
                                                         {
-                                                            isSync = true;
-
                                                             yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().MoveToExecuteCardEffect_SetPosition(handCard.cardSource, Pos));
                                                             handCard.transform.position = handCard.cardSource.Owner.brainStormObject.BrainStormHandCards[0].transform.position;
 
@@ -2385,8 +2303,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                                                         IEnumerator SelectWheterToAppFusion()
                                                         {
-                                                            isSync = true;
-
                                                             yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().MoveToExecuteCardEffect_SetPosition(handCard.cardSource, Pos));
                                                             handCard.transform.position = handCard.cardSource.Owner.brainStormObject.BrainStormHandCards[0].transform.position;
 
@@ -2432,8 +2348,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                                                         IEnumerator SelectJogressTarget()
                                                         {
-                                                            isSync = true;
-
                                                             if (move)
                                                             {
                                                                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().MoveToExecuteCardEffect_SetPosition(handCard.cardSource, Pos));
@@ -2463,8 +2377,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                                                                 yield return null;
                                                                 yield return StartCoroutine(Return());
                                                             }
-
-                                                            isSync = false;
                                                         }
                                                     }
                                                     #endregion
@@ -2482,8 +2394,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                                                         IEnumerator SelectJogressTarget()
                                                         {
-                                                            isSync = true;
-
                                                             if (move)
                                                             {
                                                                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().MoveToExecuteCardEffect_SetPosition(handCard.cardSource, Pos));
@@ -2514,8 +2424,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                                                                 yield return null;
                                                                 yield return StartCoroutine(Return());
                                                             }
-
-                                                            isSync = false;
                                                         }
                                                     }
                                                     #endregion
@@ -2533,8 +2441,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                                                         IEnumerator SelectAppFusionTarget()
                                                         {
-                                                            isSync = true;
-
                                                             if (move)
                                                             {
                                                                 yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().MoveToExecuteCardEffect_SetPosition(handCard.cardSource, Pos));
@@ -2565,8 +2471,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                                                                 yield return null;
                                                                 yield return StartCoroutine(Return());
                                                             }
-
-                                                            isSync = false;
                                                         }
                                                     }
                                                     #endregion
@@ -2688,11 +2592,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                     #region While dragging
                     void OnDragCard(List<DropArea> dropAreas)
                     {
-                        if (isSync)
-                        {
-                            StartCoroutine(Return());
-                        }
-
                         GManager.instance.memoryObject.OffMemoryPredictionLine();
 
                         if (gameContext.TurnPlayer.FieldPermanentObjects.Count((_fieldUnitCard1) => _fieldUnitCard1.fieldUnitCommandPanel.isActive()) == 0)
@@ -2859,7 +2758,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                             }
                         }
 
-                        isSync = false;
                         StartCoroutine(SetMainPhase());
                     }
                 }
@@ -3274,11 +3172,9 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
         OffFieldCardTarget(gameContext.TurnPlayer);
         #endregion
 
-        isSync = true;
         gameContext.TurnPhase = GameContext.phase.End;
         Debug.Log($"{gameContext.TurnPlayer}:End Phase");
         yield return GManager.instance.photonWaitController.StartWait("EndPhase");
-        isSync = false;
 
         isFirstPlayerFirstTurn = false;