From d402d7008a5ac56115f26e446b676cc70eac7bda Mon Sep 17 00:00:00 2001 From: jamespa Date: Mon, 6 Oct 2025 13:03:32 +0200 Subject: [PATCH] Update to .58f2 --- Assets/Materials/BlackoutBackface.mat | 2 +- Assets/Materials/Blocker.mat | 2 +- Assets/Materials/BushTest.mat | 2 +- Assets/Materials/Checkpoint.mat | 2 +- Assets/Materials/Seaweed.mat | 2 +- Assets/Materials/Splash.mat | 2 +- Assets/Materials/StudioLight.mat | 3 +- Assets/Materials/StudioLight_Bright.mat | 3 +- Assets/Materials/Terrain.mat | 2 +- .../Objects/boats/Interceptor/Interceptor.mat | 2 +- Assets/Objects/boats/renegade/Renegade.mat | 2 +- .../Cliffs/Materials/Env_Cliff_Full_01.mat | 2 +- .../Cliffs/Materials/Env_Cliffs.mat | 2 +- .../Cliffs/Materials/Env_HeroCave.mat | 2 +- .../Cliffs/Materials/Env_HeroLarge.mat | 2 +- .../Cliffs/Materials/Env_Rocks.mat | 2 +- .../Objects/environment/Clouds/CloudLayer.mat | 2 +- Assets/Objects/environment/Clouds/Clouds.mat | 2 +- .../environment/Trees/Materials/Bushes.mat | 2 +- .../environment/Trees/Materials/Trees.mat | 2 +- .../Trees/Materials/Trees_billboards.mat | 2 +- .../houses/Materials/Matr_BuildingsJettys.mat | 2 +- .../props/props/Materials/Matr_Props.mat | 2 +- .../props/props/Materials/Matr_Props_Hue.mat | 2 +- Assets/Scripts/GameSystem/InputControls.cs | 3 +- ...niversalRenderPipelineGlobalSettings.asset | 122 ++++++++++++++++++ Packages/manifest.json | 16 +-- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/ShaderGraphSettings.asset | 1 + ProjectSettings/URPProjectSettings.asset | 2 +- 30 files changed, 162 insertions(+), 36 deletions(-) diff --git a/Assets/Materials/BlackoutBackface.mat b/Assets/Materials/BlackoutBackface.mat index 2a256e398..3f87f57a6 100644 --- a/Assets/Materials/BlackoutBackface.mat +++ b/Assets/Materials/BlackoutBackface.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Materials/Blocker.mat b/Assets/Materials/Blocker.mat index 2a988cc7b..f2a368ce6 100644 --- a/Assets/Materials/Blocker.mat +++ b/Assets/Materials/Blocker.mat @@ -149,4 +149,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Materials/BushTest.mat b/Assets/Materials/BushTest.mat index 1cad6e7a1..c9c14171b 100644 --- a/Assets/Materials/BushTest.mat +++ b/Assets/Materials/BushTest.mat @@ -175,4 +175,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Materials/Checkpoint.mat b/Assets/Materials/Checkpoint.mat index af12c2aa7..7584aea7a 100644 --- a/Assets/Materials/Checkpoint.mat +++ b/Assets/Materials/Checkpoint.mat @@ -57,4 +57,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Materials/Seaweed.mat b/Assets/Materials/Seaweed.mat index 12fcba3a7..74aa2463d 100644 --- a/Assets/Materials/Seaweed.mat +++ b/Assets/Materials/Seaweed.mat @@ -116,4 +116,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Materials/Splash.mat b/Assets/Materials/Splash.mat index 4238ff854..5eac17a74 100644 --- a/Assets/Materials/Splash.mat +++ b/Assets/Materials/Splash.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Materials/StudioLight.mat b/Assets/Materials/StudioLight.mat index 3f97048c8..561bcbd65 100644 --- a/Assets/Materials/StudioLight.mat +++ b/Assets/Materials/StudioLight.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -97,6 +97,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 diff --git a/Assets/Materials/StudioLight_Bright.mat b/Assets/Materials/StudioLight_Bright.mat index cf5c2671b..2b4718416 100644 --- a/Assets/Materials/StudioLight_Bright.mat +++ b/Assets/Materials/StudioLight_Bright.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -97,6 +97,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 diff --git a/Assets/Materials/Terrain.mat b/Assets/Materials/Terrain.mat index e7b123b61..cdda944c5 100644 --- a/Assets/Materials/Terrain.mat +++ b/Assets/Materials/Terrain.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Objects/boats/Interceptor/Interceptor.mat b/Assets/Objects/boats/Interceptor/Interceptor.mat index 4cb2b7eed..92eec03ce 100644 --- a/Assets/Objects/boats/Interceptor/Interceptor.mat +++ b/Assets/Objects/boats/Interceptor/Interceptor.mat @@ -150,4 +150,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Objects/boats/renegade/Renegade.mat b/Assets/Objects/boats/renegade/Renegade.mat index e832f7d25..5a58eea9c 100644 --- a/Assets/Objects/boats/renegade/Renegade.mat +++ b/Assets/Objects/boats/renegade/Renegade.mat @@ -113,4 +113,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat b/Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat index 956a8e28b..b167068d1 100644 --- a/Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat +++ b/Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat b/Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat index b3f7ba793..a3796e244 100644 --- a/Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat +++ b/Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat b/Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat index 591920040..d8bafd7c3 100644 --- a/Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat +++ b/Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat b/Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat index 79d736df2..6bc663415 100644 --- a/Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat +++ b/Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat @@ -91,4 +91,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat b/Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat index e2e59a150..4cd4610b9 100644 --- a/Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat +++ b/Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat @@ -91,4 +91,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Objects/environment/Clouds/CloudLayer.mat b/Assets/Objects/environment/Clouds/CloudLayer.mat index a80059eea..85a3075a8 100644 --- a/Assets/Objects/environment/Clouds/CloudLayer.mat +++ b/Assets/Objects/environment/Clouds/CloudLayer.mat @@ -134,4 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Objects/environment/Clouds/Clouds.mat b/Assets/Objects/environment/Clouds/Clouds.mat index f246d07b2..4341b220a 100644 --- a/Assets/Objects/environment/Clouds/Clouds.mat +++ b/Assets/Objects/environment/Clouds/Clouds.mat @@ -100,4 +100,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Objects/environment/Trees/Materials/Bushes.mat b/Assets/Objects/environment/Trees/Materials/Bushes.mat index c1ff13ef6..8e1a38763 100644 --- a/Assets/Objects/environment/Trees/Materials/Bushes.mat +++ b/Assets/Objects/environment/Trees/Materials/Bushes.mat @@ -153,4 +153,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Objects/environment/Trees/Materials/Trees.mat b/Assets/Objects/environment/Trees/Materials/Trees.mat index fdff8a556..6e2661463 100644 --- a/Assets/Objects/environment/Trees/Materials/Trees.mat +++ b/Assets/Objects/environment/Trees/Materials/Trees.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Objects/environment/Trees/Materials/Trees_billboards.mat b/Assets/Objects/environment/Trees/Materials/Trees_billboards.mat index f53d37589..9e0af3d6b 100644 --- a/Assets/Objects/environment/Trees/Materials/Trees_billboards.mat +++ b/Assets/Objects/environment/Trees/Materials/Trees_billboards.mat @@ -73,4 +73,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Objects/props/houses/Materials/Matr_BuildingsJettys.mat b/Assets/Objects/props/houses/Materials/Matr_BuildingsJettys.mat index e2636837f..1eff58aef 100644 --- a/Assets/Objects/props/houses/Materials/Matr_BuildingsJettys.mat +++ b/Assets/Objects/props/houses/Materials/Matr_BuildingsJettys.mat @@ -164,4 +164,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Objects/props/props/Materials/Matr_Props.mat b/Assets/Objects/props/props/Materials/Matr_Props.mat index 21c99ae89..2fad33119 100644 --- a/Assets/Objects/props/props/Materials/Matr_Props.mat +++ b/Assets/Objects/props/props/Materials/Matr_Props.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Objects/props/props/Materials/Matr_Props_Hue.mat b/Assets/Objects/props/props/Materials/Matr_Props_Hue.mat index 8369f180c..44af85040 100644 --- a/Assets/Objects/props/props/Materials/Matr_Props_Hue.mat +++ b/Assets/Objects/props/props/Materials/Matr_Props_Hue.mat @@ -137,4 +137,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Scripts/GameSystem/InputControls.cs b/Assets/Scripts/GameSystem/InputControls.cs index 61e0f6888..b37fc2830 100644 --- a/Assets/Scripts/GameSystem/InputControls.cs +++ b/Assets/Scripts/GameSystem/InputControls.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.14.0 +// version 1.14.2 // from Assets/Data/InputControls.inputactions // // Changes to this file may cause incorrect behavior and will be lost if @@ -85,6 +85,7 @@ public partial class @InputControls: IInputActionCollection2, IDisposable public @InputControls() { asset = InputActionAsset.FromJson(@"{ + ""version"": 1, ""name"": ""InputControls"", ""maps"": [ { diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index 8477da17b..72b1de617 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -55,6 +55,11 @@ MonoBehaviour: - rid: 8329534643960545283 - rid: 7932631822410973184 - rid: 4975679781515558912 + - rid: 6120128157049946112 + - rid: 6120128157049946113 + - rid: 6120128157049946114 + - rid: 6120128157049946115 + - rid: 6120128157049946116 m_RuntimeSettings: m_List: [] m_AssetVersion: 8 @@ -96,6 +101,8 @@ MonoBehaviour: type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} + m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, + type: 2} - rid: 3715396717999554801 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} @@ -242,6 +249,115 @@ MonoBehaviour: type: 3} m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3} + - rid: 6120128157049946112 + type: {class: ScreenSpaceAmbientOcclusionPersistentResources, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} + m_Version: 0 + - rid: 6120128157049946113 + type: {class: PostProcessData/TextureResources, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + blueNoise16LTex: + - {fileID: 2800000, guid: 81200413a40918d4d8702e94db29911c, type: 3} + - {fileID: 2800000, guid: d50c5e07c9911a74982bddf7f3075e7b, type: 3} + - {fileID: 2800000, guid: 1134690bf9216164dbc75050e35b7900, type: 3} + - {fileID: 2800000, guid: 7ce2118f74614a94aa8a0cdf2e6062c3, type: 3} + - {fileID: 2800000, guid: 2ca97df9d1801e84a8a8f2c53cb744f0, type: 3} + - {fileID: 2800000, guid: e63eef8f54aa9dc4da9a5ac094b503b5, type: 3} + - {fileID: 2800000, guid: 39451254daebd6d40b52899c1f1c0c1b, type: 3} + - {fileID: 2800000, guid: c94ad916058dff743b0f1c969ddbe660, type: 3} + - {fileID: 2800000, guid: ed5ea7ce59ca8ec4f9f14bf470a30f35, type: 3} + - {fileID: 2800000, guid: 071e954febf155243a6c81e48f452644, type: 3} + - {fileID: 2800000, guid: 96aaab9cc247d0b4c98132159688c1af, type: 3} + - {fileID: 2800000, guid: fc3fa8f108657e14486697c9a84ccfc5, type: 3} + - {fileID: 2800000, guid: bfed3e498947fcb4890b7f40f54d85b9, type: 3} + - {fileID: 2800000, guid: d512512f4af60a442ab3458489412954, type: 3} + - {fileID: 2800000, guid: 47a45908f6db0cb44a0d5e961143afec, type: 3} + - {fileID: 2800000, guid: 4dcc0502f8586f941b5c4a66717205e8, type: 3} + - {fileID: 2800000, guid: 9d92991794bb5864c8085468b97aa067, type: 3} + - {fileID: 2800000, guid: 14381521ff11cb74abe3fe65401c23be, type: 3} + - {fileID: 2800000, guid: d36f0fe53425e08499a2333cf423634c, type: 3} + - {fileID: 2800000, guid: d4044ea2490d63b43aa1765f8efbf8a9, type: 3} + - {fileID: 2800000, guid: c9bd74624d8070f429e3f46d161f9204, type: 3} + - {fileID: 2800000, guid: d5c9b274310e5524ebe32a4e4da3df1f, type: 3} + - {fileID: 2800000, guid: f69770e54f2823f43badf77916acad83, type: 3} + - {fileID: 2800000, guid: 10b6c6d22e73dea46a8ab36b6eebd629, type: 3} + - {fileID: 2800000, guid: a2ec5cbf5a9b64345ad3fab0912ddf7b, type: 3} + - {fileID: 2800000, guid: 1c3c6d69a645b804fa232004b96b7ad3, type: 3} + - {fileID: 2800000, guid: d18a24d7b4ed50f4387993566d9d3ae2, type: 3} + - {fileID: 2800000, guid: c989e1ed85cf7154caa922fec53e6af6, type: 3} + - {fileID: 2800000, guid: ff47e5a0f105eb34883b973e51f4db62, type: 3} + - {fileID: 2800000, guid: fa042edbfc40fbd4bad0ab9d505b1223, type: 3} + - {fileID: 2800000, guid: 896d9004736809c4fb5973b7c12eb8b9, type: 3} + - {fileID: 2800000, guid: 179f794063d2a66478e6e726f84a65bc, type: 3} + filmGrainTex: + - {fileID: 2800000, guid: 654c582f7f8a5a14dbd7d119cbde215d, type: 3} + - {fileID: 2800000, guid: dd77ffd079630404e879388999033049, type: 3} + - {fileID: 2800000, guid: 1097e90e1306e26439701489f391a6c0, type: 3} + - {fileID: 2800000, guid: f0b67500f7fad3b4c9f2b13e8f41ba6e, type: 3} + - {fileID: 2800000, guid: 9930fb4528622b34687b00bbe6883de7, type: 3} + - {fileID: 2800000, guid: bd9e8c758250ef449a4b4bfaad7a2133, type: 3} + - {fileID: 2800000, guid: 510a2f57334933e4a8dbabe4c30204e4, type: 3} + - {fileID: 2800000, guid: b4db8180660810945bf8d55ab44352ad, type: 3} + - {fileID: 2800000, guid: fd2fd78b392986e42a12df2177d3b89c, type: 3} + - {fileID: 2800000, guid: 5cdee82a77d13994f83b8fdabed7c301, type: 3} + smaaAreaTex: {fileID: 2800000, guid: d1f1048909d55cd4fa1126ab998f617e, type: 3} + smaaSearchTex: {fileID: 2800000, guid: 51eee22c2a633ef4aada830eed57c3fd, type: 3} + m_TexturesResourcesVersion: 0 + - rid: 6120128157049946114 + type: {class: ScreenSpaceAmbientOcclusionDynamicResources, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_BlueNoise256Textures: + - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3} + - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3} + - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3} + - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3} + - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3} + - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3} + - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3} + m_Version: 0 + - rid: 6120128157049946115 + type: {class: PostProcessData/ShaderResources, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + stopNanPS: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3} + subpixelMorphologicalAntialiasingPS: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, + type: 3} + gaussianDepthOfFieldPS: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, + type: 3} + bokehDepthOfFieldPS: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, + type: 3} + cameraMotionBlurPS: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, + type: 3} + paniniProjectionPS: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, + type: 3} + lutBuilderLdrPS: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, + type: 3} + lutBuilderHdrPS: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, + type: 3} + bloomPS: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3} + temporalAntialiasingPS: {fileID: 4800000, guid: 9c70c1a35ff15f340b38ea84842358bf, + type: 3} + LensFlareDataDrivenPS: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, + type: 3} + LensFlareScreenSpacePS: {fileID: 4800000, guid: 701880fecb344ea4c9cd0db3407ab287, + type: 3} + scalingSetupPS: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, + type: 3} + easuPS: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3} + uberPostPS: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3} + finalPostPassPS: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, + type: 3} + m_ShaderResourcesVersion: 0 + - rid: 6120128157049946116 + type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, + asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, + type: 2} - rid: 7932631822410973184 type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} @@ -318,6 +434,12 @@ MonoBehaviour: m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, 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} - rid: 9155629212231794702 type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: diff --git a/Packages/manifest.json b/Packages/manifest.json index eab963cb4..5b237ab2f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,18 +1,18 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.addressables": "2.4.1", - "com.unity.ai.navigation": "2.0.6", - "com.unity.burst": "1.8.19", + "com.unity.addressables": "2.7.2", + "com.unity.ai.navigation": "2.0.9", + "com.unity.burst": "1.8.24", "com.unity.cinemachine": "3.1.3", - "com.unity.ide.rider": "3.0.35", - "com.unity.ide.visualstudio": "2.0.22", - "com.unity.inputsystem": "1.14.0", + "com.unity.ide.rider": "3.0.38", + "com.unity.ide.visualstudio": "2.0.23", + "com.unity.inputsystem": "1.14.2", "com.unity.mathematics": "1.3.2", - "com.unity.memoryprofiler": "1.1.6", + "com.unity.memoryprofiler": "1.1.8", "com.unity.render-pipelines.universal": "17.0.4", "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.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 2795afad2..0faef8df9 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.45f1 -m_EditorVersionWithRevision: 6000.0.45f1 (d91bd3d4e081) +m_EditorVersion: 6000.0.58f2 +m_EditorVersionWithRevision: 6000.0.58f2 (92dee566b325) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index 10b82f0a1..0421697b3 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} diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index 08faf0336..64a8674a2 100644 --- a/ProjectSettings/URPProjectSettings.asset +++ b/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 9 + m_LastMaterialVersion: 10