disconnect in menus and after game

Assets/Scripts/Script/EnterRoom.cs

@@ -68,7 +68,7 @@ public class EnterRoom : MonoBehaviourPunCallbacks
     {
         if (CanClickEnterRoomButton() && canClick)
         {
-            PhotonNetwork.JoinRoom(RoomIDInputField.text);
+            ContinuousController.instance.StartCoroutine(JoinRoomCoroutine());
         }
     }
 

Assets/Scripts/Script/RoomManager.cs

@@ -108,6 +108,11 @@ public class RoomManager : MonoBehaviourPunCallbacks
     {
         CreateRoomFailed = false;
 
+        if (!PhotonNetwork.IsConnected)
+        {
+            yield return ContinuousController.instance.StartCoroutine(PhotonUtility.ConnectToMasterServerCoroutine());
+        }
+
         yield return new WaitWhile(() => !PhotonNetwork.IsConnectedAndReady);
 
         if (!PhotonNetwork.InLobby)

Assets/Scripts/Script/SelectBattleMode.cs

@@ -61,19 +61,17 @@ public class SelectBattleMode : MonoBehaviour
 
         Opening.instance.battle.selectBattleDeck.Off();
 
-        yield return ContinuousController.instance.StartCoroutine(loadingObject.StartLoading("Connecting"));
-
         connecting = true;
 
-        yield return ContinuousController.instance.StartCoroutine(PhotonUtility.ConnectToLobbyCoroutine());
-
-        // ContinuousController.instance.BattleDeckData = null;
-        yield return ContinuousController.instance.StartCoroutine(PhotonUtility.DeleteBattleDeckData());
+        if (PhotonNetwork.IsConnected)
+        {
+            yield return ContinuousController.instance.StartCoroutine(loadingObject.StartLoading("Disconnecting"));
+            yield return ContinuousController.instance.StartCoroutine(PhotonUtility.DisconnectCoroutine());
+            yield return ContinuousController.instance.StartCoroutine(loadingObject.EndLoading());
+        }
 
         connecting = false;
 
-        yield return ContinuousController.instance.StartCoroutine(loadingObject.EndLoading());
-
         this.gameObject.SetActive(true);
 
         StartSelectBattleMode();
@@ -293,7 +291,7 @@ public class SelectBattleMode : MonoBehaviour
     {
         yield return new WaitForSeconds(0.3f);
         Opening.instance.battle.OffBattle();
-        Opening.instance.home.SetUpHome();
+        Opening.instance.home.SetUpHomeMode_Disconnect();
         this.gameObject.SetActive(false);
     }
 }