From f97cace79c9dd293efaae4afae04835d923dd16f Mon Sep 17 00:00:00 2001 From: StarBeats <977663818@qq.com> Date: Thu, 17 Apr 2025 11:46:35 +0800 Subject: [PATCH] add xess2 --- .../Editor/DependencyAnalysis.cs | 60 -- Assets/Scenes/Garden/GardenScene.unity | 729 ++++++------------ Assets/Scenes/Oasis/OasisScene.unity | 8 + Assets/Settings/Mobile/Mobile_High.asset | 4 +- .../Mobile/Mobile_High_Renderer.asset | 17 +- .../Runtime/Passes/PostProcessPass.cs | 1 + .../SuperRendering/SR/Scripts/XESS2.cs | 134 +++- .../Runtime/UniversalRenderPipeline.cs | 5 - Packages/manifest.json | 10 +- Packages/packages-lock.json | 13 +- ProjectSettings/ProjectVersion.txt | 4 +- 11 files changed, 400 insertions(+), 585 deletions(-) diff --git a/Assets/AssetDependencyGraph/Editor/DependencyAnalysis.cs b/Assets/AssetDependencyGraph/Editor/DependencyAnalysis.cs index d914165..c5e159c 100644 --- a/Assets/AssetDependencyGraph/Editor/DependencyAnalysis.cs +++ b/Assets/AssetDependencyGraph/Editor/DependencyAnalysis.cs @@ -5,7 +5,6 @@ using System.Diagnostics; using System.IO; using System.Threading.Tasks; using UnityEditor; -using Object = UnityEngine.Object; namespace AssetDependencyGraph { @@ -219,65 +218,6 @@ namespace AssetDependencyGraph } } - public class UnityDependencyAnalysis1 : IDependencyAnalysis - { - HashSet processed = new(); - - public void Analyze(string path, ConcurrentDictionary result) - { - if (!processed.Add(path)) - { - return; - } - var dependencyAnalysis = (this as IDependencyAnalysis); - - var kv = dependencyAnalysis.GetOrCreateAssetNode(path, result); - var relatePath = path.ToUnityRelatePath(); - kv.id.Guid = AssetDatabase.AssetPathToGUID(relatePath); - var selfNode = kv.node; - if (FileExtensionHelper.GetTypeByExtension(Path.GetExtension(path)) is string assetType && assetType != null) - { - kv.id.AssetType = assetType; - selfNode.AssetType = assetType; - } - else - { - if (relatePath.EndsWith("Rock_01_Prefab.prefab")) - { - Console.WriteLine(); - } - Object mainObject = AssetDatabase.LoadMainAssetAtPath(relatePath); - if (mainObject != null) - { - var prefabType = PrefabUtility.GetPrefabAssetType(mainObject); - if (prefabType != PrefabAssetType.NotAPrefab) - { - selfNode.AssetType = prefabType.ToString(); - } - else - { - selfNode.AssetType = mainObject.GetType().Name; - } - kv.id.AssetType = selfNode.AssetType; - - string[] dependencies = AssetDatabase.GetDependencies(relatePath, false); - for (int i = 0; i < dependencies.Length; i++) - { - var dep = dependencies[i].ToUnityRelatePath(); - var depkv = dependencyAnalysis.GetOrCreateAssetNode(dep, result); - depkv.node.Dependent.Add(selfNode.Self); - selfNode.Dependencies.Add(depkv.id); - Analyze(dep, result); - } - } - else - { - UnityEngine.Debug.LogWarning("unknown type:" + path); - } - } - } - } - public class FolderDependencyAnalysis : IDependencyAnalysis { public void Analyze(string path, ConcurrentDictionary result) diff --git a/Assets/Scenes/Garden/GardenScene.unity b/Assets/Scenes/Garden/GardenScene.unity index 6994b53..e9aa907 100644 --- a/Assets/Scenes/Garden/GardenScene.unity +++ b/Assets/Scenes/Garden/GardenScene.unity @@ -1,17 +1,15 @@ %YAML 1.1 -%TAG !u! tag:yousandi.cn,2023: +%TAG !u! tag:unity3d.com,2011: --- !u!29 &1 OcclusionCullingSettings: m_ObjectHideFlags: 0 - serializedVersion: 3 - m_OcclusionCullingData: {fileID: 0} + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionEnabled: 0 - m_DisplayOccluded: 0 - m_SceneDepthBufferWidth: 512 - m_SceneDepthBufferHeight: 512 - m_ShadowDepthBufferWidth: 512 - m_ShadowDepthBufferHeight: 512 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 @@ -871,12 +869,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 13973903} - component: {fileID: 13973904} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1587,13 +1584,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 22604333} - component: {fileID: 22604335} - component: {fileID: 22604334} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (12) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1700,7 +1696,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &23614454 PrefabInstance: m_ObjectHideFlags: 0 @@ -1793,12 +1788,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 23851583} - component: {fileID: 23851584} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -2064,13 +2058,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 34340235} - component: {fileID: 34340237} - component: {fileID: 34340236} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (13) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2177,7 +2170,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &35848042 PrefabInstance: m_ObjectHideFlags: 0 @@ -2382,12 +2374,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 39612979} - component: {fileID: 39612980} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (10) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2700,12 +2691,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 44295247} - component: {fileID: 44295248} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -4231,12 +4221,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 71795753} - component: {fileID: 71795754} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -5125,11 +5114,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 87142414} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: ExteriorPropsLights m_TagString: Untagged m_Icon: {fileID: 0} @@ -5835,12 +5823,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 99398195} - component: {fileID: 99398196} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Floor_W m_TagString: Untagged m_Icon: {fileID: 0} @@ -5889,12 +5876,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 99446444} - component: {fileID: 99446445} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: FakeRoomLight (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -7447,12 +7433,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 123765515} - component: {fileID: 123765516} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -8007,13 +7992,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 132360761} - component: {fileID: 132360763} - component: {fileID: 132360762} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -8120,7 +8104,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &133905337 PrefabInstance: m_ObjectHideFlags: 0 @@ -8345,13 +8328,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 134977393} - component: {fileID: 134977395} - component: {fileID: 134977394} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -8458,7 +8440,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &138180586 PrefabInstance: m_ObjectHideFlags: 0 @@ -9171,12 +9152,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 153155948} - component: {fileID: 153155949} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -9291,12 +9271,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 154140454} - component: {fileID: 154140455} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -9920,12 +9899,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 163170130} - component: {fileID: 163170131} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -10245,12 +10223,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 168040476} - component: {fileID: 168040477} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: FakeRoomLight (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -10463,12 +10440,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 171280582} - component: {fileID: 171280583} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -10998,12 +10974,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 178234205} - component: {fileID: 178234206} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: CourtyardBLightProbeGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -11237,11 +11212,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 178771771} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: ExteriorProps m_TagString: Untagged m_Icon: {fileID: 0} @@ -12009,12 +11983,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 187802600} - component: {fileID: 187802601} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Floor_N m_TagString: Untagged m_Icon: {fileID: 0} @@ -13443,13 +13416,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 206909100} - component: {fileID: 206909102} - component: {fileID: 206909101} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -13556,7 +13528,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &211249468 PrefabInstance: m_ObjectHideFlags: 0 @@ -14119,11 +14090,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 226723377} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Cameras m_TagString: Untagged m_Icon: {fileID: 0} @@ -14219,13 +14189,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 228194976} - component: {fileID: 228194978} - component: {fileID: 228194977} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (14) m_TagString: Untagged m_Icon: {fileID: 0} @@ -14332,7 +14301,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &228684291 PrefabInstance: m_ObjectHideFlags: 0 @@ -16381,12 +16349,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 271014185} - component: {fileID: 271014186} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -16890,12 +16857,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 276442355} - component: {fileID: 276442356} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -17495,11 +17461,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 290003883} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: LightProbeGroups m_TagString: Untagged m_Icon: {fileID: 0} @@ -18125,12 +18090,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 300991839} - component: {fileID: 300991840} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -18483,12 +18447,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 306061906} - component: {fileID: 306061907} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -19150,11 +19113,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 321233931} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: InteriorProps m_TagString: Untagged m_Icon: {fileID: 0} @@ -19224,12 +19186,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 321640779} - component: {fileID: 321640780} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Bamboo Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -19962,12 +19923,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 330895233} - component: {fileID: 330895234} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -21638,11 +21598,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 354845227} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Water m_TagString: Untagged m_Icon: {fileID: 0} @@ -22560,12 +22519,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 373082778} - component: {fileID: 373082779} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -22870,12 +22828,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 379175668} - component: {fileID: 379175669} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -23605,12 +23562,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 387479395} - component: {fileID: 387479396} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -23856,12 +23812,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 394020472} - component: {fileID: 394020473} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -24634,12 +24589,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 419971671} - component: {fileID: 419971672} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Ramp_E m_TagString: Untagged m_Icon: {fileID: 0} @@ -25825,12 +25779,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 434587181} - component: {fileID: 434587182} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: FakeRoomLight (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -25891,11 +25844,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 434919555} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Walls_E m_TagString: Untagged m_Icon: {fileID: 0} @@ -26260,12 +26212,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 460675785} - component: {fileID: 460675786} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Hall2ReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -26312,9 +26263,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.2 m_HDR: 1 @@ -27028,12 +26976,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 471909967} - component: {fileID: 471909968} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Hall1ReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -27080,9 +27027,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.2 m_HDR: 1 @@ -27097,13 +27041,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 482210848} - component: {fileID: 482210850} - component: {fileID: 482210849} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (13) m_TagString: Untagged m_Icon: {fileID: 0} @@ -27210,19 +27153,17 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1 &482239454 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 482239455} - component: {fileID: 482239456} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Ramp_E m_TagString: Untagged m_Icon: {fileID: 0} @@ -28739,12 +28680,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 519292359} - component: {fileID: 519292360} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -29704,12 +29644,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 537383129} - component: {fileID: 537383130} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -30838,12 +30777,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 556246621} - component: {fileID: 556246622} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -33642,12 +33580,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 603171244} - component: {fileID: 603171245} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -35703,12 +35640,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 638822272} - component: {fileID: 638822273} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -36134,12 +36070,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 645916678} - component: {fileID: 645916679} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -36250,12 +36185,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 647360465} - component: {fileID: 647360466} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -36361,12 +36295,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 648453071} - component: {fileID: 648453072} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Ceiling_N m_TagString: Untagged m_Icon: {fileID: 0} @@ -36551,13 +36484,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 650933550} - component: {fileID: 650933552} - component: {fileID: 650933551} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (15) m_TagString: Untagged m_Icon: {fileID: 0} @@ -36664,7 +36596,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &652581230 PrefabInstance: m_ObjectHideFlags: 0 @@ -38305,12 +38236,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 684967900} - component: {fileID: 684967901} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -38548,12 +38478,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 690101465} - component: {fileID: 690101466} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -38919,12 +38848,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 693020357} - component: {fileID: 693020358} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (13) m_TagString: Untagged m_Icon: {fileID: 0} @@ -39409,11 +39337,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 703935023} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Terrain m_TagString: Untagged m_Icon: {fileID: 0} @@ -40647,12 +40574,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 728425291} - component: {fileID: 728425292} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -41702,11 +41628,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 769457235} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Ground m_TagString: Untagged m_Icon: {fileID: 0} @@ -41806,12 +41731,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 771974034} - component: {fileID: 771974035} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -42287,12 +42211,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 780470843} - component: {fileID: 780470844} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -42858,12 +42781,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 787787911} - component: {fileID: 787787912} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -43195,13 +43117,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 792513466} - component: {fileID: 792513468} - component: {fileID: 792513467} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (16) m_TagString: Untagged m_Icon: {fileID: 0} @@ -43308,7 +43229,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &793431103 PrefabInstance: m_ObjectHideFlags: 0 @@ -43817,12 +43737,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 809043463} - component: {fileID: 809043464} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -43994,12 +43913,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 814322902} - component: {fileID: 814322903} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: UnderTableReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -44046,9 +43964,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.01 m_HDR: 1 @@ -44576,12 +44491,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 823001727} - component: {fileID: 823001728} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (11) m_TagString: Untagged m_Icon: {fileID: 0} @@ -45157,13 +45071,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 835065478} - component: {fileID: 835065480} - component: {fileID: 835065479} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -45270,7 +45183,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &835944026 PrefabInstance: m_ObjectHideFlags: 0 @@ -45483,12 +45395,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 837647336} - component: {fileID: 837647337} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -45537,12 +45448,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 840307925} - component: {fileID: 840307926} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -46035,12 +45945,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 849502364} - component: {fileID: 849502365} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -47451,7 +47360,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 141850471471409378, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 141850471471409437, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_LocalPosition.x @@ -47471,7 +47380,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2307673875293584181, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2760477044286518991, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: FlythroughDirector @@ -47760,12 +47669,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 881055307} - component: {fileID: 881055308} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -48866,12 +48774,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 897288004} - component: {fileID: 897288005} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -49062,12 +48969,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 900466457} - component: {fileID: 900466458} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -49378,12 +49284,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 905984603} - component: {fileID: 905984604} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -49852,13 +49757,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 912685940} - component: {fileID: 912685942} - component: {fileID: 912685941} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (17) m_TagString: Untagged m_Icon: {fileID: 0} @@ -49965,7 +49869,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &913550635 PrefabInstance: m_ObjectHideFlags: 0 @@ -50038,13 +49941,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 913614648} - component: {fileID: 913614650} - component: {fileID: 913614649} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Spot Light (18) m_TagString: Untagged m_Icon: {fileID: 0} @@ -50151,7 +50053,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &913787916 PrefabInstance: m_ObjectHideFlags: 0 @@ -50224,12 +50125,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 914711606} - component: {fileID: 914711607} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -50993,12 +50893,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 925057460} - component: {fileID: 925057461} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Bottom m_TagString: Untagged m_Icon: {fileID: 0} @@ -53424,12 +53323,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 963407110} - component: {fileID: 963407111} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: FakeRoomLight (0) m_TagString: Untagged m_Icon: {fileID: 0} @@ -54016,12 +53914,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 973756080} - component: {fileID: 973756081} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -54296,12 +54193,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 976442703} - component: {fileID: 976442704} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -54605,12 +54501,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 984361299} - component: {fileID: 984361300} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (17) m_TagString: Untagged m_Icon: {fileID: 0} @@ -54887,12 +54782,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 990156067} - component: {fileID: 990156068} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Bamboo End m_TagString: Untagged m_Icon: {fileID: 0} @@ -54961,12 +54855,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 993411288} - component: {fileID: 993411289} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: TeaRoomReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -55014,9 +54907,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.1 m_HDR: 1 @@ -55545,12 +55435,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1005385664} - component: {fileID: 1005385665} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -55590,13 +55479,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1006439070} - component: {fileID: 1006439072} - component: {fileID: 1006439071} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -55703,19 +55591,17 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1 &1007854480 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1007854481} - component: {fileID: 1007854482} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -55986,12 +55872,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1010926963} - component: {fileID: 1010926964} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Pond End m_TagString: Untagged m_Icon: {fileID: 0} @@ -56413,12 +56298,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1016323034} - component: {fileID: 1016323035} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Floor_W_2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -56931,11 +56815,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1022195582} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Lighting m_TagString: Untagged m_Icon: {fileID: 0} @@ -56970,12 +56853,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1022879622} - component: {fileID: 1022879623} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Hall4ReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -57022,9 +56904,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.2 m_HDR: 1 @@ -57105,12 +56984,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1025316202} - component: {fileID: 1025316203} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -59267,11 +59145,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1079069522} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: ExteriorGeometryWall m_TagString: Untagged m_Icon: {fileID: 0} @@ -59644,12 +59521,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1085546236} - component: {fileID: 1085546237} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (11) m_TagString: Untagged m_Icon: {fileID: 0} @@ -62173,12 +62049,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1124864096} - component: {fileID: 1124864097} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -63182,11 +63057,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1143892097} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Rocks m_TagString: Untagged m_Icon: {fileID: 0} @@ -63451,13 +63325,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1148748344} - component: {fileID: 1148748346} - component: {fileID: 1148748345} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (15) m_TagString: Untagged m_Icon: {fileID: 0} @@ -63564,7 +63437,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1149474691 PrefabInstance: m_ObjectHideFlags: 0 @@ -65335,12 +65207,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1186690820} - component: {fileID: 1186690819} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: TeaRoomLightProbeGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -66302,12 +66173,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1199543190} - component: {fileID: 1199543191} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Path_2_E m_TagString: Untagged m_Icon: {fileID: 0} @@ -66356,11 +66226,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1199642628} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: ExteriorGeometryRoof m_TagString: Untagged m_Icon: {fileID: 0} @@ -66901,12 +66770,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1206231319} - component: {fileID: 1206231320} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -67423,12 +67291,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1218832634} - component: {fileID: 1218832635} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (15) m_TagString: Untagged m_Icon: {fileID: 0} @@ -67929,12 +67796,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1223794566} - component: {fileID: 1223794567} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -68266,11 +68132,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1232103656} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -68695,12 +68560,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1236550159} - component: {fileID: 1236550160} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (13) m_TagString: Untagged m_Icon: {fileID: 0} @@ -68749,12 +68613,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1242861201} - component: {fileID: 1242861202} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -70223,11 +70086,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1276578257} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: WalkwayStones m_TagString: Untagged m_Icon: {fileID: 0} @@ -70431,12 +70293,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1281783886} - component: {fileID: 1281783887} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Ramp_W m_TagString: Untagged m_Icon: {fileID: 0} @@ -70789,11 +70650,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1291007551} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: WaterWalls m_TagString: Untagged m_Icon: {fileID: 0} @@ -71297,12 +71157,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1300095209} - component: {fileID: 1300095210} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -72596,12 +72455,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1324678591} - component: {fileID: 1324678592} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Ramp_NW m_TagString: Untagged m_Icon: {fileID: 0} @@ -72826,12 +72684,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1327263311} - component: {fileID: 1327263312} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Tree Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -73555,12 +73412,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1337800159} - component: {fileID: 1337800160} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -74198,12 +74054,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1344816770} - component: {fileID: 1344816771} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -74884,12 +74739,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1361496411} - component: {fileID: 1361496412} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -75641,12 +75495,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1376174935} - component: {fileID: 1376174936} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -75986,12 +75839,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1380809630} - component: {fileID: 1380809631} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Ramp_N m_TagString: Untagged m_Icon: {fileID: 0} @@ -76040,13 +75892,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1385390615} - component: {fileID: 1385390617} - component: {fileID: 1385390616} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (14) m_TagString: Untagged m_Icon: {fileID: 0} @@ -76153,7 +76004,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1385829917 PrefabInstance: m_ObjectHideFlags: 0 @@ -76514,11 +76364,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1390068822} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: InteriorGeometryHallway m_TagString: Untagged m_Icon: {fileID: 0} @@ -77572,12 +77421,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1404861071} - component: {fileID: 1404861072} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -78162,13 +78010,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1416384511} - component: {fileID: 1416384513} - component: {fileID: 1416384512} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -78275,7 +78122,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1417409343 PrefabInstance: m_ObjectHideFlags: 0 @@ -79449,12 +79295,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1459190439} - component: {fileID: 1459190440} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: WaterLightProbeGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -80220,13 +80065,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1470091843} - component: {fileID: 1470091845} - component: {fileID: 1470091844} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: OutdoorVolume m_TagString: Untagged m_Icon: {fileID: 0} @@ -80378,12 +80222,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1473707280} - component: {fileID: 1473707281} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -80432,12 +80275,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1478470797} - component: {fileID: 1478470798} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Ceiling_W m_TagString: Untagged m_Icon: {fileID: 0} @@ -80486,12 +80328,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1479443607} - component: {fileID: 1479443608} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: FakeRoomLight (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -81212,11 +81053,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1496257502} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: ReflectionProbes m_TagString: Untagged m_Icon: {fileID: 0} @@ -81812,12 +81652,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1506063846} - component: {fileID: 1506063847} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Ceiling_E m_TagString: Untagged m_Icon: {fileID: 0} @@ -82038,12 +81877,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1511294249} - component: {fileID: 1511294250} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: OutdoorReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -82090,9 +81928,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.75 m_HDR: 1 @@ -82173,13 +82008,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1513984326} - component: {fileID: 1513984325} - component: {fileID: 1513984327} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: VolumeIndoorA m_TagString: Untagged m_Icon: {fileID: 0} @@ -82472,12 +82306,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1518827873} - component: {fileID: 1518827874} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -84088,13 +83921,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1542573327} - component: {fileID: 1542573329} - component: {fileID: 1542573328} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light m_TagString: Untagged m_Icon: {fileID: 0} @@ -84201,7 +84033,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1543359340 PrefabInstance: m_ObjectHideFlags: 0 @@ -84533,12 +84364,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1547793195} - component: {fileID: 1547793194} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: TeleporterRoomLightProbeGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -84634,11 +84464,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1548488601} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Walls_N m_TagString: Untagged m_Icon: {fileID: 0} @@ -85885,13 +85714,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1569291826} - component: {fileID: 1569291828} - component: {fileID: 1569291827} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: DirectionalLight m_TagString: Untagged m_Icon: {fileID: 0} @@ -85998,19 +85826,17 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 1 - m_UseOcclusionCulling: 1 --- !u!1 &1569954294 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1569954295} - component: {fileID: 1569954296} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top m_TagString: Untagged m_Icon: {fileID: 0} @@ -86150,12 +85976,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1571559688} - component: {fileID: 1571559689} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -86195,12 +86020,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1572771832} - component: {fileID: 1572771833} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -87017,11 +86841,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1590364077} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: waterfallEdgeLightprobeAnchor m_TagString: Untagged m_Icon: {fileID: 0} @@ -87375,12 +87198,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1595533838} - component: {fileID: 1595533839} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -87699,12 +87521,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1608903911} - component: {fileID: 1608903912} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (14) m_TagString: Untagged m_Icon: {fileID: 0} @@ -88041,12 +87862,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1613150064} - component: {fileID: 1613150065} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -88695,12 +88515,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1620985331} - component: {fileID: 1620985332} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Tree End m_TagString: Untagged m_Icon: {fileID: 0} @@ -90111,12 +89930,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1646795998} - component: {fileID: 1646795999} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (10) m_TagString: Untagged m_Icon: {fileID: 0} @@ -90880,13 +90698,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1661477410} - component: {fileID: 1661477412} - component: {fileID: 1661477411} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: VolumeIndoorB m_TagString: Untagged m_Icon: {fileID: 0} @@ -91669,12 +91486,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1670700473} - component: {fileID: 1670700474} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -91714,12 +91530,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1670967389} - component: {fileID: 1670967390} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -91957,13 +91772,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1673298251} - component: {fileID: 1673298253} - component: {fileID: 1673298252} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (12) m_TagString: Untagged m_Icon: {fileID: 0} @@ -92070,7 +91884,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1674219767 PrefabInstance: m_ObjectHideFlags: 0 @@ -92143,12 +91956,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1675152796} - component: {fileID: 1675152797} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Pond Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -93835,12 +93647,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1705131262} - component: {fileID: 1705131263} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -95585,12 +95396,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1739248499} - component: {fileID: 1739248500} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (12) m_TagString: Untagged m_Icon: {fileID: 0} @@ -95862,12 +95672,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1742622775} - component: {fileID: 1742622776} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall_Top (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -96274,11 +96083,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1749682028} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Walls_W m_TagString: Untagged m_Icon: {fileID: 0} @@ -96386,12 +96194,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1753016294} - component: {fileID: 1753016295} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Hall3ReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -96438,9 +96245,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.2 m_HDR: 1 @@ -97175,12 +96979,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1768309302} - component: {fileID: 1768309303} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (16) m_TagString: Untagged m_Icon: {fileID: 0} @@ -98004,12 +97807,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1783290980} - component: {fileID: 1783290981} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -99067,13 +98869,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1811724817} - component: {fileID: 1811724819} - component: {fileID: 1811724818} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (10) m_TagString: Untagged m_Icon: {fileID: 0} @@ -99180,7 +98981,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1813601143 PrefabInstance: m_ObjectHideFlags: 0 @@ -100623,11 +100423,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1841440562} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Walls_S m_TagString: Untagged m_Icon: {fileID: 0} @@ -100656,13 +100455,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1842671960} - component: {fileID: 1842671962} - component: {fileID: 1842671961} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -100769,7 +100567,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1842741525 PrefabInstance: m_ObjectHideFlags: 0 @@ -101439,12 +101236,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1854759439} - component: {fileID: 1854759440} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: CourtyardALightProbeGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -101933,12 +101729,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1864274016} - component: {fileID: 1864274017} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -102718,12 +102513,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1881451618} - component: {fileID: 1881451619} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -103101,12 +102895,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1892441450} - component: {fileID: 1892441451} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -103216,12 +103009,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1896509969} - component: {fileID: 1896509970} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -103695,13 +103487,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1902711727} - component: {fileID: 1902711729} - component: {fileID: 1902711728} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -103808,7 +103599,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1905342678 PrefabInstance: m_ObjectHideFlags: 0 @@ -104781,12 +104571,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1925144051} - component: {fileID: 1925144052} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -105443,11 +105232,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1939814240} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: InteriorPropsLights m_TagString: Untagged m_Icon: {fileID: 0} @@ -105637,12 +105425,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1942816847} - component: {fileID: 1942816848} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -105947,12 +105734,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1947764005} - component: {fileID: 1947764006} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -106512,12 +106298,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1953956722} - component: {fileID: 1953956723} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -106776,12 +106561,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1968179759} - component: {fileID: 1968179760} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (12) m_TagString: Untagged m_Icon: {fileID: 0} @@ -106896,12 +106680,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1971080215} - component: {fileID: 1971080216} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Bridge m_TagString: Untagged m_Icon: {fileID: 0} @@ -107027,12 +106810,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1976464635} - component: {fileID: 1976464636} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Path_1_E m_TagString: Untagged m_Icon: {fileID: 0} @@ -107308,12 +107090,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1980922790} - component: {fileID: 1980922791} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Wall (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -108059,11 +107840,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1989208409} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Volumes m_TagString: Untagged m_Icon: {fileID: 0} @@ -108181,12 +107961,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1990478484} - component: {fileID: 1990478485} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -108292,13 +108071,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1992085996} - component: {fileID: 1992085998} - component: {fileID: 1992085997} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (11) m_TagString: Untagged m_Icon: {fileID: 0} @@ -108405,7 +108183,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1992346982 PrefabInstance: m_ObjectHideFlags: 0 @@ -108778,11 +108555,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1996431148} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Root m_TagString: Untagged m_Icon: {fileID: 0} @@ -109235,12 +109011,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2001767918} - component: {fileID: 2001767919} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Ground m_TagString: Untagged m_Icon: {fileID: 0} @@ -109516,12 +109291,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2003472078} - component: {fileID: 2003472079} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Floor_E m_TagString: Untagged m_Icon: {fileID: 0} @@ -110206,11 +109980,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2015910134} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: FakeRoomsLights m_TagString: Untagged m_Icon: {fileID: 0} @@ -111886,11 +111659,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2056100277} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Colliders m_TagString: Untagged m_Icon: {fileID: 0} @@ -112464,13 +112236,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2068376912} - component: {fileID: 2068376914} - component: {fileID: 2068376913} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Area Light (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -112577,7 +112348,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &2068396809 PrefabInstance: m_ObjectHideFlags: 0 @@ -113670,13 +113440,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2083789058} - component: {fileID: 2083789060} - component: {fileID: 2083789059} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: VolumeIndoorC m_TagString: Untagged m_Icon: {fileID: 0} @@ -113742,12 +113511,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2084144349} - component: {fileID: 2084144350} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: CorridorLightProbeGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -115554,12 +115322,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2109811623} - component: {fileID: 2109811624} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -115967,12 +115734,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2124499203} - component: {fileID: 2124499204} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: TeleportationRoomReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -116019,9 +115785,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.5 m_HDR: 1 @@ -116328,12 +116091,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2131699374} - component: {fileID: 2131699375} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -116875,11 +116637,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2142622098} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: InteriorGeometry m_TagString: Untagged m_Icon: {fileID: 0} @@ -117982,13 +117743,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 966895463892816108} - component: {fileID: 966895463892816109} - component: {fileID: 966895463892816115} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: SceneSetup m_TagString: Untagged m_Icon: {fileID: 0} @@ -118002,7 +117762,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 966895463892816114} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a8f562490b8d41b47a6b21e2f514d782, type: 3} m_Name: @@ -118033,8 +117793,6 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 - m_virtualGeometry: 0 - m_virtualGeometryShadow: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -118102,14 +117860,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 966895463987173000} - component: {fileID: 966895463987172997} - component: {fileID: 966895463987172998} - component: {fileID: 966895463987172999} m_Layer: 9 - m_HasEditorInfo: 1 m_Name: Floor m_TagString: Untagged m_Icon: {fileID: 0} @@ -118137,11 +117894,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 966895464219401362} m_Layer: 9 - m_HasEditorInfo: 1 m_Name: Spawn m_TagString: Untagged m_Icon: {fileID: 0} @@ -118414,11 +118170,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2493945319084474443} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Vegetation m_TagString: Untagged m_Icon: {fileID: 0} @@ -119143,12 +118898,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285565490676919} - component: {fileID: 5121285565490676912} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: BetweenRooms Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -119180,12 +118934,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285565501224582} - component: {fileID: 5121285565501224583} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: BetweenRooms End m_TagString: Untagged m_Icon: {fileID: 0} @@ -119255,12 +119008,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285565639616124} - component: {fileID: 5121285565639616125} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -119300,12 +119052,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285566293822013} - component: {fileID: 5121285566293822014} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Entrance End m_TagString: Untagged m_Icon: {fileID: 0} @@ -119392,11 +119143,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285566312688396} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Media m_TagString: Untagged m_Icon: {fileID: 0} @@ -119448,12 +119198,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285566391116019} - component: {fileID: 5121285566391116012} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Bridge Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -119523,12 +119272,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285566664884699} - component: {fileID: 5121285566664884692} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: TeleportRoom Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -119560,12 +119308,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285566775435290} - component: {fileID: 5121285566775435291} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Bridge End m_TagString: Untagged m_Icon: {fileID: 0} @@ -119677,12 +119424,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285566828559507} - component: {fileID: 5121285566828559500} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: HangingLamp Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -119714,12 +119460,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285566903943017} - component: {fileID: 5121285566903943018} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: TeleportRoom End m_TagString: Untagged m_Icon: {fileID: 0} @@ -119791,12 +119536,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285567140572380} - component: {fileID: 5121285567140572381} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: HangingLamp End m_TagString: Untagged m_Icon: {fileID: 0} @@ -119868,12 +119612,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285567174614562} - component: {fileID: 5121285567174614563} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: GoingOutside Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -119945,12 +119688,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285567261280102} - component: {fileID: 5121285567261280103} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: GoingOutside End m_TagString: Untagged m_Icon: {fileID: 0} @@ -120020,12 +119762,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285567285359996} - component: {fileID: 5121285567285359997} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Entrance Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -120172,12 +119913,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 5121285567406897643} - component: {fileID: 5121285567406897636} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: CinematicTimeline m_TagString: Untagged m_Icon: {fileID: 0} @@ -120345,12 +120085,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 8514182666898305103} - component: {fileID: 8514182666898305102} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120390,12 +120129,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 8514182667060670027} - component: {fileID: 8514182667060670026} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120462,12 +120200,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 8514182667126586598} - component: {fileID: 8514182667126586593} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120495,12 +120232,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 8514182667243562928} - component: {fileID: 8514182667243562931} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120525,12 +120261,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 8514182667290820703} - component: {fileID: 8514182667290820702} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120597,12 +120332,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 8514182667534492901} - component: {fileID: 8514182667534492900} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120615,12 +120349,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 8514182667717272511} - component: {fileID: 8514182667717272510} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120660,12 +120393,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 8514182667732581723} - component: {fileID: 8514182667732581722} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120732,12 +120464,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 8514182668336569674} - component: {fileID: 8514182668336569669} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120777,12 +120508,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 8514182668596613953} - component: {fileID: 8514182668596613952} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120822,12 +120552,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 8514182668675734610} - component: {fileID: 8514182668675734605} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scenes/Oasis/OasisScene.unity b/Assets/Scenes/Oasis/OasisScene.unity index 4ab2a42..ed77e62 100644 --- a/Assets/Scenes/Oasis/OasisScene.unity +++ b/Assets/Scenes/Oasis/OasisScene.unity @@ -3097,6 +3097,10 @@ PrefabInstance: propertyPath: m_Name value: Tent_01_Prefab objectReference: {fileID: 0} + - target: {fileID: 2302073556517278132, guid: 74aeec6002edd31428364ee5a1c44741, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2970688348012063075, guid: 74aeec6002edd31428364ee5a1c44741, type: 3} propertyPath: m_Enabled value: 0 @@ -29052,6 +29056,10 @@ PrefabInstance: propertyPath: m_Name value: BigRock_01_Prefab (2) objectReference: {fileID: 0} + - target: {fileID: 8354524949365800270, guid: 6d3e30d12bb32d545b4735d5456a5597, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Settings/Mobile/Mobile_High.asset b/Assets/Settings/Mobile/Mobile_High.asset index 30bd84b..b8b8fc3 100644 --- a/Assets/Settings/Mobile/Mobile_High.asset +++ b/Assets/Settings/Mobile/Mobile_High.asset @@ -28,7 +28,7 @@ MonoBehaviour: m_SupportsHDR: 1 m_HDRColorBufferPrecision: 0 m_MSAA: 1 - m_RenderScale: 1 + m_RenderScale: 0.6667969 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 1 m_FsrSharpness: 1 @@ -114,5 +114,5 @@ MonoBehaviour: m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 - superResolution: 0 + superResolution: 16 vrsRate: 0 diff --git a/Assets/Settings/Mobile/Mobile_High_Renderer.asset b/Assets/Settings/Mobile/Mobile_High_Renderer.asset index 68412dd..386d407 100644 --- a/Assets/Settings/Mobile/Mobile_High_Renderer.asset +++ b/Assets/Settings/Mobile/Mobile_High_Renderer.asset @@ -198,7 +198,8 @@ MonoBehaviour: - {fileID: 4395980931634258890} - {fileID: -8043853166483734676} - {fileID: -4454652084718109581} - m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88e5fca93e10ae6e99ca6373cd5da9013d6cff55ca297e5e90737c6cdc87e52dc2 + - {fileID: 4071882023117421450} + m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88e5fca93e10ae6e99ca6373cd5da9013d6cff55ca297e5e90737c6cdc87e52dc28a7b3653203b8238 m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} shaders: @@ -350,6 +351,20 @@ MonoBehaviour: restoreCamera: 1 offset: {x: 0, y: 0, z: 0, w: 0} cameraFieldOfView: 60 +--- !u!114 &4071882023117421450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: beb28c5693a39894e85d538fac962200, type: 3} + m_Name: XESS2 + m_EditorClassIdentifier: + m_Active: 1 + Quality: 104 --- !u!114 &4395980931634258890 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs index e94b492..ecd434b 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs @@ -507,6 +507,7 @@ namespace UnityEngine.Rendering.Universal || asset.SuperResolution == ESuperResolution.DLSS2 || asset.SuperResolution == ESuperResolution.DLSS3 || asset.SuperResolution == ESuperResolution.FSR1 + || asset.SuperResolution == ESuperResolution.XESS2 ) { colorDescriptor.enableRandomWrite = true; diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS2.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS2.cs index 42f7c3f..e02e4b6 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS2.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS2.cs @@ -8,10 +8,18 @@ namespace X.Rendering.Feature { internal class XESS2 : ScriptableRendererFeature, ISuperResolutionFeature { + [SerializeField] + private XessQuality Quality; + private ProfilingSampler profiler; private XeSS.xess_context_handle_t xessContext; private bool xessCreated; private bool xessInitialized; + private float mipBias = 0.0f; + private XessQuality lastQuality; + private bool needTurnOnXess = false; + private XeSS.xess_2d_t rendererSize; + private bool resetHistory = false; public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) { @@ -19,6 +27,7 @@ namespace X.Rendering.Feature public override void Create() { + needTurnOnXess = true; profiler = new ProfilingSampler("Xess2"); } @@ -31,6 +40,7 @@ namespace X.Rendering.Feature } XeSS.xess_result_t ret; + xessContext = new(); if ((ret = XeSS.xessCreateContext(ref xessContext)) != XeSS.xess_result_t.XESS_RESULT_SUCCESS) { xessCreated = false; @@ -38,22 +48,140 @@ namespace X.Rendering.Feature Debug.Log("XeSS context create failed:" + ret.ToString()); return false; } - + xessCreated = true; return true; } public void DoSR(CommandBuffer cmd, RTHandle source, RTHandle destination, RTHandle motionVector, ref RenderingData renderingData) { - } + using var scp = new ProfilingScope(cmd, profiler); + var cameraData = renderingData.cameraData; + var camera = cameraData.camera; + XeSS.xess_result_t ret; + if (needTurnOnXess || lastQuality != Quality) + { + needTurnOnXess = false; + InitFeature(); + XeSS.xess_2d_t displaySize = new() + { + x = (uint)camera.pixelWidth, + y = (uint)camera.pixelHeight + }; + if ((ret = XeSS.xessGetInputResolution(xessContext, displaySize, (XeSS.xess_quality_settings_t)Quality, out rendererSize)) != XeSS.xess_result_t.XESS_RESULT_SUCCESS) + { + xessInitialized = false; + Debug.LogWarning("XeSS get input resolution failed:" + ret.ToString()); + return; + } + + XeSS.xess_init_params_t initParams = default(XeSS.xess_init_params_t); + initParams.outputResolution = displaySize; + initParams.qualitySetting = (XeSS.xess_quality_settings_t)Quality; + initParams.creationNodeMask = initParams.visibleNodeMask = 0; + initParams.initFlags = (uint)XeSS.xess_init_flags_t.XESS_INIT_FLAG_ENABLE_AUTOEXPOSURE; + if (SystemInfo.usesReversedZBuffer) + { + initParams.initFlags |= (uint)XeSS.xess_init_flags_t.XESS_INIT_FLAG_INVERTED_DEPTH; + } + if (!camera.allowHDR) + { + initParams.initFlags |= (uint)XeSS.xess_init_flags_t.XESS_INIT_FLAG_LDR_INPUT_COLOR; + } + + if ((ret = XeSS.xessInitialize(xessContext, cmd, initParams)) != XeSS.xess_result_t.XESS_RESULT_SUCCESS) + { + xessInitialized = false; + Debug.LogWarning("XeSS initialization failed:" + ret.ToString()); + return; + } + xessInitialized = true; + mipBias = XeSS.Utility.GetMipmapBiasOffset(rendererSize.x, displaySize.x); + //resetHistory = true; + } + + if (lastQuality != Quality) + { + UniversalRenderPipeline.asset.renderScale = GetRenderScale(); + lastQuality = Quality; + } + + SuperResolutionParamSets.Instance.Set("NeedJitter", true); + SuperResolutionParamSets.Instance.Set("MipmapBias", mipBias); + + var jitter = TemporalAA.CurrentJitter; + + cmd.SetGlobalTexture(XeSSShaderIDs.SrvInputColor, source, RenderTextureSubElement.Color); + cmd.SetGlobalTexture(XeSSShaderIDs.SrvInputDepth, renderingData.cameraData.renderer.cameraDepthTargetHandle, RenderTextureSubElement.Depth); + cmd.SetGlobalTexture(XeSSShaderIDs.SrvInputMotionVectors, motionVector); + cmd.SetGlobalTexture(XeSSShaderIDs.UavUpscaledOutput, destination); + + camera.ResetProjectionMatrix(); + + XeSS.xess_execute_params_t executeParams = default(XeSS.xess_execute_params_t); + executeParams.colorTexture = source; + executeParams.depthTexture = renderingData.cameraData.renderer.cameraDepthTargetHandle; + executeParams.velocityTexture = motionVector; + executeParams.exposureScaleTexture = null; + executeParams.responsivePixelMaskTexture = null; + executeParams.outputTexture = destination; + executeParams.jitterOffsetX = jitter.x; + executeParams.jitterOffsetY = jitter.y; + executeParams.exposureScale = 1; + executeParams.resetHistory = (uint)(resetHistory ? 1 : 0); + resetHistory = false; + executeParams.inputWidth = rendererSize.x; + executeParams.inputHeight = rendererSize.y; + ret = XeSS.xessExecute(xessContext, cmd, executeParams); + if (ret != XeSS.xess_result_t.XESS_RESULT_SUCCESS) + { + Debug.LogWarning("XeSS execute failed:" + ret); + } + } + public float GetRenderScale() { - throw new NotImplementedException(); + switch (Quality) + { + case XessQuality.UltraPerformance: + return 0.3335938f; + case XessQuality.Performance: + return 0.4351563f; + case XessQuality.Balanced: + return 0.5f; + case XessQuality.Quality: + return 0.5882813f; + case XessQuality.UltraQuality: + return 0.6667969f; + case XessQuality.UltraQualityPlus: + return 0.7695313f; + case XessQuality.NativeAA: + return 1.0f; + default: + throw new ArgumentOutOfRangeException(nameof(XessQuality)); + } } public void SetSR(ESuperResolution resolution) { + switch (resolution) + { + case ESuperResolution.XESS2: + { + SetActive(true); + needTurnOnXess = true; + } + break; + default: + { + SetActive(false); + SuperResolutionParamSets.Instance.Set("NeedJitter", false); + SuperResolutionParamSets.Instance.Set("MipmapBias", 0); + XeSS.xessDestroyContext(xessContext); + } + break; + } } } } diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/UniversalRenderPipeline.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/UniversalRenderPipeline.cs index 239a8e1..628bbb9 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/UniversalRenderPipeline.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/UniversalRenderPipeline.cs @@ -140,11 +140,6 @@ namespace UnityEngine.Rendering.Universal { get { -#if !UNITY_2022_3_51 && !UNITY_2022_3_38 - bool isMaxVisibleLights16 = GraphicsSettings.HasShaderDefine(BuiltinShaderDefine.SHADER_API_MAX_VISIBLE_LIGHTS_16); - if (isMaxVisibleLights16) - return k_MaxVisibleAdditionalLightsMobileShaderLevelLessThan45; -#endif // Must match: Input.hlsl, MAX_VISIBLE_LIGHTS bool isMobile = GraphicsSettings.HasShaderDefine(BuiltinShaderDefine.SHADER_API_MOBILE); if (isMobile && (SystemInfo.graphicsDeviceType == GraphicsDeviceType.OpenGLES2 || (SystemInfo.graphicsDeviceType == GraphicsDeviceType.OpenGLES3 && Graphics.minOpenGLESVersion <= OpenGLESVersion.OpenGLES30))) diff --git a/Packages/manifest.json b/Packages/manifest.json index 0ea421d..e79ec1b 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,17 +1,17 @@ { "dependencies": { "com.unity.burst": "1.8.18", - "com.unity.cinemachine": "2.10.1", - "com.unity.collab-proxy": "2.5.2", - "com.unity.ide.rider": "3.0.31", + "com.unity.cinemachine": "2.10.3", + "com.unity.collab-proxy": "2.6.0", + "com.unity.ide.rider": "3.0.34", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.11.0", + "com.unity.inputsystem": "1.11.2", "com.unity.learn.iet-framework": "3.1.3", "com.unity.memoryprofiler": "1.1.1", "com.unity.recorder": "4.0.3", "com.unity.render-pipelines.universal": "14.0.11", - "com.unity.splines": "2.6.1", + "com.unity.splines": "2.7.2", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.7", "com.unity.timeline": "1.7.6", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 34d2f13..2df2893 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -11,7 +11,7 @@ "url": "https://packages.unity.cn" }, "com.unity.cinemachine": { - "version": "2.10.1", + "version": "2.10.3", "depth": 0, "source": "registry", "dependencies": { @@ -20,7 +20,7 @@ "url": "https://packages.unity.cn" }, "com.unity.collab-proxy": { - "version": "2.5.2", + "version": "2.6.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -41,7 +41,7 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.rider": { - "version": "3.0.31", + "version": "3.0.34", "depth": 0, "source": "registry", "dependencies": { @@ -66,7 +66,7 @@ "url": "https://packages.unity.cn" }, "com.unity.inputsystem": { - "version": "1.11.0", + "version": "1.11.2", "depth": 0, "source": "registry", "dependencies": { @@ -164,13 +164,12 @@ } }, "com.unity.splines": { - "version": "2.6.1", + "version": "2.7.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.settings-manager": "1.0.3", "com.unity.mathematics": "1.2.1", - "com.unity.ugui": "1.0.0" + "com.unity.settings-manager": "1.0.3" }, "url": "https://packages.unity.cn" }, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 71b159c..3d55efb 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.51f1c1 -m_EditorVersionWithRevision: 2022.3.51f1c1 (e9648b0586b8) +m_EditorVersion: 2022.3.56f1c1 +m_EditorVersionWithRevision: 2022.3.56f1c1 (bb6410cfcc53)