diff --git a/Assets/Scenes/Oasis/Art/Environment/Textures/Cliff_Ramp.asset b/Assets/Scenes/Oasis/Art/Environment/Textures/Cliff_Ramp.asset index 3749f1e..1b48e8c 100644 --- a/Assets/Scenes/Oasis/Art/Environment/Textures/Cliff_Ramp.asset +++ b/Assets/Scenes/Oasis/Art/Environment/Textures/Cliff_Ramp.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 @@ -56,11 +56,17 @@ Texture2D: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 2 + serializedVersion: 4 m_Width: 64 m_Height: 1 m_CompleteImageSize: 508 m_MipsStripped: 0 + m_WebStreaming: 0 + m_PriorityLevel: 0 + m_UploadedMode: 0 + m_DataStreamData: + size: 0 + path: m_TextureFormat: 4 m_MipCount: 7 m_IsReadable: 1 @@ -91,3 +97,6 @@ Texture2D: offset: 0 size: 0 path: + m_OriginalWidth: 0 + m_OriginalHeight: 0 + m_OriginalAssetGuid: 00000000000000000000000000000000 diff --git a/Assets/Scenes/Terminal/TerminalScene.scene b/Assets/Scenes/Terminal/TerminalScene.scene index 28c1180..0738841 100644 --- a/Assets/Scenes/Terminal/TerminalScene.scene +++ b/Assets/Scenes/Terminal/TerminalScene.scene @@ -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 @@ -128,12 +130,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 9394471} - component: {fileID: 9394473} - component: {fileID: 9394472} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: DarkAreaVolumeA m_TagString: Untagged m_Icon: {fileID: 0} @@ -199,12 +202,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 12149344} - component: {fileID: 12149348} - component: {fileID: 12149347} m_Layer: 10 + m_HasEditorInfo: 1 m_Name: Occluder m_TagString: Untagged m_Icon: {fileID: 0} @@ -243,6 +247,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: @@ -356,12 +362,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 24977133} - component: {fileID: 24977135} - component: {fileID: 24977134} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Sky_AreaLight_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -468,16 +475,18 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &34748358 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 34748359} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Room1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -616,10 +625,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 77392232} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Decals m_TagString: Untagged m_Icon: {fileID: 0} @@ -772,12 +782,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 89675506} - component: {fileID: 89675508} - component: {fileID: 89675507} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -884,18 +895,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &90308318 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 90308319} - component: {fileID: 90308321} - component: {fileID: 90308320} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: SceneLoader m_TagString: Untagged m_Icon: {fileID: 0} @@ -1147,12 +1160,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 148144005} - component: {fileID: 148144004} - component: {fileID: 148144003} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_07 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1244,6 +1258,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &148144005 Transform: m_ObjectHideFlags: 0 @@ -1351,12 +1366,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 149249569} - component: {fileID: 149249571} - component: {fileID: 149249570} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1463,18 +1479,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &150511737 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 150511738} - component: {fileID: 150511740} - component: {fileID: 150511739} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (20) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1581,6 +1599,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &166933154 PrefabInstance: m_ObjectHideFlags: 0 @@ -2177,12 +2196,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 196680221} - component: {fileID: 196680223} - component: {fileID: 196680222} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Sky_AreaLight_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2289,6 +2309,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &207358429 PrefabInstance: m_ObjectHideFlags: 0 @@ -2565,11 +2586,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 236483701} - component: {fileID: 236483702} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Reflection Probe Room2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2616,6 +2638,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 @@ -2999,12 +3024,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 313794917} - component: {fileID: 313794916} - component: {fileID: 313794915} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Spot Light_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3096,6 +3122,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &313794917 Transform: m_ObjectHideFlags: 0 @@ -3117,10 +3144,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 322445010} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Ceiling Lamps m_TagString: Untagged m_Icon: {fileID: 0} @@ -3156,11 +3184,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 327637628} - component: {fileID: 327637629} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -3200,11 +3229,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 329013200} - component: {fileID: 329013201} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -3330,12 +3360,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 338274018} - component: {fileID: 338274020} - component: {fileID: 338274019} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (12) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3442,18 +3473,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &342458600 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 342458601} - component: {fileID: 342458603} - component: {fileID: 342458602} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3560,6 +3593,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &345371528 PrefabInstance: m_ObjectHideFlags: 0 @@ -3741,10 +3775,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 350564808} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Room3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3799,12 +3834,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 366880042} - component: {fileID: 366880041} - component: {fileID: 366880040} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_11 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3896,6 +3932,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &366880042 Transform: m_ObjectHideFlags: 0 @@ -3917,11 +3954,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 382604655} - component: {fileID: 382604656} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -4136,12 +4174,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 394182508} - component: {fileID: 394182510} - component: {fileID: 394182509} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: DestinationVolume m_TagString: Untagged m_Icon: {fileID: 0} @@ -4207,13 +4246,14 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 397543236} - component: {fileID: 397543235} - component: {fileID: 397543237} - component: {fileID: 397543238} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: MainLight m_TagString: MainLight m_Icon: {fileID: 0} @@ -4282,6 +4322,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &397543236 Transform: m_ObjectHideFlags: 0 @@ -4452,12 +4493,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 402820380} - component: {fileID: 402820382} - component: {fileID: 402820381} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -4564,18 +4606,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &424966431 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 424966432} - component: {fileID: 424966434} - component: {fileID: 424966433} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4682,6 +4726,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &429615700 stripped Transform: m_CorrespondingSourceObject: {fileID: 7048526022681675114, guid: a19b99df922571649a1da524e3bdc86d, type: 3} @@ -4698,12 +4743,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 438666420} - component: {fileID: 438666422} - component: {fileID: 438666421} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (15) m_TagString: Untagged m_Icon: {fileID: 0} @@ -4810,18 +4856,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &464446385 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 464446388} - component: {fileID: 464446387} - component: {fileID: 464446386} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_10 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4913,6 +4961,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &464446388 Transform: m_ObjectHideFlags: 0 @@ -4934,10 +4983,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 467429008} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Colliders m_TagString: Untagged m_Icon: {fileID: 0} @@ -5058,12 +5108,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 493392284} - component: {fileID: 493392286} - component: {fileID: 493392285} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Spot Light_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5170,6 +5221,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &497391520 stripped Transform: m_CorrespondingSourceObject: {fileID: 1818384483134930436, guid: a4af472c77a9e40688ae7566b93ab7c2, type: 3} @@ -5473,11 +5525,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 508733974} - component: {fileID: 508733975} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Right m_TagString: Untagged m_Icon: {fileID: 0} @@ -5526,12 +5579,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 510447478} - component: {fileID: 510447480} - component: {fileID: 510447479} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Spot Light_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5638,6 +5692,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &516457975 PrefabInstance: m_ObjectHideFlags: 0 @@ -5733,12 +5788,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 517048127} - component: {fileID: 517048126} - component: {fileID: 517048125} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5830,6 +5886,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &517048127 Transform: m_ObjectHideFlags: 0 @@ -5851,12 +5908,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 572500172} - component: {fileID: 572500174} - component: {fileID: 572500173} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (11) m_TagString: Untagged m_Icon: {fileID: 0} @@ -5963,6 +6021,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &579692327 PrefabInstance: m_ObjectHideFlags: 0 @@ -6043,11 +6102,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 582727255} - component: {fileID: 582727256} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Oasis On Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -6115,12 +6175,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 582788805} - component: {fileID: 582788807} - component: {fileID: 582788806} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (21) m_TagString: Untagged m_Icon: {fileID: 0} @@ -6227,17 +6288,19 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &587682934 GameObject: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 587682935} - component: {fileID: 587682936} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -6277,12 +6340,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 616821458} - component: {fileID: 616821460} - component: {fileID: 616821459} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (13) m_TagString: Untagged m_Icon: {fileID: 0} @@ -6389,6 +6453,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &624004426 stripped Transform: m_CorrespondingSourceObject: {fileID: 3345604766945953572, guid: 1ae38a12a032db54a818dda18022abd8, type: 3} @@ -6486,11 +6551,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 629140650} - component: {fileID: 629140651} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Left m_TagString: Untagged m_Icon: {fileID: 0} @@ -6539,11 +6605,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 634847566} - component: {fileID: 634847567} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Reflection Probe Room3 A m_TagString: Untagged m_Icon: {fileID: 0} @@ -6590,6 +6657,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 @@ -6604,12 +6674,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 635439114} - component: {fileID: 635439113} - component: {fileID: 635439112} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_06 m_TagString: Untagged m_Icon: {fileID: 0} @@ -6701,6 +6772,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &635439114 Transform: m_ObjectHideFlags: 0 @@ -7022,12 +7094,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 650108521} - component: {fileID: 650108523} - component: {fileID: 650108522} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: RoomVolume m_TagString: Untagged m_Icon: {fileID: 0} @@ -7093,12 +7166,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 659315485} - component: {fileID: 659315487} - component: {fileID: 659315486} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -7205,6 +7279,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &659727765 PrefabInstance: m_ObjectHideFlags: 0 @@ -7496,12 +7571,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 677783277} - component: {fileID: 677783276} - component: {fileID: 677783275} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Sky_AreaLight_03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -7593,6 +7669,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &677783277 Transform: m_ObjectHideFlags: 0 @@ -7614,12 +7691,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 679655226} - component: {fileID: 679655228} - component: {fileID: 679655227} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Sky_AreaLight_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -7726,6 +7804,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &694569156 PrefabInstance: m_ObjectHideFlags: 0 @@ -7908,12 +7987,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 715014083} - component: {fileID: 715014085} - component: {fileID: 715014084} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: DestinationVolume m_TagString: Untagged m_Icon: {fileID: 0} @@ -7979,12 +8059,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 722630225} - component: {fileID: 722630227} - component: {fileID: 722630226} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -8091,16 +8172,18 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &737529737 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 737529738} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Room2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -8134,12 +8217,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 743435001} - component: {fileID: 743435003} - component: {fileID: 743435002} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Sky_AreaLight_02 (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -8246,18 +8330,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &785105542 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 785105543} - component: {fileID: 785105545} - component: {fileID: 785105544} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (23) m_TagString: Untagged m_Icon: {fileID: 0} @@ -8364,6 +8450,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &791936906 PrefabInstance: m_ObjectHideFlags: 0 @@ -8468,12 +8555,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 796233058} - component: {fileID: 796233060} - component: {fileID: 796233059} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (17) m_TagString: Untagged m_Icon: {fileID: 0} @@ -8580,6 +8668,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &806784677 PrefabInstance: m_ObjectHideFlags: 0 @@ -8766,12 +8855,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 831683713} - component: {fileID: 831683715} - component: {fileID: 831683714} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Point Light m_TagString: Untagged m_Icon: {fileID: 0} @@ -8878,6 +8968,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &848157425 PrefabInstance: m_ObjectHideFlags: 0 @@ -8974,11 +9065,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 855165015} - component: {fileID: 855165016} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Reflection Probe Main m_TagString: Untagged m_Icon: {fileID: 0} @@ -9025,6 +9117,9 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 1 m_HDR: 1 @@ -9044,11 +9139,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 867583717} - component: {fileID: 867583718} m_Layer: 11 + m_HasEditorInfo: 1 m_Name: FullscreenDissolve m_TagString: Untagged m_Icon: {fileID: 0} @@ -9176,13 +9272,14 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 899883805} - component: {fileID: 899883808} - component: {fileID: 899883807} - component: {fileID: 899883806} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: FloorCollider m_TagString: Untagged m_Icon: {fileID: 0} @@ -9242,6 +9339,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: @@ -9281,12 +9380,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 904530986} - component: {fileID: 904530988} - component: {fileID: 904530987} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -9393,19 +9493,21 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &907777734 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 907777735} - component: {fileID: 907777738} - component: {fileID: 907777737} - component: {fileID: 907777736} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: FloorCollider m_TagString: Untagged m_Icon: {fileID: 0} @@ -9465,6 +9567,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: @@ -9504,11 +9608,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 909084279} - component: {fileID: 909084280} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -10166,12 +10271,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 951552775} - component: {fileID: 951552777} - component: {fileID: 951552776} m_Layer: 9 + m_HasEditorInfo: 1 m_Name: Occluder m_TagString: Untagged m_Icon: {fileID: 0} @@ -10210,6 +10316,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: @@ -10249,11 +10357,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 972107861} - component: {fileID: 972107862} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CM Shot 7 Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -10501,11 +10610,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 978611390} - component: {fileID: 978611391} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Reflection Probe Room3 B m_TagString: Untagged m_Icon: {fileID: 0} @@ -10552,6 +10662,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 @@ -10566,12 +10679,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 986368242} - component: {fileID: 986368244} - component: {fileID: 986368243} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: RoomVolume m_TagString: Untagged m_Icon: {fileID: 0} @@ -10637,12 +10751,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 989380149} - component: {fileID: 989380151} - component: {fileID: 989380150} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -10749,18 +10864,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1002065096 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1002065099} - component: {fileID: 1002065098} - component: {fileID: 1002065097} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_04 m_TagString: Untagged m_Icon: {fileID: 0} @@ -10852,6 +10969,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &1002065099 Transform: m_ObjectHideFlags: 0 @@ -10873,12 +10991,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1003939888} - component: {fileID: 1003939887} - component: {fileID: 1003939886} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -10970,6 +11089,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &1003939888 Transform: m_ObjectHideFlags: 0 @@ -11077,12 +11197,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1019696549} - component: {fileID: 1019696551} - component: {fileID: 1019696550} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: SceneLoader m_TagString: Untagged m_Icon: {fileID: 0} @@ -11150,12 +11271,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1043328177} - component: {fileID: 1043328179} - component: {fileID: 1043328178} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -11262,18 +11384,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1050891273 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1050891274} - component: {fileID: 1050891276} - component: {fileID: 1050891275} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: DestinationVolume m_TagString: Untagged m_Icon: {fileID: 0} @@ -11425,12 +11549,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1073972520} - component: {fileID: 1073972522} - component: {fileID: 1073972521} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -11537,6 +11662,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1081950986 PrefabInstance: m_ObjectHideFlags: 0 @@ -11715,12 +11841,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1118218364} - component: {fileID: 1118218366} - component: {fileID: 1118218365} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: DarkAreaVolumeB m_TagString: Untagged m_Icon: {fileID: 0} @@ -11786,10 +11913,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1126794967} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Rock Lamps m_TagString: Untagged m_Icon: {fileID: 0} @@ -11922,12 +12050,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1133605185} - component: {fileID: 1133605187} - component: {fileID: 1133605186} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (14) m_TagString: Untagged m_Icon: {fileID: 0} @@ -12034,6 +12163,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1135150812 PrefabInstance: m_ObjectHideFlags: 0 @@ -12278,10 +12408,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1168380296} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Room2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -12428,13 +12559,14 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1175237764} - component: {fileID: 1175237765} - component: {fileID: 1175237767} - component: {fileID: 1175237766} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Terminal_MeshCollider m_TagString: Untagged m_Icon: {fileID: 0} @@ -12503,6 +12635,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: @@ -12534,11 +12668,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1195391424} - component: {fileID: 1195391425} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Oasis On End m_TagString: Untagged m_Icon: {fileID: 0} @@ -12606,12 +12741,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1225181272} - component: {fileID: 1225181274} - component: {fileID: 1225181273} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -12718,6 +12854,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1233749213 PrefabInstance: m_ObjectHideFlags: 0 @@ -13244,12 +13381,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1269914516} - component: {fileID: 1269914518} - component: {fileID: 1269914517} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (13) m_TagString: Untagged m_Icon: {fileID: 0} @@ -13356,18 +13494,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1278812353 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1278812356} - component: {fileID: 1278812355} - component: {fileID: 1278812354} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_05 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13459,6 +13599,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &1278812356 Transform: m_ObjectHideFlags: 0 @@ -13578,11 +13719,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1301824148} - component: {fileID: 1301824149} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CinematicVolume m_TagString: Untagged m_Icon: {fileID: 0} @@ -13627,13 +13769,14 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1305717445} - component: {fileID: 1305717448} - component: {fileID: 1305717447} - component: {fileID: 1305717446} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: FloorCollider m_TagString: Untagged m_Icon: {fileID: 0} @@ -13693,6 +13836,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: @@ -13732,12 +13877,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1310961893} - component: {fileID: 1310961895} - component: {fileID: 1310961894} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Spot Light_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13844,17 +13990,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1317243097 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1317243099} - component: {fileID: 1317243098} + - component: {fileID: 1317243100} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: SceneSetup m_TagString: Untagged m_Icon: {fileID: 0} @@ -13904,17 +14053,31 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1317243100 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1317243097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a8f562490b8d41b47a6b21e2f514d782, type: 3} + m_Name: + m_EditorClassIdentifier: + transform: {fileID: 0} --- !u!1 &1325026286 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1325026287} - component: {fileID: 1325026288} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Back m_TagString: Untagged m_Icon: {fileID: 0} @@ -13963,11 +14126,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1325839462} - component: {fileID: 1325839463} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -14084,11 +14248,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1340680834} - component: {fileID: 1340680835} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -14349,11 +14514,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1357497469} - component: {fileID: 1357497470} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -14398,12 +14564,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1361245260} - component: {fileID: 1361245262} - component: {fileID: 1361245261} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -14510,6 +14677,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1380703671 PrefabInstance: m_ObjectHideFlags: 0 @@ -14672,11 +14840,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1389637080} - component: {fileID: 1389637081} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -14851,10 +15020,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1399957440} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: ReferencePoint m_TagString: Untagged m_Icon: {fileID: 0} @@ -14882,11 +15052,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1410471070} - component: {fileID: 1410471071} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CM Shot 7 End m_TagString: Untagged m_Icon: {fileID: 0} @@ -14954,12 +15125,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1424884226} - component: {fileID: 1424884228} - component: {fileID: 1424884227} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: SceneLoader m_TagString: Untagged m_Icon: {fileID: 0} @@ -15232,12 +15404,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1474557448} - component: {fileID: 1474557450} - component: {fileID: 1474557449} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -15344,6 +15517,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1487997530 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1328794821902915481, guid: 7313909bb567bec4684fdffe69460335, type: 3} @@ -15507,11 +15681,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1510284358} - component: {fileID: 1510284360} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: TransitionManager m_TagString: Untagged m_Icon: {fileID: 0} @@ -15646,12 +15821,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1523755390} - component: {fileID: 1523755392} - component: {fileID: 1523755391} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -15758,17 +15934,19 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1524077122 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1524077123} - component: {fileID: 1524077124} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Center m_TagString: Untagged m_Icon: {fileID: 0} @@ -16076,12 +16254,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1533953814} - component: {fileID: 1533953816} - component: {fileID: 1533953815} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Spot Light_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -16188,17 +16367,19 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1536161579 GameObject: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1536161580} - component: {fileID: 1536161581} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -16238,11 +16419,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1552611713} - component: {fileID: 1552611714} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -16282,12 +16464,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1558555975} - component: {fileID: 1558555977} - component: {fileID: 1558555976} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Sky_AreaLight_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -16394,6 +16577,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1558980086 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4916034631659228877, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} @@ -16405,11 +16589,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1559356783} - component: {fileID: 1559356784} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Left m_TagString: Untagged m_Icon: {fileID: 0} @@ -16458,12 +16643,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1565870517} - component: {fileID: 1565870516} - component: {fileID: 1565870515} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_08 m_TagString: Untagged m_Icon: {fileID: 0} @@ -16555,6 +16741,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &1565870517 Transform: m_ObjectHideFlags: 0 @@ -16576,12 +16763,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1570265816} - component: {fileID: 1570265818} - component: {fileID: 1570265817} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -16688,16 +16876,18 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1575947927 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1575947928} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Colliders m_TagString: Untagged m_Icon: {fileID: 0} @@ -16728,10 +16918,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1578993559} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Colliders m_TagString: Untagged m_Icon: {fileID: 0} @@ -16760,12 +16951,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1584836551} - component: {fileID: 1584836552} - component: {fileID: 1584836553} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -16822,12 +17014,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1599619627} - component: {fileID: 1599619629} - component: {fileID: 1599619628} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -16934,17 +17127,19 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1600821288 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1600821289} - component: {fileID: 1600821290} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Room3 Shot 1 Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -17012,12 +17207,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1601868292} - component: {fileID: 1601868291} - component: {fileID: 1601868290} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Sky_AreaLight_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17109,6 +17305,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &1601868292 Transform: m_ObjectHideFlags: 0 @@ -17130,11 +17327,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1613590157} - component: {fileID: 1613590158} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -17268,10 +17466,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1636404061} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Room3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17307,12 +17506,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1646172915} - component: {fileID: 1646172917} - component: {fileID: 1646172916} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Sky_AreaLight_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17419,18 +17619,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1646247604 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1646247605} - component: {fileID: 1646247607} - component: {fileID: 1646247606} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Point Light m_TagString: Untagged m_Icon: {fileID: 0} @@ -17537,6 +17739,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 1 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1649972010 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1328794821902915481, guid: 7313909bb567bec4684fdffe69460335, type: 3} @@ -17548,11 +17751,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1650985057} - component: {fileID: 1650985058} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -17592,12 +17796,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1656953759} - component: {fileID: 1656953761} - component: {fileID: 1656953760} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (16) m_TagString: Untagged m_Icon: {fileID: 0} @@ -17704,6 +17909,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1684424881 PrefabInstance: m_ObjectHideFlags: 0 @@ -17910,11 +18116,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1699875170} - component: {fileID: 1699875171} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -18126,11 +18333,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1720639582} - component: {fileID: 1720639583} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Room3 Shot 2 Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -18198,11 +18406,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1726573383} - component: {fileID: 1726573384} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Reflection Probe Back m_TagString: Untagged m_Icon: {fileID: 0} @@ -18249,6 +18458,9 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 4 m_HDR: 1 @@ -18352,10 +18564,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1741781312} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Lighting m_TagString: Untagged m_Icon: {fileID: 0} @@ -18387,12 +18600,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1748540453} - component: {fileID: 1748540455} - component: {fileID: 1748540454} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (18) m_TagString: Untagged m_Icon: {fileID: 0} @@ -18499,18 +18713,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1751695762 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1751695763} - component: {fileID: 1751695765} - component: {fileID: 1751695764} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (11) m_TagString: Untagged m_Icon: {fileID: 0} @@ -18617,6 +18833,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1764072537 PrefabInstance: m_ObjectHideFlags: 0 @@ -18717,11 +18934,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1776154087} - component: {fileID: 1776154088} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: RightFront m_TagString: Untagged m_Icon: {fileID: 0} @@ -18770,12 +18988,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1791809210} - component: {fileID: 1791809212} - component: {fileID: 1791809211} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (10) m_TagString: Untagged m_Icon: {fileID: 0} @@ -18882,6 +19101,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1795683442 PrefabInstance: m_ObjectHideFlags: 0 @@ -18974,11 +19194,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1797551579} - component: {fileID: 1797551580} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -19104,11 +19325,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1804249468} - component: {fileID: 1804249469} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Room3 Shot 2 End m_TagString: Untagged m_Icon: {fileID: 0} @@ -19176,11 +19398,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1820459041} - component: {fileID: 1820459042} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Room3 Shot 1 End m_TagString: Untagged m_Icon: {fileID: 0} @@ -19248,12 +19471,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1823065070} - component: {fileID: 1823065072} - component: {fileID: 1823065071} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (10) m_TagString: Untagged m_Icon: {fileID: 0} @@ -19360,6 +19584,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1830045412 PrefabInstance: m_ObjectHideFlags: 0 @@ -19722,12 +19947,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1854231617} - component: {fileID: 1854231616} - component: {fileID: 1854231615} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -19819,6 +20045,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &1854231617 Transform: m_ObjectHideFlags: 0 @@ -19840,11 +20067,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1854353491} - component: {fileID: 1854353492} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CenterLeft m_TagString: Untagged m_Icon: {fileID: 0} @@ -19893,12 +20121,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1861868505} - component: {fileID: 1861868507} - component: {fileID: 1861868506} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Point Light m_TagString: Untagged m_Icon: {fileID: 0} @@ -20005,18 +20234,20 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &1867100950 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1867100951} - component: {fileID: 1867100953} - component: {fileID: 1867100952} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (12) m_TagString: Untagged m_Icon: {fileID: 0} @@ -20123,6 +20354,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1874106866 PrefabInstance: m_ObjectHideFlags: 0 @@ -20573,10 +20805,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1890990766} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Outdoor m_TagString: Untagged m_Icon: {fileID: 0} @@ -20699,12 +20932,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1901501470} - component: {fileID: 1901501472} - component: {fileID: 1901501471} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -20811,6 +21045,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &1905381696 PrefabInstance: m_ObjectHideFlags: 0 @@ -20903,11 +21138,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1905455819} - component: {fileID: 1905455820} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Left m_TagString: Untagged m_Icon: {fileID: 0} @@ -20956,12 +21192,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1911712332} - component: {fileID: 1911712334} - component: {fileID: 1911712333} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: RoomVolume m_TagString: Untagged m_Icon: {fileID: 0} @@ -21027,11 +21264,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1934511725} - component: {fileID: 1934511726} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Reflection Probe Room1 B m_TagString: Untagged m_Icon: {fileID: 0} @@ -21078,6 +21316,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 @@ -21092,12 +21333,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1960033401} - component: {fileID: 1960033400} - component: {fileID: 1960033399} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_09 m_TagString: Untagged m_Icon: {fileID: 0} @@ -21189,6 +21431,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &1960033401 Transform: m_ObjectHideFlags: 0 @@ -21210,11 +21453,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1969570582} - component: {fileID: 1969570583} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Reflection Probe Room1 A m_TagString: Untagged m_Icon: {fileID: 0} @@ -21261,6 +21505,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 @@ -21275,11 +21522,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1977906697} - component: {fileID: 1977906698} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: RightBack m_TagString: Untagged m_Icon: {fileID: 0} @@ -21328,10 +21576,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1988248024} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: ReferencePoint m_TagString: Untagged m_Icon: {fileID: 0} @@ -21359,11 +21608,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1988605913} - component: {fileID: 1988605914} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -21403,11 +21653,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1995881869} - component: {fileID: 1995881870} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Right m_TagString: Untagged m_Icon: {fileID: 0} @@ -21456,11 +21707,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 1997154166} - component: {fileID: 1997154167} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -21595,12 +21847,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2014770768} - component: {fileID: 2014770770} - component: {fileID: 2014770769} m_Layer: 10 + m_HasEditorInfo: 1 m_Name: Occluder m_TagString: Untagged m_Icon: {fileID: 0} @@ -21639,6 +21892,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: @@ -21678,10 +21933,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2023108639} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Root m_TagString: Untagged m_Icon: {fileID: 0} @@ -21810,12 +22066,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2027396115} - component: {fileID: 2027396117} - component: {fileID: 2027396116} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (19) m_TagString: Untagged m_Icon: {fileID: 0} @@ -21922,6 +22179,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1001 &2028127299 PrefabInstance: m_ObjectHideFlags: 0 @@ -22106,10 +22364,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2050461559} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Room1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -22144,10 +22403,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2057804700} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Colliders m_TagString: Untagged m_Icon: {fileID: 0} @@ -22186,12 +22446,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2069285574} - component: {fileID: 2069285576} - component: {fileID: 2069285575} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -22298,17 +22559,19 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &2077556282 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2077556283} - component: {fileID: 2077556284} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CenterRight m_TagString: Untagged m_Icon: {fileID: 0} @@ -22357,12 +22620,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2078028195} - component: {fileID: 2078028197} - component: {fileID: 2078028196} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -22469,17 +22733,19 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &2092480881 GameObject: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2092480882} - component: {fileID: 2092480883} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -22519,12 +22785,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2096992349} - component: {fileID: 2096992351} - component: {fileID: 2096992350} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Screen_AreaLight_01 (22) m_TagString: Untagged m_Icon: {fileID: 0} @@ -22631,17 +22898,19 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!1 &2105520692 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2105520693} - component: {fileID: 2105520694} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Back m_TagString: Untagged m_Icon: {fileID: 0} @@ -22780,12 +23049,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2122278086} - component: {fileID: 2122278085} - component: {fileID: 2122278084} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Spot Light_02 m_TagString: Untagged m_Icon: {fileID: 0} @@ -22877,6 +23147,7 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_UseOcclusionCulling: 1 --- !u!4 &2122278086 Transform: m_ObjectHideFlags: 0 @@ -22980,11 +23251,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 2127246594} - component: {fileID: 2127246595} m_Layer: 6 + m_HasEditorInfo: 1 m_Name: Light Probe Group m_TagString: Untagged m_Icon: {fileID: 0} @@ -24692,7 +24964,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2307673875293584181, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2307673875293584185, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_DefaultControlScheme @@ -25020,11 +25292,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149924374491350} - component: {fileID: 3547149924374491353} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Cinematic Timeline m_TagString: Untagged m_Icon: {fileID: 0} @@ -25128,11 +25401,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149924405434143} - component: {fileID: 3547149924405434142} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CM Shot 2 Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -25200,11 +25474,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149924452519515} - component: {fileID: 3547149924452519514} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CM Shot 2 End m_TagString: Untagged m_Icon: {fileID: 0} @@ -25327,11 +25602,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149924495440961} - component: {fileID: 3547149924495440960} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CM Shot 3 Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -25344,11 +25620,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149924640876001} - component: {fileID: 3547149924640876000} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Garden Transition End m_TagString: Untagged m_Icon: {fileID: 0} @@ -25432,11 +25709,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149924676056660} - component: {fileID: 3547149924676056663} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CM Shot 1 End m_TagString: Untagged m_Icon: {fileID: 0} @@ -25488,11 +25766,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149924804487463} - component: {fileID: 3547149924804487462} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Garden On End m_TagString: Untagged m_Icon: {fileID: 0} @@ -25576,11 +25855,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149924885657006} - component: {fileID: 3547149924885657009} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Garden Transition Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -25648,11 +25928,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149924982261990} - component: {fileID: 3547149924982261993} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CM Shot 1 Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -25720,11 +26001,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149925255588302} - component: {fileID: 3547149925255588305} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Garden On Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -25776,13 +26058,14 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149925401584177} - component: {fileID: 1391890562} - component: {fileID: 1391890563} - component: {fileID: 3547149925401584178} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Media m_TagString: Untagged m_Icon: {fileID: 0} @@ -25846,11 +26129,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149925420434176} - component: {fileID: 3547149925420434179} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: CM Shot 3 End m_TagString: Untagged m_Icon: {fileID: 0} @@ -25929,11 +26213,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149926074068801} - component: {fileID: 3547149926074068800} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -25946,12 +26231,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149926212534203} - component: {fileID: 3547149926212534202} - component: {fileID: 3547149926212534204} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Garden Off End m_TagString: Untagged m_Icon: {fileID: 0} @@ -26050,11 +26336,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 3547149926222925194} - component: {fileID: 3547149926222925197} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: Garden Off Start m_TagString: Untagged m_Icon: {fileID: 0} @@ -26290,10 +26577,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + serializedVersion: 7 m_Component: - component: {fileID: 4542212125432741249} m_Layer: 0 + m_HasEditorInfo: 1 m_Name: MainRoom m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Settings/Mobile/Mobile_High.asset b/Assets/Settings/Mobile/Mobile_High.asset index 30bd84b..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 @@ -29,7 +29,7 @@ MonoBehaviour: m_HDRColorBufferPrecision: 0 m_MSAA: 1 m_RenderScale: 1 - m_UpscalingFilter: 0 + m_UpscalingFilter: 3 m_FsrOverrideSharpness: 1 m_FsrSharpness: 1 m_EnableLODCrossFade: 1 diff --git a/Assets/Settings/Mobile/Mobile_High_Renderer.asset b/Assets/Settings/Mobile/Mobile_High_Renderer.asset index 3031537..c666e29 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 @@ -127,10 +127,6 @@ MonoBehaviour: m_Name: DLSS m_EditorClassIdentifier: m_Active: 0 - quality: 3 - useOptimalSetting: 1 - sharpness: 0.126 - preExposure: 0.214 --- !u!114 &-194876054633339434 MonoBehaviour: m_ObjectHideFlags: 0 @@ -179,7 +175,8 @@ MonoBehaviour: - {fileID: 4962205925092569722} - {fileID: -8576419846133267094} - {fileID: -7390778553674367771} - m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d122222735d34a93f399f2716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88e5fca93e10ae6e99 + - {fileID: 4395980931634258890} + m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d122222735d34a93f399f2716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88e5fca93e10ae6e99ca6373cd5da9013d m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} shaders: @@ -331,6 +328,20 @@ MonoBehaviour: restoreCamera: 1 offset: {x: 0, y: 0, z: 0, w: 0} cameraFieldOfView: 60 +--- !u!114 &4395980931634258890 +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: 74dc463bb029b6b41a2fe66db031c2ae, type: 3} + m_Name: MetalFxSpatialUpScale + m_EditorClassIdentifier: + m_Active: 0 + quality: 0 --- !u!114 &4962205925092569722 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Settings/PC/PC_High_Renderer.asset b/Assets/Settings/PC/PC_High_Renderer.asset index 7d4f797..492ba1e 100644 --- a/Assets/Settings/PC/PC_High_Renderer.asset +++ b/Assets/Settings/PC/PC_High_Renderer.asset @@ -76,9 +76,7 @@ MonoBehaviour: - {fileID: 7833122117494664109} - {fileID: 3573653513797426673} - {fileID: -3751262535411419207} - - {fileID: 7635965471217900352} - - {fileID: 3550966996045925474} - m_RendererFeatureMap: a163f70a5ce289f0ad6b866f10d7b46cf1dd38d0ef2a9831b937925d99d6f0cb405b17952366f869620c7448ab914731 + m_RendererFeatureMap: a163f70a5ce289f0ad6b866f10d7b46cf1dd38d0ef2a9831b937925d99d6f0cb m_UseNativeRenderPass: 1 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} shaders: @@ -165,20 +163,6 @@ MonoBehaviour: normalBlend: 0 m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} ---- !u!114 &7635965471217900352 -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: 74dc463bb029b6b41a2fe66db031c2ae, type: 3} - m_Name: MetalFxSpatialUpScale - m_EditorClassIdentifier: - m_Active: 1 - quality: 3 --- !u!114 &7833122117494664109 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Settings/VolumeProfiles/LowQualityVolumeProfile.asset b/Assets/Settings/VolumeProfiles/LowQualityVolumeProfile.asset index 5776da3..c59f8fa 100644 --- a/Assets/Settings/VolumeProfiles/LowQualityVolumeProfile.asset +++ b/Assets/Settings/VolumeProfiles/LowQualityVolumeProfile.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!114 &-8189118008837629952 MonoBehaviour: m_ObjectHideFlags: 3 @@ -28,7 +28,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3} m_Name: Bloom m_EditorClassIdentifier: - active: 0 + active: 1 skipIterations: m_OverrideState: 1 m_Value: 0 @@ -170,7 +170,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3} m_Name: Tonemapping m_EditorClassIdentifier: - active: 0 + active: 1 mode: m_OverrideState: 1 m_Value: 1 diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android/libbindcore.so b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android/libbindcore.so deleted file mode 100644 index 6314828..0000000 Binary files a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android/libbindcore.so and /dev/null differ diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android/libbindcore.so.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android/libbindcore.so.meta deleted file mode 100644 index e09af1a..0000000 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android/libbindcore.so.meta +++ /dev/null @@ -1,81 +0,0 @@ -fileFormatVersion: 2 -guid: 1ca5bd2d305278446bdd07289c7ba929 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 1 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Android: 0 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 1 - - first: - Android: Android - second: - enabled: 1 - settings: - AndroidSharedLibraryType: Executable - CPU: ARM64 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - 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 - - first: - iPhone: iOS - second: - enabled: 0 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: - 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 85bdccd..078d597 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 @@ -35,11 +35,6 @@ namespace X.Rendering.Feature //#endif // public static extern bool DoFGExtrapolation(IntPtr src, IntPtr data, IntPtr dst); -#if PLATFORM_ANDROID - [DllImport("bindcore")] - public static extern void BindBigCore(); -#endif - public enum NativeRenderingEvent { EnableVRS = 1, @@ -97,11 +92,6 @@ namespace X.Rendering.Feature featureSupports[(GraphicsFeature)i] = GetFeatureSupport(i); UnityEngine.Debug.Log($"feature->{(GraphicsFeature)i}:{featureSupports[(GraphicsFeature)i]}"); } -#if PLATFORM_ANDROID && !UNITY_EDITOR - UnityEngine.Debug.Log("BindBigCore start"); - BindBigCore(); - UnityEngine.Debug.Log("BindBigCore end"); -#endif } public static bool GetFeatureSupport(GraphicsFeature feature) diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF/FG.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF/FG.cs index fa38650..473ef40 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF/FG.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF/FG.cs @@ -21,7 +21,7 @@ namespace X.Rendering.Feature static RTHandle[] historys = new RTHandle[2]; static RTHandle presentRt; static bool presented = false; - public static bool UseFG = true; + public static bool UseFG = false; public static bool CanDoFG => frameIndex > 0 && frameIndex % 3 == 0 && !presented && UseFG; diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs index b4d5a55..889a306 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs @@ -6,7 +6,7 @@ namespace X.Rendering.Feature { public class DLSS : ScriptableRendererFeature, ISuperResolutionFeature { -#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX +#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY [SerializeField] private UnityEngine.NVIDIA.DLSSQuality quality; [SerializeField] @@ -42,7 +42,7 @@ namespace X.Rendering.Feature #endif public static bool InitFeature() { -#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX +#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY if (!UnityEngine.NVIDIA.NVUnityPlugin.IsLoaded()) { return false; @@ -71,7 +71,7 @@ namespace X.Rendering.Feature bool playInit = false; public override void Create() { -#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX +#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY if (gfxDevice != null && playInit) { @@ -89,7 +89,7 @@ namespace X.Rendering.Feature #endif } -#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX +#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY private void UpdateDlssContext(in CommandBuffer cmd, in DlssStatus dlssStatus) { @@ -114,7 +114,7 @@ namespace X.Rendering.Feature #endif public void DoSR(CommandBuffer cmd, RTHandle source, RTHandle destination, RTHandle motionVector, ref RenderingData renderingData) { -#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX +#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY using var scp = new ProfilingScope(cmd, profiler); ref var cameraData = ref renderingData.cameraData; @@ -187,7 +187,7 @@ namespace X.Rendering.Feature public float GetRenderScale() { -#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX +#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY switch (quality) { @@ -216,7 +216,7 @@ namespace X.Rendering.Feature public void SetSR(ESuperResolution resolution) { -#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX +#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY switch (resolution) { case ESuperResolution.DLSS1: 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 new file mode 100644 index 0000000..ab617ee --- /dev/null +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/HuaweiSR.cs @@ -0,0 +1,44 @@ +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +namespace X.Rendering.Feature +{ + public class HuaweiSR : ScriptableRendererFeature, ISuperResolutionFeature + { + [SerializeField] + SrQuality quality; + private ProfilingSampler profiler; + + public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) + { + } + + public override void Create() + { + profiler = new ProfilingSampler("HuaweiSR"); + + } + + public void DoSR(CommandBuffer cmd, RTHandle source, RTHandle destination, RTHandle motionVector, ref RenderingData renderingData) + { + if (source.rt == null || destination.rt == null) + { + return; + } + using var scp = new ProfilingScope(cmd, profiler); + + //SuperResolutionParamSets.Instance.Set("NeedJitter", true); + + } + + public float GetRenderScale() + { + return 1.0f; + } + + public void SetSR(ESuperResolution resolution) + { + } + } +} diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/HuaweiSR.cs.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/HuaweiSR.cs.meta new file mode 100644 index 0000000..a9547bf --- /dev/null +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/HuaweiSR.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: Xn5M43n4W3gIAvdqz/oinE4xDAEtU2xxwJr+x6z9dELyC6Mh4egM7SU= +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/MetalFx.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/MetalFx.cs index bb210c4..22960df 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/MetalFx.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/MetalFx.cs @@ -8,7 +8,6 @@ using UnityEngine.Rendering.Universal; namespace X.Rendering.Feature { - internal unsafe class MetalFxSpatialUpScale : ScriptableRendererFeature, ISuperResolutionFeature { [SerializeField] diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 290d304..f9fe65b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,14 +1,14 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.16", + "version": "1.8.17", "depth": 1, "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 bbd0358..c135f84 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,22 +1,15 @@ %YAML 1.1 -%TAG !u! tag:yousandi.cn,2023: +%TAG !u! tag:unity3d.com,2011: --- !u!1045 &1 EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/Oasis/OasisScene.scene - guid: 9fa2ba603a3424f9bafa4119f837f2bc + path: Assets/Scenes/Terminal/TerminalScene.scene + guid: 4496a3dbb8d263043a4460bac5382ac5 m_configObjects: Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 290a6e6411d135049940bec2237b8938, type: 2} 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/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 086939c..5171e3e 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!114 &1 MonoBehaviour: m_ObjectHideFlags: 61 @@ -21,7 +21,7 @@ MonoBehaviour: m_Registries: - m_Id: main m_Name: - m_Url: https://packages.unity.cn + m_Url: https://packages.tuanjie.cn m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 @@ -31,6 +31,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -838 - m_OriginalInstanceId: -840 + m_UserModificationsInstanceId: -872 + m_OriginalInstanceId: -874 m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index f3fb7ab..feff13a 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,3 @@ -m_EditorVersion: 2022.3.38f1c1 -m_EditorVersionWithRevision: 2022.3.38f1c1 (b17906c7b2b6) +m_EditorVersion: 2022.3.48t2 +m_EditorVersionWithRevision: 2022.3.48t2 (635b9f68393f) +m_TuanjieEditorVersion: 1.3.5 diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index 3250b06..8ad2e55 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!114 &1 MonoBehaviour: m_ObjectHideFlags: 61 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 9c432dd..ed5c0e4 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:yousandi.cn,2023: +%TAG !u! tag:unity3d.com,2011: --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 @@ -10,6 +10,8 @@ UnityConnectSettings: m_EventUrl: https://cdp.tuanjie.cn/v1/events m_ConfigUrl: https://config.uca.cloud.tuanjie.cn m_DashboardUrl: https://dashboard.tuanjie.cn + m_CNEventUrl: https://cdp.cloud.unity.cn/v1/events + m_CNConfigUrl: https://cdp.cloud.unity.cn/config m_TestInitMode: 0 CrashReportingSettings: m_EventUrl: https://perf-events.cloud.unity3d.com diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index e01ff9f..0bef0ad 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!162 &1 EditorUserSettings: m_ObjectHideFlags: 0 @@ -9,17 +9,32 @@ EditorUserSettings: value: 0257020252075b0b5a0b5b2345715a444f4e402b7a2d22667f7c4b35e7b16769 flags: 0 RecentlyUsedSceneGuid-1: - value: 01060c075556080e0956597315775b14104e4179282b25662b2c1c31b7b63068 - flags: 0 - RecentlyUsedSceneGuid-2: - value: 57050d5004060d590f56087046700f4445164c7e7a7824312e7c4e6bb0e1376d - flags: 0 - RecentlyUsedSceneGuid-3: value: 5b00515154055e035459547042705a44154f1e2c2e2e7f677e7d4567e1b9376d flags: 0 + RecentlyUsedSceneGuid-2: + value: 5253030556035d5f5b585f7a16760f44144f1c2f2a7023347c7a4432b6b3353b + flags: 0 + RecentlyUsedSceneGuid-3: + value: 52035256550d510b5e595e2613700e44454e1a7e7d2b74312b7d1f36b3b03161 + flags: 0 RecentlyUsedSceneGuid-4: + value: 01060c075556080e0956597315775b14104e4179282b25662b2c1c31b7b63068 + flags: 0 + RecentlyUsedSceneGuid-5: value: 5a57555407545f0b5e0f5f764277594914161e2b787977692b714e64e4b2363b flags: 0 + RecentlyUsedSceneGuid-6: + value: 57050d5004060d590f56087046700f4445164c7e7a7824312e7c4e6bb0e1376d + flags: 0 + UnityEditor.ShaderGraph.Blackboard: + value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7 + flags: 0 + UnityEditor.ShaderGraph.FloatingWindowsLayout2: + value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf + flags: 0 + UnityEditor.ShaderGraph.InspectorWindow: + value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 3d9987e..5573cda 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:unity3d.com,2011: +%TAG !u! tag:yousandi.cn,2023: --- !u!114 &1 MonoBehaviour: m_ObjectHideFlags: 52 @@ -19,7 +19,7 @@ MonoBehaviour: width: 2560 height: 1349 m_ShowMode: 4 - m_Title: Inspector + m_Title: Lighting m_RootView: {fileID: 10} m_MinSize: {x: 875, y: 321} m_MaxSize: {x: 10000, y: 10000} @@ -34,23 +34,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 391 + x: 434 y: 0 - width: 1472 + width: 1632 height: 770 - m_MinSize: {x: 102, y: 121} + m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 19} m_Panes: - {fileID: 15} - {fileID: 19} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -70,12 +70,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1863 + width: 2066 height: 770 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 40 + controlID: 128 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -92,12 +92,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1079 + x: 1196 y: 0 - width: 784 + width: 870 height: 529 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -122,12 +122,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 770 - width: 1863 + width: 2066 height: 529 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 65 + controlID: 161 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -153,7 +153,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 144 + controlID: 126 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -165,23 +165,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow + m_Name: LightingWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1863 + x: 2066 y: 0 - width: 697 + width: 494 height: 1299 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 17} + m_MinSize: {x: 391, y: 411} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 17} - {fileID: 14} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -199,7 +199,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 391 + width: 434 height: 770 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -225,7 +225,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1079 + width: 1196 height: 529 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -324,12 +324,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1863 + width: 2066 height: 1299 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 64 + controlID: 127 draggingID: 0 --- !u!114 &14 MonoBehaviour: @@ -351,9 +351,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1863 + x: 2066 y: 73 - width: 696 + width: 493 height: 1278 m_SerializedDataModeController: m_DataMode: 0 @@ -385,9 +385,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 391 + x: 434 y: 73 - width: 1470 + width: 1630 height: 749 m_SerializedDataModeController: m_DataMode: 0 @@ -404,7 +404,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -171, y: -26} + snapOffsetDelta: {x: -179, y: -26} snapCorner: 3 id: Tool Settings index: 0 @@ -721,9 +721,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 23.915308, y: -12.379151, z: -206.87144} + m_Target: {x: 0.49164727, y: -7.533593, z: -38.261467} speed: 2 - m_Value: {x: 23.915308, y: -12.379151, z: -206.87144} + m_Value: {x: 0.49164727, y: -7.533593, z: -38.261467} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -769,13 +769,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.014979714, y: 0.98480403, z: -0.13256745, w: 0.111246854} + m_Target: {x: -0.00022618985, y: 0.9882768, z: -0.15271015, w: -0.0014957726} speed: 2 - m_Value: {x: 0.014812732, y: 0.98499525, z: -0.13108921, w: 0.11126845} + m_Value: {x: -0.0002261883, y: 0.98827004, z: -0.15270911, w: -0.0014957625} m_Size: - m_Target: 35.659737 + m_Target: 33.820503 speed: 2 - m_Value: 34.12415 + m_Value: 27.608574 m_Ortho: m_Target: 0 speed: 2 @@ -793,6 +793,8 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 + m_EnableGDRP: 1 + m_BackfaceCulling: 0 m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} @@ -822,7 +824,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 843 - width: 1078 + width: 1195 height: 508 m_SerializedDataModeController: m_DataMode: 0 @@ -843,7 +845,7 @@ MonoBehaviour: m_SceneHandles: m_ShowAllHits: 0 m_SkipHidden: 0 - m_SearchArea: 1 + m_SearchArea: 0 m_Folders: - Assets/Settings/Mobile m_Globs: [] @@ -860,9 +862,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 607c0100 - m_LastClickedID: 97376 - m_ExpandedIDs: 000000000463000016d800003ed8000040d800006cd8000094d8000062d90000aad90000dad90000e6d9000006da00001473010018730100ccb70100dcb70100e2b70100ffffff7f + m_SelectedIDs: 44a70000 + m_LastClickedID: 42820 + m_ExpandedIDs: 00000000747e0000008100002c810000baa60000bca60000d2a60000d8a6000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -890,7 +892,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000016d80000 + m_ExpandedIDs: 00000000747e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -921,18 +923,18 @@ MonoBehaviour: m_ExpandedInstanceIDs: c6230000000000005aca0000a6790000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Mobile_High_Renderer - m_OriginalName: Mobile_High_Renderer + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 17064 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 9} m_CreateAssetUtility: @@ -966,9 +968,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1863 + x: 2066 y: 73 - width: 696 + width: 493 height: 1278 m_SerializedDataModeController: m_DataMode: 0 @@ -1015,7 +1017,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 390 + width: 433 height: 749 m_SerializedDataModeController: m_DataMode: 0 @@ -1030,23 +1032,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 2874fcffca32fdff8a3efdff8c3efdffdc4bfdff80cbfdff82cbfdff58dffdff5adffdfffaf5fdfffcf5fdff40f7fdff42f7fdffb419feffb819feffbc19feff7c25feff1426feff8492ffff9a5a0100c65a01009c5b0100045c0100a45d010028780100107901007cb401009cb4010004b501009cc70200bad8020068da0200aaf1020002f702002afd0200a60e0300321c0300 + m_SelectedIDs: 9e720000 + m_LastClickedID: 29342 + m_ExpandedIDs: 3afaffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Root - m_OriginalName: Root + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 96528 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 8} m_SearchString: @@ -1076,9 +1078,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 391 + x: 434 y: 73 - width: 1470 + width: 1630 height: 749 m_SerializedDataModeController: m_DataMode: 0 @@ -1132,23 +1134,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1470 + width: 1630 height: 728 m_Scale: {x: 0.67407405, y: 0.67407405} - m_Translation: {x: 735, y: 364} + m_Translation: {x: 814.99994, y: 364} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1090.3846 + x: -1209.0659 y: -540 - width: 2180.7693 + width: 2418.1318 height: 1080 m_MinimalGUI: 1 m_defaultScale: 0.67407405 - m_LastWindowPixelSize: {x: 1470, y: 749} + m_LastWindowPixelSize: {x: 1630, y: 749} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000001000000000000 @@ -1174,9 +1176,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1079 + x: 1196 y: 843 - width: 782 + width: 868 height: 508 m_SerializedDataModeController: m_DataMode: 0