diff --git a/Assets/Desert/Assets/Materials/Desert Floor.mat b/Assets/Desert/Assets/Materials/Desert Floor.mat index 547062c..e0bb3b7 100644 --- a/Assets/Desert/Assets/Materials/Desert Floor.mat +++ b/Assets/Desert/Assets/Materials/Desert Floor.mat @@ -132,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 diff --git a/Assets/Desert/Assets/Materials/Desert Portal Entrance.mat b/Assets/Desert/Assets/Materials/Desert Portal Entrance.mat index 862da48..de8df94 100644 --- a/Assets/Desert/Assets/Materials/Desert Portal Entrance.mat +++ b/Assets/Desert/Assets/Materials/Desert Portal Entrance.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Desert/Assets/Materials/Desert Portal.mat b/Assets/Desert/Assets/Materials/Desert Portal.mat index 4166547..6fbc0e4 100644 --- a/Assets/Desert/Assets/Materials/Desert Portal.mat +++ b/Assets/Desert/Assets/Materials/Desert Portal.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Desert/Assets/Materials/Dispenser.mat b/Assets/Desert/Assets/Materials/Dispenser.mat index 5e97332..fbf317f 100644 --- a/Assets/Desert/Assets/Materials/Dispenser.mat +++ b/Assets/Desert/Assets/Materials/Dispenser.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Desert/Assets/Materials/Hexagon Stand.mat b/Assets/Desert/Assets/Materials/Hexagon Stand.mat index ba4457c..31568a4 100644 --- a/Assets/Desert/Assets/Materials/Hexagon Stand.mat +++ b/Assets/Desert/Assets/Materials/Hexagon Stand.mat @@ -132,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 diff --git a/Assets/Desert/Assets/Materials/Hole Orb.mat b/Assets/Desert/Assets/Materials/Hole Orb.mat index 35f7f87..311639b 100644 --- a/Assets/Desert/Assets/Materials/Hole Orb.mat +++ b/Assets/Desert/Assets/Materials/Hole Orb.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Desert/Assets/Materials/Holes.mat b/Assets/Desert/Assets/Materials/Holes.mat index d27f340..78a3695 100644 --- a/Assets/Desert/Assets/Materials/Holes.mat +++ b/Assets/Desert/Assets/Materials/Holes.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Desert/Assets/Materials/Holo.mat b/Assets/Desert/Assets/Materials/Holo.mat index bdb9ef6..724037e 100644 --- a/Assets/Desert/Assets/Materials/Holo.mat +++ b/Assets/Desert/Assets/Materials/Holo.mat @@ -139,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 diff --git a/Assets/Desert/Assets/Materials/Hoop.mat b/Assets/Desert/Assets/Materials/Hoop.mat index a24284f..1e0419a 100644 --- a/Assets/Desert/Assets/Materials/Hoop.mat +++ b/Assets/Desert/Assets/Materials/Hoop.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Desert/Assets/Materials/Light.mat b/Assets/Desert/Assets/Materials/Light.mat index cd02394..1b02f5d 100644 --- a/Assets/Desert/Assets/Materials/Light.mat +++ b/Assets/Desert/Assets/Materials/Light.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 diff --git a/Assets/Desert/Assets/Materials/Ring and Crystal.mat b/Assets/Desert/Assets/Materials/Ring and Crystal.mat index 83ee3d8..84d7cf7 100644 --- a/Assets/Desert/Assets/Materials/Ring and Crystal.mat +++ b/Assets/Desert/Assets/Materials/Ring and Crystal.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 diff --git a/Assets/Desert/Assets/Materials/Space Floor.mat b/Assets/Desert/Assets/Materials/Space Floor.mat index 940b3e7..8a561c8 100644 --- a/Assets/Desert/Assets/Materials/Space Floor.mat +++ b/Assets/Desert/Assets/Materials/Space Floor.mat @@ -139,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 diff --git a/Assets/Desert/Assets/Materials/Sphere.mat b/Assets/Desert/Assets/Materials/Sphere.mat index 091f0eb..72a386c 100644 --- a/Assets/Desert/Assets/Materials/Sphere.mat +++ b/Assets/Desert/Assets/Materials/Sphere.mat @@ -132,4 +132,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 diff --git a/Assets/Desert/Assets/Materials/Symbol.mat b/Assets/Desert/Assets/Materials/Symbol.mat index 312f9f3..48fcf9b 100644 --- a/Assets/Desert/Assets/Materials/Symbol.mat +++ b/Assets/Desert/Assets/Materials/Symbol.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Desert/Assets/Materials/Terminal.mat b/Assets/Desert/Assets/Materials/Terminal.mat index fd014b6..0f4e7f2 100644 --- a/Assets/Desert/Assets/Materials/Terminal.mat +++ b/Assets/Desert/Assets/Materials/Terminal.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Engine/Assets/Materials/Generic Material A.mat b/Assets/Engine/Assets/Materials/Generic Material A.mat index c4cacb8..91b3982 100644 --- a/Assets/Engine/Assets/Materials/Generic Material A.mat +++ b/Assets/Engine/Assets/Materials/Generic Material A.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Engine/Assets/Materials/Generic Material B.mat b/Assets/Engine/Assets/Materials/Generic Material B.mat index 1049324..3c9183e 100644 --- a/Assets/Engine/Assets/Materials/Generic Material B.mat +++ b/Assets/Engine/Assets/Materials/Generic Material B.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Engine/Assets/Materials/Generic Material C.mat b/Assets/Engine/Assets/Materials/Generic Material C.mat index 6d046cc..36d4bd3 100644 --- a/Assets/Engine/Assets/Materials/Generic Material C.mat +++ b/Assets/Engine/Assets/Materials/Generic Material C.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index 8276bf5..3df15a1 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -105,7 +105,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +118,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -299,7 +299,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 6854256364732531324, guid: ecbf9ce952d5f38458b8237a4483c562, @@ -363,7 +363,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ecbf9ce952d5f38458b8237a4483c562, type: 3} --- !u!1 &410087039 GameObject: @@ -472,14 +474,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 1 + m_Version: 2 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 + m_RenderingLayers: 1 m_CustomShadowLayers: 0 m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -590,6 +595,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_MoveRepeatDelay: 0.5 m_MoveRepeatRate: 0.1 m_XRTrackingOrigin: {fileID: 0} @@ -680,7 +686,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: loggingEnabled: 1 - typeFilter: 00000000 + typeFilter: 0000000009000000 --- !u!114 &1568048339 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Test Assets/Materials/Interactable Metal.mat b/Assets/Test Assets/Materials/Interactable Metal.mat index ce4ec71..63af26b 100644 --- a/Assets/Test Assets/Materials/Interactable Metal.mat +++ b/Assets/Test Assets/Materials/Interactable Metal.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Test Assets/Materials/Interactable Plastic.mat b/Assets/Test Assets/Materials/Interactable Plastic.mat index 8e3b40d..8096203 100644 --- a/Assets/Test Assets/Materials/Interactable Plastic.mat +++ b/Assets/Test Assets/Materials/Interactable Plastic.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Test Assets/Materials/Light.mat b/Assets/Test Assets/Materials/Light.mat index 652a41d..c6b56a6 100644 --- a/Assets/Test Assets/Materials/Light.mat +++ b/Assets/Test Assets/Materials/Light.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Test Assets/Materials/World A.mat b/Assets/Test Assets/Materials/World A.mat index 15fb43d..f5a2b27 100644 --- a/Assets/Test Assets/Materials/World A.mat +++ b/Assets/Test Assets/Materials/World A.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Test Assets/Materials/World B.mat b/Assets/Test Assets/Materials/World B.mat index db627c7..6128d0a 100644 --- a/Assets/Test Assets/Materials/World B.mat +++ b/Assets/Test Assets/Materials/World B.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Test Assets/Materials/World C.mat b/Assets/Test Assets/Materials/World C.mat index 581d604..1084875 100644 --- a/Assets/Test Assets/Materials/World C.mat +++ b/Assets/Test Assets/Materials/World C.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/Test Assets/Materials/World D.mat b/Assets/Test Assets/Materials/World D.mat index 8034647..12ff384 100644 --- a/Assets/Test Assets/Materials/World D.mat +++ b/Assets/Test Assets/Materials/World D.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/URP/URP-Balanced.asset b/Assets/URP/URP-Balanced.asset index 83ee844..cf14a5c 100644 --- a/Assets/URP/URP-Balanced.asset +++ b/Assets/URP/URP-Balanced.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: URP-Balanced m_EditorClassIdentifier: - k_AssetVersion: 9 - k_AssetPreviousVersion: 9 + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,10 +23,15 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 - m_StoreActionsOptimization: 0 m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 m_MSAA: 1 m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 1024 @@ -47,14 +52,20 @@ MonoBehaviour: m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 1 + m_ConservativeEnclosingSphere: 0 + m_NumIterationsEnclosingSphere: 64 m_AdditionalLightsCookieResolution: 512 m_AdditionalLightsCookieFormat: 1 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 @@ -64,6 +75,9 @@ MonoBehaviour: m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/Assets/URP/URP-HighFidelity-Renderer.asset b/Assets/URP/URP-HighFidelity-Renderer.asset index 6e4d296..0534679 100644 --- a/Assets/URP/URP-HighFidelity-Renderer.asset +++ b/Assets/URP/URP-HighFidelity-Renderer.asset @@ -13,8 +13,8 @@ MonoBehaviour: m_Name: SSAO m_EditorClassIdentifier: m_Active: 0 - m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} m_Settings: + AOMethod: 1 Downsample: 0 AfterOpaque: 0 Source: 1 @@ -22,7 +22,19 @@ MonoBehaviour: Intensity: 0.5 DirectLightingStrength: 0.25 Radius: 0.25 - SampleCount: 12 + Samples: 0 + BlurQuality: 0 + Falloff: 100 + SampleCount: -1 + 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_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -51,6 +63,7 @@ MonoBehaviour: samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, @@ -78,6 +91,4 @@ MonoBehaviour: m_DepthPrimingMode: 0 m_CopyDepthMode: 0 m_AccurateGbufferNormals: 0 - m_ClusteredRendering: 0 - m_TileSize: 32 m_IntermediateTextureMode: 1 diff --git a/Assets/URP/URP-HighFidelity.asset b/Assets/URP/URP-HighFidelity.asset index 7f0ea68..ec93268 100644 --- a/Assets/URP/URP-HighFidelity.asset +++ b/Assets/URP/URP-HighFidelity.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: URP-HighFidelity m_EditorClassIdentifier: - k_AssetVersion: 9 - k_AssetPreviousVersion: 9 + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -24,8 +24,14 @@ MonoBehaviour: m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 m_MSAA: 4 m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 4096 @@ -46,6 +52,7 @@ MonoBehaviour: m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 1 m_ConservativeEnclosingSphere: 0 m_NumIterationsEnclosingSphere: 64 @@ -54,9 +61,11 @@ MonoBehaviour: m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 @@ -66,6 +75,9 @@ MonoBehaviour: m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_ShaderVariantLogLevel: 0 m_ShadowCascades: 1 diff --git a/Assets/URP/URP-Performant.asset b/Assets/URP/URP-Performant.asset index 5e53341..9b7d2e0 100644 --- a/Assets/URP/URP-Performant.asset +++ b/Assets/URP/URP-Performant.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: URP-Performant m_EditorClassIdentifier: - k_AssetVersion: 9 - k_AssetPreviousVersion: 9 + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,10 +23,15 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 - m_StoreActionsOptimization: 0 m_SupportsHDR: 0 + m_HDRColorBufferPrecision: 0 m_MSAA: 1 m_RenderScale: 1 + m_UpscalingFilter: 0 + m_FsrOverrideSharpness: 0 + m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 0 m_MainLightShadowmapResolution: 1024 @@ -47,14 +52,20 @@ MonoBehaviour: m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 0 + m_ConservativeEnclosingSphere: 0 + m_NumIterationsEnclosingSphere: 64 m_AdditionalLightsCookieResolution: 2048 m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 16 @@ -64,6 +75,9 @@ MonoBehaviour: m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/Assets/URP/UniversalRenderPipelineGlobalSettings.asset b/Assets/URP/UniversalRenderPipelineGlobalSettings.asset index f84421d..0c0350e 100644 --- a/Assets/URP/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/URP/UniversalRenderPipelineGlobalSettings.asset @@ -12,7 +12,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 2 + k_AssetVersion: 3 + m_RenderingLayerNames: + - Light Layer default + - Light Layer 1 + - Light Layer 2 + - Light Layer 3 + - Light Layer 4 + - Light Layer 5 + - Light Layer 6 + - Light Layer 7 + m_ValidRenderingLayers: 255 lightLayerName0: Light Layer default lightLayerName1: Light Layer 1 lightLayerName2: Light Layer 2 @@ -24,4 +34,8 @@ MonoBehaviour: m_StripDebugVariants: 1 m_StripUnusedPostProcessingVariants: 1 m_StripUnusedVariants: 1 + m_StripUnusedLODCrossFadeVariants: 1 + m_StripScreenCoordOverrideVariants: 1 supportRuntimeDebugDisplay: 0 + m_ShaderVariantLogLevel: 0 + m_ExportShaderVariants: 1 diff --git a/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db index 7e29c5f..31a0240 100644 Binary files a/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db and b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db differ diff --git a/Assets/VR/Assets/Materials/Hand.mat b/Assets/VR/Assets/Materials/Hand.mat index d0ac555..88d0aca 100644 --- a/Assets/VR/Assets/Materials/Hand.mat +++ b/Assets/VR/Assets/Materials/Hand.mat @@ -126,4 +126,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 6 + version: 7 diff --git a/Packages/manifest.json b/Packages/manifest.json index ec191a9..caddcb9 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,18 +1,19 @@ { "dependencies": { - "io.realm.unity": "10.18.0", "com.dbrizov.naughtyattributes": "https://github.com/dbrizov/NaughtyAttributes.git#upm", + "com.unity.ai.navigation": "1.1.1", "com.unity.ide.rider": "3.0.17", "com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.vscode": "1.2.5", - "com.unity.render-pipelines.universal": "13.1.9", + "com.unity.render-pipelines.universal": "14.0.4", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.2", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.7.8", - "com.unity.xr.interaction.toolkit": "2.0.4", + "com.unity.xr.interaction.toolkit": "2.1.1", "com.unity.xr.openxr": "1.5.3", + "io.realm.unity": "10.18.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f7f5831..3ac3b0f 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,8 +7,17 @@ "dependencies": {}, "hash": "8a8fa5a9659a6d63f196391c71e06c4286c8acd7" }, + "com.unity.ai.navigation": { + "version": "1.1.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { - "version": "1.7.4", + "version": "1.7.3", "depth": 1, "source": "registry", "dependencies": { @@ -65,24 +74,25 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "13.1.9", + "version": "14.0.4", "depth": 1, "source": "builtin", "dependencies": { "com.unity.ugui": "1.0.0", "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.render-pipelines.universal": { - "version": "13.1.9", + "version": "14.0.4", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.7.3", - "com.unity.render-pipelines.core": "13.1.9", - "com.unity.shadergraph": "13.1.9" + "com.unity.render-pipelines.core": "14.0.4", + "com.unity.shadergraph": "14.0.4" } }, "com.unity.searcher": { @@ -93,11 +103,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "13.1.9", + "version": "14.0.4", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "13.1.9", + "com.unity.render-pipelines.core": "14.0.4", "com.unity.searcher": "4.9.2" } }, @@ -162,7 +172,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.core-utils": { - "version": "2.0.0", + "version": "2.1.0", "depth": 1, "source": "registry", "dependencies": { @@ -171,7 +181,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.interaction.toolkit": { - "version": "2.0.4", + "version": "2.1.1", "depth": 0, "source": "registry", "dependencies": { @@ -358,17 +368,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ab1578c..df0a387 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.1.24f1 -m_EditorVersionWithRevision: 2022.1.24f1 (709dddfb713f) +m_EditorVersion: 2022.2.0f1 +m_EditorVersionWithRevision: 2022.2.0f1 (35dcd44975df) diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index 4fae4e6..cd7fd8c 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: 6 + m_LastMaterialVersion: 7