fix: better name to stop namespace conflict with Unity (MirageNet#755)

* fix: better name to stop namespace conflict with Unity * Update Assets/Mirage/Runtime/NetworkManager.cs Co-authored-by: James Frowen <jamesfrowen5@gmail.com> BREAKING CHANGE: networkManager.SceneManager removed to networkManager.NetworkSceneManager
James-Frowen · Apr 1, 2021 · 69784e7 · 69784e7
1 parent 6499d53
commit 69784e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Assets/Mirage/Editor/NetworkMenu.cs b/Assets/Mirage/Editor/NetworkMenu.cs
@@ -36,7 +36,7 @@ public static GameObject CreateNetworkManager()
             networkManager.Server = networkServer;
             networkManager.ServerObjectManager = serverObjectManager;
             networkManager.ClientObjectManager = clientObjectManager;
-            networkManager.SceneManager = nsm;
+            networkManager.NetworkSceneManager = nsm;
 
             CharacterSpawner playerSpawner = go.GetComponent<CharacterSpawner>();
             playerSpawner.Client = networkClient;

diff --git a/Assets/Mirage/Runtime/NetworkManager.cs b/Assets/Mirage/Runtime/NetworkManager.cs
@@ -16,7 +16,8 @@ public class NetworkManager : MonoBehaviour
         [FormerlySerializedAs("client")]
         public NetworkClient Client;
         [FormerlySerializedAs("sceneManager")]
-        public NetworkSceneManager SceneManager;
+        [FormerlySerializedAs("SceneManager")]
+        public NetworkSceneManager NetworkSceneManager;
         [FormerlySerializedAs("serverObjectManager")]
         public ServerObjectManager ServerObjectManager;
         [FormerlySerializedAs("clientObjectManager")]