fix: scene loading issue when shutting down [MTT-2828] (#610)

* Adding parameter to decide if we load through NetworkSceneManager or SceneManager

Author: LPLafontaineB

Assets/BossRoom/Scenes/PostGame.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c11f84c175b1dd9496d25f84bd4e0c29ca64c90df9346d1f26578dfef5523f6
-size 56409
+oid sha256:8396657ee40387e39344857a6fdaf264df857bf1386f7f766e830dfc97b2270e
+size 56639

Assets/BossRoom/Scripts/Client/UI/PostGameUI.cs

@@ -1,5 +1,7 @@
 using UnityEngine;
 using TMPro;
+using Unity.Multiplayer.Samples.BossRoom.Shared;
+using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
 using Unity.Multiplayer.Samples.Utilities;
 using Unity.Netcode;
 
@@ -34,6 +36,14 @@ public class PostGameUI : MonoBehaviour
         [SerializeField]
         private Color m_LoseLightColor;
 
+        ApplicationController m_ApplicationController;
+
+        [Inject]
+        void InjectDependencies(ApplicationController applicationController)
+        {
+            m_ApplicationController = applicationController;
+        }
+
         void Start()
         {
             // only hosts can restart the game, other players see a wait message
@@ -75,18 +85,14 @@ void SetPostGameUI(WinState winState)
         public void OnPlayAgainClicked()
         {
             // this should only ever be called by the Host - so just go ahead and switch scenes
-            SceneLoaderWrapper.Instance.LoadScene("CharSelect");
+            SceneLoaderWrapper.Instance.LoadScene("CharSelect", useNetworkSceneManager: true);
 
             // FUTURE: could be improved to better support a dedicated server architecture
         }
 
         public void OnMainMenuClicked()
         {
-            // Player is leaving this group - leave current network connection first
-            var gameNetPortal = GameObject.FindGameObjectWithTag("GameNetPortal").GetComponent<GameNetPortal>();
-            gameNetPortal.RequestDisconnect();
-
-            SceneLoaderWrapper.Instance.LoadScene("MainMenu");
+            m_ApplicationController.LeaveSession(true);
         }
     }
 }

Assets/BossRoom/Scripts/DebugCheats/DebugCheatsManager.cs

@@ -283,7 +283,7 @@ void TogglePortalsServerRpc(ServerRpcParams serverRpcParams = default)
         [ServerRpc(RequireOwnership = false)]
         void GoToPostGameServerRpc(ServerRpcParams serverRpcParams = default)
         {
-            SceneLoaderWrapper.Instance.LoadScene("PostGame", LoadSceneMode.Single);
+            SceneLoaderWrapper.Instance.LoadScene("PostGame", useNetworkSceneManager: true);
             LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "GoToPostGame");
         }
 

Assets/BossRoom/Scripts/Server/Game/State/ServerBossRoomState.cs

@@ -259,7 +259,7 @@ private IEnumerator CoroGameOver(float wait, bool gameWon)
 
             SetWinState(gameWon ? WinState.Win : WinState.Loss);
 
-            SceneLoaderWrapper.Instance.LoadScene("PostGame");
+            SceneLoaderWrapper.Instance.LoadScene("PostGame", useNetworkSceneManager: true);
         }
     }
 }

Assets/BossRoom/Scripts/Server/Game/State/ServerCharSelectState.cs

@@ -176,7 +176,7 @@ void SaveLobbyResults()
         IEnumerator WaitToEndLobby()
         {
             yield return new WaitForSeconds(3);
-            SceneLoaderWrapper.Instance.LoadScene("BossRoom");
+            SceneLoaderWrapper.Instance.LoadScene("BossRoom", useNetworkSceneManager: true);
         }
 
         public override void OnNetworkDespawn()

Assets/BossRoom/Scripts/Shared/ApplicationController.cs

@@ -126,7 +126,7 @@ public void LeaveSession(bool UserRequested)
                     gameNetPortal.RequestDisconnect();
                 }
             }
-            SceneLoaderWrapper.Instance.LoadScene("MainMenu");
+            SceneLoaderWrapper.Instance.LoadScene("MainMenu", useNetworkSceneManager: false);
         }
 
         public void QuitGame()

Assets/BossRoom/Scripts/Shared/Net/ConnectionManagement/ServerGameNetPortal.cs

@@ -295,7 +295,7 @@ void ServerStartedHandler()
 
             //The "BossRoom" server always advances to CharSelect immediately on start. Different games
             //may do this differently.
-            SceneLoaderWrapper.Instance.LoadScene("CharSelect");
+            SceneLoaderWrapper.Instance.LoadScene("CharSelect", useNetworkSceneManager: true);
         }
 
     }

Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/SceneLoaderWrapper.cs

@@ -70,20 +70,24 @@ public void AddOnSceneEventCallback()
         /// method also triggers the start of the loading screen.
         /// </summary>
         /// <param name="sceneName">Name or path of the Scene to load.</param>
+        /// <param name="useNetworkSceneManager">If true, uses NetworkSceneManager, else uses SceneManager</param>
         /// <param name="loadSceneMode">If LoadSceneMode.Single then all current Scenes will be unloaded before loading.</param>
-        public void LoadScene(string sceneName, LoadSceneMode loadSceneMode = LoadSceneMode.Single)
+        public void LoadScene(string sceneName, bool useNetworkSceneManager, LoadSceneMode loadSceneMode = LoadSceneMode.Single)
         {
-            if (IsSpawned && IsNetworkSceneManagementEnabled && !NetworkManager.ShutdownInProgress)
+            if (useNetworkSceneManager)
             {
-                if (NetworkManager.IsServer)
+                if (IsSpawned && IsNetworkSceneManagementEnabled && !NetworkManager.ShutdownInProgress)
                 {
-                    // If is active server and NetworkManager uses scene management, load scene using NetworkManager's SceneManager
-                    NetworkManager.SceneManager.LoadScene(sceneName, loadSceneMode);
+                    if (NetworkManager.IsServer)
+                    {
+                        // If is active server and NetworkManager uses scene management, load scene using NetworkManager's SceneManager
+                        NetworkManager.SceneManager.LoadScene(sceneName, loadSceneMode);
+                    }
                 }
             }
             else
             {
-                // If offline, load using SceneManager
+                // Load using SceneManager
                 var loadOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode);
                 if (loadSceneMode == LoadSceneMode.Single)
                 {