From d3dc51e2bf83295e233441f00927ed79346842f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C5=A0vec?= Date: Wed, 24 Sep 2025 13:57:51 +0200 Subject: [PATCH] upgrade to 6.2 --- Assets/DefaultNetworkPrefabs.asset | 5 ++ ...niversalRenderPipelineGlobalSettings.asset | 12 ++--- .../XR/Settings/OpenXR Package Settings.asset | 3 ++ Packages/manifest.json | 12 ++--- Packages/packages-lock.json | 48 ++++++++++--------- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/ShaderGraphSettings.asset | 1 + 7 files changed, 48 insertions(+), 37 deletions(-) diff --git a/Assets/DefaultNetworkPrefabs.asset b/Assets/DefaultNetworkPrefabs.asset index 2aa8a141..586afe1a 100644 --- a/Assets/DefaultNetworkPrefabs.asset +++ b/Assets/DefaultNetworkPrefabs.asset @@ -62,3 +62,8 @@ MonoBehaviour: SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} + - Override: 0 + Prefab: {fileID: 75161255762383020, guid: 1ef3259331ddc1f4d94b628323ec45f3, type: 3} + SourcePrefabToOverride: {fileID: 0} + SourceHashToOverride: 0 + OverridingTargetPrefab: {fileID: 0} diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 9f994e9a..d6ca9725 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -61,6 +61,7 @@ MonoBehaviour: - rid: 8408844319228428313 - rid: 8408844319228428314 - rid: 8408844319228428315 + - rid: 7786560465546510336 m_RuntimeSettings: m_List: [] m_AssetVersion: 8 @@ -93,6 +94,11 @@ MonoBehaviour: references: version: 2 RefIds: + - rid: 7786560465546510336 + type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, + asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 - rid: 8408844319228428288 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -204,12 +210,6 @@ MonoBehaviour: type: 3} m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} - m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, - type: 3} - m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, - type: 3} - m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, - type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, diff --git a/Assets/Settings/XR/Settings/OpenXR Package Settings.asset b/Assets/Settings/XR/Settings/OpenXR Package Settings.asset index 22e7b5c4..02df160d 100644 --- a/Assets/Settings/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/Settings/XR/Settings/OpenXR Package Settings.asset @@ -109,6 +109,7 @@ MonoBehaviour: m_multiviewRenderRegionsOptimizationMode: 0 m_hasMigratedMultiviewRenderRegionSetting: 1 m_foveatedRenderingApi: 0 + m_useOpenXRPredictedTime: 0 --- !u!114 &-8329024555236165502 MonoBehaviour: m_ObjectHideFlags: 0 @@ -380,6 +381,7 @@ MonoBehaviour: m_multiviewRenderRegionsOptimizationMode: 0 m_hasMigratedMultiviewRenderRegionSetting: 1 m_foveatedRenderingApi: 0 + m_useOpenXRPredictedTime: 0 --- !u!114 &-4210802607049660204 MonoBehaviour: m_ObjectHideFlags: 0 @@ -421,6 +423,7 @@ MonoBehaviour: company: Unity priority: 0 required: 0 + m_UseRightHandedNDC: 0 --- !u!114 &-3138498671197059368 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index d429bf65..518f6da7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,19 +1,19 @@ { "dependencies": { "com.meta.xr.sdk.all": "77.0.0", - "com.unity.collab-proxy": "2.8.2", - "com.unity.ide.rider": "3.0.36", + "com.unity.collab-proxy": "2.9.3", + "com.unity.ide.rider": "3.0.37", "com.unity.ide.visualstudio": "2.0.23", - "com.unity.inputsystem": "1.14.1", + "com.unity.inputsystem": "1.14.2", "com.unity.multiplayer.center": "1.0.0", "com.unity.netcode.gameobjects": "2.4.3", - "com.unity.render-pipelines.universal": "17.1.0", + "com.unity.render-pipelines.universal": "17.2.0", "com.unity.services.relay": "1.1.1", "com.unity.test-framework": "1.5.1", - "com.unity.timeline": "1.8.8", + "com.unity.timeline": "1.8.9", "com.unity.ugui": "2.0.0", "com.unity.xr.management": "4.5.1", - "com.unity.xr.openxr": "1.15.0", + "com.unity.xr.openxr": "1.15.1", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b77b4be2..bacae976 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -96,7 +96,7 @@ "url": "https://packages.unity.com" }, "com.unity.ai.navigation": { - "version": "2.0.8", + "version": "2.0.9", "depth": 2, "source": "registry", "dependencies": { @@ -105,7 +105,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.23", + "version": "1.8.24", "depth": 2, "source": "registry", "dependencies": { @@ -115,20 +115,21 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.8.2", + "version": "2.9.3", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.5.1", + "version": "2.5.7", "depth": 2, "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.19", + "com.unity.mathematics": "1.3.2", + "com.unity.test-framework": "1.4.6", + "com.unity.nuget.mono-cecil": "1.11.5", "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" @@ -140,7 +141,7 @@ "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.36", + "version": "3.0.37", "depth": 0, "source": "registry", "dependencies": { @@ -158,7 +159,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.14.1", + "version": "1.14.2", "depth": 0, "source": "registry", "dependencies": { @@ -192,7 +193,7 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.mono-cecil": { - "version": "1.11.4", + "version": "1.11.5", "depth": 1, "source": "registry", "dependencies": {}, @@ -206,7 +207,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.1.0", + "version": "17.2.0", "depth": 1, "source": "builtin", "dependencies": { @@ -221,12 +222,12 @@ } }, "com.unity.render-pipelines.universal": { - "version": "17.1.0", + "version": "17.2.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.1.0", - "com.unity.shadergraph": "17.1.0", + "com.unity.render-pipelines.core": "17.2.0", + "com.unity.shadergraph": "17.2.0", "com.unity.render-pipelines.universal-config": "17.0.3" } }, @@ -310,11 +311,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.1.0", + "version": "17.2.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.1.0", + "com.unity.render-pipelines.core": "17.2.0", "com.unity.searcher": "4.9.3" } }, @@ -347,24 +348,24 @@ } }, "com.unity.timeline": { - "version": "1.8.8", + "version": "1.8.9", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "2.5.2", + "version": "2.5.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.12", "com.unity.collections": "2.2.1", + "com.unity.burst": "1.8.12", "com.unity.mathematics": "1.3.1" }, "url": "https://packages.unity.com" @@ -379,7 +380,7 @@ } }, "com.unity.xr.core-utils": { - "version": "2.5.2", + "version": "2.5.3", "depth": 1, "source": "registry", "dependencies": { @@ -411,7 +412,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.openxr": { - "version": "1.15.0", + "version": "1.15.1", "depth": 0, "source": "registry", "dependencies": { @@ -570,7 +571,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": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index c995141a..7b82d475 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.1.12f1 -m_EditorVersionWithRevision: 6000.1.12f1 (da0c3ee78ee0) +m_EditorVersion: 6000.2.5f1 +m_EditorVersionWithRevision: 6000.2.5f1 (43d04cd1df69) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index e66042a7..ce8c2432 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: shaderVariantLimit: 128 + overrideShaderVariantLimit: 0 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 customHeatmapValues: {fileID: 0}