diff --git a/.gitignore b/.gitignore index 7458408..b824819 100644 --- a/.gitignore +++ b/.gitignore @@ -59,4 +59,5 @@ UserSettings/ **/.DS_Store out/ -.vscode/ \ No newline at end of file +.vscode/ +Il2CppBackup/ \ No newline at end of file diff --git a/Assets/Scenes/Garden/GardenScene.unity b/Assets/Scenes/Garden/GardenScene.unity index 72d24f7..6994b53 100644 --- a/Assets/Scenes/Garden/GardenScene.unity +++ b/Assets/Scenes/Garden/GardenScene.unity @@ -1,15 +1,17 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!29 &1 OcclusionCullingSettings: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 + serializedVersion: 3 m_OcclusionCullingData: {fileID: 0} + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionEnabled: 0 + m_DisplayOccluded: 0 + m_SceneDepthBufferWidth: 512 + m_SceneDepthBufferHeight: 512 + m_ShadowDepthBufferWidth: 512 + m_ShadowDepthBufferHeight: 512 --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 @@ -869,11 +871,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -1584,12 +1587,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -1696,6 +1700,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &23614454 PrefabInstance: m_ObjectHideFlags: 0 @@ -1788,11 +1793,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 23851583} - component: {fileID: 23851584} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -2058,12 +2064,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -2170,6 +2177,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &35848042 PrefabInstance: m_ObjectHideFlags: 0 @@ -2374,11 +2382,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -2691,11 +2700,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -4221,11 +4231,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 71795753} - component: {fileID: 71795754} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -5114,10 +5125,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 87142414} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: ExteriorPropsLights m_TagString: Untagged m_Icon: {fileID: 0} @@ -5823,11 +5835,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -5876,11 +5889,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -7433,11 +7447,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 123765515} - component: {fileID: 123765516} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -7992,12 +8007,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -8104,6 +8120,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &133905337 PrefabInstance: m_ObjectHideFlags: 0 @@ -8328,12 +8345,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -8440,6 +8458,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &138180586 PrefabInstance: m_ObjectHideFlags: 0 @@ -9152,11 +9171,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -9271,11 +9291,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -9899,11 +9920,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 163170130} - component: {fileID: 163170131} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -10223,11 +10245,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -10440,11 +10463,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 171280582} - component: {fileID: 171280583} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -10974,11 +10998,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 178234205} - component: {fileID: 178234206} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CourtyardBLightProbeGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -11212,10 +11237,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 178771771} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: ExteriorProps m_TagString: Untagged m_Icon: {fileID: 0} @@ -11983,11 +12009,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -13416,12 +13443,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -13528,6 +13556,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &211249468 PrefabInstance: m_ObjectHideFlags: 0 @@ -14090,10 +14119,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 226723377} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Cameras m_TagString: Untagged m_Icon: {fileID: 0} @@ -14189,12 +14219,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -14301,6 +14332,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &228684291 PrefabInstance: m_ObjectHideFlags: 0 @@ -16349,11 +16381,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 271014185} - component: {fileID: 271014186} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -16857,11 +16890,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -17461,10 +17495,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 290003883} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: LightProbeGroups m_TagString: Untagged m_Icon: {fileID: 0} @@ -18090,11 +18125,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 300991839} - component: {fileID: 300991840} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -18447,11 +18483,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 306061906} - component: {fileID: 306061907} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -19113,10 +19150,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 321233931} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: InteriorProps m_TagString: Untagged m_Icon: {fileID: 0} @@ -19186,11 +19224,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -19923,11 +19962,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 330895233} - component: {fileID: 330895234} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -21598,10 +21638,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 354845227} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Water m_TagString: Untagged m_Icon: {fileID: 0} @@ -22519,11 +22560,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 373082778} - component: {fileID: 373082779} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -22828,11 +22870,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 379175668} - component: {fileID: 379175669} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -23562,11 +23605,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 387479395} - component: {fileID: 387479396} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -23812,11 +23856,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 394020472} - component: {fileID: 394020473} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -24589,11 +24634,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -25779,11 +25825,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -25844,10 +25891,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 434919555} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Walls_E m_TagString: Untagged m_Icon: {fileID: 0} @@ -26212,11 +26260,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 460675785} - component: {fileID: 460675786} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Hall2ReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -26263,6 +26312,9 @@ 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 @@ -26976,11 +27028,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 471909967} - component: {fileID: 471909968} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Hall1ReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -27027,6 +27080,9 @@ 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 @@ -27041,12 +27097,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -27153,17 +27210,19 @@ 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: 6 + serializedVersion: 7 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} @@ -28680,11 +28739,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 519292359} - component: {fileID: 519292360} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -29644,11 +29704,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -30777,11 +30838,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 556246621} - component: {fileID: 556246622} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -33580,11 +33642,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 603171244} - component: {fileID: 603171245} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -35640,11 +35703,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 638822272} - component: {fileID: 638822273} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -36070,11 +36134,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 645916678} - component: {fileID: 645916679} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -36185,11 +36250,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 647360465} - component: {fileID: 647360466} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -36295,11 +36361,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -36484,12 +36551,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -36596,6 +36664,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &652581230 PrefabInstance: m_ObjectHideFlags: 0 @@ -38236,11 +38305,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 684967900} - component: {fileID: 684967901} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -38478,11 +38548,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 690101465} - component: {fileID: 690101466} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -38848,11 +38919,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -39337,10 +39409,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 703935023} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Terrain m_TagString: Untagged m_Icon: {fileID: 0} @@ -40574,11 +40647,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 728425291} - component: {fileID: 728425292} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -41628,10 +41702,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 769457235} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Ground m_TagString: Untagged m_Icon: {fileID: 0} @@ -41731,11 +41806,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 771974034} - component: {fileID: 771974035} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -42211,11 +42287,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 780470843} - component: {fileID: 780470844} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -42781,11 +42858,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 787787911} - component: {fileID: 787787912} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -43117,12 +43195,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -43229,6 +43308,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &793431103 PrefabInstance: m_ObjectHideFlags: 0 @@ -43737,11 +43817,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 809043463} - component: {fileID: 809043464} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -43913,11 +43994,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 814322902} - component: {fileID: 814322903} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: UnderTableReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -43964,6 +44046,9 @@ 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 @@ -44491,11 +44576,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -45071,12 +45157,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -45183,6 +45270,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &835944026 PrefabInstance: m_ObjectHideFlags: 0 @@ -45395,11 +45483,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -45448,11 +45537,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -45945,11 +46035,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 849502364} - component: {fileID: 849502365} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Wall m_TagString: Untagged m_Icon: {fileID: 0} @@ -47358,6 +47449,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 226723377} m_Modifications: + - target: {fileID: 141850471471409378, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 141850471471409437, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -47374,6 +47469,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2307673875293584181, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2760477044286518991, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: FlythroughDirector value: @@ -47661,11 +47760,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 881055307} - component: {fileID: 881055308} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -48766,11 +48866,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 897288004} - component: {fileID: 897288005} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -48961,11 +49062,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -49276,11 +49378,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 905984603} - component: {fileID: 905984604} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -49749,12 +49852,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -49861,6 +49965,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &913550635 PrefabInstance: m_ObjectHideFlags: 0 @@ -49933,12 +50038,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -50045,6 +50151,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &913787916 PrefabInstance: m_ObjectHideFlags: 0 @@ -50117,11 +50224,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 914711606} - component: {fileID: 914711607} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -50885,11 +50993,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -53315,11 +53424,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -53906,11 +54016,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 973756080} - component: {fileID: 973756081} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -54185,11 +54296,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 976442703} - component: {fileID: 976442704} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -54493,11 +54605,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -54774,11 +54887,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -54847,11 +54961,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 993411288} - component: {fileID: 993411289} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: TeaRoomReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -54899,6 +55014,9 @@ 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 @@ -55427,11 +55545,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1005385664} - component: {fileID: 1005385665} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -55471,12 +55590,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -55583,17 +55703,19 @@ 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: 6 + serializedVersion: 7 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} @@ -55864,11 +55986,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -56290,11 +56413,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -56807,10 +56931,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1022195582} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Lighting m_TagString: Untagged m_Icon: {fileID: 0} @@ -56845,11 +56970,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1022879622} - component: {fileID: 1022879623} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Hall4ReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -56896,6 +57022,9 @@ 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 @@ -56976,11 +57105,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -59137,10 +59267,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1079069522} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: ExteriorGeometryWall m_TagString: Untagged m_Icon: {fileID: 0} @@ -59513,11 +59644,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -62041,11 +62173,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -63049,10 +63182,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1143892097} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Rocks m_TagString: Untagged m_Icon: {fileID: 0} @@ -63317,12 +63451,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -63429,6 +63564,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1149474691 PrefabInstance: m_ObjectHideFlags: 0 @@ -65199,11 +65335,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1186690820} - component: {fileID: 1186690819} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: TeaRoomLightProbeGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -66165,11 +66302,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -66218,10 +66356,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1199642628} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: ExteriorGeometryRoof m_TagString: Untagged m_Icon: {fileID: 0} @@ -66762,11 +66901,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1206231319} - component: {fileID: 1206231320} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -67283,11 +67423,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -67788,11 +67929,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1223794566} - component: {fileID: 1223794567} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -68124,10 +68266,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1232103656} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -68552,11 +68695,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -68605,11 +68749,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1242861201} - component: {fileID: 1242861202} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -70078,10 +70223,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1276578257} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: WalkwayStones m_TagString: Untagged m_Icon: {fileID: 0} @@ -70285,11 +70431,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -70642,10 +70789,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1291007551} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: WaterWalls m_TagString: Untagged m_Icon: {fileID: 0} @@ -71149,11 +71297,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1300095209} - component: {fileID: 1300095210} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -72447,11 +72596,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -72676,11 +72826,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -73404,11 +73555,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1337800159} - component: {fileID: 1337800160} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -74046,11 +74198,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1344816770} - component: {fileID: 1344816771} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -74731,11 +74884,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -75487,11 +75641,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1376174935} - component: {fileID: 1376174936} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -75831,11 +75986,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -75884,12 +76040,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -75996,6 +76153,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1385829917 PrefabInstance: m_ObjectHideFlags: 0 @@ -76356,10 +76514,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1390068822} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: InteriorGeometryHallway m_TagString: Untagged m_Icon: {fileID: 0} @@ -77413,11 +77572,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1404861071} - component: {fileID: 1404861072} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -78002,12 +78162,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -78114,6 +78275,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1417409343 PrefabInstance: m_ObjectHideFlags: 0 @@ -79287,11 +79449,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1459190439} - component: {fileID: 1459190440} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: WaterLightProbeGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -80057,12 +80220,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -80214,11 +80378,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -80267,11 +80432,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -80320,11 +80486,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -81045,10 +81212,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1496257502} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: ReflectionProbes m_TagString: Untagged m_Icon: {fileID: 0} @@ -81644,11 +81812,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -81869,11 +82038,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1511294249} - component: {fileID: 1511294250} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: OutdoorReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -81920,6 +82090,9 @@ 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 @@ -82000,12 +82173,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -82298,11 +82472,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1518827873} - component: {fileID: 1518827874} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -83913,12 +84088,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -84025,6 +84201,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1543359340 PrefabInstance: m_ObjectHideFlags: 0 @@ -84356,11 +84533,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1547793195} - component: {fileID: 1547793194} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: TeleporterRoomLightProbeGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -84456,10 +84634,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1548488601} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Walls_N m_TagString: Untagged m_Icon: {fileID: 0} @@ -85706,12 +85885,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -85818,17 +85998,19 @@ 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: 6 + serializedVersion: 7 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} @@ -85968,11 +86150,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1571559688} - component: {fileID: 1571559689} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -86012,11 +86195,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -86833,10 +87017,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1590364077} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: waterfallEdgeLightprobeAnchor m_TagString: Untagged m_Icon: {fileID: 0} @@ -87190,11 +87375,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1595533838} - component: {fileID: 1595533839} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -87513,11 +87699,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -87854,11 +88041,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -88507,11 +88695,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -89922,11 +90111,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -90690,12 +90880,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -91478,11 +91669,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1670700473} - component: {fileID: 1670700474} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -91522,11 +91714,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1670967389} - component: {fileID: 1670967390} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -91764,12 +91957,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -91876,6 +92070,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1674219767 PrefabInstance: m_ObjectHideFlags: 0 @@ -91948,11 +92143,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -93639,11 +93835,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -95388,11 +95585,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -95664,11 +95862,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -96075,10 +96274,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1749682028} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Walls_W m_TagString: Untagged m_Icon: {fileID: 0} @@ -96186,11 +96386,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1753016294} - component: {fileID: 1753016295} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Hall3ReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -96237,6 +96438,9 @@ 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 @@ -96971,11 +97175,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -97799,11 +98004,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1783290980} - component: {fileID: 1783290981} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -98861,12 +99067,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -98973,6 +99180,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1813601143 PrefabInstance: m_ObjectHideFlags: 0 @@ -100415,10 +100623,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1841440562} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Walls_S m_TagString: Untagged m_Icon: {fileID: 0} @@ -100447,12 +100656,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -100559,6 +100769,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1842741525 PrefabInstance: m_ObjectHideFlags: 0 @@ -101228,11 +101439,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1854759439} - component: {fileID: 1854759440} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CourtyardALightProbeGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -101721,11 +101933,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1864274016} - component: {fileID: 1864274017} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -102505,11 +102718,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1881451618} - component: {fileID: 1881451619} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -102887,11 +103101,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1892441450} - component: {fileID: 1892441451} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -103001,11 +103216,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1896509969} - component: {fileID: 1896509970} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -103479,12 +103695,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -103591,6 +103808,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1905342678 PrefabInstance: m_ObjectHideFlags: 0 @@ -104563,11 +104781,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1925144051} - component: {fileID: 1925144052} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -105224,10 +105443,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1939814240} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: InteriorPropsLights m_TagString: Untagged m_Icon: {fileID: 0} @@ -105417,11 +105637,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1942816847} - component: {fileID: 1942816848} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -105726,11 +105947,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -106290,11 +106512,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1953956722} - component: {fileID: 1953956723} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -106553,11 +106776,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -106672,11 +106896,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1971080215} - component: {fileID: 1971080216} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Bridge m_TagString: Untagged m_Icon: {fileID: 0} @@ -106802,11 +107027,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -107082,11 +107308,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -107832,10 +108059,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1989208409} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Volumes m_TagString: Untagged m_Icon: {fileID: 0} @@ -107953,11 +108181,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1990478484} - component: {fileID: 1990478485} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -108063,12 +108292,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -108175,6 +108405,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1992346982 PrefabInstance: m_ObjectHideFlags: 0 @@ -108547,10 +108778,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1996431148} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Root m_TagString: Untagged m_Icon: {fileID: 0} @@ -109003,11 +109235,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2001767918} - component: {fileID: 2001767919} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Ground m_TagString: Untagged m_Icon: {fileID: 0} @@ -109283,11 +109516,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -109972,10 +110206,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2015910134} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: FakeRoomsLights m_TagString: Untagged m_Icon: {fileID: 0} @@ -111651,10 +111886,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2056100277} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Colliders m_TagString: Untagged m_Icon: {fileID: 0} @@ -112228,12 +112464,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -112340,6 +112577,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &2068396809 PrefabInstance: m_ObjectHideFlags: 0 @@ -113432,12 +113670,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -113503,11 +113742,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2084144349} - component: {fileID: 2084144350} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CorridorLightProbeGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -115314,11 +115554,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2109811623} - component: {fileID: 2109811624} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -115726,11 +115967,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2124499203} - component: {fileID: 2124499204} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: TeleportationRoomReflectionProbe m_TagString: Untagged m_Icon: {fileID: 0} @@ -115777,6 +116019,9 @@ 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 @@ -116083,11 +116328,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2131699374} - component: {fileID: 2131699375} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -116629,10 +116875,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2142622098} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: InteriorGeometry m_TagString: Untagged m_Icon: {fileID: 0} @@ -117735,12 +117982,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -117785,6 +118033,8 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_virtualGeometry: 0 + m_virtualGeometryShadow: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -117852,13 +118102,14 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -117886,10 +118137,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 966895464219401362} m_Layer: 9 + m_HasEditorInfo: 1 m_Name: Spawn m_TagString: Untagged m_Icon: {fileID: 0} @@ -118162,10 +118414,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2493945319084474443} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Vegetation m_TagString: Untagged m_Icon: {fileID: 0} @@ -118890,11 +119143,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -118926,11 +119180,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -119000,11 +119255,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 5121285565639616124} - component: {fileID: 5121285565639616125} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -119044,11 +119300,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -119135,10 +119392,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 5121285566312688396} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Media m_TagString: Untagged m_Icon: {fileID: 0} @@ -119190,11 +119448,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -119264,11 +119523,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -119300,11 +119560,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -119416,11 +119677,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -119452,11 +119714,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -119528,11 +119791,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -119604,11 +119868,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -119680,11 +119945,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -119754,11 +120020,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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} @@ -119905,11 +120172,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 5121285567406897643} - component: {fileID: 5121285567406897636} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CinematicTimeline m_TagString: Untagged m_Icon: {fileID: 0} @@ -120077,11 +120345,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 8514182666898305103} - component: {fileID: 8514182666898305102} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120121,11 +120390,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 8514182667060670027} - component: {fileID: 8514182667060670026} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120192,11 +120462,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 8514182667126586598} - component: {fileID: 8514182667126586593} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120224,11 +120495,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 8514182667243562928} - component: {fileID: 8514182667243562931} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120253,11 +120525,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 8514182667290820703} - component: {fileID: 8514182667290820702} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120324,11 +120597,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 8514182667534492901} - component: {fileID: 8514182667534492900} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120341,11 +120615,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 8514182667717272511} - component: {fileID: 8514182667717272510} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120385,11 +120660,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 8514182667732581723} - component: {fileID: 8514182667732581722} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120456,11 +120732,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 8514182668336569674} - component: {fileID: 8514182668336569669} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120500,11 +120777,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 8514182668596613953} - component: {fileID: 8514182668596613952} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -120544,11 +120822,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 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/Test.cs b/Assets/Scenes/Test.cs index b4b5347..c1e0bef 100644 --- a/Assets/Scenes/Test.cs +++ b/Assets/Scenes/Test.cs @@ -29,13 +29,14 @@ public class Test : MonoBehaviour private int dlssQuality; private bool xessOn = false; + private bool hwssr = false; private void Start() { RenderingPlugin.InitSupportFeatures(); } - public void OnClickVRS() + public void OnClickVRS() { var asset = UniversalRenderPipeline.asset; if (asset != null) @@ -53,7 +54,7 @@ public class Test : MonoBehaviour private void Update() { - + //transform?.Rotate(new Vector3(0, 0.1f, 0)); if (Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.R)) { @@ -85,7 +86,7 @@ public class Test : MonoBehaviour SuperResolutionParamSets.Instance.Set("NeedJitter", false); SuperResolutionParamSets.Instance.Set("MipmapBias", 0); - asset.superResolution= ESuperResolution.None; + asset.superResolution = ESuperResolution.None; dlss.SetActive(false); } } @@ -103,7 +104,10 @@ public class Test : MonoBehaviour break; } } + +#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY dlss.quality = (UnityEngine.NVIDIA.DLSSQuality)dlssQuality; +#endif } if (Input.GetKey(KeyCode.LeftShift) && Input.GetKeyDown(KeyCode.X)) @@ -163,10 +167,50 @@ public class Test : MonoBehaviour // asset.superResolution = ESuperResolution.METAL_FX_SPATIAL_SR; // asset.UpdateSSSettings(); //} +#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY + GUI.Label(new Rect(50, 100, 300, 100), $"ctrl + r resultion:{resultions[resultionIndex]}", font); GUI.Label(new Rect(50, 150, 300, 100), $"ctrl + e dlss:{(dlssOn ? "On" : "Off")}", font); GUI.Label(new Rect(50, 200, 300, 100), $"ctrl + q quality:{dlssQualitys[dlssQuality]}", font); +#endif +#if UNITY_EDITOR_WIN || UNITY_OPENHARMONY + if (GUI.Button(new Rect(50, 100, 300, 50), $"resultion:{resultions[resultionIndex]}")) + { + resultionIndex++; + resultionIndex = resultionIndex % resultions.Length; + UniversalRenderPipeline.asset.renderScale = resultions[resultionIndex]; + } + if (GUI.Button(new Rect(50, 150, 300, 50), $"HWSpatialUpScale:{(hwssr ? "On" : "Off")}")) + { + hwssr = !hwssr; + var asset = UniversalRenderPipeline.asset; + HuaweiSR hwsr = null; + foreach (var item in asset.GetRenderer(0).rendererFeatures) + { + if (item is HuaweiSR sr) + { + hwsr = sr; + break; + } + } + if (hwssr) + { + asset.superResolution = ESuperResolution.HW_SPATIAL_SR; + hwsr.SetSR(ESuperResolution.HW_SPATIAL_SR); + } + else + { + SuperResolutionParamSets.Instance.Set("NeedJitter", false); + SuperResolutionParamSets.Instance.Set("MipmapBias", 0); + asset.superResolution = ESuperResolution.None; + hwsr.SetSR(ESuperResolution.None); + } + + } +#endif +#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN GUI.Label(new Rect(50, 250, 300, 100), $"shift + x xess:{(xessOn ? "On" : "Off")}", font); +#endif } public static void TestBatchMode() @@ -174,3 +218,4 @@ public class Test : MonoBehaviour Debug.Log("TestBatchMode"); } } + diff --git a/Assets/Settings/Mobile/Mobile_High.asset b/Assets/Settings/Mobile/Mobile_High.asset index af6c8e0..80832a7 100644 --- a/Assets/Settings/Mobile/Mobile_High.asset +++ b/Assets/Settings/Mobile/Mobile_High.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Settings/Mobile/Mobile_High_Renderer.asset b/Assets/Settings/Mobile/Mobile_High_Renderer.asset index 47b73b3..2dd9bc2 100644 --- a/Assets/Settings/Mobile/Mobile_High_Renderer.asset +++ b/Assets/Settings/Mobile/Mobile_High_Renderer.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!114 &-8576419846133267094 MonoBehaviour: m_ObjectHideFlags: 0 @@ -27,11 +27,6 @@ MonoBehaviour: m_Name: DLSS m_EditorClassIdentifier: m_Active: 0 - quality: 2 - useOptimalSetting: 0 - sharpness: 0 - preExposure: 0 - mipMapBias: 0 --- !u!114 &-7390778553674367771 MonoBehaviour: m_ObjectHideFlags: 0 @@ -56,6 +51,22 @@ MonoBehaviour: ComputeShader: {fileID: 7200000, guid: 7b9233ff11584414688b5f10a526ca15, type: 3} v3setting: ComputeShader: {fileID: 7200000, guid: b79f3a2fdeeac5745b545fc41148f6c3, type: 3} +--- !u!114 &-4454652084718109581 +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: a4cfce835b2919a4c954f788ca0d08b0, type: 3} + m_Name: HuaweiSR + m_EditorClassIdentifier: + m_Active: 0 + quality: 1 + spatialUpScaleSettings: + sharpness: 0.35 --- !u!114 &-2621301742936824463 MonoBehaviour: m_ObjectHideFlags: 0 @@ -181,7 +192,8 @@ MonoBehaviour: - {fileID: -7390778553674367771} - {fileID: 4395980931634258890} - {fileID: -8043853166483734676} - m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88e5fca93e10ae6e99ca6373cd5da9013d6cff55ca297e5e90 + - {fileID: -4454652084718109581} + m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88e5fca93e10ae6e99ca6373cd5da9013d6cff55ca297e5e90737c6cdc87e52dc2 m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} shaders: diff --git a/NativeRenderPlugin/RenderAPI_OpenGLCoreES.cpp b/NativeRenderPlugin/RenderAPI_OpenGLCoreES.cpp index 930a4aa..a281e69 100644 --- a/NativeRenderPlugin/RenderAPI_OpenGLCoreES.cpp +++ b/NativeRenderPlugin/RenderAPI_OpenGLCoreES.cpp @@ -412,6 +412,9 @@ void RenderAPI_OpenGLCoreES::spatialUpScale(void *data) float sharpness; uint32_t render_width; uint32_t render_height; + uint32_t upscale_width; + uint32_t upscale_height; + }; DataPack* data_pack = static_cast(data); if (data_pack->data != NULL) @@ -423,17 +426,17 @@ void RenderAPI_OpenGLCoreES::spatialUpScale(void *data) // upscaleScissor为超分输入图像的采样区域 int upscaleScissor[4] = {0, 0, static_cast(param->render_width), static_cast(param->render_height)}; HMS_XEG_SpatialUpscaleParameter(XEG_SPATIAL_UPSCALE_SCISSOR, upscaleScissor); - } - GLuint gl_srctex = (GLuint)(size_t)(data_pack->src); - - // TODO: 测试由上层设置 - // GLuint gl_dsttex = (GLuint)(size_t)(data_pack->dst); - // // upscaleFBO为用户自定义创建的framebuffer - // glBindFramebuffer(GL_FRAMEBUFFER, gl_dsttex); - // glViewport(0, 0, upscale_width, upscale_height); - // glScissor(0, 0, upscale_width, upscale_height); + GLuint gl_srctex = (GLuint)(size_t)(data_pack->src); + + // TODO: 测试由上层设置 + GLuint gl_dsttex = (GLuint)(size_t)(data_pack->dst); + // // upscaleFBO为用户自定义创建的framebuffer + glBindFramebuffer(GL_FRAMEBUFFER, gl_dsttex); + glViewport(0, 0, param->upscale_width, param->upscale_height); + glScissor(0, 0, param->upscale_width, param->upscale_height); - HMS_XEG_RenderSpatialUpscale(gl_srctex); + HMS_XEG_RenderSpatialUpscale(gl_srctex); + } #endif } diff --git a/NativeRenderPlugin/xmake.lua b/NativeRenderPlugin/xmake.lua index be9569a..1c82cda 100644 --- a/NativeRenderPlugin/xmake.lua +++ b/NativeRenderPlugin/xmake.lua @@ -103,6 +103,7 @@ target("GfxPluginNativeRender") if is_plat("harmonyos") then add_links("xengine") + add_ldflags("-fPIE", "-fPIC") add_links("framegeneration") add_defines("OHOS=1") end @@ -146,6 +147,8 @@ toolchain("ohndk") toolchain:add("ldflags", "-fPIE") toolchain:add("ldflags", "-pie") + toolchain:add("ldflags", "-fPIC") + -- add some builtin flags toolchain:add("cxflags", "-D__MUSL__") 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 8cd1b32..d5dda14 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 @@ -512,6 +512,7 @@ namespace UnityEngine.Rendering.Universal { colorDescriptor.enableRandomWrite = true; } + colorDescriptor.enableRandomWrite = true; if (asset.SuperResolution == ESuperResolution.XESS13) { colorDescriptor.graphicsFormat = GraphicsFormat.R16G16B16A16_SFloat; diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/OpenHarmony.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/OpenHarmony.meta new file mode 100644 index 0000000..154e37c --- /dev/null +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/OpenHarmony.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: DHpNti+oUirNF2tvS3naa2hMxyDIh3eOEsMwGWjWaE3v358MM07f17k= +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/OpenHarmony/libGfxPluginNativeRender.so b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/OpenHarmony/libGfxPluginNativeRender.so new file mode 100644 index 0000000..0aa10d7 Binary files /dev/null and b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/OpenHarmony/libGfxPluginNativeRender.so differ diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/OpenHarmony/libGfxPluginNativeRender.so.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/OpenHarmony/libGfxPluginNativeRender.so.meta new file mode 100644 index 0000000..323bef4 --- /dev/null +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/OpenHarmony/libGfxPluginNativeRender.so.meta @@ -0,0 +1,79 @@ +fileFormatVersion: 2 +guid: Wn1MsnmpVnztDIGlc1D1qXyU+AhqJr6M7j9DPtwxEp93Qg8ezZpLh3A= +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 1 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 1 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude OpenHarmony: 0 + Exclude Win: 1 + Exclude Win64: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + AndroidSharedLibraryType: Executable + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: AnyOS + - first: + OpenHarmony: OpenHarmony + second: + enabled: 1 + settings: + CPU: ARM64 + OpenHarmonySharedLibraryType: Symbol + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Windows/GfxPluginNativeRender.dll.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Windows/GfxPluginNativeRender.dll.meta index 5eb295c..b1d18c7 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Windows/GfxPluginNativeRender.dll.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Windows/GfxPluginNativeRender.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5f2d1973ed81cfa48a2454937af74b84 +guid: Ciwd4SukVHjmo3sbv6mbRQOAS8tMmDtogzuA8jtsvh3tUelT2TDaMkM= PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,17 +11,69 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 1 + Exclude Linux64: 0 + Exclude OSXUniversal: 0 + Exclude OpenHarmony: 1 + Exclude Win: 0 + Exclude Win64: 0 + - first: + Android: Android + second: + enabled: 0 + settings: + AndroidSharedLibraryType: Executable + CPU: ARMv7 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor second: enabled: 0 settings: + CPU: AnyCPU DefaultValueInitialized: true + OS: AnyOS + - first: + OpenHarmony: OpenHarmony + second: + enabled: 0 + settings: + CPU: ARMv7 + OpenHarmonySharedLibraryType: Executable + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: None + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Windows/libxess.dll.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Windows/libxess.dll.meta index 1a746b2..588b391 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Windows/libxess.dll.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Windows/libxess.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4cb43d44daaa0754ab8d56c6424aa456 +guid: CylNsSn5V385rwZDZ0c3ZH2bVn7sAt4uXYM3ovG+CFkMBMj6NWTM5h0= PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,17 +11,69 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 1 + Exclude Linux64: 0 + Exclude OSXUniversal: 0 + Exclude OpenHarmony: 1 + Exclude Win: 1 + Exclude Win64: 0 + - first: + Android: Android + second: + enabled: 0 + settings: + AndroidSharedLibraryType: Executable + CPU: ARMv7 - first: Any: second: - enabled: 1 + enabled: 0 settings: {} - first: Editor: Editor second: enabled: 0 settings: + CPU: AnyCPU DefaultValueInitialized: true + OS: AnyOS + - first: + OpenHarmony: OpenHarmony + second: + enabled: 0 + settings: + CPU: ARMv7 + OpenHarmonySharedLibraryType: Executable + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs index 9991fe9..5811607 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs @@ -7,21 +7,21 @@ namespace X.Rendering.Feature { public static class RenderingPlugin { -#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST ) && !UNITY_EDITOR +#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST) && !UNITY_EDITOR [DllImport("__Internal")] #else [DllImport("GfxPluginNativeRender")] #endif public static extern IntPtr GetRenderEventAndDataFunc(); -#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST ) && !UNITY_EDITOR +#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST) && !UNITY_EDITOR [DllImport("__Internal")] #else [DllImport("GfxPluginNativeRender")] #endif private static extern bool GetFeatureSupport(int feature); -#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST ) && !UNITY_EDITOR +#if (PLATFORM_IOS || PLATFORM_TVOS || PLATFORM_BRATWURST) && !UNITY_EDITOR [DllImport("__Internal")] #else [DllImport("GfxPluginNativeRender")] diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/HuaweiSR.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/HuaweiSR.cs index ab617ee..a3630bf 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/HuaweiSR.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/HuaweiSR.cs @@ -1,3 +1,5 @@ +using System; +using System.Runtime.InteropServices; using UnityEngine; using UnityEngine.Rendering; using UnityEngine.Rendering.Universal; @@ -9,15 +11,32 @@ namespace X.Rendering.Feature [SerializeField] SrQuality quality; private ProfilingSampler profiler; + private ESuperResolution superResolution; + [Serializable] + internal class HWSpatialUpScaleSettings + { + public float sharpness; + } + + [SerializeField] + private HWSpatialUpScaleSettings spatialUpScaleSettings; + + HWSpatialUpScale hwSpatialUpScale; public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) { } public override void Create() { - profiler = new ProfilingSampler("HuaweiSR"); + profiler = new ProfilingSampler(nameof(HuaweiSR)); + hwSpatialUpScale = new HWSpatialUpScale(spatialUpScaleSettings); + } + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + hwSpatialUpScale.Dispose(); } public void DoSR(CommandBuffer cmd, RTHandle source, RTHandle destination, RTHandle motionVector, ref RenderingData renderingData) @@ -29,7 +48,10 @@ namespace X.Rendering.Feature using var scp = new ProfilingScope(cmd, profiler); //SuperResolutionParamSets.Instance.Set("NeedJitter", true); - + if (superResolution == ESuperResolution.HW_SPATIAL_SR) + { + hwSpatialUpScale.DoSR(cmd, source, destination, motionVector, ref renderingData); + } } public float GetRenderScale() @@ -39,6 +61,70 @@ namespace X.Rendering.Feature public void SetSR(ESuperResolution resolution) { + superResolution = resolution; + switch (resolution) + { + case ESuperResolution.HW_SPATIAL_SR: + case ESuperResolution.HW_AISR: + { + SetActive(true); + } + break; + default: + SetActive(false); + break; + } + } + } + + internal unsafe sealed class HWSpatialUpScale : IDisposable + { + [StructLayout(LayoutKind.Sequential)] + struct HWSpatialSRParam + { + public float sharpness; + public uint render_width; + public uint render_height; + }; + + [StructLayout(LayoutKind.Sequential)] + struct DataPack + { + public IntPtr src; + public HWSpatialSRParam* data; + public IntPtr dst; + }; + IntPtr dataPtr; + IntPtr paramPtr; + private ProfilingSampler profiler; + + public HuaweiSR.HWSpatialUpScaleSettings SpatialUpScaleSettings { get; } + + internal HWSpatialUpScale(HuaweiSR.HWSpatialUpScaleSettings spatialUpScaleSettings) + { + dataPtr = Marshal.AllocHGlobal(sizeof(DataPack)); + paramPtr = Marshal.AllocHGlobal(sizeof(HWSpatialSRParam)); + profiler = new ProfilingSampler(nameof(HWSpatialUpScale)); + SpatialUpScaleSettings = spatialUpScaleSettings; + } + + public void DoSR(CommandBuffer cmd, RTHandle source, RTHandle destination, RTHandle motionVector, ref RenderingData renderingData) + { + using var scp = new ProfilingScope(cmd, profiler); + DataPack* ptr = (DataPack*)dataPtr.ToPointer(); + ptr->data = (HWSpatialSRParam*)paramPtr.ToPointer(); + ptr->data->sharpness = SpatialUpScaleSettings.sharpness; + ptr->data->render_width = (uint)source.referenceSize.x; + ptr->data->render_height = (uint)source.referenceSize.y; + ptr->src = source.rt.GetNativeTexturePtr(); + ptr->dst = destination.rt.GetNativeTexturePtr(); + cmd.IssuePluginEventAndData(RenderingPlugin.GetRenderEventAndDataFunc(), (int)RenderingPlugin.NativeRenderingEvent.SpatialUpScale, dataPtr); + } + + public void Dispose() + { + Marshal.FreeHGlobal(dataPtr); + Marshal.FreeHGlobal(paramPtr); } } } diff --git a/Packages/manifest.json b/Packages/manifest.json index fed5f99..0ea421d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "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", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b61e7ef..0fd4168 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -2,13 +2,13 @@ "dependencies": { "com.unity.burst": { "version": "1.8.18", - "depth": 1, + "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.cinemachine": { "version": "2.10.1", @@ -17,28 +17,28 @@ "dependencies": { "com.unity.test-framework": "1.1.31" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.collab-proxy": { "version": "2.5.2", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.editorcoroutines": { "version": "1.0.0", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.ide.rider": { "version": "3.0.31", @@ -47,7 +47,7 @@ "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.ide.visualstudio": { "version": "2.0.22", @@ -56,14 +56,14 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.ide.vscode": { "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.inputsystem": { "version": "1.11.0", @@ -72,7 +72,7 @@ "dependencies": { "com.unity.modules.uielements": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.learn.iet-framework": { "version": "3.1.3", @@ -82,14 +82,14 @@ "com.unity.editorcoroutines": "1.0.0", "com.unity.settings-manager": "1.0.3" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.mathematics": { "version": "1.2.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.memoryprofiler": { "version": "1.1.1", @@ -98,7 +98,7 @@ "dependencies": { "com.unity.editorcoroutines": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.recorder": { "version": "4.0.3", @@ -107,7 +107,7 @@ "dependencies": { "com.unity.timeline": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.render-pipelines.core": { "version": "14.0.11", @@ -145,14 +145,14 @@ "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.settings-manager": { "version": "2.0.1", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.shadergraph": { "version": "14.0.11", @@ -172,7 +172,7 @@ "com.unity.mathematics": "1.2.1", "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.test-framework": { "version": "1.1.33", @@ -183,7 +183,7 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.textmeshpro": { "version": "3.0.7", @@ -192,7 +192,7 @@ "dependencies": { "com.unity.ugui": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.timeline": { "version": "1.7.6", @@ -204,7 +204,7 @@ "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.cn" + "url": "https://packages.tuanjie.cn" }, "com.unity.ugui": { "version": "1.0.0", @@ -237,7 +237,10 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": {} + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } }, "com.unity.modules.audio": { "version": "1.0.0", diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c8df5c5..1dfcc36 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!1045 &1 EditorBuildSettings: m_ObjectHideFlags: 0 @@ -13,3 +13,10 @@ EditorBuildSettings: com.unity.input.settings: {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2} com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 4c1640683c539c14080cfd43fbeffbda, type: 2} xr.sdk.mock-hmd.settings: {fileID: 11400000, guid: 9e9f2958d1b4b4642ace1d0c7770650b, type: 2} + m_SlimFeaturesWeixinMiniGame: + AllocateOverhead: 1 + DecompressASTC: 0 + DecompressDXT: 1 + DecompressETC: 1 + FreeTypeSfntPng: 1 + LightProbe: 2 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5f1f572..161bf9d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -780,7 +780,7 @@ PlayerSettings: m_Automatic: 0 - m_BuildTarget: OpenHarmonyPlayer m_APIs: 0b00000015000000 - m_Automatic: 1 + m_Automatic: 0 m_BuildTargetVRSettings: [] m_DefaultShaderChunkSizeInMB: 16 m_DefaultShaderChunkCount: 8 @@ -790,6 +790,7 @@ PlayerSettings: m_TemplateCustomTags: {} mobileMTRendering: Android: 1 + OpenHarmony: 1 iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: @@ -1180,7 +1181,7 @@ PlayerSettings: hmiCpuConfiguration: openHarmonySplashScreen: {fileID: 0} openHarmonySplashScreenScale: 0 - OpenHarmonyTargetArchitectures: 6 + OpenHarmonyTargetArchitectures: 2 openHarmonyClientID: openHarmonyAppID: openHarmonyDeviceTypes: 7 @@ -1190,11 +1191,11 @@ PlayerSettings: forceOpenHarmonySDCardPermission: 0 openHarmonyUseLowAccuracyLocation: 0 openHarmonyPredefinedPermissions: [] - OpenHarmonyKeystoreName: - OpenHarmonyKeyaliasName: - OpenHarmonyProfile: - OpenHarmonyCertificate: - OpenHarmonyUseCustomKeystore: 0 + OpenHarmonyKeystoreName: D:/ohkey.p12 + OpenHarmonyKeyaliasName: debugkey + OpenHarmonyProfile: D:/debugprofileDebug.p7b + OpenHarmonyCertificate: D:/debug_key.cer + OpenHarmonyUseCustomKeystore: 1 apiCompatibilityLevel: 6 weixinMiniGameMemorySize: 32 weixinMiniGameExceptionSupport: 1