fix for newer version of mirage.

MirageNet · Dec 8, 2023 · 9df0aa4 · 9df0aa4
1 parent cc6421c
commit 9df0aa4
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 13 deletions.
diff --git a/Assets/Object Pooler/Runtime/ObjectPoolingManager.cs b/Assets/Object Pooler/Runtime/ObjectPoolingManager.cs
@@ -32,9 +32,9 @@ private void Start()
             _parent = new GameObject { name = "Pooled Objects" };
             DontDestroyOnLoad(_parent);
 #if MIRAGE
-            _serverObjectManager = FindObjectOfType<ServerObjectManager>();
+            _serverObjectManager = FindFirstObjectByType<ServerObjectManager>();
 
-            ClientObjectManager clientObject = FindObjectOfType<ClientObjectManager>();
+            ClientObjectManager clientObject = FindFirstObjectByType<ClientObjectManager>();
 
             if (clientObject == null) return;
 
@@ -76,7 +76,7 @@ internal GameObject SpawnObject(Vector3 position, Guid assetId)
 #endif
         {
 #if MIRAGE
-            NetworkIdentity spawnedObject = NetworkSpawnPool(msg.position ?? new Vector3(), Quaternion.identity, msg.prefabHash, 1);
+            NetworkIdentity spawnedObject = NetworkSpawnPool(msg.SpawnValues.Position ?? new Vector3(), Quaternion.identity, msg.PrefabHash, 1);
 #else
             NetworkIdentity spawnedObject = NetworkSpawnPool(position, Quaternion.identity, assetId, 1);
 #endif

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,10 +1,11 @@
 {
   "dependencies": {
     "com.cysharp.unitask": "2.2.5",
-    "com.miragenet.mirage": "107.1.0",
-    "com.unity.ide.rider": "3.0.7",
-    "com.unity.ide.visualstudio": "2.0.11",
-    "com.unity.test-framework": "1.1.29",
+    "com.james-frowen.mirage-profiler": "https://github.com/James-Frowen/Mirage.Profiler.git?path=/Assets/Mirage.Profiler",
+    "com.miragenet.mirage": "114.1.0",
+    "com.unity.ide.rider": "3.0.14",
+    "com.unity.ide.visualstudio": "2.0.15",
+    "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.21-preview",
     "com.unity.ugui": "1.0.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -7,9 +7,19 @@
       "dependencies": {},
       "url": "https://package.openupm.com"
     },
-    "com.miragenet.mirage": {
-      "version": "107.1.0",
+    "com.james-frowen.mirage-profiler": {
+      "version": "https://github.com/James-Frowen/Mirage.Profiler.git?path=/Assets/Mirage.Profiler",
       "depth": 0,
+      "source": "git",
+      "dependencies": {
+        "com.miragenet.mirage": "123.3.1",
+        "com.unity.profiling.core": "1.0.2"
+      },
+      "hash": "f5bd40dd5e91b79b024907af7605e43e05e1726f"
+    },
+    "com.miragenet.mirage": {
+      "version": "123.3.1",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.nuget.mono-cecil": "1.10.1",
@@ -25,7 +35,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.7",
+      "version": "3.0.14",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -34,7 +44,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.11",
+      "version": "2.0.15",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -49,6 +59,13 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.profiling.core": {
+      "version": "1.0.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.sysroot": {
       "version": "0.1.19-preview",
       "depth": 1,
@@ -66,7 +83,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.29",
+      "version": "1.1.31",
       "depth": 0,
       "source": "registry",
       "dependencies": {

diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
@@ -5,6 +5,12 @@ EditorUserSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 4
   m_ConfigSettings:
+    RecentlyUsedSceneGuid-0:
+      value: 53020102540d5c0c580f0d76167a0d4447164e7e2f7b736328784c66e1b33039
+      flags: 0
+    RecentlyUsedScenePath-0:
+      value: 224247031146467e150f01321c264c5f330f19273c24237f1e2a183de7f37b17e0ed33eaf37a0f33360ee63203701431fb1e10
+      flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0
@@ -13,7 +19,13 @@ EditorUserSettings:
   m_VCDebugCmd: 0
   m_VCDebugOut: 0
   m_SemanticMergeMode: 2
+  m_DesiredImportWorkerCount: 3
+  m_StandbyImportWorkerCount: 2
+  m_IdleImportWorkerShutdownDelay: 60000
   m_VCShowFailedCheckout: 1
   m_VCOverwriteFailedCheckoutAssets: 1
-  m_VCOverlayIcons: 1
+  m_VCProjectOverlayIcons: 1
+  m_VCHierarchyOverlayIcons: 1
+  m_VCOtherOverlayIcons: 1
   m_VCAllowAsyncUpdate: 0
+  m_ArtifactGarbageCollection: 1