Skip to content

Commit 9df0aa4

Browse files
committed
fix for newer version of mirage.
1 parent cc6421c commit 9df0aa4

File tree

4 files changed

+43
-13
lines changed

4 files changed

+43
-13
lines changed

Assets/Object Pooler/Runtime/ObjectPoolingManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ private void Start()
3232
_parent = new GameObject { name = "Pooled Objects" };
3333
DontDestroyOnLoad(_parent);
3434
#if MIRAGE
35-
_serverObjectManager = FindObjectOfType<ServerObjectManager>();
35+
_serverObjectManager = FindFirstObjectByType<ServerObjectManager>();
3636

37-
ClientObjectManager clientObject = FindObjectOfType<ClientObjectManager>();
37+
ClientObjectManager clientObject = FindFirstObjectByType<ClientObjectManager>();
3838

3939
if (clientObject == null) return;
4040

@@ -76,7 +76,7 @@ internal GameObject SpawnObject(Vector3 position, Guid assetId)
7676
#endif
7777
{
7878
#if MIRAGE
79-
NetworkIdentity spawnedObject = NetworkSpawnPool(msg.position ?? new Vector3(), Quaternion.identity, msg.prefabHash, 1);
79+
NetworkIdentity spawnedObject = NetworkSpawnPool(msg.SpawnValues.Position ?? new Vector3(), Quaternion.identity, msg.PrefabHash, 1);
8080
#else
8181
NetworkIdentity spawnedObject = NetworkSpawnPool(position, Quaternion.identity, assetId, 1);
8282
#endif

Packages/manifest.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"dependencies": {
33
"com.cysharp.unitask": "2.2.5",
4-
"com.miragenet.mirage": "107.1.0",
5-
"com.unity.ide.rider": "3.0.7",
6-
"com.unity.ide.visualstudio": "2.0.11",
7-
"com.unity.test-framework": "1.1.29",
4+
"com.james-frowen.mirage-profiler": "https://github.com/James-Frowen/Mirage.Profiler.git?path=/Assets/Mirage.Profiler",
5+
"com.miragenet.mirage": "114.1.0",
6+
"com.unity.ide.rider": "3.0.14",
7+
"com.unity.ide.visualstudio": "2.0.15",
8+
"com.unity.test-framework": "1.1.31",
89
"com.unity.textmeshpro": "3.0.6",
910
"com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.21-preview",
1011
"com.unity.ugui": "1.0.0",

Packages/packages-lock.json

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,19 @@
77
"dependencies": {},
88
"url": "https://package.openupm.com"
99
},
10-
"com.miragenet.mirage": {
11-
"version": "107.1.0",
10+
"com.james-frowen.mirage-profiler": {
11+
"version": "https://github.com/James-Frowen/Mirage.Profiler.git?path=/Assets/Mirage.Profiler",
1212
"depth": 0,
13+
"source": "git",
14+
"dependencies": {
15+
"com.miragenet.mirage": "123.3.1",
16+
"com.unity.profiling.core": "1.0.2"
17+
},
18+
"hash": "f5bd40dd5e91b79b024907af7605e43e05e1726f"
19+
},
20+
"com.miragenet.mirage": {
21+
"version": "123.3.1",
22+
"depth": 1,
1323
"source": "registry",
1424
"dependencies": {
1525
"com.unity.nuget.mono-cecil": "1.10.1",
@@ -25,7 +35,7 @@
2535
"url": "https://packages.unity.com"
2636
},
2737
"com.unity.ide.rider": {
28-
"version": "3.0.7",
38+
"version": "3.0.14",
2939
"depth": 0,
3040
"source": "registry",
3141
"dependencies": {
@@ -34,7 +44,7 @@
3444
"url": "https://packages.unity.com"
3545
},
3646
"com.unity.ide.visualstudio": {
37-
"version": "2.0.11",
47+
"version": "2.0.15",
3848
"depth": 0,
3949
"source": "registry",
4050
"dependencies": {
@@ -49,6 +59,13 @@
4959
"dependencies": {},
5060
"url": "https://packages.unity.com"
5161
},
62+
"com.unity.profiling.core": {
63+
"version": "1.0.2",
64+
"depth": 1,
65+
"source": "registry",
66+
"dependencies": {},
67+
"url": "https://packages.unity.com"
68+
},
5269
"com.unity.sysroot": {
5370
"version": "0.1.19-preview",
5471
"depth": 1,
@@ -66,7 +83,7 @@
6683
"url": "https://packages.unity.com"
6784
},
6885
"com.unity.test-framework": {
69-
"version": "1.1.29",
86+
"version": "1.1.31",
7087
"depth": 0,
7188
"source": "registry",
7289
"dependencies": {

UserSettings/EditorUserSettings.asset

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ EditorUserSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 4
77
m_ConfigSettings:
8+
RecentlyUsedSceneGuid-0:
9+
value: 53020102540d5c0c580f0d76167a0d4447164e7e2f7b736328784c66e1b33039
10+
flags: 0
11+
RecentlyUsedScenePath-0:
12+
value: 224247031146467e150f01321c264c5f330f19273c24237f1e2a183de7f37b17e0ed33eaf37a0f33360ee63203701431fb1e10
13+
flags: 0
814
vcSharedLogLevel:
915
value: 0d5e400f0650
1016
flags: 0
@@ -13,7 +19,13 @@ EditorUserSettings:
1319
m_VCDebugCmd: 0
1420
m_VCDebugOut: 0
1521
m_SemanticMergeMode: 2
22+
m_DesiredImportWorkerCount: 3
23+
m_StandbyImportWorkerCount: 2
24+
m_IdleImportWorkerShutdownDelay: 60000
1625
m_VCShowFailedCheckout: 1
1726
m_VCOverwriteFailedCheckoutAssets: 1
18-
m_VCOverlayIcons: 1
27+
m_VCProjectOverlayIcons: 1
28+
m_VCHierarchyOverlayIcons: 1
29+
m_VCOtherOverlayIcons: 1
1930
m_VCAllowAsyncUpdate: 0
31+
m_ArtifactGarbageCollection: 1

0 commit comments

Comments
 (0)