diff --git a/Assets/Scripts/Infrastructure/PubSub/NetworkedMessageChannel.cs b/Assets/Scripts/Infrastructure/PubSub/NetworkedMessageChannel.cs index 39228691c..3ca9adfd5 100644 --- a/Assets/Scripts/Infrastructure/PubSub/NetworkedMessageChannel.cs +++ b/Assets/Scripts/Infrastructure/PubSub/NetworkedMessageChannel.cs @@ -75,6 +75,12 @@ public override void Publish(T message) void SendMessageThroughNetwork(T message) { + // Avoid throwing an exception if you are in the middle of shutting down and either + // NetworkManager no longer exists or the CustomMessagingManager no longer exists. + if (m_NetworkManager == null || m_NetworkManager.CustomMessagingManager == null) + { + return; + } var writer = new FastBufferWriter(FastBufferWriter.GetWriteSize(), Allocator.Temp); writer.WriteValueSafe(message); m_NetworkManager.CustomMessagingManager.SendNamedMessageToAll(m_Name, writer); diff --git a/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low.asset b/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low.asset index ac12d42a8..ae1ae60d1 100644 --- a/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low.asset +++ b/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b276240933fdda078fe3a462a4729dbade38d49a9ae51cc6eaad477907cb2ac9 -size 3493 +oid sha256:156f546b1b47dd12ebf17462717d52e8b9225b90057649a6f994d1b9a05df6d3 +size 3673 diff --git a/Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium.asset b/Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium.asset index 60ab234f6..67025e14f 100644 --- a/Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium.asset +++ b/Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08ba74e6bb58af1ca915ad7e9f6bdcc451d2604be3bf6a8621a9a91f83ac747c -size 3501 +oid sha256:664825d50ebaca88798a13d93675e3c4c5bb7d155e963ee13cf2bc79f5f8d86f +size 3681 diff --git a/Assets/URP/Windows/2_UniversalRenderPipelineAsset_Windows_High.asset b/Assets/URP/Windows/2_UniversalRenderPipelineAsset_Windows_High.asset index 636658577..96f2f92e9 100644 --- a/Assets/URP/Windows/2_UniversalRenderPipelineAsset_Windows_High.asset +++ b/Assets/URP/Windows/2_UniversalRenderPipelineAsset_Windows_High.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3fa683710f40f40512976e3bdae2171c9ba488c985f87995fd0577839347cd6 -size 3493 +oid sha256:6031aaba9d7ac0ca61ea9f6cc34c9133e0b65e4be56559ca2641975bfb980f54 +size 3673 diff --git a/Assets/URP/Windows/3_UniversalRenderPipelineAsset_Windows_Ultra.asset b/Assets/URP/Windows/3_UniversalRenderPipelineAsset_Windows_Ultra.asset index 85384a7ed..782d7e5f3 100644 --- a/Assets/URP/Windows/3_UniversalRenderPipelineAsset_Windows_Ultra.asset +++ b/Assets/URP/Windows/3_UniversalRenderPipelineAsset_Windows_Ultra.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d20bce9da6b76d3fb037333159f05170ad0e75d5f4df6414bcca8c368585f501 -size 3495 +oid sha256:e410deed7cd331c908f7de7defdf7a2994eb002e3384c8ad69357c033d25b665 +size 3675 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cc8b1abd..9a6e324e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ Additional documentation and release notes are available at [Multiplayer Documen ## [unreleased] - yyyy-mm-dd +### Changed +* Upgraded editor version to 2022.3.14f1 (#871) +* Upgraded Boss Room to Netcode for GameObjects v1.7.1 (#871) + ### Fixed * Fixed NetworkVariable warnings that would be logged when a player was spawned (#863) For a player, certain NetworkVariable values were previously modified before the player's NetworkObject was spawned, resulting in warnings. Now, the NetworkVariable itself is instantiated on the server pre-spawn, such that it is instantiated with the new default value, ensuring the new default value is ready to be read on subsequent OnNetworkSpawn methods for said NetworkObject. diff --git a/Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md b/Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md index 94dce858a..c403734e6 100644 --- a/Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md +++ b/Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md @@ -1,5 +1,10 @@ # Multiplayer Samples Co-op Changelog +## [unreleased] - yyyy-mm-dd + +### Changed +* Upgraded Utilities package to Netcode for GameObjects v1.7.1 (#871) + ## [1.7.0] - 2023-09-07 ### Changed diff --git a/Packages/com.unity.multiplayer.samples.coop/package.json b/Packages/com.unity.multiplayer.samples.coop/package.json index 1c1d942c3..3acf88b3b 100644 --- a/Packages/com.unity.multiplayer.samples.coop/package.json +++ b/Packages/com.unity.multiplayer.samples.coop/package.json @@ -9,7 +9,7 @@ "dependencies": { "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "com.unity.services.relay": "1.0.5" } } \ No newline at end of file diff --git a/Packages/manifest.json b/Packages/manifest.json index cc3850e86..c4af97ddf 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,25 +1,25 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.ai.navigation": "1.1.4", + "com.unity.ai.navigation": "1.1.5", "com.unity.cinemachine": "2.9.5", - "com.unity.collab-proxy": "2.0.5", - "com.unity.ide.rider": "3.0.24", - "com.unity.ide.visualstudio": "2.0.18", + "com.unity.collab-proxy": "2.2.0", + "com.unity.ide.rider": "3.0.26", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.learn.iet-framework": "3.1.3", - "com.unity.memoryprofiler": "1.0.0", + "com.unity.memoryprofiler": "1.1.0", "com.unity.multiplayer.tools": "2.0.0-pre.3", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "com.unity.performance.profile-analyzer": "1.2.2", "com.unity.postprocessing": "3.2.2", - "com.unity.render-pipelines.universal": "14.0.8", - "com.unity.services.authentication": "2.7.1", + "com.unity.render-pipelines.universal": "14.0.9", + "com.unity.services.authentication": "2.7.2", "com.unity.services.lobby": "1.1.0", "com.unity.services.relay": "1.0.5", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.5", + "com.unity.timeline": "1.7.6", "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.4", "com.unity.transport": "2.0.2", "com.unity.ugui": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 08daed58d..e2f1af818 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.ai.navigation": { - "version": "1.1.4", + "version": "1.1.5", "depth": 0, "source": "registry", "dependencies": { @@ -16,7 +16,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.7", + "version": "1.8.10", "depth": 1, "source": "registry", "dependencies": { @@ -34,7 +34,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.5", + "version": "2.2.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -66,7 +66,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.24", + "version": "3.0.26", "depth": 0, "source": "registry", "dependencies": { @@ -75,7 +75,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -108,7 +108,7 @@ "url": "https://packages.unity.com" }, "com.unity.memoryprofiler": { - "version": "1.0.0", + "version": "1.1.0", "depth": 0, "source": "registry", "dependencies": { @@ -123,7 +123,7 @@ "dependencies": { "com.unity.learn.iet-framework": "3.1.3", "com.unity.multiplayer.tools": "1.1.0", - "com.unity.netcode.gameobjects": "1.6.0", + "com.unity.netcode.gameobjects": "1.7.1", "com.unity.services.relay": "1.0.5" } }, @@ -143,12 +143,12 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.6.0", + "version": "1.7.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.4" + "com.unity.transport": "1.4.0" }, "url": "https://packages.unity.com" }, @@ -190,7 +190,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { @@ -201,14 +201,23 @@ } }, "com.unity.render-pipelines.universal": { - "version": "14.0.8", + "version": "14.0.9", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "14.0.8", - "com.unity.shadergraph": "14.0.8" + "com.unity.burst": "1.8.9", + "com.unity.render-pipelines.core": "14.0.9", + "com.unity.shadergraph": "14.0.9", + "com.unity.render-pipelines.universal-config": "14.0.9" + } + }, + "com.unity.render-pipelines.universal-config": { + "version": "14.0.9", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.9" } }, "com.unity.searcher": { @@ -219,7 +228,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "2.7.1", + "version": "2.7.2", "depth": 0, "source": "registry", "dependencies": { @@ -231,7 +240,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.10.1", + "version": "1.12.0", "depth": 1, "source": "registry", "dependencies": { @@ -290,13 +299,13 @@ "url": "https://packages.unity.com" }, "com.unity.services.wire": { - "version": "1.2.0", + "version": "1.2.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.services.core": "1.10.1", + "com.unity.services.core": "1.11.0", "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.services.authentication": "2.6.1" + "com.unity.services.authentication": "2.7.2" }, "url": "https://packages.unity.com" }, @@ -308,11 +317,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.8", + "com.unity.render-pipelines.core": "14.0.9", "com.unity.searcher": "4.9.2" } }, @@ -353,7 +362,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.5", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/NetcodeForGameObjects.asset b/ProjectSettings/NetcodeForGameObjects.asset new file mode 100644 index 000000000..adbb8d27b --- /dev/null +++ b/ProjectSettings/NetcodeForGameObjects.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:361bce09d25b168055f616f3b0691fa9df29bc6988f911c21f399571e619f268 +size 536 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5cc42a20f..ed826e2aa 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64b4451c53ca78def1a82ed366a92399fce17e936d3c4e4e370f3f5b57d3f9ad -size 26959 +oid sha256:4c7cd337a322f876e0c3730a3785edfe5b7c7f40ffc06e1793f7b3881f5137d3 +size 27052 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 78a778891..da6718916 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.7f1 -m_EditorVersionWithRevision: 2022.3.7f1 (b16b3b16c7a0) +m_EditorVersion: 2022.3.14f1 +m_EditorVersionWithRevision: 2022.3.14f1 (eff2de9070d8) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index dd093378f..f4a219d76 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16a92b7409c2b1f39a3a4c3b49ec6c6ab3a641e55eaaa8f47101026758e3339c -size 463 +oid sha256:dd7b0e5c5b40aea5d5c546731cb576959d0829155cddf50e862a0be072195ca9 +size 489