diff --git a/Experimental/DistributedAuthoritySample/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Experimental/DistributedAuthoritySample/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 9c1a99874..682af13b6 100644 --- a/Experimental/DistributedAuthoritySample/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Experimental/DistributedAuthoritySample/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -158,7 +158,6 @@ MonoBehaviour: m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3} m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} - m_DefaultCustomMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} @@ -206,12 +205,12 @@ MonoBehaviour: dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, type: 3} subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, type: 3} voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3} - traceVirtualOffsetCS: {fileID: 7200000, guid: 805f10d263aac4b4098c0279cd37a4f3, type: 3} - traceVirtualOffsetRT: {fileID: 4807578003741378534, guid: b60511f4aa1443f4d8c0b18f4fec92f4, type: 3} - skyOcclusionCS: {fileID: 7200000, guid: 798f52ec82fa04048a12826bbbbcf7b4, type: 3} - skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3} - renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3} - renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3} + traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} + traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3} + skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} + skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} + renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} + renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - rid: 6852985685364965389 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: diff --git a/Experimental/DistributedAuthoritySample/Packages/manifest.json b/Experimental/DistributedAuthoritySample/Packages/manifest.json index c0e1293a3..93b9ce8d5 100644 --- a/Experimental/DistributedAuthoritySample/Packages/manifest.json +++ b/Experimental/DistributedAuthoritySample/Packages/manifest.json @@ -1,19 +1,19 @@ { "dependencies": { - "com.unity.ai.navigation": "2.0.0", + "com.unity.ai.navigation": "2.0.4", "com.unity.animation.rigging": "1.3.0", "com.unity.cinemachine": "3.1.1", - "com.unity.collab-proxy": "2.4.4", + "com.unity.collab-proxy": "2.5.1", "com.unity.ide.rider": "3.0.31", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.inputsystem": "1.9.0", - "com.unity.multiplayer.playmode": "1.2.1", - "com.unity.multiplayer.tools": "2.1.0", - "com.unity.netcode.gameobjects": "2.0.0-pre.4", + "com.unity.inputsystem": "1.11.0", + "com.unity.multiplayer.playmode": "1.2.2", + "com.unity.multiplayer.tools": "2.2.0", + "com.unity.netcode.gameobjects": "2.0.0", "com.unity.render-pipelines.universal": "17.0.3", - "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.services.multiplayer": "1.0.0", + "com.unity.services.vivox": "16.5.0", + "com.unity.test-framework": "1.4.5", "com.unity.timeline": "1.8.7", "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.9.4", diff --git a/Experimental/DistributedAuthoritySample/Packages/packages-lock.json b/Experimental/DistributedAuthoritySample/Packages/packages-lock.json index bd94f3144..5d9f06d8c 100644 --- a/Experimental/DistributedAuthoritySample/Packages/packages-lock.json +++ b/Experimental/DistributedAuthoritySample/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.ai.navigation": { - "version": "2.0.0", + "version": "2.0.4", "depth": 0, "source": "registry", "dependencies": { @@ -39,15 +39,15 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.4.4", + "version": "2.5.1", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.4.1", - "depth": 2, + "version": "2.4.3", + "depth": 1, "source": "registry", "dependencies": { "com.unity.burst": "1.8.13", @@ -83,7 +83,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.9.0", + "version": "1.11.0", "depth": 0, "source": "registry", "dependencies": { @@ -93,13 +93,13 @@ }, "com.unity.mathematics": { "version": "1.3.2", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.multiplayer.playmode": { - "version": "1.2.1", + "version": "1.2.2", "depth": 0, "source": "registry", "dependencies": { @@ -108,22 +108,22 @@ "url": "https://packages.unity.com" }, "com.unity.multiplayer.tools": { - "version": "2.1.0", + "version": "2.2.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.6", - "com.unity.collections": "1.1.0", - "com.unity.mathematics": "1.2.6", - "com.unity.profiling.core": "1.0.0-pre.1", - "com.unity.nuget.mono-cecil": "1.10.1", + "com.unity.burst": "1.8.16", + "com.unity.collections": "2.4.1", + "com.unity.mathematics": "1.3.2", + "com.unity.profiling.core": "1.0.2", + "com.unity.nuget.mono-cecil": "1.11.4", "com.unity.modules.uielements": "1.0.0", - "com.unity.nuget.newtonsoft-json": "2.0.0" + "com.unity.nuget.newtonsoft-json": "3.2.1" }, "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "2.0.0-pre.4", + "version": "2.0.0", "depth": 0, "source": "registry", "dependencies": { @@ -161,7 +161,7 @@ "com.unity.burst": "1.8.14", "com.unity.mathematics": "1.3.2", "com.unity.ugui": "2.0.0", - "com.unity.collections": "2.4.1", + "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", @@ -244,7 +244,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.multiplayer": { - "version": "1.0.0-pre.1", + "version": "1.0.0", "depth": 0, "source": "registry", "dependencies": { @@ -252,7 +252,7 @@ "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.2.6", + "com.unity.services.wire": "1.2.7", "com.unity.services.deployment": "1.3.0", "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.modules.unitywebrequest": "1.0.0", @@ -274,7 +274,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.vivox": { - "version": "16.3.0", + "version": "16.5.0", "depth": 0, "source": "registry", "dependencies": { @@ -286,7 +286,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.wire": { - "version": "1.2.6", + "version": "1.2.7", "depth": 1, "source": "registry", "dependencies": { @@ -324,7 +324,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.4.4", + "version": "1.4.5", "depth": 0, "source": "registry", "dependencies": { diff --git a/Experimental/DistributedAuthoritySample/ProjectSettings/ProjectSettings.asset b/Experimental/DistributedAuthoritySample/ProjectSettings/ProjectSettings.asset index 16586c871..d813aeee9 100644 --- a/Experimental/DistributedAuthoritySample/ProjectSettings/ProjectSettings.asset +++ b/Experimental/DistributedAuthoritySample/ProjectSettings/ProjectSettings.asset @@ -49,6 +49,7 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 unsupportedMSAAFallback: 0 + m_SpriteBatchMaxVertexCount: 65535 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -82,7 +83,6 @@ PlayerSettings: defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 0 - captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 @@ -555,6 +555,7 @@ PlayerSettings: playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 + editorGfxJobOverride: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 diff --git a/Experimental/DistributedAuthoritySample/ProjectSettings/ProjectVersion.txt b/Experimental/DistributedAuthoritySample/ProjectSettings/ProjectVersion.txt index a31f2d0d9..17666dbf4 100644 --- a/Experimental/DistributedAuthoritySample/ProjectSettings/ProjectVersion.txt +++ b/Experimental/DistributedAuthoritySample/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.13f1 -m_EditorVersionWithRevision: 6000.0.13f1 (53a692e3fca9) +m_EditorVersion: 6000.0.21f1 +m_EditorVersionWithRevision: 6000.0.21f1 (e2bacb8dee3a) diff --git a/Experimental/DistributedAuthoritySample/ProjectSettings/VirtualProjectsConfig.json b/Experimental/DistributedAuthoritySample/ProjectSettings/VirtualProjectsConfig.json index 47661d380..74091c749 100644 --- a/Experimental/DistributedAuthoritySample/ProjectSettings/VirtualProjectsConfig.json +++ b/Experimental/DistributedAuthoritySample/ProjectSettings/VirtualProjectsConfig.json @@ -1,4 +1,4 @@ { "PlayerTags": [], - "version": "1.2.1" + "version": "1.2.2" } \ No newline at end of file