Skip to content

Commit eb6b3f4

Browse files
crucial changes added for repro: package & scripting updates
1 parent a14efdf commit eb6b3f4

File tree

10 files changed

+176
-128
lines changed

10 files changed

+176
-128
lines changed

Assets/Scripts/ConnectionManagement/ConnectionMethod.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public override async Task SetupClientConnectionAsync()
160160

161161
// Configure UTP with allocation
162162
var utp = (UnityTransport)m_ConnectionManager.NetworkManager.NetworkConfig.NetworkTransport;
163-
utp.SetRelayServerData(new RelayServerData(joinedAllocation, k_DtlsConnType));
163+
utp.SetRelayServerData(AllocationUtils.ToRelayServerData(/*new RelayServerData*/joinedAllocation, k_DtlsConnType));
164164
}
165165

166166
public override async Task<(bool success, bool shouldTryAgain)> SetupClientReconnectionAsync()
@@ -203,7 +203,7 @@ public override async Task SetupHostConnectionAsync()
203203

204204
// Setup UTP with relay connection info
205205
var utp = (UnityTransport)m_ConnectionManager.NetworkManager.NetworkConfig.NetworkTransport;
206-
utp.SetRelayServerData(new RelayServerData(hostAllocation, k_DtlsConnType)); // This is with DTLS enabled for a secure connection
206+
utp.SetRelayServerData(AllocationUtils.ToRelayServerData(/*new RelayServerData*/hostAllocation, k_DtlsConnType)); // This is with DTLS enabled for a secure connection
207207

208208
Debug.Log($"Created relay allocation with join code {m_LocalLobby.RelayJoinCode}");
209209
}

Assets/Scripts/ConnectionManagement/Unity.BossRoom.ConnectionManagement.asmdef

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"Unity.Services.Lobbies",
1313
"Unity.Networking.Transport",
1414
"VContainer",
15-
"Unity.Services.Relay"
15+
"Unity.Services.Relay",
16+
"Unity.Services.Multiplayer"
1617
],
1718
"includePlatforms": [],
1819
"excludePlatforms": [],
@@ -23,4 +24,4 @@
2324
"defineConstraints": [],
2425
"versionDefines": [],
2526
"noEngineReferences": false
26-
}
27+
}

Assets/Scripts/Gameplay/Unity.BossRoom.Gameplay.asmdef

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"VContainer",
2323
"Unity.BossRoom.VisualEffects",
2424
"Unity.BossRoom.CameraUtils",
25-
"Unity.Multiplayer.Tools.NetworkSimulator.Runtime"
25+
"Unity.Multiplayer.Tools.NetworkSimulator.Runtime",
26+
"Unity.Services.Multiplayer"
2627
],
2728
"includePlatforms": [],
2829
"excludePlatforms": [],

Assets/Scripts/UnityServices/Lobbies/LobbyServiceFacade.cs

+2
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,9 @@ async void UnsubscribeToJoinedLobbyAsync()
303303
#if UNITY_EDITOR
304304
try
305305
{
306+
Debug.Log("Unsubscribing");
306307
await m_LobbyEvents.UnsubscribeAsync();
308+
Debug.Log("Unsubscribed");
307309
}
308310
catch (WebSocketException e)
309311
{

Assets/Scripts/UnityServices/Unity.BossRoom.UnityServices.asmdef

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"Unity.Services.Relay",
99
"Unity.Services.Wire.Internal",
1010
"Unity.BossRoom.Infrastructure",
11-
"VContainer"
11+
"VContainer",
12+
"Unity.Services.Multiplayer"
1213
],
1314
"includePlatforms": [],
1415
"excludePlatforms": [],

Packages/com.unity.multiplayer.samples.coop/Utilities/com.unity.multiplayer.samples.utilities.asmdef

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"Unity.Netcode.Components",
66
"Unity.Netcode.Runtime",
77
"Unity.Services.Relay",
8-
"Unity.Collections"
8+
"Unity.Collections",
9+
"Unity.Services.Multiplayer"
910
],
1011
"includePlatforms": [],
1112
"excludePlatforms": [],

Packages/com.unity.multiplayer.samples.coop/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"dependencies": {
1010
"com.unity.learn.iet-framework": "3.1.3",
1111
"com.unity.multiplayer.tools": "1.1.0",
12-
"com.unity.netcode.gameobjects": "1.8.1",
13-
"com.unity.services.relay": "1.0.5"
12+
"com.unity.netcode.gameobjects": "1.8.1"
1413
}
1514
}

Packages/manifest.json

+19-18
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
{
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
4-
"com.unity.ai.navigation": "1.1.5",
5-
"com.unity.cinemachine": "2.9.5",
6-
"com.unity.collab-proxy": "2.3.1",
7-
"com.unity.ide.rider": "3.0.28",
4+
"com.unity.ai.navigation": "2.0.5",
5+
"com.unity.cinemachine": "2.10.3",
6+
"com.unity.collab-proxy": "2.6.0",
7+
"com.unity.ide.rider": "3.0.31",
88
"com.unity.ide.visualstudio": "2.0.22",
99
"com.unity.ide.vscode": "1.2.5",
10-
"com.unity.learn.iet-framework": "3.1.3",
11-
"com.unity.memoryprofiler": "1.1.0",
12-
"com.unity.multiplayer.tools": "2.0.0-pre.3",
13-
"com.unity.netcode.gameobjects": "1.8.1",
10+
"com.unity.learn.iet-framework": "4.0.3",
11+
"com.unity.memoryprofiler": "1.1.1",
12+
"com.unity.multiplayer.center": "1.0.0",
13+
"com.unity.multiplayer.playmode": "1.3.3",
14+
"com.unity.multiplayer.tools": "2.2.1",
15+
"com.unity.netcode.gameobjects": "1.10.0",
1416
"com.unity.performance.profile-analyzer": "1.2.2",
1517
"com.unity.postprocessing": "3.4.0",
16-
"com.unity.render-pipelines.universal": "14.0.10",
17-
"com.unity.services.authentication": "2.7.2",
18-
"com.unity.services.lobby": "1.1.0",
19-
"com.unity.services.relay": "1.0.5",
20-
"com.unity.test-framework": "1.1.33",
21-
"com.unity.textmeshpro": "3.0.6",
22-
"com.unity.timeline": "1.7.6",
23-
"com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.4",
24-
"com.unity.transport": "2.0.2",
25-
"com.unity.ugui": "1.0.0",
18+
"com.unity.render-pipelines.universal": "17.0.3",
19+
"com.unity.services.authentication": "3.4.0",
20+
"com.unity.services.multiplayer": "1.1.1",
21+
"com.unity.test-framework": "1.4.5",
22+
"com.unity.timeline": "1.8.7",
23+
"com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.10",
24+
"com.unity.transport": "2.4.0",
25+
"com.unity.ugui": "2.0.0",
2626
"com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696",
2727
"jp.hadashikick.vcontainer": "1.11.0",
28+
"com.unity.modules.accessibility": "1.0.0",
2829
"com.unity.modules.ai": "1.0.0",
2930
"com.unity.modules.androidjni": "1.0.0",
3031
"com.unity.modules.animation": "1.0.0",

0 commit comments

Comments
 (0)