From 47d942d1763cf56e24cab02ba09abdd8be532693 Mon Sep 17 00:00:00 2001 From: AlexanderT Date: Fri, 26 Sep 2025 08:48:33 +0200 Subject: [PATCH] Switched Unity version to 6.2, updated some packages + installed GraphToolkit --- ...niversalRenderPipelineGlobalSettings.asset | 21 ++--- Packages/manifest.json | 7 +- Packages/packages-lock.json | 77 +++++++++++-------- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/ShaderGraphSettings.asset | 1 + 5 files changed, 57 insertions(+), 53 deletions(-) diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index 7acb884f..9497abb8 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -61,19 +61,9 @@ MonoBehaviour: - rid: 7785851992983994371 - rid: 7785851992983994372 - rid: 7785851992983994373 + - rid: 1219994508087787520 m_RuntimeSettings: - m_List: - - rid: 7752762179098771456 - - rid: 7752762179098771457 - - rid: 7752762179098771459 - - rid: 7752762179098771461 - - rid: 7752762179098771462 - - rid: 7752762179098771464 - - rid: 7752762179098771466 - - rid: 7752762179098771468 - - rid: 7752762179098771472 - - rid: 7752762179098771476 - - rid: 7785851992983994373 + m_List: [] m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: @@ -97,6 +87,10 @@ MonoBehaviour: references: version: 2 RefIds: + - rid: 1219994508087787520 + type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 - rid: 3958521779966443520 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -129,9 +123,6 @@ MonoBehaviour: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, 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, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} diff --git a/Packages/manifest.json b/Packages/manifest.json index 24fa4567..b6cc5615 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,17 +1,18 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "11.0.0", - "com.unity.addressables": "2.6.0", + "com.unity.2d.spriteshape": "12.0.1", + "com.unity.addressables": "2.7.3", "com.unity.addressables.android": "1.0.7", "com.unity.cinemachine": "3.1.4", "com.unity.feature.2d": "2.0.1", "com.unity.film-internal-utilities": "0.18.4-preview", + "com.unity.graphtoolkit": "0.4.0-exp.2", "com.unity.ide.rider": "3.0.38", "com.unity.ide.visualstudio": "2.0.23", "com.unity.inputsystem": "1.14.2", "com.unity.multiplayer.center": "1.0.0", - "com.unity.render-pipelines.universal": "17.1.0", + "com.unity.render-pipelines.universal": "17.2.0", "com.unity.timeline": "1.8.9", "com.unity.ugui": "2.0.0", "com.unity.modules.accessibility": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index e94e9fa7..1bced10b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "11.0.0", + "version": "12.0.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "10.0.0", + "com.unity.2d.common": "11.0.1", "com.unity.2d.sprite": "1.0.0", "com.unity.collections": "1.2.4", "com.unity.modules.animation": "1.0.0", @@ -14,11 +14,11 @@ "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { - "version": "1.2.5", + "version": "2.0.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "10.0.0", + "com.unity.2d.common": "11.0.1", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.mathematics": "1.2.6", @@ -27,7 +27,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "10.0.0", + "version": "11.0.1", "depth": 1, "source": "registry", "dependencies": { @@ -49,11 +49,11 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "10.1.1", + "version": "11.0.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "10.0.0", + "com.unity.2d.common": "11.0.1", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0" }, @@ -66,11 +66,11 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "11.0.0", + "version": "12.0.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "10.0.0", + "com.unity.2d.common": "11.0.1", "com.unity.mathematics": "1.1.0", "com.unity.modules.physics2d": "1.0.0" }, @@ -86,7 +86,7 @@ } }, "com.unity.2d.tilemap.extras": { - "version": "4.3.1", + "version": "5.0.1", "depth": 1, "source": "registry", "dependencies": { @@ -97,7 +97,7 @@ "url": "https://packages.unity.com" }, "com.unity.addressables": { - "version": "2.6.0", + "version": "2.7.3", "depth": 0, "source": "registry", "dependencies": { @@ -107,7 +107,7 @@ "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "2.4.0", + "com.unity.scriptablebuildpipeline": "2.4.2", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" @@ -123,7 +123,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.23", + "version": "1.8.24", "depth": 2, "source": "registry", "dependencies": { @@ -143,13 +143,14 @@ "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" @@ -165,14 +166,14 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "11.0.0", + "com.unity.2d.animation": "12.0.2", "com.unity.2d.pixel-perfect": "5.1.0", - "com.unity.2d.psdimporter": "10.1.1", + "com.unity.2d.psdimporter": "11.0.1", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "11.0.0", + "com.unity.2d.spriteshape": "12.0.1", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "4.3.1", - "com.unity.2d.aseprite": "1.2.5" + "com.unity.2d.tilemap.extras": "5.0.1", + "com.unity.2d.aseprite": "2.0.1" } }, "com.unity.film-internal-utilities": { @@ -185,6 +186,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.graphtoolkit": { + "version": "0.4.0-exp.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.ide.rider": { "version": "3.0.38", "depth": 0, @@ -228,7 +238,7 @@ } }, "com.unity.nuget.mono-cecil": { - "version": "1.11.4", + "version": "1.11.5", "depth": 3, "source": "registry", "dependencies": {}, @@ -242,7 +252,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.1.0", + "version": "17.2.0", "depth": 1, "source": "builtin", "dependencies": { @@ -257,12 +267,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" } }, @@ -285,7 +295,7 @@ } }, "com.unity.scriptablebuildpipeline": { - "version": "2.4.0", + "version": "2.4.2", "depth": 1, "source": "registry", "dependencies": { @@ -309,16 +319,16 @@ "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" } }, "com.unity.splines": { - "version": "2.8.1", + "version": "2.8.2", "depth": 1, "source": "registry", "dependencies": { @@ -329,7 +339,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.5.1", + "version": "1.6.0", "depth": 1, "source": "builtin", "dependencies": { @@ -517,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": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index df314e09..b28bf8bd 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.1.15f1 -m_EditorVersionWithRevision: 6000.1.15f1 (faa32412f6c9) +m_EditorVersion: 6000.2.6f1 +m_EditorVersionWithRevision: 6000.2.6f1 (cc51a95c0300) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index 10b82f0a..0421697b 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}