Made SceneLoaderWrapper into a MonoBehavior and increased the delay before fading out loading screen

Author: LPLafontaineB

Assets/BossRoom/Prefabs/SceneLoader.prefab

@@ -10,7 +10,6 @@ GameObject:
   m_Component:
   - component: {fileID: 7533068275093218427}
   - component: {fileID: 2071498811241465156}
-  - component: {fileID: 8734696198808489477}
   m_Layer: 0
   m_Name: SceneLoader
   m_TagString: Untagged
@@ -44,32 +43,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d202c9ed4a2c4a6fa83f21f1c21394ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ScenesTriggeringLoadingScreen:
-  - MainMenu
-  - CharSelect
-  - PostGame
-  - BossRoom
-  m_ScenesEndingLoadingScreen:
-  - MainMenu
-  - CharSelect
-  - PostGame
-  - DungeonEntrance
-  - DungeonTransition
-  - DungeonBossRoom
   m_ClientLoadingScreen: {fileID: 0}
---- !u!114 &8734696198808489477
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5970766024194302363}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 951099334
-  AlwaysReplicateAsRoot: 0
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
+  m_NetworkManager: {fileID: 0}

Assets/BossRoom/Scenes/Startup.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a523d895c6dadd7608849b89e6c8f9c80c95acc0f7ec523b2cdf27879a85dfe
-size 42916
+oid sha256:df9c2b258e0ebbfd9252072a0b9b08a9d39558c94319d52d29035e282cda90ad
+size 42040

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

@@ -16,7 +16,7 @@ public class ClientLoadingScreen : MonoBehaviour
         CanvasGroup m_CanvasGroup;
 
         [SerializeField]
-        float m_DelayBeforeFadeOut = 0.5f;
+        float m_DelayBeforeFadeOut = 1;
 
         [SerializeField]
         float m_FadeOutDuration = 1;

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

@@ -5,7 +5,7 @@
 
 namespace Unity.Multiplayer.Samples.Utilities
 {
-    public class SceneLoaderWrapper : NetworkBehaviour
+    public class SceneLoaderWrapper : MonoBehaviour
     {
         /// <summary>
         /// Manages a loading screen by wrapping around scene management APIs. It loads scene using the SceneManager,
@@ -16,6 +16,9 @@ public class SceneLoaderWrapper : NetworkBehaviour
         [SerializeField]
         ClientLoadingScreen m_ClientLoadingScreen;
 
+        [SerializeField]
+        NetworkManager m_NetworkManager;
+
         public static SceneLoaderWrapper Instance { get; private set; }
 
         public void Awake()
@@ -36,14 +39,13 @@ void Start()
             SceneManager.sceneLoaded += OnSceneLoaded;
         }
 
-        public override void OnDestroy()
+        public void OnDestroy()
         {
-            if (NetworkManager != null && NetworkManager.SceneManager != null)
+            if (m_NetworkManager != null && m_NetworkManager.SceneManager != null)
             {
-                NetworkManager.SceneManager.OnSceneEvent -= OnSceneEvent;
+                m_NetworkManager.SceneManager.OnSceneEvent -= OnSceneEvent;
             }
             SceneManager.sceneLoaded -= OnSceneLoaded;
-            base.OnDestroy();
         }
 
         /// <summary>
@@ -52,9 +54,9 @@ public override void OnDestroy()
         /// </summary>
         public void AddOnSceneEventCallback()
         {
-            if (NetworkManager != null && NetworkManager.SceneManager != null && NetworkManager.NetworkConfig.EnableSceneManagement)
+            if (m_NetworkManager != null && m_NetworkManager.SceneManager != null && m_NetworkManager.NetworkConfig.EnableSceneManagement)
             {
-                NetworkManager.SceneManager.OnSceneEvent += OnSceneEvent;
+                m_NetworkManager.SceneManager.OnSceneEvent += OnSceneEvent;
             }
         }
 
@@ -67,12 +69,12 @@ public void AddOnSceneEventCallback()
         /// <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)
         {
-            if (NetworkManager != null && NetworkManager.IsListening && NetworkManager.NetworkConfig.EnableSceneManagement)
+            if (m_NetworkManager != null && m_NetworkManager.IsListening && m_NetworkManager.NetworkConfig.EnableSceneManagement)
             {
-                if (NetworkManager.IsServer)
+                if (m_NetworkManager.IsServer)
                 {
                     // If is active server and NetworkManager uses scene management, load scene using NetworkManager's SceneManager
-                    NetworkManager.SceneManager.LoadScene(sceneName, loadSceneMode);
+                    m_NetworkManager.SceneManager.LoadScene(sceneName, loadSceneMode);
                 }
             }
             else
@@ -88,20 +90,20 @@ public void LoadScene(string sceneName, LoadSceneMode loadSceneMode = LoadSceneM
 
         void OnSceneLoaded(Scene scene, LoadSceneMode loadSceneMode)
         {
-            if (NetworkManager == null || !NetworkManager.IsListening || !NetworkManager.NetworkConfig.EnableSceneManagement)
+            if (m_NetworkManager == null || !m_NetworkManager.IsListening || !m_NetworkManager.NetworkConfig.EnableSceneManagement)
             {
                 m_ClientLoadingScreen.StopLoadingScreen();
             }
         }
 
         void OnSceneEvent(SceneEvent sceneEvent)
         {
-            switch (sceneEvent.SceneEventType)
+            // Only executes on client
+            if (m_NetworkManager.IsClient)
             {
-                case SceneEventType.Load: // Server told client to load a scene
-                    // Only executes on client
-                    if (IsClient)
-                    {
+                switch (sceneEvent.SceneEventType)
+                {
+                    case SceneEventType.Load: // Server told client to load a scene
                         // Only start a new loading screen if scene loaded in Single mode, else simply update
                         if (sceneEvent.LoadSceneMode == LoadSceneMode.Single)
                         {
@@ -111,30 +113,16 @@ void OnSceneEvent(SceneEvent sceneEvent)
                         {
                             m_ClientLoadingScreen.UpdateLoadingScreen(sceneEvent.SceneName, sceneEvent.AsyncOperation);
                         }
-                    }
-                    break;
-                case SceneEventType.LoadEventCompleted: // Server told client that all clients finished loading a scene
-                    // Only executes on client
-                    if (IsClient)
-                    {
+                        break;
+                    case SceneEventType.LoadEventCompleted: // Server told client that all clients finished loading a scene
                         m_ClientLoadingScreen.StopLoadingScreen();
-                    }
-                    break;
-                case SceneEventType.SynchronizeComplete: // Client told server that they finished synchronizing
-                    // Only executes on server
-                    if (IsServer)
-                    {
+                        break;
+                    case SceneEventType.SynchronizeComplete: // Client told server that they finished synchronizing
                         // Send client RPC to make sure the client stops the loading screen after the server handles what it needs to after the client finished synchronizing
-                        StopLoadingScreenClientRpc(new ClientRpcParams {Send = new ClientRpcSendParams {TargetClientIds = new[] {sceneEvent.ClientId}}});
-                    }
-                    break;
+                        m_ClientLoadingScreen.StopLoadingScreen();
+                        break;
+                }
             }
         }
-
-        [ClientRpc]
-        void StopLoadingScreenClientRpc(ClientRpcParams clientRpcParams = default)
-        {
-            m_ClientLoadingScreen.StopLoadingScreen();
-        }
     }
 }