From 65689c00e6a7bb2415701b4cfa161c6e20953b9e Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Mon, 5 Aug 2024 18:10:27 -0400 Subject: [PATCH] NGO & Multiplayer SDK package upgrade, scripting fix, editor upgrade --- .../Assets/Scripts/Temp/ServicesHelper.cs | 8 +-- .../Packages/manifest.json | 12 ++--- .../Packages/packages-lock.json | 51 ++++++++++++------- .../ProjectSettings/ProjectVersion.txt | 4 +- .../VirtualProjectsConfig.json | 2 +- 5 files changed, 46 insertions(+), 31 deletions(-) diff --git a/Experimental/DistributedAuthoritySample/Assets/Scripts/Temp/ServicesHelper.cs b/Experimental/DistributedAuthoritySample/Assets/Scripts/Temp/ServicesHelper.cs index 0f9e5fa90..56cbdd84a 100644 --- a/Experimental/DistributedAuthoritySample/Assets/Scripts/Temp/ServicesHelper.cs +++ b/Experimental/DistributedAuthoritySample/Assets/Scripts/Temp/ServicesHelper.cs @@ -99,15 +99,15 @@ async Task ConnectThroughLiveService(string sessionName) { try { - var options = new CreateSessionOptions(100) + var options = new SessionOptions() { Name = sessionName, - MaxPlayers = 100, - }; + MaxPlayers = 64, + }.WithDistributedAuthorityNetwork(); if (m_LastSession == null) { - m_LastSession = await MultiplayerService.Instance.CreateOrJoinSessionAsync(sessionName, options.WithDistributedConnection()); + m_LastSession = await MultiplayerService.Instance.CreateOrJoinSessionAsync(sessionName, options); } else { diff --git a/Experimental/DistributedAuthoritySample/Packages/manifest.json b/Experimental/DistributedAuthoritySample/Packages/manifest.json index 8fc5f799d..50e0306e4 100644 --- a/Experimental/DistributedAuthoritySample/Packages/manifest.json +++ b/Experimental/DistributedAuthoritySample/Packages/manifest.json @@ -2,15 +2,15 @@ "dependencies": { "com.unity.ai.navigation": "2.0.0", "com.unity.cinemachine": "2.10.1", - "com.unity.collab-proxy": "2.4.3", - "com.unity.ide.rider": "3.0.28", + "com.unity.collab-proxy": "2.4.4", + "com.unity.ide.rider": "3.0.31", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.inputsystem": "1.8.2", - "com.unity.multiplayer.playmode": "1.2.0", + "com.unity.inputsystem": "1.9.0", + "com.unity.multiplayer.playmode": "1.2.1", "com.unity.multiplayer.tools": "2.1.0", - "com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0", + "com.unity.netcode.gameobjects": "2.0.0-pre.3", "com.unity.render-pipelines.universal": "17.0.3", - "com.unity.services.multiplayer": "0.4.2", + "com.unity.services.multiplayer": "1.0.0-pre.1", "com.unity.services.vivox": "16.3.0", "com.unity.test-framework": "1.4.4", "com.unity.timeline": "1.8.7", diff --git a/Experimental/DistributedAuthoritySample/Packages/packages-lock.json b/Experimental/DistributedAuthoritySample/Packages/packages-lock.json index 9a3bf4c32..6bc74299a 100644 --- a/Experimental/DistributedAuthoritySample/Packages/packages-lock.json +++ b/Experimental/DistributedAuthoritySample/Packages/packages-lock.json @@ -10,7 +10,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.16", + "version": "1.8.17", "depth": 1, "source": "registry", "dependencies": { @@ -29,7 +29,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.4.3", + "version": "2.4.4", "depth": 0, "source": "registry", "dependencies": {}, @@ -55,7 +55,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.28", + "version": "3.0.31", "depth": 0, "source": "registry", "dependencies": { @@ -73,7 +73,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.8.2", + "version": "1.9.0", "depth": 0, "source": "registry", "dependencies": { @@ -89,7 +89,7 @@ "url": "https://packages.unity.com" }, "com.unity.multiplayer.playmode": { - "version": "1.2.0", + "version": "1.2.1", "depth": 0, "source": "registry", "dependencies": { @@ -113,14 +113,14 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0", + "version": "2.0.0-pre.3", "depth": 0, - "source": "git", + "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.11.4", - "com.unity.transport": "2.2.1" + "com.unity.transport": "2.3.0" }, - "hash": "8f71c14ce4c77d482a9204a1907e7139fefef673" + "url": "https://packages.unity.com" }, "com.unity.nuget.mono-cecil": { "version": "1.11.4", @@ -216,22 +216,37 @@ }, "url": "https://packages.unity.com" }, + "com.unity.services.deployment": { + "version": "1.3.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.services.deployment.api": "1.0.0", + "com.unity.services.core": "1.12.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.deployment.api": { + "version": "1.0.0", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.services.multiplayer": { - "version": "0.4.2", + "version": "1.0.0-pre.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.services.authentication": "3.1.0", - "com.unity.services.core": "1.12.1", + "com.unity.services.authentication": "3.3.3", + "com.unity.services.core": "1.13.0", "com.unity.services.qos": "1.3.0", - "com.unity.services.wire": "1.2.3", - "com.unity.transport": "1.4.1" + "com.unity.services.wire": "1.2.6", + "com.unity.transport": "2.2.1", + "com.unity.collections": "2.2.1", + "com.unity.services.deployment": "1.3.0" }, "url": "https://packages.unity.com" }, diff --git a/Experimental/DistributedAuthoritySample/ProjectSettings/ProjectVersion.txt b/Experimental/DistributedAuthoritySample/ProjectSettings/ProjectVersion.txt index 160a67701..a31f2d0d9 100644 --- a/Experimental/DistributedAuthoritySample/ProjectSettings/ProjectVersion.txt +++ b/Experimental/DistributedAuthoritySample/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.11f1 -m_EditorVersionWithRevision: 6000.0.11f1 (fa01dd6b76d5) +m_EditorVersion: 6000.0.13f1 +m_EditorVersionWithRevision: 6000.0.13f1 (53a692e3fca9) diff --git a/Experimental/DistributedAuthoritySample/ProjectSettings/VirtualProjectsConfig.json b/Experimental/DistributedAuthoritySample/ProjectSettings/VirtualProjectsConfig.json index 911d2c6cd..47661d380 100644 --- a/Experimental/DistributedAuthoritySample/ProjectSettings/VirtualProjectsConfig.json +++ b/Experimental/DistributedAuthoritySample/ProjectSettings/VirtualProjectsConfig.json @@ -1,4 +1,4 @@ { "PlayerTags": [], - "version": "1.2.0" + "version": "1.2.1" } \ No newline at end of file