Merge pull request #1402 from BennAbbot/Remove-PhotonWaitController

Remove photon wait controller

Assets/Scripts/CardEffect/BT10/Red/BT10_095.cs

@@ -104,8 +104,6 @@ namespace DCGO.CardEffects.BT10
 
                         while (canSelectEffects.Count((effect) => !activatedEffects.Contains(effect)) >= 1)
                         {
-                            yield return GManager.instance.photonWaitController.StartWait("FlyingHero_selectFirst");
-
                             if (canSelectEffects.Count((effect) => !activatedEffects.Contains(effect)) >= 2)
                             {
                                 List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()

Assets/Scripts/CardEffect/BT12/Yellow/BT12_041.cs

@@ -70,7 +70,6 @@ namespace DCGO.CardEffects.BT12
                         {
                             for (int i = 0; i < count; i++)
                             {
-                                yield return GManager.instance.photonWaitController.StartWait("Cho-Hakkaimon");
 
                                 if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                                 {

Assets/Scripts/CardEffect/BT13/Green/BT13_059.cs

@@ -280,8 +280,6 @@ namespace DCGO.CardEffects.BT13
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    yield return GManager.instance.photonWaitController.StartWait("Examon_Select_ET13_059");
-
                     List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
                         {
                             new SelectionElement<bool>(message: $"Suspend 1 Digimon", value : true, spriteIndex: 0),

Assets/Scripts/CardEffect/BT14/Yellow/BT14_094.cs

@@ -29,8 +29,6 @@ namespace DCGO.CardEffects.BT14
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    yield return GManager.instance.photonWaitController.StartWait("Heavens_Select_BT14");
-
                     List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                         {
                             new SelectionElement<int>(message: $"DP-6000", value : 0, spriteIndex: 0),

Assets/Scripts/CardEffect/BT14/Yellow/BT14_102.cs

@@ -77,8 +77,6 @@ namespace DCGO.CardEffects.BT14
 
                     if (deleted)
                     {
-                        yield return GManager.instance.photonWaitController.StartWait("Heavens_Select_BT14");
-
                         List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                         {
                             new SelectionElement<int>(message: $"Place 1 Digimon with the [Virus] trait at the bottom of security", value : 0, spriteIndex: 0),

Assets/Scripts/CardEffect/BT16/Black/BT16_056.cs

@@ -266,8 +266,6 @@ namespace DCGO.CardEffects.BT16
                     if (card.Owner.Enemy.SecurityCards.Count < 3)
                         yield break;
 
-                    yield return GManager.instance.photonWaitController.StartWait("Publimon_Select_ETB");
-
                     List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
                     {
                         new SelectionElement<bool>(message: $"Security Top", value : true, spriteIndex: 0),

Assets/Scripts/CardEffect/BT17/Blue/BT17_027.cs

@@ -187,8 +187,6 @@ namespace DCGO.CardEffects.BT17
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        yield return GManager.instance.photonWaitController.StartWait("MetalGarurumon_BT17");
-
                         List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                         {
                             new(message: "1 of your opponent's Digimon or Tamers can't suspend until the end of their turn. ",
@@ -396,8 +394,6 @@ namespace DCGO.CardEffects.BT17
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        yield return GManager.instance.photonWaitController.StartWait("MetalGarurumon_BT17");
-
                         List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                         {
                             new(message: "1 of your opponent's Digimon or Tamers can't suspend until the end of their turn. ",

Assets/Scripts/CardEffect/BT17/Red/BT17_015.cs

@@ -190,8 +190,6 @@ namespace DCGO.CardEffects.BT17
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        yield return GManager.instance.photonWaitController.StartWait("WarGreymon_BT17");
-
                         List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                         {
                             new(message: "Delete 1 of your opponent's Digimon with 8000 DP or less",
@@ -360,8 +358,6 @@ namespace DCGO.CardEffects.BT17
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        yield return GManager.instance.photonWaitController.StartWait("WarGreymon_BT17");
-
                         List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                         {
                             new(message: "Delete 1 of your opponent's Digimon with 8000 DP or less",

Assets/Scripts/CardEffect/BT22/Red/BT22_013.cs

@@ -195,8 +195,6 @@ namespace DCGO.CardEffects.BT22
 
                     if(CanDelete || CanEvo)
                     {
-                        yield return GManager.instance.photonWaitController.StartWait("WarGreymon_BT22-013");
-
                         List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                         {
                             new(

Assets/Scripts/CardEffect/BT5/Purple/BT5_082.cs

@@ -126,7 +126,6 @@ public class BT5_082 : CEntity_Effect
 
                     while (canSelectEffects.Count((effect) => !activatedEffects.Contains(effect)) >= 1)
                     {
-                        yield return GManager.instance.photonWaitController.StartWait("Tactimon_selectFirst");
 
                         if (canSelectEffects.Count((effect) => !activatedEffects.Contains(effect)) >= 2)
                         {

Assets/Scripts/CardEffect/BT6/Black/BT6_111.cs

@@ -213,7 +213,6 @@ public class BT6_111 : CEntity_Effect
 
                         while (card.Owner.MaxMemoryCost >= 1 && count < 5)
                         {
-                            yield return GManager.instance.photonWaitController.StartWait("PayMemory_Alphamon");
 
                             List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
                             {

Assets/Scripts/CardEffect/BT6/Yellow/BT6_033.cs

@@ -50,7 +50,6 @@ public class BT6_033 : CEntity_Effect
                     {
                         if (card.Owner.SecurityCards.Count > 3)
                         {
-                            yield return GManager.instance.photonWaitController.StartWait("Pulsemon_Select_ETB");
 
                             List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>();
 

Assets/Scripts/CardEffect/EX2/Black/EX2_038.cs

@@ -40,8 +40,6 @@ namespace DCGO.CardEffects.EX2
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    yield return GManager.instance.photonWaitController.StartWait("Justimon_Select_ETB");
-
                     List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                         {
                             new SelectionElement<int>(message: $"DP+2000", value : 0, spriteIndex: 0),

Assets/Scripts/CardEffect/EX3/Green/EX3_070.cs

@@ -142,8 +142,6 @@ namespace DCGO.CardEffects.EX3
 
                         while (canSelectEffects.Count((effect) => !activatedEffects.Contains(effect)) >= 1)
                         {
-                            yield return GManager.instance.photonWaitController.StartWait("AvalonsGate_selectFirst");
-
                             if (canSelectEffects.Count((effect) => !activatedEffects.Contains(effect)) >= 2)
                             {
                                 List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()

Assets/Scripts/CardEffect/EX4/Black/EX4_049.cs

@@ -56,7 +56,6 @@ namespace DCGO.CardEffects.EX4
                     {
                         if (card.Owner.GetBattleAreaDigimons().Contains(card.PermanentOfThisCard()))
                         {
-                            yield return GManager.instance.photonWaitController.StartWait("Kuresgarurumon_Select_ETB");
                             List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                             {
                                 new SelectionElement<int>(message: $"Deck Bounce", value : 0, spriteIndex: 0),

Assets/Scripts/CardEffect/EX4/Black/EX4_051.cs

@@ -56,7 +56,6 @@ namespace DCGO.CardEffects.EX4
                     {
                         if (card.Owner.GetBattleAreaDigimons().Contains(card.PermanentOfThisCard()))
                         {
-                            yield return GManager.instance.photonWaitController.StartWait("Kuresgarurumon_Select_ETB");
                             List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                             {
                                 new SelectionElement<int>(message: $"De-Digivolve", value : 0, spriteIndex: 0),

Assets/Scripts/CardEffect/EX4/Blue/EX4_066.cs

@@ -29,8 +29,6 @@ namespace DCGO.CardEffects.EX4
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    yield return GManager.instance.photonWaitController.StartWait("GoldBeast_Select");
-
                     List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                         {
                             new SelectionElement<int>(message: $"Digivolve into [BlitzGreymon]", value : 0, spriteIndex: 0),

Assets/Scripts/CardEffect/EX5/Black/EX5_054.cs

@@ -296,8 +296,6 @@ namespace DCGO.CardEffects.EX5
 
                     if (added)
                     {
-                        yield return GManager.instance.photonWaitController.StartWait("MetalEtemon_Select_switchB");
-
                         List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                         {
                             new SelectionElement<int>(message: $"This Digimon", value : 0, spriteIndex: 0),

Assets/Scripts/CardEffect/LM/Yellow/LM_020.cs

@@ -191,8 +191,6 @@ namespace DCGO.CardEffects.LM
                 {
                     Permanent selectedPermanent = card.PermanentOfThisCard();
 
-                    yield return GManager.instance.photonWaitController.StartWait("Quantumon_Select_ETB");
-
                     List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                         {
                             new SelectionElement<int>(message: $"Digimon", value : 0, spriteIndex: 0),

Assets/Scripts/CardEffect/P/Blue/P_012.cs

@@ -52,7 +52,6 @@ public class P_012 : CEntity_Effect
 
                         yield return ContinuousController.instance.StartCoroutine(new SuspendPermanentsClass(new List<Permanent>() { card.PermanentOfThisCard() }, hashtable).Tap());
 
-                        yield return GManager.instance.photonWaitController.StartWait("Taichi_Select");
                         List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                         {
                             new SelectionElement<int>(message: $"Draw 1", value : 0, spriteIndex: 0),

Assets/Scripts/CardEffect/P/Purple/P_096.cs

@@ -136,8 +136,6 @@ namespace DCGO.CardEffects.P
                             bool fromTrash = false;
                             bool noSelect = false;
 
-                            yield return GManager.instance.photonWaitController.StartWait("PrismGallet_Select");
-
                             if (canSelectTamer() && canSelectTrash())
                             {
                                 List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()

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

@@ -551,7 +551,6 @@ public class PlayCardClass
 
                                             selectCountEffect.SetCandidates(CostList);
                                             selectCountEffect.SetPreferMin(true);
-                                            selectCountEffect.SetNotDoSync(true);
                                             selectCountEffect.SetIsDigivolutionCost(true);
 
                                             yield return ContinuousController.instance.StartCoroutine(selectCountEffect.Activate());
@@ -800,7 +799,6 @@ public class PlayCardClass
                     appFusion = true;
                 }
 
-                yield return GManager.instance.photonWaitController.StartWait("AppFuse");
             }
 
             #endregion
@@ -1279,8 +1277,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>();
@@ -1390,8 +1386,6 @@ public class PlayPermanentClass
                             permanent.EnterFieldTurnCount = GManager.instance.turnStateMachine.TurnCount;
                         }
 
-                        GManager.instance.turnStateMachine.isSync = true;
-
                         if (GManager.instance.turnStateMachine.DoneStartGame)
                         {
                             if (!isEvolution)
@@ -1660,7 +1654,6 @@ public class PlayPermanentClass
             GManager.instance.GetComponent<SelectAssemblyClass>().ResetSelectAssemblyClass();
             GManager.instance.GetComponent<SelectDNACondition>().ResetSelectDNAConditionClass();
 
-            yield return GManager.instance.photonWaitController.StartWait("EndPlayPermanent");
         }
 
         // except [On Play] effect
@@ -1745,8 +1738,6 @@ public class UseOptionClass
 
             card.Init();
 
-            GManager.instance.turnStateMachine.isSync = true;
-
             card.SetFace();
 
             int cost = card.GetCostItself;
@@ -1901,7 +1892,6 @@ public class UseOptionClass
 
             yield return ContinuousController.instance.StartCoroutine(card.Owner.brainStormObject.CloseBrainstrorm(card));
 
-            yield return GManager.instance.photonWaitController.StartWait("EndPlayOption");
         }
     }
 }

Assets/Scripts/Script/CardEffectCommons/DNADigivolveEffects.cs

@@ -554,8 +554,6 @@ public partial class CardEffectCommons
             SetJogressEvoRootsController controller = (SetJogressEvoRootsController)component;
             int[] _jogressEvoRootsFrameIDs = new int[0];
 
-            yield return GManager.instance.photonWaitController.StartWait("DNA_Digivolve_by_Effect");
-
             if (owner.isYou || GManager.instance.IsAI)
             {
                 GManager.instance.selectJogressEffect.SetUp_SelectDigivolutionRoots

Assets/Scripts/Script/GManager.cs

@@ -201,8 +201,7 @@ public class GManager : MonoBehaviourPun
     public BurstEffectObject burstEffectObject;
     [Header("Background Particle effects")]
     [SerializeField] List<ParticleSystem> _backgroundParticles = new List<ParticleSystem>();
-    [Header("Photon wait controller")]
-    public PhotonWaitController photonWaitController;
+ 
     [Header("Gameobjects closed when ending game")]
     public List<GameObject> CloseWhenEndingGameObjects = new List<GameObject>();
 

Assets/Scripts/Script/MultipleSkills.cs

@@ -52,10 +52,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>();
 
@@ -184,7 +182,6 @@ public class MultipleSkills : MonoBehaviourPunCallbacks
                 {
                     List<CardSource> RootCardSources = skillInfos_active.Map(skillInfo => skillInfo.CardEffect.EffectSourceCard);
 
-                    yield return GManager.instance.photonWaitController.StartWait("StartSelectMultipleSkill");
 
                     // Blast Digivolution
                     if (IsOnlyHandEffectStacked && IsOnlyOptionalEffectStacked && IsEachStackedEffectHasDistinctSourceCard)
@@ -336,7 +333,6 @@ public class MultipleSkills : MonoBehaviourPunCallbacks
 
                     yield return ContinuousController.instance.StartCoroutine(Activate(!(IsOnlyHandEffectStacked && IsOnlyOptionalEffectStacked && IsEachStackedEffectHasDistinctSourceCard)));
 
-                    yield return GManager.instance.photonWaitController.StartWait("EndSelectMultipleSkill");
                 }
                 #endregion
 

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/OptionalSkill.cs

@@ -32,7 +32,6 @@ public class OptionalSkill : MonoBehaviourPunCallbacks
             _Message = $"Will you use \"{cardEffect.EffectName}\" targeting {string.Join(", ", effectTargets.Select(permanent => permanent.TopCard.CardNames[0]))}?";
         }
 
-        yield return GManager.instance.photonWaitController.StartWait("SelectOptional");
 
         #region ƒgƒ‰ƒbƒVƒ…‚̃J[ƒh‚ð•\Ž¦
         if (cardEffect != null)

Assets/Scripts/Script/PhotonWaitController.cs

@@ -1,261 +0,0 @@
-using Photon.Pun;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
-using UnityEngine.Events;
-using Hashtable = ExitGames.Client.Photon.Hashtable;
-using UnityEngine.UI;
-
-public class PhotonWaitController : MonoBehaviour
-{
-    int waitCount = 0;
-    public Text SyncText;
-
-    private void Start()
-    {
-        OffSyncText();
-    }
-
-    void OffSyncText()
-    {
-        if (SyncText != null)
-        {
-            SyncText.gameObject.SetActive(false);
-        }
-    }
-
-    IEnumerator SetWaitingText(string defultString)
-    {
-        float waitTime = 0.18f;
-
-        int count = 0;
-
-        if (SyncText != null)
-        {
-            SyncText.gameObject.SetActive(true);
-
-            while (SyncText.gameObject.activeSelf)
-            {
-                count++;
-
-                if (count >= 4)
-                {
-                    count = 0;
-                }
-
-                SyncText.text = defultString;
-
-                for (int i = 0; i < count; i++)
-                {
-                    SyncText.text += ".";
-                }
-
-                yield return new WaitForSeconds(waitTime);
-            }
-        } 
-    }
-
-    public void SetWaiting(string key, bool isGo, bool isAdd)
-    {
-        Hashtable PlayerProp = PhotonNetwork.LocalPlayer.CustomProperties;
-
-        object value;
-
-        if (isAdd)
-        {
-            if (PlayerProp.TryGetValue(key, out value))
-            {
-                if ((bool)PlayerProp[key] && !isGo)
-                {
-                    return;
-                }
-
-                PlayerProp[key] = isGo;
-            }
-
-            else
-            {
-                PlayerProp.Add(key, isGo);
-            }
-        }
-
-        else
-        {
-            if (PlayerProp.TryGetValue(key, out value))
-            {
-                PlayerProp.Remove(key);
-            }
-        }
-
-        PhotonNetwork.LocalPlayer.SetCustomProperties(PlayerProp);
-    }
-
-
-    public static bool isWaiting(string key, Photon.Realtime.Player player)
-    {
-        Hashtable PlayerProp = PhotonNetwork.LocalPlayer.CustomProperties;
-
-        object value;
-
-        if (PlayerProp.TryGetValue(key, out value))
-        {
-            if ((bool)value)
-            {
-                return false;
-            }
-
-            else
-            {
-                return true;
-            }
-        }
-
-        return true;
-    }
-
-    public static bool AllIsWaiting(string key)//Returns true if everyone has key false
-    {
-        foreach (var player in PhotonNetwork.PlayerList)
-        {
-            Hashtable PlayerProp = player.CustomProperties;
-
-            object value;
-
-            if (PlayerProp.TryGetValue(key, out value))
-            {
-                if ((bool)value)
-                {
-                    return false;
-                }
-            }
-
-            else
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    bool RoomHasTrueKey(string key)
-    {
-        Hashtable roomHash = PhotonNetwork.CurrentRoom.CustomProperties;
-        object value;
-
-        if(roomHash != null)
-        {
-            if (roomHash.TryGetValue(key, out value))
-            {
-                if ((bool)value)
-                {
-                    return true;
-                }
-            }
-        }
-        
-        return false;
-    }
-
-    void SetRoomTrueKey(string key)
-    {
-        Hashtable roomHash = PhotonNetwork.CurrentRoom.CustomProperties;
-        object value;
-
-        if(roomHash == null)
-        {
-            roomHash = new Hashtable();
-        }
-
-        if (roomHash.TryGetValue(key, out value))
-        {
-            roomHash[key] = true;//if true, it can go through
-        }
-
-        else
-        {
-            roomHash.Add(key, true);
-        }
-
-        PhotonNetwork.CurrentRoom.SetCustomProperties(roomHash);
-    }
-
-    public IEnumerator Wait(string key)
-    {
-        StartCoroutine(SetWaitingText("Syncing"));
-
-        Debug.Log($"Start Waiting:{key}");
-
-        while (isWaiting(key, PhotonNetwork.LocalPlayer))
-        {
-            if (PhotonNetwork.IsMasterClient)
-            {
-                if (AllIsWaiting(key))
-                {
-                    yield return new WaitForSeconds(Time.deltaTime);
-
-                    SetRoomTrueKey(key);
-                }
-            }
-
-            if (RoomHasTrueKey(key))
-            {
-                SetWaiting(key, true, false);
-                break;
-            }
-
-            yield return null;
-        }
-
-        yield return null;
-
-        OffSyncText();
-
-        Debug.Log($"End Waiting:{key}");
-    }
-
-    public Coroutine StartWait(string key)
-    {
-        waitCount++;
-        key += "_" + waitCount.ToString();
-
-        if(PhotonNetwork.InRoom)
-        {
-            key += "_" + PhotonNetwork.CurrentRoom.Name;
-        }
-        key += "_" + GameRandom.Range(0, 9999999).ToString();
-        //int synchronizedSeed = PhotonNetwork.CurrentRoom.Name.GetHashCode() + waitCount;
-        //System.Random random = new System.Random(synchronizedSeed);
-        //key += "_" + random.Next(0, 9999999).ToString();
-        
-        keys.Add(key);
-
-        if (!GManager.instance.IsAI)
-        {
-            if (!RoomHasTrueKey(key))
-            {
-                SetWaiting(key, false, true);
-
-                return StartCoroutine(Wait(key));
-            }
-        }
-        
-        return null;
-    }
-
-    public List<string> keys = new List<string>();
-
-    public void ResetKeys()
-    {
-        Hashtable PlayerProp = PhotonNetwork.LocalPlayer.CustomProperties;
-
-        foreach(string key in keys)
-        {
-            PlayerProp.Remove(key);
-        }
-
-        PhotonNetwork.LocalPlayer.SetCustomProperties(PlayerProp);
-    }
-}

Assets/Scripts/Script/PhotonWaitController.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 623c78dd1056b73439acdda6b04d4516
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Script/SelectAssemblyClass.cs

@@ -163,8 +163,6 @@ public class SelectAssemblyClass : MonoBehaviourPunCallbacks
     #region Select
     public IEnumerator Select(CardSource card)
     {
-        GManager.instance.turnStateMachine.isSync = true;
-
         selectedAssemblyCards = new List<CardSource>();
 
         playCard = card;
@@ -175,7 +173,6 @@ public class SelectAssemblyClass : MonoBehaviourPunCallbacks
 
             foreach(AssemblyConditionElement element in AssemblyCondition.elements)
             {
-                yield return GManager.instance.photonWaitController.StartWait("SelectAssemblys");
 
                 if (selectedAssemblyCards.Count >= AssemblyCondition.elementCount)
                 {
@@ -209,8 +206,6 @@ public class SelectAssemblyClass : MonoBehaviourPunCallbacks
         }
 
         GManager.instance.GetComponent<Effects>().OffShowCard2();
-
-        GManager.instance.turnStateMachine.isSync = false;
     }
     #endregion
 

Assets/Scripts/Script/SelectAttackEffect.cs

@@ -210,7 +210,6 @@ public class SelectAttackEffect : MonoBehaviourPunCallbacks
 
         if (active())
         {
-            yield return GManager.instance.photonWaitController.StartWait("SelectAttackEffect");
 
             foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players)
             {

Assets/Scripts/Script/SelectCardEffect.cs

@@ -338,11 +338,6 @@ public class SelectCardEffect : MonoBehaviourPunCallbacks
         _targetCards = new List<CardSource>();
 
         _slectedInexesInList = new List<int>();
-        
-        if (!_isLocal)
-        {
-            yield return GManager.instance.photonWaitController.StartWait("SelectCardEffect");
-        }
 
         bool oldIsActiveOutline_AttackingPermanent = false;
 

Assets/Scripts/Script/SelectCountEffect.cs

@@ -25,7 +25,6 @@ public class SelectCountEffect : MonoBehaviourPunCallbacks
         _messageForEnemy = Message_Enemy;
         _selectCountCoroutine = SelectCountCoroutine;
         _preferMin = false;
-        _notDoSync = false;
         _isDigivolutionCost = false;
 
         _candidates = new List<int>();
@@ -41,11 +40,6 @@ public class SelectCountEffect : MonoBehaviourPunCallbacks
         _preferMin = preferMin;
     }
 
-    public void SetNotDoSync(bool notDoSync)
-    {
-        _notDoSync = notDoSync;
-    }
-
     public void SetIsDigivolutionCost(bool isDigivolutionCost)
     {
         _isDigivolutionCost = isDigivolutionCost;
@@ -61,15 +55,10 @@ public class SelectCountEffect : MonoBehaviourPunCallbacks
     List<int> _candidates = new List<int>();
     int _selectedCount = 0;
     bool _preferMin = true;
-    bool _notDoSync = false;
     bool _isDigivolutionCost = false;
 
     public IEnumerator Activate()
     {
-        if (!_notDoSync)
-        {
-            yield return GManager.instance.photonWaitController.StartWait("SelectCountEffect");
-        }
 
         if (_maxCount >= 1)
         {

Assets/Scripts/Script/SelectDigiXrosClass.cs

@@ -367,8 +367,6 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
     #region Select
     public IEnumerator Select(CardSource card)
     {
-        GManager.instance.turnStateMachine.isSync = true;
-
         selectedDigicrossCards = new List<CardSource>();
 
         playCard = card;
@@ -381,7 +379,6 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
 
                 foreach (DigiXrosConditionElement element in digiXrosCondition.elements)
                 {
-                    yield return GManager.instance.photonWaitController.StartWait("SelectDigiXross");
 
                     if (selectedDigicrossCards.Count >= 1)
                     {
@@ -572,8 +569,6 @@ public class SelectDigiXrosClass : MonoBehaviourPunCallbacks
         }
 
         GManager.instance.GetComponent<Effects>().OffShowCard2();
-
-        GManager.instance.turnStateMachine.isSync = false;
     }
     #endregion
 

Assets/Scripts/Script/SelectHandEffect.cs

@@ -179,11 +179,6 @@ public class SelectHandEffect : MonoBehaviourPunCallbacks
 
             _targetCards = new List<CardSource>();
 
-            if (!_isLocal)
-            {
-                yield return GManager.instance.photonWaitController.StartWait("SelectHandEffect");
-            }
-
             foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players)
             {
                 GManager.instance.turnStateMachine.OffFieldCardTarget(player);

Assets/Scripts/Script/SelectPermanentEffect.cs

@@ -284,11 +284,6 @@ public class SelectPermanentEffect : MonoBehaviourPunCallbacks
             }
             #endregion
 
-            if (!_isLocal)
-            {
-                yield return GManager.instance.photonWaitController.StartWait("SelectPermanentEffect");
-            }
-
             foreach (Player player in GManager.instance.turnStateMachine.gameContext.Players)
             {
                 GManager.instance.turnStateMachine.OffFieldCardTarget(player);

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;
 
@@ -231,7 +228,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
         ContinuousController.instance.DoneSetRandom = false;
         #endregion
 
-        yield return GManager.instance.photonWaitController.StartWait("EndSetRandom");
 
         #region デッキカード生成
         yield return StartCoroutine(CardObjectController.CreatePlayerDecks(GManager.instance.CardPrefab, gameContext));
@@ -347,7 +343,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 #if UNITY_EDITOR
         //gameContext.TurnPlayer = GManager.instance.Opponent;
 #endif
-        yield return GManager.instance.photonWaitController.StartWait("StartGame");
 
         #region 先攻・後攻の決定
         if (gameContext.NonTurnPlayer.isYou)
@@ -371,22 +366,16 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
         #endregion
 
-        yield return GManager.instance.photonWaitController.StartWait("EndSelectStartPlayer");
-
         foreach (Player player in gameContext.Players_ForNonTurnPlayer)
         {
             yield return StartCoroutine(new DrawClass(player, 5, null).Draw());
         }
 
-        yield return GManager.instance.photonWaitController.StartWait("EndDrawStartGame");
-
         #region マリガン
         foreach (Player player in gameContext.Players_ForNonTurnPlayer)
         {
             _isRedraw = false;
 
-            yield return GManager.instance.photonWaitController.StartWait($"Mulligan");
-
             if (!player.isYou)
             {
                 GManager.instance.commandText.OpenCommandText("The opponent is selecting mulligan.");
@@ -560,11 +549,8 @@ 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 +581,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
             yield break;
         }
 
-        isSync = true;
-
         #region Unsuspend
 
         #region Untap permanents in play
@@ -677,12 +661,7 @@ 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 +710,8 @@ 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,10 +892,8 @@ 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");
 
         GManager.instance.showPhaseNotificationObject.ShowPhase(GameContext.phase.Main);
 
@@ -930,8 +905,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.
@@ -960,8 +933,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
         #region Repeat until turn player selects
         while (!endGame)
         {
-            yield return GManager.instance.photonWaitController.StartWait("SetHandCardPlayablity");
-
             //自動処理チェックタイミング
             yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.AutoProcessCheck());
             //Handle attack steps
@@ -980,8 +951,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
             ResetMainPhaseParameter();
             #endregion
 
-            yield return GManager.instance.photonWaitController.StartWait("SetMainPhase");
-
             if (gameContext.TurnPhase == GameContext.phase.Main)
             {
                 if (!CanSelect())
@@ -1197,26 +1166,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 +1195,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 +1239,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                 yield return StartCoroutine(playCard.PlayCard());
 
-                isSync = false;
             }
             #endregion
 
@@ -1388,7 +1334,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
             #endregion
 
             IsSelecting = false;
-            isSync = false;
+
             PlayCard = null;
             TargetFrameID = -1;
             JogressEvoRootsFrameIDs = new int[0];
@@ -1405,13 +1351,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;
@@ -1479,9 +1418,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)
         {
@@ -1497,11 +1433,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                     IEnumerator OnClick_Select()
                     {
-                        if (isSync)
-                        {
-                            yield break;
-                        }
-
                         IsSelecting = true;
 
                         #region Reset cards in other places
@@ -1794,11 +1725,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                             #region ドラッグ開始
                             void OnBeginDragAction(FieldPermanentCard fieldPermanentCard2)
                             {
-                                if (isSync)
-                                {
-                                    return;
-                                }
-
                                 if (gameContext.TurnPlayer.FieldPermanentObjects.Count((fieldPermanentCard3) => fieldPermanentCard3.fieldUnitCommandPanel.isActive()) == 0)
                                 {
                                     #region 手札のカードをリセット
@@ -1866,11 +1792,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                             #region ドラッグ中
                             void OnDragAction(FieldPermanentCard fieldPermanentCard2, List<DropArea> dropAreas)
                             {
-                                if (isSync)
-                                {
-                                    StartCoroutine(SetMainPhase());
-                                }
-
                                 fieldPermanentCard2.CloseCommandPanel();
 
                                 TargetArrow targetArrow = null;
@@ -1946,11 +1867,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                             #region ドラッグ終了
                             void OnEndDragAction(FieldPermanentCard fieldPermanentCard2, List<DropArea> dropAreas)
                             {
-                                if (isSync)
-                                {
-                                    StartCoroutine(SetMainPhase());
-                                }
-
                                 IsSelecting = false;
 
                                 TargetArrow targetArrow = null;
@@ -2068,11 +1984,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;
@@ -2176,11 +2087,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)
@@ -2289,8 +2195,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;
 
@@ -2338,8 +2242,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;
 
@@ -2386,8 +2288,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;
 
@@ -2433,8 +2333,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));
@@ -2464,8 +2362,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                                                                 yield return null;
                                                                 yield return StartCoroutine(Return());
                                                             }
-
-                                                            isSync = false;
                                                         }
                                                     }
                                                     #endregion
@@ -2483,8 +2379,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));
@@ -2515,8 +2409,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                                                                 yield return null;
                                                                 yield return StartCoroutine(Return());
                                                             }
-
-                                                            isSync = false;
                                                         }
                                                     }
                                                     #endregion
@@ -2534,8 +2426,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));
@@ -2566,8 +2456,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                                                                 yield return null;
                                                                 yield return StartCoroutine(Return());
                                                             }
-
-                                                            isSync = false;
                                                         }
                                                     }
                                                     #endregion
@@ -2689,11 +2577,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)
@@ -2860,7 +2743,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                             }
                         }
 
-                        isSync = false;
                         StartCoroutine(SetMainPhase());
                     }
                 }
@@ -3275,11 +3157,8 @@ 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;
 
@@ -3430,8 +3309,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
         ContinuousController.instance.CanSetRandom = false;
 
-        GManager.instance.photonWaitController.ResetKeys();
-
         if (PhotonNetwork.InRoom)
         {
             PhotonNetwork.CurrentRoom.SetCustomProperties(new ExitGames.Client.Photon.Hashtable());