diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 865b2eb75..eaa1a8977 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -30,4 +30,4 @@ projects: - name: com.unity.multiplayer.samples.coop path: Packages/com.unity.multiplayer.samples.coop test_editors: - - 2022.3.14 + - 2022.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index e3c345d80..c75ae31ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,11 @@ Additional documentation and release notes are available at [Multiplayer Documen ## [Unreleased] - yyyy-mm-dd ### Changed -* Upgraded to Boss Room to Netcode for GameObjects v1.8.1 (#883) +* Upgraded Boss Room to Netcode for GameObjects v1.8.1 (#883) * Upgraded to the newer API for Rpcs, Universal Rpcs * ClientConnectedState has been modified to account for server/host now populating DisconnectReason before disconnecting a client before shutting down +* Upgraded editor version to 2022.3.22f1 (#884) + * com.unity.render-pipelines.universal upgraded to v14.0.10 ### Cleanup * Removed NetworkObject from MainMenuState (#881) diff --git a/Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/ClientLoadingScreen.cs b/Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/ClientLoadingScreen.cs index e62c958af..0ca2ce38f 100644 --- a/Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/ClientLoadingScreen.cs +++ b/Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/ClientLoadingScreen.cs @@ -77,7 +77,10 @@ void Start() void OnDestroy() { - m_LoadingProgressManager.onTrackersUpdated -= OnProgressTrackersUpdated; + if (m_LoadingProgressManager != null) + { + m_LoadingProgressManager.onTrackersUpdated -= OnProgressTrackersUpdated; + } } void Update() diff --git a/Packages/manifest.json b/Packages/manifest.json index 309648c17..37dec26d2 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,8 +3,8 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.ai.navigation": "1.1.5", "com.unity.cinemachine": "2.9.5", - "com.unity.collab-proxy": "2.2.0", - "com.unity.ide.rider": "3.0.26", + "com.unity.collab-proxy": "2.3.1", + "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.learn.iet-framework": "3.1.3", @@ -12,8 +12,8 @@ "com.unity.multiplayer.tools": "2.0.0-pre.3", "com.unity.netcode.gameobjects": "1.8.1", "com.unity.performance.profile-analyzer": "1.2.2", - "com.unity.postprocessing": "3.2.2", - "com.unity.render-pipelines.universal": "14.0.9", + "com.unity.postprocessing": "3.4.0", + "com.unity.render-pipelines.universal": "14.0.10", "com.unity.services.authentication": "2.7.2", "com.unity.services.lobby": "1.1.0", "com.unity.services.relay": "1.0.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 1594b10bf..fd5333fa3 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -16,11 +16,12 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.10", + "version": "1.8.12", "depth": 1, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -34,7 +35,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.2.0", + "version": "2.3.1", "depth": 0, "source": "registry", "dependencies": {}, @@ -66,7 +67,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { @@ -174,7 +175,7 @@ "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.2.2", + "version": "3.4.0", "depth": 0, "source": "registry", "dependencies": { @@ -190,7 +191,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.9", + "version": "14.0.10", "depth": 1, "source": "builtin", "dependencies": { @@ -201,14 +202,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "14.0.9", + "version": "14.0.10", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.8.9", - "com.unity.render-pipelines.core": "14.0.9", - "com.unity.shadergraph": "14.0.9", + "com.unity.render-pipelines.core": "14.0.10", + "com.unity.shadergraph": "14.0.10", "com.unity.render-pipelines.universal-config": "14.0.9" } }, @@ -240,7 +241,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.12.0", + "version": "1.12.4", "depth": 1, "source": "registry", "dependencies": { @@ -317,11 +318,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.9", + "version": "14.0.10", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.9", + "com.unity.render-pipelines.core": "14.0.10", "com.unity.searcher": "4.9.2" } }, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index da6718916..c47c8be78 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.14f1 -m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8) +m_EditorVersion: 2022.3.22f1 +m_EditorVersionWithRevision: 2022.3.22f1 (887be4894c44)