diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 80f716f909..b1eecbc5fd 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: - - 6000.0.44 + - 6000.3.20 diff --git a/Assets/Material/Characters/Character_Shadow.mat b/Assets/Material/Characters/Character_Shadow.mat index 72e7a1257a..56b70fa3e4 100644 --- a/Assets/Material/Characters/Character_Shadow.mat +++ b/Assets/Material/Characters/Character_Shadow.mat @@ -104,6 +104,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -119,6 +120,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UseAlpha: 1 - _UseSoftParticles: 0 diff --git a/Assets/Material/Characters/Enemy_Eyes_sheet.mat b/Assets/Material/Characters/Enemy_Eyes_sheet.mat index 8df68bbc65..2cb92b4b9d 100644 --- a/Assets/Material/Characters/Enemy_Eyes_sheet.mat +++ b/Assets/Material/Characters/Enemy_Eyes_sheet.mat @@ -97,6 +97,7 @@ Material: - _Depth_Blend: 0 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _GlossMapScale: 1 - _Glossiness: 1 - _GlossinessSource: 0 @@ -115,6 +116,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _UseAlpha: 1 diff --git a/Assets/Material/Characters/Enemy_Mouth_sheet.mat b/Assets/Material/Characters/Enemy_Mouth_sheet.mat index b0bf27b411..71bc02c0b3 100644 --- a/Assets/Material/Characters/Enemy_Mouth_sheet.mat +++ b/Assets/Material/Characters/Enemy_Mouth_sheet.mat @@ -110,6 +110,7 @@ Material: - _Depth_Blend: 0 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _GlossMapScale: 1 - _Glossiness: 1 - _GlossinessSource: 0 @@ -130,6 +131,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _UseAlpha: 1 diff --git a/Assets/Material/Characters/Hero_Eyes_sheet.mat b/Assets/Material/Characters/Hero_Eyes_sheet.mat index d03cae6bae..a3da00f7c3 100644 --- a/Assets/Material/Characters/Hero_Eyes_sheet.mat +++ b/Assets/Material/Characters/Hero_Eyes_sheet.mat @@ -97,6 +97,7 @@ Material: - _Depth_Blend: 0 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _GlossMapScale: 1 - _Glossiness: 1 - _GlossinessSource: 0 @@ -115,6 +116,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _UseAlpha: 1 diff --git a/Assets/Material/Characters/Hero_Mouth_sheet.mat b/Assets/Material/Characters/Hero_Mouth_sheet.mat index 33a099c0ba..e8c13a207d 100644 --- a/Assets/Material/Characters/Hero_Mouth_sheet.mat +++ b/Assets/Material/Characters/Hero_Mouth_sheet.mat @@ -97,6 +97,7 @@ Material: - _Depth_Blend: 0 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _GlossMapScale: 1 - _Glossiness: 1 - _GlossinessSource: 0 @@ -117,6 +118,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _UseAlpha: 1 diff --git a/Assets/Material/Dungeon/M_Lava.mat b/Assets/Material/Dungeon/M_Lava.mat index d7f94de326..328c51b900 100644 --- a/Assets/Material/Dungeon/M_Lava.mat +++ b/Assets/Material/Dungeon/M_Lava.mat @@ -116,6 +116,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -132,6 +133,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _UseAlpha: 0 diff --git a/Assets/Material/Dungeon/M_SpiderWeb.mat b/Assets/Material/Dungeon/M_SpiderWeb.mat index 0685e7e962..8f77977df2 100644 --- a/Assets/Material/Dungeon/M_SpiderWeb.mat +++ b/Assets/Material/Dungeon/M_SpiderWeb.mat @@ -126,6 +126,7 @@ Material: - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EmissionEnabled: 0 - _EnableExternalAlpha: 0 - _FlipbookMode: 0 @@ -145,6 +146,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _UseAlpha: 0 diff --git a/Assets/URP/Mobile/0_UniversalRenderPipelineAsset_Mobile_Low.asset b/Assets/URP/Mobile/0_UniversalRenderPipelineAsset_Mobile_Low.asset index 25311b7ed8..1d39360e69 100644 --- a/Assets/URP/Mobile/0_UniversalRenderPipelineAsset_Mobile_Low.asset +++ b/Assets/URP/Mobile/0_UniversalRenderPipelineAsset_Mobile_Low.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a14e787d75e40f95ac253c8ff8f4024f220abe97989868c59132ca6946c77e43 -size 4358 +oid sha256:0465fc0b8370e21cc99cf7c98635c0ed22571dbecc70334ede4d43fa82e4a90c +size 4626 diff --git a/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low.asset b/Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low.asset index a21ed98cbb..e5cbc3ade5 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:b2208c1fefb455a174645cb2d6f7f6cb6bc074cdec65f73f0d5c27bb83bd58a2 -size 4350 +oid sha256:427dea9f6aebb3b9a7dcd4ea4d5ef96b90482ca81db4b0da28d7a772b34b95e7 +size 4618 diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index e0ec1201fc..a386d3d3f7 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8505bb67f60142799e6e7c60fe6b0776808faeaadf5ecd42e73eecfb482f75b3 -size 21653 +oid sha256:17ce244738598504138b2fb89639f259e8b2d4b4180187356c5b9162b9ffeec4 +size 25581 diff --git a/Assets/VFX/Materials/FX_M_Glow_Additive_01.mat b/Assets/VFX/Materials/FX_M_Glow_Additive_01.mat index 5871a12976..5324b59bce 100644 --- a/Assets/VFX/Materials/FX_M_Glow_Additive_01.mat +++ b/Assets/VFX/Materials/FX_M_Glow_Additive_01.mat @@ -100,6 +100,7 @@ Material: - _Cutoff: 0.5 - _Depth_Blend: 0 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -113,6 +114,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Surface: 1 - _Switch_Alpha: 1 - _UseAlpha: 1 diff --git a/Assets/VFX/Materials/FX_M_SpawnDoor.mat b/Assets/VFX/Materials/FX_M_SpawnDoor.mat index 1997fa89ff..aecd323266 100644 --- a/Assets/VFX/Materials/FX_M_SpawnDoor.mat +++ b/Assets/VFX/Materials/FX_M_SpawnDoor.mat @@ -177,6 +177,7 @@ Material: - _DistortionStrength: 500 - _DistortionStrengthScaled: 50 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EmissionEnabled: 1 - _EnableExternalAlpha: 0 - _FlipbookBlending: 0 @@ -205,6 +206,7 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 diff --git a/Assets/VFX/Materials/FX_M_StylizeSmoke_01.mat b/Assets/VFX/Materials/FX_M_StylizeSmoke_01.mat index a424ede176..87f26688c1 100644 --- a/Assets/VFX/Materials/FX_M_StylizeSmoke_01.mat +++ b/Assets/VFX/Materials/FX_M_StylizeSmoke_01.mat @@ -130,6 +130,7 @@ Material: - _DetailNormalMapScale: 1 - _Dissolve: 0.35 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _Flowintencity: 0.15 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -152,6 +153,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StepSubtract: 1 - _Surface: 1 - _UVSec: 0 diff --git a/Assets/VFX/Materials/FX_M_TorchFire.mat b/Assets/VFX/Materials/FX_M_TorchFire.mat index 8b2087bd94..c6d9c0e993 100644 --- a/Assets/VFX/Materials/FX_M_TorchFire.mat +++ b/Assets/VFX/Materials/FX_M_TorchFire.mat @@ -153,6 +153,7 @@ Material: - _DetailNormalMapScale: 1 - _Dissolve: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 - _Flowintencity: 0.15 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -176,6 +177,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _StepSubtract: 1 - _Surface: 1 - _UVSec: 0 diff --git a/CHANGELOG.md b/CHANGELOG.md index b295f06bcc..35f0decea4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ Additional documentation and release notes are available at [Multiplayer Documen ## [unreleased] yyyy-mm-dd ### Changed +* Upgraded editor version to 6000.3.20f1 and upgraded Boss Room to Netcode for GameObjects v2.13.1 (#890) * Moved behaviour of client-side visual Components to OnNetworkPostSpawn method to prevent race conditions on other NetworkBehaviours that initialize on OnNetworkSpawn (#925) * Responsibility of the initialization of an Avatar's GUID is now deferred to ServerBossRoomState component (#925) This allows the Avatar's NetworkBehaviours to read the GUID value at spawn time. diff --git a/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/RNSM Panel Settings.asset b/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/RNSM Panel Settings.asset index 388134a19d..3d4aa69ccd 100644 --- a/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/RNSM Panel Settings.asset +++ b/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/RNSM/RNSM Panel Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f0ffde61371799f9a65b96ac680b14358aaa8a96efb9a4f975c20d28a92e8f6 -size 1447 +oid sha256:1a8a7915a1f49f2db22a4e4a64a3ffa367d637aed8dfcc519c8fa15c8832bcd4 +size 1847 diff --git a/Packages/manifest.json b/Packages/manifest.json index c1e626ef8a..8e51b6cfe5 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,30 +1,29 @@ { "dependencies": { - "com.unity.ai.navigation": "2.0.8", + "com.unity.ai.navigation": "2.0.13", "com.unity.cinemachine": "3.1.3", - "com.unity.collab-proxy": "2.8.2", - "com.unity.ide.rider": "3.0.36", - "com.unity.ide.visualstudio": "2.0.23", - "com.unity.inputsystem": "1.14.0", - "com.unity.learn.iet-framework": "4.0.4", - "com.unity.learn.iet-framework.authoring": "1.2.2", - "com.unity.memoryprofiler": "1.1.6", - "com.unity.multiplayer.center": "1.0.0", - "com.unity.multiplayer.playmode": "1.5.0", - "com.unity.multiplayer.tools": "2.2.4", - "com.unity.netcode.gameobjects": "2.4.3", - "com.unity.performance.profile-analyzer": "1.2.3", - "com.unity.postprocessing": "3.5.0", - "com.unity.render-pipelines.universal": "17.0.4", - "com.unity.services.authentication": "3.5.1", - "com.unity.services.multiplayer": "1.1.4", - "com.unity.test-framework": "1.5.1", - "com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.4", - "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.10", - "com.unity.transport": "2.5.1", + "com.unity.collab-proxy": "2.12.4", + "com.unity.ide.rider": "3.0.40", + "com.unity.ide.visualstudio": "2.0.26", + "com.unity.inputsystem": "1.19.0", + "com.unity.learn.iet-framework": "5.0.3", + "com.unity.learn.iet-framework.authoring": "1.5.3", + "com.unity.memoryprofiler": "1.1.12", + "com.unity.multiplayer.center": "1.0.1", + "com.unity.multiplayer.playmode": "2.0.2", + "com.unity.multiplayer.tools": "2.2.9", + "com.unity.netcode.gameobjects": "2.13.1", + "com.unity.performance.profile-analyzer": "1.4.0", + "com.unity.postprocessing": "3.5.4", + "com.unity.render-pipelines.universal": "17.3.0", + "com.unity.services.authentication": "3.7.1", + "com.unity.services.multiplayer": "2.2.4", + "com.unity.test-framework": "1.6.0", + "com.unity.transport": "2.7.4", "com.unity.ugui": "2.0.0", "jp.hadashikick.vcontainer": "1.16.8", "com.unity.modules.accessibility": "1.0.0", + "com.unity.modules.adaptiveperformance": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", @@ -43,7 +42,8 @@ "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.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vectorgraphics": "1.0.0" }, "testables": [ "com.unity.netcode.gameobjects" diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 9ae21d84e9..4cb36de517 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.ai.navigation": { - "version": "2.0.8", + "version": "2.0.13", "depth": 0, "source": "registry", "dependencies": { @@ -10,7 +10,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.23", + "version": "1.8.29", "depth": 1, "source": "registry", "dependencies": { @@ -30,26 +30,27 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.8.2", + "version": "2.12.4", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.5.1", + "version": "2.6.6", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.test-framework": "1.4.5", - "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.burst": "1.8.28", + "com.unity.mathematics": "1.3.2", + "com.unity.test-framework": "1.4.6", + "com.unity.nuget.mono-cecil": "1.11.6", "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, "com.unity.editorcoroutines": { - "version": "1.0.0", + "version": "1.1.0", "depth": 1, "source": "registry", "dependencies": {}, @@ -62,7 +63,7 @@ "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.36", + "version": "3.0.40", "depth": 0, "source": "registry", "dependencies": { @@ -71,16 +72,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.23", + "version": "2.0.26", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.9" + "com.unity.test-framework": "1.1.33" }, "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.14.0", + "version": "1.19.0", "depth": 0, "source": "registry", "dependencies": { @@ -89,7 +90,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "4.0.4", + "version": "5.0.3", "depth": 0, "source": "registry", "dependencies": { @@ -99,23 +100,23 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework.authoring": { - "version": "1.2.2", + "version": "1.5.3", "depth": 0, "source": "registry", "dependencies": { - "com.unity.learn.iet-framework": "3.1.3" + "com.unity.learn.iet-framework": "5.0.3" }, "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.3.2", + "version": "1.3.3", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.memoryprofiler": { - "version": "1.1.6", + "version": "1.1.12", "depth": 0, "source": "registry", "dependencies": { @@ -128,7 +129,7 @@ "url": "https://packages.unity.com" }, "com.unity.multiplayer.center": { - "version": "1.0.0", + "version": "1.0.1", "depth": 0, "source": "builtin", "dependencies": { @@ -136,7 +137,7 @@ } }, "com.unity.multiplayer.playmode": { - "version": "1.5.0", + "version": "2.0.2", "depth": 0, "source": "registry", "dependencies": { @@ -154,7 +155,7 @@ } }, "com.unity.multiplayer.tools": { - "version": "2.2.4", + "version": "2.2.9", "depth": 0, "source": "registry", "dependencies": { @@ -169,74 +170,74 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "2.4.3", + "version": "2.13.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.transport": "2.4.0", + "com.unity.transport": "2.6.0", "com.unity.nuget.mono-cecil": "1.11.4" }, "url": "https://packages.unity.com" }, "com.unity.nuget.mono-cecil": { - "version": "1.11.4", + "version": "1.11.6", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "3.2.1", + "version": "3.2.2", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.performance.profile-analyzer": { - "version": "1.2.3", + "version": "1.4.0", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.5.0", + "version": "3.5.4", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.imgui": "1.0.0", "com.unity.modules.physics": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.profiling.core": { - "version": "1.0.2", + "version": "1.0.3", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.0.4", + "version": "17.3.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.burst": "1.8.20", + "com.unity.burst": "1.8.14", "com.unity.mathematics": "1.3.2", "com.unity.ugui": "2.0.0", "com.unity.collections": "2.4.3", "com.unity.modules.physics": "1.0.0", "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.rendering.light-transport": "1.0.1" + "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.render-pipelines.universal": { - "version": "17.0.4", + "version": "17.3.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.4", - "com.unity.shadergraph": "17.0.4", + "com.unity.render-pipelines.core": "17.3.0", + "com.unity.shadergraph": "17.3.0", "com.unity.render-pipelines.universal-config": "17.0.3" } }, @@ -248,95 +249,85 @@ "com.unity.render-pipelines.core": "17.0.3" } }, - "com.unity.rendering.light-transport": { - "version": "1.0.1", - "depth": 2, - "source": "builtin", - "dependencies": { - "com.unity.collections": "2.2.0", - "com.unity.mathematics": "1.2.4", - "com.unity.modules.terrain": "1.0.0" - } - }, "com.unity.searcher": { - "version": "4.9.3", + "version": "4.9.4", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "3.5.1", + "version": "3.7.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.services.core": "1.15.1", - "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.services.core": "1.18.0", + "com.unity.nuget.newtonsoft-json": "3.2.2", "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.15.1", + "version": "1.18.0", "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.androidjni": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.nuget.newtonsoft-json": "3.2.2", "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.deployment": { - "version": "1.3.0", + "version": "1.7.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.services.core": "1.12.0", - "com.unity.services.deployment.api": "1.0.0" + "com.unity.services.core": "1.15.1", + "com.unity.services.deployment.api": "1.1.2" }, "url": "https://packages.unity.com" }, "com.unity.services.deployment.api": { - "version": "1.0.0", + "version": "1.1.3", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.services.multiplayer": { - "version": "1.1.4", + "version": "2.2.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.transport": "2.5.0", + "com.unity.transport": "2.6.0", "com.unity.collections": "2.2.1", - "com.unity.services.qos": "1.3.0", - "com.unity.services.core": "1.13.0", - "com.unity.services.wire": "1.4.0", - "com.unity.services.deployment": "1.3.0", - "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.services.qos": "1.4.1", + "com.unity.services.core": "1.16.0", + "com.unity.services.wire": "1.4.4", + "com.unity.services.deployment": "1.7.1", + "com.unity.nuget.newtonsoft-json": "3.2.2", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.services.authentication": "3.3.3" + "com.unity.services.authentication": "3.6.0" }, "url": "https://packages.unity.com" }, "com.unity.services.qos": { - "version": "1.3.0", + "version": "1.4.1", "depth": 1, "source": "registry", "dependencies": { "com.unity.collections": "1.2.4", - "com.unity.services.core": "1.12.4", + "com.unity.services.core": "1.12.5", "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.services.authentication": "2.0.0" + "com.unity.services.authentication": "3.5.2" }, "url": "https://packages.unity.com" }, "com.unity.services.wire": { - "version": "1.4.0", + "version": "1.4.4", "depth": 1, "source": "registry", "dependencies": { @@ -347,23 +338,23 @@ "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "2.1.0", + "version": "2.1.1", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.0.4", + "version": "17.3.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.4", + "com.unity.render-pipelines.core": "17.3.0", "com.unity.searcher": "4.9.3" } }, "com.unity.splines": { - "version": "2.8.1", + "version": "2.9.0", "depth": 1, "source": "registry", "dependencies": { @@ -373,24 +364,8 @@ }, "url": "https://packages.unity.com" }, - "com.unity.sysroot": { - "version": "2.0.10", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.sysroot.linux-x86_64": { - "version": "2.0.9", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.sysroot": "2.0.10" - }, - "url": "https://packages.unity.com" - }, "com.unity.test-framework": { - "version": "1.5.1", + "version": "1.6.0", "depth": 0, "source": "builtin", "dependencies": { @@ -400,7 +375,7 @@ } }, "com.unity.test-framework.performance": { - "version": "3.1.0", + "version": "3.5.0", "depth": 2, "source": "registry", "dependencies": { @@ -409,34 +384,14 @@ }, "url": "https://packages.unity.com" }, - "com.unity.toolchain.macos-arm64-linux-x86_64": { - "version": "2.0.4", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.sysroot": "2.0.10", - "com.unity.sysroot.linux-x86_64": "2.0.9" - }, - "url": "https://packages.unity.com" - }, - "com.unity.toolchain.macos-x86_64-linux-x86_64": { - "version": "2.0.10", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.sysroot": "2.0.10", - "com.unity.sysroot.linux-x86_64": "2.0.9" - }, - "url": "https://packages.unity.com" - }, "com.unity.transport": { - "version": "2.5.1", + "version": "2.7.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.12", + "com.unity.burst": "1.8.24", "com.unity.collections": "2.2.1", - "com.unity.mathematics": "1.3.1" + "com.unity.mathematics": "1.3.2" }, "url": "https://packages.unity.com" }, @@ -462,6 +417,14 @@ "source": "builtin", "dependencies": {} }, + "com.unity.modules.adaptiveperformance": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.subsystems": "1.0.0" + } + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -536,6 +499,14 @@ "com.unity.modules.imageconversion": "1.0.0" } }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, "com.unity.modules.terrain": { "version": "1.0.0", "depth": 2, @@ -556,7 +527,8 @@ "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.hierarchycore": "1.0.0" + "com.unity.modules.hierarchycore": "1.0.0", + "com.unity.modules.physics": "1.0.0" } }, "com.unity.modules.umbra": { @@ -619,6 +591,16 @@ "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.imageconversion": "1.0.0" } + }, + "com.unity.modules.vectorgraphics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } } } } diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 8ad9e81355..7ace8810a1 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7cec3c146cbb300673f75dd5464cd23953c4ca2ccfd7d9aa38cf410d6bd5b5e -size 3949 +oid sha256:40d44d4e54a909f8c1e5d9094f9cab3371d664ad350bcb0706b343bd8d85f9cb +size 4010 diff --git a/ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json b/ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json index 91c8442610..843a7464c1 100644 --- a/ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json +++ b/ProjectSettings/Packages/com.unity.learn.iet-framework/Settings.json @@ -9,7 +9,7 @@ { "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "IET.DisplayWelcomeDialogOnStartup", - "value": "{\"m_Value\":true}" + "value": "{\"m_Value\":false}" } ] } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 171ea1c1b8..b068668149 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c25a44d1b9df3697e1b22ea14fc5a65a43d549ad4d65a6a3ec409362e61c206 -size 27878 +oid sha256:8d67c1cefc9991fcc5a671094a93cdff2d2c6067c6b6bc19d72ef656c76eac2c +size 28430 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ce2bc70628..b12d98b16e 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.52f1 -m_EditorVersionWithRevision: 6000.0.52f1 (9e4086222921) +m_EditorVersion: 6000.3.20f1 +m_EditorVersionWithRevision: 6000.3.20f1 (c9ba695d4f07) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index 62cf15dffd..30d0e4416a 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:773803237466ffe9bbfed9ecef9bbe25f63196dd47ab6b3003f0cd1649fd2bd0 -size 524 +oid sha256:cdba1e5d65bcf6e3269d76ed3e60b6c21f98322002996642c9d74f1eb89f6b91 +size 556 diff --git a/ProjectSettings/VirtualProjectsConfig.json b/ProjectSettings/VirtualProjectsConfig.json index fea182f0f2..e3d27758b1 100644 --- a/ProjectSettings/VirtualProjectsConfig.json +++ b/ProjectSettings/VirtualProjectsConfig.json @@ -1,4 +1,4 @@ { "PlayerTags": [], - "version": "1.5.0" + "version": "6000.3.20f1" } \ No newline at end of file diff --git a/README.md b/README.md index 492b730c34..ac47276b86 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ### Made with and Including Utilities for Netcode for GameObjects
-[![UnityVersion](https://img.shields.io/badge/Unity%20Version:-6000.0.52f1%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/6000.0.52) +[![UnityVersion](https://img.shields.io/badge/Unity%20Version:-6000.3.20f1%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/6000.3.520f1) [![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-2.4.3-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/v2.4.3) [![LatestRelease](https://img.shields.io/badge/Latest%20Github%20Release:-v3.0.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop/releases/tag/v3.0.0)

@@ -86,7 +86,7 @@ For more information on the art of Boss Room, see [ART_NOTES.md](Documentation/A ## Requirements -BossRoom is compatible with the latest Unity Long Term Support (LTS) editor version, currently [6000.0 LTS](https://unity.com/releases/editor/archive). Please include standalone support for Windows/Mac in your installation. +BossRoom is compatible with the latest Unity Long Term Support (LTS) editor version, currently [6000.3 LTS](https://unity.com/releases/editor/archive). Please include standalone support for Windows/Mac in your installation. **PLEASE NOTE:** You will also need Netcode for Game Objects to use these samples. See the [Installation Documentation](https://docs-multiplayer.unity3d.com/netcode/current/installation) to prepare your environment. You can also complete the [Get Started With NGO](https://docs-multiplayer.unity3d.com/netcode/current/tutorials/get-started-ngo) tutorial to familiarize yourself with Netcode For Game Objects.

diff --git a/dotnet-tools/netcode.standards/netcode.standards.csproj b/dotnet-tools/netcode.standards/netcode.standards.csproj index 74e37a2170..86f2f3ba3d 100644 --- a/dotnet-tools/netcode.standards/netcode.standards.csproj +++ b/dotnet-tools/netcode.standards/netcode.standards.csproj @@ -1,15 +1,15 @@ - - - - Exe - net6.0 - true - netcode.standards - ./nupkg - - - - - - + + + + Exe + net8.0 + true + netcode.standards + ./nupkg + + + + + + \ No newline at end of file