Fixed Scene Transition Delay (Clients)

Dani-24 · Jul 8, 2024 · 5c266f5 · 5c266f5
1 parent faea27b
commit 5c266f5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/MultiplayerGame/Assets/Scripts/Managers/Canvas Scripts/CanvasS_Conn.cs b/MultiplayerGame/Assets/Scripts/Managers/Canvas Scripts/CanvasS_Conn.cs
@@ -256,7 +256,8 @@ public void OpenGear()
 
     public void StartGame(string scene)
     {
-        UI_Manager.Instance.PopUp_LogMessage("Starting Battle", 1, true, scene);
+        UI_Manager.Instance.PopUp_LogMessage("Starting Battle", 0.5f, true, scene);
+        ConnectionManager.Instance.activeSceneName = scene;
         SceneManagerScript.Instance.TeamsForBattle();
     }
 

diff --git a/MultiplayerGame/Assets/Scripts/Managers/ConnectionManager.cs b/MultiplayerGame/Assets/Scripts/Managers/ConnectionManager.cs
@@ -85,13 +85,12 @@ public class ConnectionManager : MonoBehaviour
     public bool disconnect = false;
 
     bool changeScene;
-    string sceneToChange;
 
     #region NET Data
 
     [Header("NET Data Display")]
     [SerializeField] bool connectionStablished = false;
-    string activeSceneName;
+    public string activeSceneName;
 
     public int ownPlayerNetID = -1;
     public PlayerPackage ownPlayerPck;
@@ -240,7 +239,7 @@ void ReadPackage(Package pck)
         // CHANGE SCENE
         if (!isHosting && pck.currentScene != activeSceneName)
         {
-            sceneToChange = pck.currentScene;
+            activeSceneName = pck.currentScene;
             changeScene = true;
         }
 
@@ -358,8 +357,7 @@ private void Awake()
 
     public void StartConnection()
     {
-        if (isConnected)
-            EndConnection();
+        if (isConnected) EndConnection();
 
         try
         {
@@ -780,6 +778,8 @@ void Start()
         if (connectAtStart) StartConnection();
 
         audioSource = GetComponent<AudioSource>();
+
+        activeSceneName = SceneManager.GetActiveScene().name;
     }
 
     void Update()
@@ -808,8 +808,6 @@ void Update()
 
         userName = UI_Manager.Instance.userName;    // this should only update when the username is updated instead of every frame
 
-        activeSceneName = SceneManager.GetActiveScene().name;
-
         delay += Time.deltaTime;
 
         UpdateGameObjects();
@@ -818,8 +816,7 @@ void Update()
         {
             changeScene = false;
             SceneManagerScript.Instance.netGOs.Clear();
-            SceneManagerScript.Instance.ChangeScene(sceneToChange);
-            sceneToChange = "";
+            SceneManagerScript.Instance.ChangeScene(activeSceneName);
         }
 
         if (activeSceneName != lobbyScene) connGameplayState = ConnectionGameplayState.Playing; else connGameplayState = ConnectionGameplayState.Lobby;

diff --git a/MultiplayerGame/Assets/Scripts/Managers/GameManagerScript.cs b/MultiplayerGame/Assets/Scripts/Managers/GameManagerScript.cs
@@ -161,7 +161,11 @@ void Update()
                     }
                 }
 
-                if (!timerNetGo.connectedToServer && timerCount <= 0) SceneManagerScript.Instance.ChangeScene("000_Lobby", true);
+                if (!timerNetGo.connectedToServer && timerCount <= 0)
+                {
+                    SceneManagerScript.Instance.ChangeScene("000_Lobby", true);
+                    ConnectionManager.Instance.activeSceneName = "000_Lobby";
+                }
 
                 break;
         }

diff --git a/MultiplayerGame/ProjectSettings/ProjectSettings.asset b/MultiplayerGame/ProjectSettings/ProjectSettings.asset
@@ -137,7 +137,7 @@ PlayerSettings:
   vulkanEnableLateAcquireNextImage: 0
   vulkanEnableCommandBufferRecycling: 1
   loadStoreDebugModeEnabled: 0
-  bundleVersion: 1.0.0
+  bundleVersion: 1.0.1
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0