fix: loading screen progress not always synced [MTT-6302] (#862)

* fixing syncing issue of loading progress

Author: LPLafontaineB

Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Multiplayer Samples Co-op Changelog
 
+## [Unreleased]
+
+### Fixed
+* Host loading progress bar is now properly updated on all clients during scene loads (#862)
+
 ## [1.6.1] - 2023-06-14
 
 ### Fixed

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

@@ -27,6 +27,7 @@ public AsyncOperation LocalLoadOperation
         {
             set
             {
+                m_IsLoading = true;
                 LocalProgress = 0;
                 m_LocalLoadOperation = value;
             }
@@ -36,6 +37,8 @@ public AsyncOperation LocalLoadOperation
 
         float m_LocalProgress;
 
+        bool m_IsLoading;
+
         /// <summary>
         /// This event is invoked each time the dictionary of progress trackers is updated (if one is removed or added, for example.)
         /// </summary>
@@ -51,7 +54,7 @@ public float LocalProgress
                 ProgressTrackers[NetworkManager.LocalClientId].Progress.Value : m_LocalProgress;
             private set
             {
-                if (IsSpawned && ProgressTrackers.ContainsKey(NetworkManager.LocalClientId))
+                if (IsSpawned && ProgressTrackers.ContainsKey(NetworkManager.LocalClientId) && ProgressTrackers[NetworkManager.LocalClientId].IsSpawned)
                 {
                     ProgressTrackers[NetworkManager.LocalClientId].Progress.Value = value;
                 }
@@ -84,9 +87,17 @@ public override void OnNetworkDespawn()
 
         void Update()
         {
-            if (m_LocalLoadOperation != null)
+            if (m_LocalLoadOperation != null && m_IsLoading)
             {
-                LocalProgress = m_LocalLoadOperation.isDone ? 1 : m_LocalLoadOperation.progress;
+                if (m_LocalLoadOperation.isDone)
+                {
+                    m_IsLoading = false;
+                    LocalProgress = 1;
+                }
+                else
+                {
+                    LocalProgress = m_LocalLoadOperation.progress;
+                }
             }
         }
 
@@ -137,10 +148,5 @@ void RemoveTracker(ulong clientId)
                 }
             }
         }
-
-        public void ResetLocalProgress()
-        {
-            LocalProgress = 0;
-        }
     }
 }

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

@@ -1,4 +1,5 @@
 using Unity.Netcode;
+using UnityEngine;
 
 namespace Unity.Multiplayer.Samples.Utilities
 {
@@ -11,5 +12,10 @@ public class NetworkedLoadingProgressTracker : NetworkBehaviour
         /// The current loading progress associated with the owner of this NetworkBehavior
         /// </summary>
         public NetworkVariable<float> Progress { get; } = new NetworkVariable<float>(0, NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Owner);
+
+        void Awake()
+        {
+            DontDestroyOnLoad(this);
+        }
     }
 }

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

@@ -154,7 +154,6 @@ void OnSceneEvent(SceneEvent sceneEvent)
                     if (NetworkManager.IsClient)
                     {
                         m_ClientLoadingScreen.StopLoadingScreen();
-                        m_LoadingProgressManager.ResetLocalProgress();
                     }
                     break;
                 case SceneEventType.Synchronize: // Server told client to start synchronizing scenes