From d9471c47088132a57bc40d8490bb7d9ccd34c128 Mon Sep 17 00:00:00 2001 From: StarBeats <977663818@qq.com> Date: Tue, 24 Dec 2024 15:54:22 +0800 Subject: [PATCH] add dlss --- Assets/InputSystem_Actions.inputactions | 1057 ----------------- Assets/InputSystem_Actions.inputactions.meta | 14 - Assets/Plugins.meta | 2 +- Assets/Plugins/Android.meta | 2 +- .../Android/libGfxPluginNativeRender.so.meta | 8 +- Assets/Plugins/Mac.meta | 2 +- Assets/Plugins/Mac/MetalFX.swift.meta | 47 +- .../Mac/libGfxPluginNativeRender.dylib.meta | 2 +- Assets/Plugins/Windows.meta | 2 +- .../Windows/GfxPluginNativeRender.dll.meta | 2 +- Assets/Plugins/Windows/libxess.dll.meta | 2 +- Assets/Plugins/iOS.meta | 2 +- Assets/Plugins/iOS/IUnityGraphics.h.meta | 2 +- Assets/Plugins/iOS/RegisterPlugin.mm.meta | 44 +- .../iOS/libGfxPluginNativeRender.a.meta | 42 +- .../Materials/OasisSunsetSkybox_Mat.mat | 4 +- .../Art/Environment/Textures/Cliff_Ramp.asset | 13 +- Assets/Scenes/Terminal/TerminalScene.scene | 639 +++------- Assets/Settings/Mobile/Mobile_High.asset | 6 +- .../Mobile/Mobile_High_Renderer.asset | 118 +- .../Runtime/Passes/PostProcessPass.cs | 13 +- .../Runtime/SuperRendering.meta | 2 +- .../Runtime/SuperRendering/NatvieHelper.meta | 2 +- .../NatvieHelper/RenderingPlugin.cs.meta | 2 +- .../Runtime/SuperRendering/SF.meta | 2 +- .../Runtime/SuperRendering/SF/FG.cs.meta | 2 +- .../Runtime/SuperRendering/SR.meta | 2 +- .../Runtime/SuperRendering/SR/Scripts.meta | 2 +- .../Runtime/SuperRendering/SR/Scripts/DLSS.cs | 147 ++- .../SuperRendering/SR/Scripts/DLSS.cs.meta | 2 +- .../SuperRendering/SR/Scripts/FSR.cs.meta | 2 +- .../SuperRendering/SR/Scripts/GSR.cs.meta | 2 +- .../SuperRendering/SR/Scripts/SR.cs.meta | 2 +- .../SuperRendering/SR/Scripts/XESS.cs.meta | 2 +- .../Runtime/SuperRendering/SR/Shader.meta | 2 +- .../SR/Shader/MRP_SR_GSR1.mat.meta | 2 +- .../SR/Shader/MRP_SR_GSR2.mat.meta | 2 +- .../Runtime/SuperRendering/SRSettings.cs.meta | 2 +- .../Runtime/UniversalRenderPipeline.cs | 2 + Packages/packages-lock.json | 45 +- ProjectSettings/PackageManagerSettings.asset | 8 +- ProjectSettings/ProjectVersion.txt | 5 +- ProjectSettings/ShaderGraphSettings.asset | 2 +- UserSettings/EditorUserSettings.asset | 6 +- 44 files changed, 500 insertions(+), 1770 deletions(-) delete mode 100644 Assets/InputSystem_Actions.inputactions delete mode 100644 Assets/InputSystem_Actions.inputactions.meta diff --git a/Assets/InputSystem_Actions.inputactions b/Assets/InputSystem_Actions.inputactions deleted file mode 100644 index 1a12cb9..0000000 --- a/Assets/InputSystem_Actions.inputactions +++ /dev/null @@ -1,1057 +0,0 @@ -{ - "name": "InputSystem_Actions", - "maps": [ - { - "name": "Player", - "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", - "actions": [ - { - "name": "Move", - "type": "Value", - "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Look", - "type": "Value", - "id": "6b444451-8a00-4d00-a97e-f47457f736a8", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Attack", - "type": "Button", - "id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Interact", - "type": "Button", - "id": "852140f2-7766-474d-8707-702459ba45f3", - "expectedControlType": "Button", - "processors": "", - "interactions": "Hold", - "initialStateCheck": false - }, - { - "name": "Crouch", - "type": "Button", - "id": "27c5f898-bc57-4ee1-8800-db469aca5fe3", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Jump", - "type": "Button", - "id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Previous", - "type": "Button", - "id": "2776c80d-3c14-4091-8c56-d04ced07a2b0", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Next", - "type": "Button", - "id": "b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Sprint", - "type": "Button", - "id": "641cd816-40e6-41b4-8c3d-04687c349290", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "", - "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", - "path": "/leftStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "WASD", - "id": "00ca640b-d935-4593-8157-c05846ea39b3", - "path": "Dpad", - "interactions": "", - "processors": "", - "groups": "", - "action": "Move", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", - "path": "/w", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", - "path": "/s", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", - "path": "/a", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "2e46982e-44cc-431b-9f0b-c11910bf467a", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", - "path": "/d", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "77bff152-3580-4b21-b6de-dcd0c7e41164", - "path": "/rightArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", - "path": "/{Primary2DAxis}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3ea4d645-4504-4529-b061-ab81934c3752", - "path": "/stick", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235", - "path": "/rightStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8c8e490b-c610-4785-884f-f04217b23ca4", - "path": "/delta", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse;Touch", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3e5f5442-8668-4b27-a940-df99bad7e831", - "path": "/{Hatswitch}", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91", - "path": "/buttonWest", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "05f6913d-c316-48b2-a6bb-e225f14c7960", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "886e731e-7071-4ae4-95c0-e61739dad6fd", - "path": "/primaryTouch/tap", - "interactions": "", - "processors": "", - "groups": ";Touch", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8255d333-5683-4943-a58a-ccb207ff1dce", - "path": "/{PrimaryAction}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7", - "path": "/enter", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "cbac6039-9c09-46a1-b5f2-4e5124ccb5ed", - "path": "/2", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e15ca19d-e649-4852-97d5-7fe8ccc44e94", - "path": "/dpad/right", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "f2e9ba44-c423-42a7-ad56-f20975884794", - "path": "/leftShift", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8cbb2f4b-a784-49cc-8d5e-c010b8c7f4e6", - "path": "/leftStickPress", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "d8bf24bf-3f2f-4160-a97c-38ec1eb520ba", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "eb40bb66-4559-4dfa-9a2f-820438abb426", - "path": "/space", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "daba33a1-ad0c-4742-a909-43ad1cdfbeb6", - "path": "/buttonSouth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "603f3daf-40bd-4854-8724-93e8017f59e3", - "path": "/secondaryButton", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1534dc16-a6aa-499d-9c3a-22b47347b52a", - "path": "/1", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "25060bbd-a3a6-476e-8fba-45ae484aad05", - "path": "/dpad/left", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1c04ea5f-b012-41d1-a6f7-02e963b52893", - "path": "/e", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Interact", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3f66d0b-7751-423f-908b-a11c5bd95930", - "path": "/buttonNorth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Interact", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4f4649ac-64a8-4a73-af11-b3faef356a4d", - "path": "/buttonEast", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Crouch", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a", - "path": "/c", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Crouch", - "isComposite": false, - "isPartOfComposite": false - } - ] - }, - { - "name": "UI", - "id": "272f6d14-89ba-496f-b7ff-215263d3219f", - "actions": [ - { - "name": "Navigate", - "type": "PassThrough", - "id": "c95b2375-e6d9-4b88-9c4c-c5e76515df4b", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Submit", - "type": "Button", - "id": "7607c7b6-cd76-4816-beef-bd0341cfe950", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Cancel", - "type": "Button", - "id": "15cef263-9014-4fd5-94d9-4e4a6234a6ef", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Point", - "type": "PassThrough", - "id": "32b35790-4ed0-4e9a-aa41-69ac6d629449", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Click", - "type": "PassThrough", - "id": "3c7022bf-7922-4f7c-a998-c437916075ad", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "RightClick", - "type": "PassThrough", - "id": "44b200b1-1557-4083-816c-b22cbdf77ddf", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "MiddleClick", - "type": "PassThrough", - "id": "dad70c86-b58c-4b17-88ad-f5e53adf419e", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "ScrollWheel", - "type": "PassThrough", - "id": "0489e84a-4833-4c40-bfae-cea84b696689", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "TrackedDevicePosition", - "type": "PassThrough", - "id": "24908448-c609-4bc3-a128-ea258674378a", - "expectedControlType": "Vector3", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "TrackedDeviceOrientation", - "type": "PassThrough", - "id": "9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be", - "expectedControlType": "Quaternion", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "Gamepad", - "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", - "path": "/leftStick/up", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", - "path": "/rightStick/up", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "2db08d65-c5fb-421b-983f-c71163608d67", - "path": "/leftStick/down", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "58748904-2ea9-4a80-8579-b500e6a76df8", - "path": "/rightStick/down", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", - "path": "/leftStick/left", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", - "path": "/rightStick/left", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "fcd248ae-a788-4676-a12e-f4d81205600b", - "path": "/leftStick/right", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", - "path": "/rightStick/right", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", - "path": "/dpad", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "Joystick", - "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "3db53b26-6601-41be-9887-63ac74e79d19", - "path": "/stick/up", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", - "path": "/stick/down", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", - "path": "/stick/left", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", - "path": "/stick/right", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "Keyboard", - "id": "ff527021-f211-4c02-933e-5976594c46ed", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Navigate", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", - "path": "/w", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", - "path": "/s", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "74214943-c580-44e4-98eb-ad7eebe17902", - "path": "/a", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "cea9b045-a000-445b-95b8-0c171af70a3b", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "8607c725-d935-4808-84b1-8354e29bab63", - "path": "/d", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", - "path": "/rightArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Navigate", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", - "path": "*/{Submit}", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", - "action": "Submit", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", - "path": "*/{Cancel}", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", - "action": "Cancel", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", - "path": "/position", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", - "path": "/position", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", - "path": "/touch*/position", - "interactions": "", - "processors": "", - "groups": "Touch", - "action": "Point", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", - "path": "/tip", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", - "path": "/touch*/press", - "interactions": "", - "processors": "", - "groups": "Touch", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Click", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "38c99815-14ea-4617-8627-164d27641299", - "path": "/scroll", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "ScrollWheel", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4c191405-5738-4d4b-a523-c6a301dbf754", - "path": "/rightButton", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "RightClick", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", - "path": "/middleButton", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "MiddleClick", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", - "path": "/devicePosition", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "TrackedDevicePosition", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", - "path": "/deviceRotation", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "TrackedDeviceOrientation", - "isComposite": false, - "isPartOfComposite": false - } - ] - } - ], - "controlSchemes": [ - { - "name": "Keyboard&Mouse", - "bindingGroup": "Keyboard&Mouse", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - }, - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Gamepad", - "bindingGroup": "Gamepad", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Touch", - "bindingGroup": "Touch", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Joystick", - "bindingGroup": "Joystick", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "XR", - "bindingGroup": "XR", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - } - ] -} \ No newline at end of file diff --git a/Assets/InputSystem_Actions.inputactions.meta b/Assets/InputSystem_Actions.inputactions.meta deleted file mode 100644 index 86f84a5..0000000 --- a/Assets/InputSystem_Actions.inputactions.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 34a28de1376caf34fb343f031ba811c4 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} - generateWrapperCode: 0 - wrapperCodePath: - wrapperClassName: - wrapperCodeNamespace: diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta index 8898e87..e69ff05 100644 --- a/Assets/Plugins.meta +++ b/Assets/Plugins.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: W3gf43v7AX7cTPQxR8YjE1dpIPTV5wZRzpHYu5Fn0KISlXqsRzLtc1A= +guid: c4dfdd550d12e1d4aa56014cee40e4a9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/Android.meta b/Assets/Plugins/Android.meta index c877c3d..bcedb22 100644 --- a/Assets/Plugins/Android.meta +++ b/Assets/Plugins/Android.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: WXkcvXv4UX1/JuVoVKRpheP6zqwavizmXJNdeXG0oEB4Ijk2wBHOKM0= +guid: fa79a8f597c768248ad8a35516009bf8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/Android/libGfxPluginNativeRender.so.meta b/Assets/Plugins/Android/libGfxPluginNativeRender.so.meta index 01e2f71..5ec4bcf 100644 --- a/Assets/Plugins/Android/libGfxPluginNativeRender.so.meta +++ b/Assets/Plugins/Android/libGfxPluginNativeRender.so.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: DCkXsnv/B34eOwGENG/puU/aLspZXxc9PezQb5HZ7ZE2dZf9faeP2Qk= +guid: f8284eb94f7b72e4d9e029cee95a1e07 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -28,12 +28,6 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - - first: - HMIAndroid: HMIAndroid - second: - enabled: 1 - settings: - CPU: ARM64 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Mac.meta b/Assets/Plugins/Mac.meta index 32ebf66..eaa0400 100644 --- a/Assets/Plugins/Mac.meta +++ b/Assets/Plugins/Mac.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: W3JN4Cj8AnjAT4EnoFgVw0sGIaewWtDOmemEk0j3KPLe8qKzB87y+4o= +guid: b322e69d6a5404e4ab31237060f7c858 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/Mac/MetalFX.swift.meta b/Assets/Plugins/Mac/MetalFX.swift.meta index bbc5c2f..41f9242 100644 --- a/Assets/Plugins/Mac/MetalFX.swift.meta +++ b/Assets/Plugins/Mac/MetalFX.swift.meta @@ -1,27 +1,16 @@ fileFormatVersion: 2 -guid: XSwctyOuUi5e8vo1FC1TvohNJQv3y7dKjVgiFt4zcpHYPc0SwU/5aw8= +guid: 9bcaa39a334766a409b877683193cb9d PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} defineConstraints: [] - isPreloaded: 1 + isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 1 - Exclude Linux64: 0 - Exclude OSXUniversal: 0 - Exclude Win: 0 - Exclude Win64: 0 - Exclude iOS: 0 - first: Any: second: @@ -32,42 +21,12 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: Metal;MetalKit; + settings: {} - first: tvOS: tvOS second: diff --git a/Assets/Plugins/Mac/libGfxPluginNativeRender.dylib.meta b/Assets/Plugins/Mac/libGfxPluginNativeRender.dylib.meta index 2477013..5fafd4a 100644 --- a/Assets/Plugins/Mac/libGfxPluginNativeRender.dylib.meta +++ b/Assets/Plugins/Mac/libGfxPluginNativeRender.dylib.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: XS4X4HupWi2gadg8zmdPT5zNR10R7w++TxzTA0SIyDZ5yDSx5FMZFyA= +guid: 946ddfffa01fb0f47b3b78eb66f8216e PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/Windows.meta b/Assets/Plugins/Windows.meta index cc48dbc..c2c0f0f 100644 --- a/Assets/Plugins/Windows.meta +++ b/Assets/Plugins/Windows.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: WSsfty/7UH++iuK/tWenHX7H1q9yLZfCPmEk6KR2UPRA8V8V0XNmP4I= +guid: e90eec6d2c5c20645a94987542273fad folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/Windows/GfxPluginNativeRender.dll.meta b/Assets/Plugins/Windows/GfxPluginNativeRender.dll.meta index f28d4f7..5eb295c 100644 --- a/Assets/Plugins/Windows/GfxPluginNativeRender.dll.meta +++ b/Assets/Plugins/Windows/GfxPluginNativeRender.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: DCtMtCn5U3xMS7shR8OwiBEID90HAVK1x74mzYKnSk8WZJSdtVLPTY0= +guid: 5f2d1973ed81cfa48a2454937af74b84 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/Windows/libxess.dll.meta b/Assets/Plugins/Windows/libxess.dll.meta index 44c309d..1a746b2 100644 --- a/Assets/Plugins/Windows/libxess.dll.meta +++ b/Assets/Plugins/Windows/libxess.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: CXtK5iilVi2vEbG9dAhdz7u8sY5CU6sNVZp12U9UqlsjYk/4wrgr5h0= +guid: 4cb43d44daaa0754ab8d56c6424aa456 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/iOS.meta b/Assets/Plugins/iOS.meta index d80b09f..4c5f1a5 100644 --- a/Assets/Plugins/iOS.meta +++ b/Assets/Plugins/iOS.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: DigdsiypBntkIGjYWr/lNCnMHSLZ68PUXpepr1/9PL0GHp8HjiLc37A= +guid: 6faee7077f57a2e498249d5c3f8d4353 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Plugins/iOS/IUnityGraphics.h.meta b/Assets/Plugins/iOS/IUnityGraphics.h.meta index bb78456..c977864 100644 --- a/Assets/Plugins/iOS/IUnityGraphics.h.meta +++ b/Assets/Plugins/iOS/IUnityGraphics.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: DnxM43+uBi5PTN+VjLUhJiqWT35vZ3X/qYGSh1s9ygOCPHX7gp770Po= +guid: 2c90f02ae241f2846abf6e12468613a1 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/iOS/RegisterPlugin.mm.meta b/Assets/Plugins/iOS/RegisterPlugin.mm.meta index e60ce08..3d26d29 100644 --- a/Assets/Plugins/iOS/RegisterPlugin.mm.meta +++ b/Assets/Plugins/iOS/RegisterPlugin.mm.meta @@ -1,27 +1,16 @@ fileFormatVersion: 2 -guid: BykYsCOpBX+d2b+9FYpH4sRtQQWfzWt//qzo8usCE85bX6WDY31ZgjI= +guid: 0fd0862097aaef849a0b7c5acd8ff8f2 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} defineConstraints: [] - isPreloaded: 1 + isPreloaded: 0 isOverridable: 0 isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - first: Any: second: @@ -32,42 +21,13 @@ PluginImporter: second: enabled: 0 settings: - CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 settings: AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/iOS/libGfxPluginNativeRender.a.meta b/Assets/Plugins/iOS/libGfxPluginNativeRender.a.meta index 65b987b..5eb2e78 100644 --- a/Assets/Plugins/iOS/libGfxPluginNativeRender.a.meta +++ b/Assets/Plugins/iOS/libGfxPluginNativeRender.a.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: XHlJsC2uB38xAIi0lDpkCshxqvlTjn8VMSnmslbwsBuz6ljxkThu6So= +guid: a5d499eec1d3f2f42bf108bb60280ca2 PluginImporter: externalObjects: {} serializedVersion: 2 @@ -11,17 +11,6 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 0 - first: Any: second: @@ -32,42 +21,13 @@ PluginImporter: second: enabled: 0 settings: - CPU: ARM64 DefaultValueInitialized: true - OS: OSX - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - first: iPhone: iOS second: enabled: 1 settings: AddToEmbeddedBinaries: false - CPU: ARM64 - CompileFlags: - FrameworkDependencies: Metal;MetalKit; userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/Oasis/Art/Environment/Materials/OasisSunsetSkybox_Mat.mat b/Assets/Scenes/Oasis/Art/Environment/Materials/OasisSunsetSkybox_Mat.mat index 88ecc1b..2cb731f 100644 --- a/Assets/Scenes/Oasis/Art/Environment/Materials/OasisSunsetSkybox_Mat.mat +++ b/Assets/Scenes/Oasis/Art/Environment/Materials/OasisSunsetSkybox_Mat.mat @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:yousandi.cn,2023: +%TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: serializedVersion: 8 @@ -68,7 +68,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Tex: - m_Texture: {fileID: 8900000, guid: 5500c7bc667b55f49b29485c043a2b42, type: 3} + m_Texture: {fileID: 8900000, guid: 870ca4df5e7d0044eb0d94414730e50c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: diff --git a/Assets/Scenes/Oasis/Art/Environment/Textures/Cliff_Ramp.asset b/Assets/Scenes/Oasis/Art/Environment/Textures/Cliff_Ramp.asset index 1b48e8c..3749f1e 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:yousandi.cn,2023: +%TAG !u! tag:unity3d.com,2011: --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -56,17 +56,11 @@ Texture2D: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 - serializedVersion: 4 + serializedVersion: 2 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 @@ -97,6 +91,3 @@ 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 5bd384b..28c1180 100644 --- a/Assets/Scenes/Terminal/TerminalScene.scene +++ b/Assets/Scenes/Terminal/TerminalScene.scene @@ -1,17 +1,15 @@ %YAML 1.1 -%TAG !u! tag:yousandi.cn,2023: +%TAG !u! tag:unity3d.com,2011: --- !u!29 &1 OcclusionCullingSettings: m_ObjectHideFlags: 0 - serializedVersion: 3 - m_OcclusionCullingData: {fileID: 0} + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionEnabled: 0 - m_DisplayOccluded: 0 - m_SceneDepthBufferWidth: 512 - m_SceneDepthBufferHeight: 512 - m_ShadowDepthBufferWidth: 512 - m_ShadowDepthBufferHeight: 512 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 @@ -130,13 +128,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -202,13 +199,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -247,8 +243,6 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 - m_virtualGeometry: 0 - m_virtualGeometryShadow: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -362,13 +356,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -475,18 +468,16 @@ 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: 7 + serializedVersion: 6 m_Component: - component: {fileID: 34748359} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Room1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -625,11 +616,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 77392232} m_Layer: 6 - m_HasEditorInfo: 1 m_Name: Decals m_TagString: Untagged m_Icon: {fileID: 0} @@ -782,13 +772,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -895,20 +884,18 @@ 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: 7 + serializedVersion: 6 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} @@ -1160,13 +1147,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -1258,7 +1244,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &148144005 Transform: m_ObjectHideFlags: 0 @@ -1366,13 +1351,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -1479,20 +1463,18 @@ 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: 7 + serializedVersion: 6 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} @@ -1599,7 +1581,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &166933154 PrefabInstance: m_ObjectHideFlags: 0 @@ -2196,13 +2177,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -2309,7 +2289,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &207358429 PrefabInstance: m_ObjectHideFlags: 0 @@ -2586,12 +2565,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -2638,9 +2616,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.5 m_HDR: 1 @@ -3024,13 +2999,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -3122,7 +3096,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &313794917 Transform: m_ObjectHideFlags: 0 @@ -3144,11 +3117,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 322445010} m_Layer: 6 - m_HasEditorInfo: 1 m_Name: Ceiling Lamps m_TagString: Untagged m_Icon: {fileID: 0} @@ -3184,12 +3156,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 327637628} - component: {fileID: 327637629} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -3229,12 +3200,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 329013200} - component: {fileID: 329013201} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -3360,13 +3330,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -3473,20 +3442,18 @@ 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: 7 + serializedVersion: 6 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} @@ -3593,7 +3560,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &345371528 PrefabInstance: m_ObjectHideFlags: 0 @@ -3775,11 +3741,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 350564808} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Room3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3834,13 +3799,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -3932,7 +3896,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &366880042 Transform: m_ObjectHideFlags: 0 @@ -3954,12 +3917,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 382604655} - component: {fileID: 382604656} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -4174,13 +4136,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -4246,14 +4207,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -4322,7 +4282,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &397543236 Transform: m_ObjectHideFlags: 0 @@ -4493,13 +4452,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -4606,20 +4564,18 @@ 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: 7 + serializedVersion: 6 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} @@ -4726,7 +4682,6 @@ 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} @@ -4743,13 +4698,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -4856,20 +4810,18 @@ 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: 7 + serializedVersion: 6 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} @@ -4961,7 +4913,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &464446388 Transform: m_ObjectHideFlags: 0 @@ -4983,11 +4934,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 467429008} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Colliders m_TagString: Untagged m_Icon: {fileID: 0} @@ -5108,13 +5058,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -5221,7 +5170,6 @@ 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} @@ -5525,12 +5473,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 508733974} - component: {fileID: 508733975} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Right m_TagString: Untagged m_Icon: {fileID: 0} @@ -5579,13 +5526,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -5692,7 +5638,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &516457975 PrefabInstance: m_ObjectHideFlags: 0 @@ -5788,13 +5733,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -5886,7 +5830,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &517048127 Transform: m_ObjectHideFlags: 0 @@ -5908,13 +5851,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -6021,7 +5963,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &579692327 PrefabInstance: m_ObjectHideFlags: 0 @@ -6102,12 +6043,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -6175,13 +6115,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -6288,19 +6227,17 @@ 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: 7 + serializedVersion: 6 m_Component: - component: {fileID: 587682935} - component: {fileID: 587682936} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -6340,13 +6277,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -6453,7 +6389,6 @@ 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} @@ -6551,12 +6486,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 629140650} - component: {fileID: 629140651} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Left m_TagString: Untagged m_Icon: {fileID: 0} @@ -6605,12 +6539,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -6657,9 +6590,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.5 m_HDR: 1 @@ -6674,13 +6604,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -6772,7 +6701,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &635439114 Transform: m_ObjectHideFlags: 0 @@ -7094,13 +7022,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -7166,13 +7093,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -7279,7 +7205,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &659727765 PrefabInstance: m_ObjectHideFlags: 0 @@ -7571,13 +7496,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -7669,7 +7593,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &677783277 Transform: m_ObjectHideFlags: 0 @@ -7691,13 +7614,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -7804,7 +7726,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &694569156 PrefabInstance: m_ObjectHideFlags: 0 @@ -7987,13 +7908,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -8059,13 +7979,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -8172,18 +8091,16 @@ 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: 7 + serializedVersion: 6 m_Component: - component: {fileID: 737529738} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Room2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -8217,13 +8134,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -8330,20 +8246,18 @@ 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: 7 + serializedVersion: 6 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} @@ -8450,7 +8364,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &791936906 PrefabInstance: m_ObjectHideFlags: 0 @@ -8555,13 +8468,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -8668,7 +8580,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &806784677 PrefabInstance: m_ObjectHideFlags: 0 @@ -8855,13 +8766,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -8968,7 +8878,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &848157425 PrefabInstance: m_ObjectHideFlags: 0 @@ -9065,12 +8974,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -9117,9 +9025,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 1 m_HDR: 1 @@ -9139,12 +9044,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 867583717} - component: {fileID: 867583718} m_Layer: 11 - m_HasEditorInfo: 1 m_Name: FullscreenDissolve m_TagString: Untagged m_Icon: {fileID: 0} @@ -9272,14 +9176,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -9339,8 +9242,6 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 - m_virtualGeometry: 0 - m_virtualGeometryShadow: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9380,13 +9281,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -9493,21 +9393,19 @@ 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: 7 + serializedVersion: 6 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} @@ -9567,8 +9465,6 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 - m_virtualGeometry: 0 - m_virtualGeometryShadow: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9608,12 +9504,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 909084279} - component: {fileID: 909084280} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -10271,13 +10166,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -10316,8 +10210,6 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 - m_virtualGeometry: 0 - m_virtualGeometryShadow: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10357,12 +10249,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -10610,12 +10501,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -10662,9 +10552,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.5 m_HDR: 1 @@ -10679,13 +10566,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -10751,13 +10637,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -10864,20 +10749,18 @@ 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: 7 + serializedVersion: 6 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} @@ -10969,7 +10852,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &1002065099 Transform: m_ObjectHideFlags: 0 @@ -10991,13 +10873,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -11089,7 +10970,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &1003939888 Transform: m_ObjectHideFlags: 0 @@ -11197,13 +11077,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -11271,13 +11150,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -11384,20 +11262,18 @@ 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: 7 + serializedVersion: 6 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} @@ -11549,13 +11425,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -11662,7 +11537,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1081950986 PrefabInstance: m_ObjectHideFlags: 0 @@ -11841,13 +11715,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -11913,11 +11786,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1126794967} m_Layer: 6 - m_HasEditorInfo: 1 m_Name: Rock Lamps m_TagString: Untagged m_Icon: {fileID: 0} @@ -12050,13 +11922,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -12163,7 +12034,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1135150812 PrefabInstance: m_ObjectHideFlags: 0 @@ -12408,11 +12278,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1168380296} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Room2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -12559,14 +12428,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -12635,8 +12503,6 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 - m_virtualGeometry: 0 - m_virtualGeometryShadow: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12668,12 +12534,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -12741,13 +12606,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -12854,7 +12718,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1233749213 PrefabInstance: m_ObjectHideFlags: 0 @@ -13381,13 +13244,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -13494,20 +13356,18 @@ 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: 7 + serializedVersion: 6 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} @@ -13599,7 +13459,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &1278812356 Transform: m_ObjectHideFlags: 0 @@ -13719,12 +13578,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1301824148} - component: {fileID: 1301824149} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: CinematicVolume m_TagString: Untagged m_Icon: {fileID: 0} @@ -13769,14 +13627,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -13836,8 +13693,6 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 - m_virtualGeometry: 0 - m_virtualGeometryShadow: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13877,13 +13732,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -13990,19 +13844,17 @@ 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: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1317243099} - component: {fileID: 1317243098} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: SceneSetup m_TagString: Untagged m_Icon: {fileID: 0} @@ -14058,12 +13910,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1325026287} - component: {fileID: 1325026288} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Back m_TagString: Untagged m_Icon: {fileID: 0} @@ -14112,12 +13963,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1325839462} - component: {fileID: 1325839463} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -14234,12 +14084,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1340680834} - component: {fileID: 1340680835} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -14500,12 +14349,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1357497469} - component: {fileID: 1357497470} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -14550,13 +14398,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -14663,7 +14510,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1380703671 PrefabInstance: m_ObjectHideFlags: 0 @@ -14826,12 +14672,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1389637080} - component: {fileID: 1389637081} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -15006,11 +14851,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1399957440} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: ReferencePoint m_TagString: Untagged m_Icon: {fileID: 0} @@ -15038,12 +14882,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -15111,13 +14954,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -15390,13 +15232,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -15503,7 +15344,6 @@ 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} @@ -15667,12 +15507,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1510284358} - component: {fileID: 1510284360} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: TransitionManager m_TagString: Untagged m_Icon: {fileID: 0} @@ -15807,13 +15646,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -15920,19 +15758,17 @@ 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: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1524077123} - component: {fileID: 1524077124} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Center m_TagString: Untagged m_Icon: {fileID: 0} @@ -16240,13 +16076,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -16353,19 +16188,17 @@ 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: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1536161580} - component: {fileID: 1536161581} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -16405,12 +16238,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1552611713} - component: {fileID: 1552611714} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -16450,13 +16282,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -16563,7 +16394,6 @@ 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} @@ -16575,12 +16405,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1559356783} - component: {fileID: 1559356784} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Left m_TagString: Untagged m_Icon: {fileID: 0} @@ -16629,13 +16458,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -16727,7 +16555,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &1565870517 Transform: m_ObjectHideFlags: 0 @@ -16749,13 +16576,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -16862,18 +16688,16 @@ 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: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1575947928} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Colliders m_TagString: Untagged m_Icon: {fileID: 0} @@ -16904,11 +16728,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1578993559} m_Layer: 6 - m_HasEditorInfo: 1 m_Name: Colliders m_TagString: Untagged m_Icon: {fileID: 0} @@ -16937,13 +16760,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -17000,13 +16822,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -17113,19 +16934,17 @@ 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: 7 + serializedVersion: 6 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} @@ -17193,13 +17012,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -17291,7 +17109,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &1601868292 Transform: m_ObjectHideFlags: 0 @@ -17313,12 +17130,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1613590157} - component: {fileID: 1613590158} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -17452,11 +17268,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1636404061} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Room3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17492,13 +17307,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -17605,20 +17419,18 @@ 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: 7 + serializedVersion: 6 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} @@ -17725,7 +17537,6 @@ 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} @@ -17737,12 +17548,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1650985057} - component: {fileID: 1650985058} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -17782,13 +17592,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -17895,7 +17704,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1684424881 PrefabInstance: m_ObjectHideFlags: 0 @@ -18102,12 +17910,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1699875170} - component: {fileID: 1699875171} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -18319,12 +18126,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -18392,12 +18198,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -18444,9 +18249,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 4 m_HDR: 1 @@ -18550,11 +18352,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1741781312} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Lighting m_TagString: Untagged m_Icon: {fileID: 0} @@ -18586,13 +18387,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -18699,20 +18499,18 @@ 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: 7 + serializedVersion: 6 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} @@ -18819,7 +18617,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1764072537 PrefabInstance: m_ObjectHideFlags: 0 @@ -18920,12 +18717,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1776154087} - component: {fileID: 1776154088} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: RightFront m_TagString: Untagged m_Icon: {fileID: 0} @@ -18974,13 +18770,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -19087,7 +18882,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1795683442 PrefabInstance: m_ObjectHideFlags: 0 @@ -19180,12 +18974,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1797551579} - component: {fileID: 1797551580} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -19311,12 +19104,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -19384,12 +19176,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -19457,13 +19248,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -19570,7 +19360,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1830045412 PrefabInstance: m_ObjectHideFlags: 0 @@ -19933,13 +19722,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -20031,7 +19819,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &1854231617 Transform: m_ObjectHideFlags: 0 @@ -20053,12 +19840,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1854353491} - component: {fileID: 1854353492} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: CenterLeft m_TagString: Untagged m_Icon: {fileID: 0} @@ -20107,13 +19893,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -20220,20 +20005,18 @@ 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: 7 + serializedVersion: 6 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} @@ -20340,7 +20123,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1874106866 PrefabInstance: m_ObjectHideFlags: 0 @@ -20791,11 +20573,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1890990766} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Outdoor m_TagString: Untagged m_Icon: {fileID: 0} @@ -20918,13 +20699,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -21031,7 +20811,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &1905381696 PrefabInstance: m_ObjectHideFlags: 0 @@ -21124,12 +20903,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1905455819} - component: {fileID: 1905455820} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Left m_TagString: Untagged m_Icon: {fileID: 0} @@ -21178,13 +20956,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -21250,12 +21027,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -21302,9 +21078,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.1 m_HDR: 1 @@ -21319,13 +21092,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -21417,7 +21189,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &1960033401 Transform: m_ObjectHideFlags: 0 @@ -21439,12 +21210,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -21491,9 +21261,6 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_IntensityMultiplier: 1 m_BlendDistance: 0.5 m_HDR: 1 @@ -21508,12 +21275,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1977906697} - component: {fileID: 1977906698} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: RightBack m_TagString: Untagged m_Icon: {fileID: 0} @@ -21562,11 +21328,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1988248024} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: ReferencePoint m_TagString: Untagged m_Icon: {fileID: 0} @@ -21594,12 +21359,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1988605913} - component: {fileID: 1988605914} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -21639,12 +21403,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1995881869} - component: {fileID: 1995881870} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Right m_TagString: Untagged m_Icon: {fileID: 0} @@ -21693,12 +21456,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 1997154166} - component: {fileID: 1997154167} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -21833,13 +21595,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -21878,8 +21639,6 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 - m_virtualGeometry: 0 - m_virtualGeometryShadow: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -21919,11 +21678,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2023108639} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Root m_TagString: Untagged m_Icon: {fileID: 0} @@ -22052,13 +21810,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -22165,7 +21922,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!1001 &2028127299 PrefabInstance: m_ObjectHideFlags: 0 @@ -22350,11 +22106,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2050461559} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Room1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -22389,11 +22144,10 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2057804700} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Colliders m_TagString: Untagged m_Icon: {fileID: 0} @@ -22432,13 +22186,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -22545,19 +22298,17 @@ 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: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2077556283} - component: {fileID: 2077556284} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: CenterRight m_TagString: Untagged m_Icon: {fileID: 0} @@ -22606,13 +22357,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -22719,19 +22469,17 @@ 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: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2092480882} - component: {fileID: 2092480883} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -22771,13 +22519,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -22884,19 +22631,17 @@ 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: 7 + serializedVersion: 6 m_Component: - component: {fileID: 2105520693} - component: {fileID: 2105520694} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: Back m_TagString: Untagged m_Icon: {fileID: 0} @@ -23035,13 +22780,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -23133,7 +22877,6 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_UseOcclusionCulling: 1 --- !u!4 &2122278086 Transform: m_ObjectHideFlags: 0 @@ -23237,12 +22980,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -24894,7 +24636,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 141850471471409378, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 141850471471409436, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_Enabled @@ -24950,7 +24692,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2307673875293584181, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2307673875293584185, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_DefaultControlScheme @@ -25086,7 +24828,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2760477045267651031, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4682428349833130388, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_IsActive @@ -25122,7 +24864,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7019485897165914674, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_LocalRotation.w - value: -0.9006986 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7019485897165914674, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_LocalRotation.x @@ -25130,7 +24872,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7019485897165914674, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_LocalRotation.y - value: 0.43444455 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7019485897165914674, guid: 8e5bed6b8dcfed240a38affefd9c58f6, type: 3} propertyPath: m_LocalRotation.z @@ -25278,12 +25020,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -25387,12 +25128,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -25460,12 +25200,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -25588,12 +25327,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -25606,12 +25344,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -25695,12 +25432,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -25752,12 +25488,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -25841,12 +25576,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -25914,12 +25648,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -25987,12 +25720,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -26044,14 +25776,13 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -26115,12 +25846,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -26199,12 +25929,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 m_Component: - component: {fileID: 3547149926074068801} - component: {fileID: 3547149926074068800} m_Layer: 0 - m_HasEditorInfo: 1 m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} @@ -26217,13 +25946,12 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -26322,12 +26050,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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} @@ -26557,18 +26284,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a62f35552be2a4a4e8e2683b7aea565b, type: 3} m_Name: m_EditorClassIdentifier: - transform: {fileID: 1425990503} --- !u!1 &8509203744807723470 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 7 + serializedVersion: 6 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 9628bae..79c0d93 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:yousandi.cn,2023: +%TAG !u! tag:unity3d.com,2011: --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -28,7 +28,7 @@ MonoBehaviour: m_SupportsHDR: 1 m_HDRColorBufferPrecision: 0 m_MSAA: 1 - m_RenderScale: 0.6666667 + m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 1 m_FsrSharpness: 1 @@ -114,5 +114,5 @@ MonoBehaviour: m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 - superResolution: 0 + superResolution: 12 vrsRate: 0 diff --git a/Assets/Settings/Mobile/Mobile_High_Renderer.asset b/Assets/Settings/Mobile/Mobile_High_Renderer.asset index 29e0fbe..ba5c7ec 100644 --- a/Assets/Settings/Mobile/Mobile_High_Renderer.asset +++ b/Assets/Settings/Mobile/Mobile_High_Renderer.asset @@ -1,5 +1,46 @@ %YAML 1.1 -%TAG !u! tag:yousandi.cn,2023: +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8576419846133267094 +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 &-2621301742936824463 +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: a00dddc5b3ea7fe45953ccbd49b58b94, type: 3} + m_Name: GSR + m_EditorClassIdentifier: + m_Active: 0 + quality: 0 + v1settings: + EnableEdgeDirection: 1 + Mode: 1 + Sharp: 2 + MipMapBias: 0 + GSRV1Material: {fileID: 0} + v2settings: + UseCompute2Pass: 0 + GSRV2Material: {fileID: 0} + GSRV2ComputeShader: {fileID: 0} + FiveSample: 0 + Exposure_co_rcp: 1 + MipMapBias: 0 --- !u!114 &-2390300670611609275 MonoBehaviour: m_ObjectHideFlags: 0 @@ -49,6 +90,23 @@ MonoBehaviour: m_EditorClassIdentifier: m_Active: 0 quality: 0 +--- !u!114 &-965472831153162969 +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: f5759a0bb27e83b4ab2925ac09c35710, type: 3} + m_Name: DLSS + m_EditorClassIdentifier: + m_Active: 1 + quality: 2 + useOptimalSetting: 1 + sharpness: 0.126 + preExposure: 0.214 --- !u!114 &-194876054633339434 MonoBehaviour: m_ObjectHideFlags: 0 @@ -92,13 +150,12 @@ MonoBehaviour: - {fileID: -194876054633339434} - {fileID: -2390300670611609275} - {fileID: 2459758869679212578} - - {fileID: 1524480044783497712} - - {fileID: 6334271670068977784} - - {fileID: 1342351342872651138} - - {fileID: 6446168921458335383} - - {fileID: -1133205096357012623} - m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d12222f0f17d10860a28157820480586dae7578265b12b6ffda01297deaf157b647559715bfa05f80b46f0 - m_UseNativeRenderPass: 1 + - {fileID: -965472831153162969} + - {fileID: -2621301742936824463} + - {fileID: 4962205925092569722} + - {fileID: -8576419846133267094} + m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d122222735d34a93f399f2716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88 + m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} shaders: blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} @@ -249,6 +306,37 @@ MonoBehaviour: restoreCamera: 1 offset: {x: 0, y: 0, z: 0, w: 0} cameraFieldOfView: 60 +--- !u!114 &4962205925092569722 +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: b1643a5e9ea49724e8a7bc2c6f3713e1, type: 3} + m_Name: XESS + m_EditorClassIdentifier: + m_Active: 0 + xess1ConfigParam: + OutputWidth: 0 + OutputHeight: 0 + Quality: 0 + UseHiResMotionVectors: 0 + UseJitteredMotionVectors: 0 + UseMotionVectorsInNDC: 0 + UseExposureTexture: 0 + UseResponsiveMask: 0 + UseAutoExposure: 0 + EnableProfiling: 0 + InvertedDepth: 0 + VelocityScaleX: 0 + VelocityScaleY: 0 + JitterScaleX: 0 + JitterScaleY: 0 + ExposureScale: 0 + MipMapBias: 0 --- !u!114 &6334271670068977784 MonoBehaviour: m_ObjectHideFlags: 0 @@ -262,17 +350,3 @@ MonoBehaviour: m_Name: FSR m_EditorClassIdentifier: m_Active: 0 ---- !u!114 &6446168921458335383 -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: 3 diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs index ab09c4b..4e30616 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Passes/PostProcessPass.cs @@ -502,12 +502,12 @@ namespace UnityEngine.Rendering.Universal ref var colorDescriptor = ref cameraData.cameraTargetDescriptor; colorDescriptor.width = cameraData.camera.pixelWidth; colorDescriptor.height = cameraData.camera.pixelHeight; - if (asset.SuperResolution == ESuperResolution.GSR2_COMPUTE) - { - colorDescriptor.graphicsFormat = GraphicsFormat.R16G16B16A16_SFloat; - colorDescriptor.enableRandomWrite = true; // - } - if (asset.SuperResolution == ESuperResolution.XESS13) + if (asset.SuperResolution == ESuperResolution.GSR2_COMPUTE + || asset.SuperResolution == ESuperResolution.XESS13 + || asset.SuperResolution == ESuperResolution.DLSS1 + || asset.SuperResolution == ESuperResolution.DLSS2 + || asset.SuperResolution == ESuperResolution.DLSS3 + ) { colorDescriptor.enableRandomWrite = true; } @@ -533,6 +533,7 @@ namespace UnityEngine.Rendering.Universal destination = renderer.GetCameraColorBackBuffer(cmd); source = renderer.GetCameraColorFrontBuffer(cmd); + Swap(renderer); } // Motion blur diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering.meta index 016f345..aa4e52a 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: XikfsS7/UnoAgNXKddNVyz1/tYO4UFfDpvnwlKmlzB/K+GZ1gRjau/U= +guid: d1359975e53ebde4bbd8652c835d53a1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper.meta index c4e7762..291a915 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: CywXvS6rACqOz8AzXm3/guivoN49k5mf6LvMdWQIzrS3DCAVnaUZco0= +guid: 597c52e7f25ff954f9426380ab0e581e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs.meta index 8da0bec..ce620b9 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: CH5L5H/+UnxEqSGXd00s74+tlixjysHWCidinvgkiMYx+vrFdSyumYo= +guid: ce7c84f2c7907334abb2afb9b693dbaa MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF.meta index 1699390..3795370 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: Dnse5nikW3lDClHjchcaNSIwtFnD3IZD6O5Jv4DBslNYbmV5VYF6BAc= +guid: d735d3e4bca0d9a41b52c565e261e77d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF/FG.cs.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF/FG.cs.meta index 8ac07ea..b3d1fe9 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF/FG.cs.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF/FG.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: DHJO436qVXPaiPjBKhVktuljyOEvzwR/ZfvT3gJYnQT8IrDHNkCZa/4= +guid: 1f0655fe633517d4da6440ee34b24ce8 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR.meta index 618feeb..3ecf62e 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: CHoZsH+lACq3nmUmbXW4hC5C04NxGerlNAUP1I3Ew2nYwjuICu5QVWA= +guid: 601d737ff1de19a47ad547da58b375e0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts.meta index 460d8b6..fdebe76 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: XXwd4y+tB3qPhWoI5VosMX+ua2BaJ7tFCL4jGtz1LP1EIzwWfTufPK4= +guid: 189651f579f585543ac1354d50fc2f0c folderAsset: yes DefaultImporter: externalObjects: {} 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 5e59879..311c2fd 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 @@ -7,7 +7,13 @@ namespace X.Rendering.Feature public class DLSS : ScriptableRendererFeature, ISuperResolutionFeature { [SerializeField] - public UnityEngine.NVIDIA.DLSSQuality quality; + private UnityEngine.NVIDIA.DLSSQuality quality; + [SerializeField] + private bool useOptimalSetting = false; + [SerializeField, Range(0, 2)] + private float sharpness; + [SerializeField, Range(0, 2)] + private float preExposure; private ProfilingSampler profiler; private static uint expectedDeviceVersion = 0x04; @@ -16,7 +22,23 @@ namespace X.Rendering.Feature public static bool SupportDLSS { get => supportDLSS;} private UnityEngine.NVIDIA.GraphicsDevice gfxDevice = null; + private UnityEngine.NVIDIA.DLSSContext dlssContext; + struct DlssStatus + { + public UnityEngine.NVIDIA.DLSSQuality quality; + public bool useOptimalSetting; + public float sharpness; + public uint inResultionW; + public uint inResultionH; + public uint outResultionW; + public uint outResultionH; + } + private DlssStatus dlssStatus; + private UnityEngine.NVIDIA.OptimalDLSSSettingsData optimalSettings = new(); + private RTHandle biasColorMask; + private bool resetHistory; + public static bool InitFeature() { if (!UnityEngine.NVIDIA.NVUnityPlugin.IsLoaded()) @@ -34,31 +56,148 @@ namespace X.Rendering.Feature { return false; } - var device = UnityEngine.NVIDIA.GraphicsDevice.CreateGraphicsDevice(); + return device != null && device.IsFeatureAvailable(UnityEngine.NVIDIA.GraphicsDeviceFeature.DLSS); } public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) { } - + bool playInit = false; public override void Create() { + if (gfxDevice != null && playInit) + { + return; + } supportDLSS = InitFeature(); profiler = new ProfilingSampler("NV.DLSS"); gfxDevice = UnityEngine.NVIDIA.GraphicsDevice.device; + resetHistory = true; + if (Application.isPlaying) + { + playInit = true; + } + } + + + private void UpdateDlssContext(in CommandBuffer cmd, in DlssStatus dlssStatus) + { + if (dlssContext != null) + { + gfxDevice.DestroyFeature(cmd, dlssContext); + dlssContext = null; + } + + var settings = new UnityEngine.NVIDIA.DLSSCommandInitializationData(); + settings.SetFlag(UnityEngine.NVIDIA.DLSSFeatureFlags.IsHDR, true); + settings.SetFlag(UnityEngine.NVIDIA.DLSSFeatureFlags.MVLowRes, true); + settings.SetFlag(UnityEngine.NVIDIA.DLSSFeatureFlags.DepthInverted, true); + settings.SetFlag(UnityEngine.NVIDIA.DLSSFeatureFlags.DoSharpening, true); + settings.inputRTWidth = dlssStatus.inResultionW; + settings.inputRTHeight = dlssStatus.inResultionH; + settings.outputRTWidth = dlssStatus.outResultionW; + settings.outputRTHeight = dlssStatus.outResultionH; + settings.quality = dlssStatus.quality; + dlssContext = gfxDevice.CreateFeature(cmd, settings); } public void DoSR(CommandBuffer cmd, RTHandle source, RTHandle destination, RTHandle motionVector, ref RenderingData renderingData) { using var scp = new ProfilingScope(cmd, profiler); + var camerdData = renderingData.cameraData; + uint inputWidth = (uint)source.referenceSize.x; + uint inputHeight = (uint)source.referenceSize.y; + uint outputWidth = (uint)camerdData.pixelWidth; + uint outputHeight = (uint)camerdData.pixelHeight; + gfxDevice.GetOptimalSettings(outputWidth, outputHeight, quality, out optimalSettings); + bool reset = false; + if (resetHistory || dlssContext == null || dlssStatus.quality != quality + || dlssStatus.inResultionW != inputWidth || dlssStatus.inResultionH != inputHeight + || dlssStatus.outResultionW != outputWidth || dlssStatus.outResultionH != outputHeight + || dlssStatus.useOptimalSetting != useOptimalSetting + ) + { + reset = true; + resetHistory = false; + + dlssStatus.quality = quality; + dlssStatus.inResultionW = inputWidth; + dlssStatus.inResultionH = inputHeight; + dlssStatus.useOptimalSetting = useOptimalSetting; + dlssStatus.outResultionW = outputWidth; + dlssStatus.outResultionH = outputHeight; + UpdateDlssContext(cmd, dlssStatus); + } + + //RenderingUtils.ReAllocateIfNeeded(ref biasColorMask, new() + //{ + // graphicsFormat = UnityEngine.Experimental.Rendering.GraphicsFormat.R8_UNorm, + // width = (int)inputWidth, + // height = (int)inputHeight, + // depthBufferBits = 0, + // msaaSamples = 1, + // dimension = TextureDimension.Tex2D + + //}, FilterMode.Point, TextureWrapMode.Clamp); + var textureTable = new UnityEngine.NVIDIA.DLSSTextureTable() + { + colorInput = source, + colorOutput = destination, + depth = renderingData.cameraData.renderer.cameraDepthTargetHandle, + motionVectors = motionVector, + //biasColorMask = biasColorMask + }; + + SuperResolutionParamSets.Instance.Set("NeedJitter", true); + //SuperResolutionParamSets.Instance.Set("MipmapBias", xess1ConfigParam.MipMapBias); + + var jitter = TemporalAA.CurrentJitter; + + dlssContext.executeData.sharpness = useOptimalSetting ? optimalSettings.sharpness : sharpness; + dlssContext.executeData.mvScaleX = -((float)inputWidth); + dlssContext.executeData.mvScaleY = -((float)inputHeight); + dlssContext.executeData.subrectOffsetX = 0; + dlssContext.executeData.subrectOffsetY = 0; + dlssContext.executeData.subrectWidth = inputWidth; + dlssContext.executeData.subrectHeight = inputHeight; + dlssContext.executeData.jitterOffsetX = -jitter.x; + dlssContext.executeData.jitterOffsetY = -jitter.y; + dlssContext.executeData.preExposure = preExposure; + dlssContext.executeData.invertYAxis = 1u; + dlssContext.executeData.invertXAxis = 0u; + dlssContext.executeData.reset = reset ? 1 : 0; + + gfxDevice.ExecuteDLSS(cmd, dlssContext, textureTable); } public float GetRenderScale() { - return 0; + switch (quality) + { + case UnityEngine.NVIDIA.DLSSQuality.MaximumQuality: + { + return 1f; + } + case UnityEngine.NVIDIA.DLSSQuality.Balanced: + { + return 0.75f; + } + case UnityEngine.NVIDIA.DLSSQuality.MaximumPerformance: + { + return 0.5f; + } + case UnityEngine.NVIDIA.DLSSQuality.UltraPerformance: + { + return 1.0f / 3; + } + default: + break; + } + + return 0.5f; } public void SetSR(ESuperResolution resolution) diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs.meta index cc8009c..ea6651e 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: Cy9Nt3n+W3hDJG+ZFGXRsiMRG5HzmWs7zQeWLxDvXMtBHl5sJI455Ak= +guid: f5759a0bb27e83b4ab2925ac09c35710 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/FSR.cs.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/FSR.cs.meta index 323d9c5..95df75c 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/FSR.cs.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/FSR.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: Wi8W5CqpBnyRtSrKEIJWDr05e5gDl/CYWX5mQ1jkad/OTRozQA3Lric= +guid: 386e439eeef2849448d91896c74ff1d5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/GSR.cs.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/GSR.cs.meta index 39fd4fb..af239b6 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/GSR.cs.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/GSR.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: XnxNvXj8VnrbqhHxZs/kkq1cV/yQSWe7bXUsK3e7ihU4lcfjr13lxxc= +guid: a00dddc5b3ea7fe45953ccbd49b58b94 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/SR.cs.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/SR.cs.meta index 971ec1b..f25f9ac 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/SR.cs.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/SR.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: C30W4CitV3I827oKpG928HoF40nnBdsmT433hyCpdgRUQ+rTZLrHSow= +guid: e606a88f5429fe34797c11c684c4b89c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS.cs.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS.cs.meta index 0b2c156..8190bdf 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS.cs.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/XESS.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: XHlMsSmkUnqD7anEmz652oCNyEfaXhRDBzQ7mUApwFc8gavrk9akMoQ= +guid: b1643a5e9ea49724e8a7bc2c6f3713e1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Shader.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Shader.meta index e9115b9..b5e6abb 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Shader.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Shader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: WS4atS+kWygJE/dWIAe2r4NSXkM0MC489zuGBUId21CiVzMzdF6M878= +guid: 2bce6da647c737d479694873eaa31897 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Shader/MRP_SR_GSR1.mat.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Shader/MRP_SR_GSR1.mat.meta index a66ee1a..3833730 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Shader/MRP_SR_GSR1.mat.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Shader/MRP_SR_GSR1.mat.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: d57e64d5723127243b429034bed82c7d NativeFormatImporter: externalObjects: {} - mainObjectFileID: 2100000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Shader/MRP_SR_GSR2.mat.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Shader/MRP_SR_GSR2.mat.meta index fb03141..7a5ccd4 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Shader/MRP_SR_GSR2.mat.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Shader/MRP_SR_GSR2.mat.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: faa906817c0647f42a0cec70faeb91c1 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 2100000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SRSettings.cs.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SRSettings.cs.meta index fe263c0..027d847 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SRSettings.cs.meta +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SRSettings.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: DX0fsSmrWy0LqrNOLBZPpt0SfpaO80cR9yeCiv2NkP1zAckeIKg8J24= +guid: b7e94215cd1dae742bf691dfd310e1ad MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/UniversalRenderPipeline.cs b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/UniversalRenderPipeline.cs index 86bd10a..ce3f8e7 100644 --- a/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/UniversalRenderPipeline.cs +++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/UniversalRenderPipeline.cs @@ -140,9 +140,11 @@ namespace UnityEngine.Rendering.Universal { get { +#if !UNITY_2022_3_51 bool isMaxVisibleLights16 = GraphicsSettings.HasShaderDefine(BuiltinShaderDefine.SHADER_API_MAX_VISIBLE_LIGHTS_16); if (isMaxVisibleLights16) return k_MaxVisibleAdditionalLightsMobileShaderLevelLessThan45; +#endif // Must match: Input.hlsl, MAX_VISIBLE_LIGHTS bool isMobile = GraphicsSettings.HasShaderDefine(BuiltinShaderDefine.SHADER_API_MOBILE); if (isMobile && (SystemInfo.graphicsDeviceType == GraphicsDeviceType.OpenGLES2 || (SystemInfo.graphicsDeviceType == GraphicsDeviceType.OpenGLES3 && Graphics.minOpenGLESVersion <= OpenGLESVersion.OpenGLES30))) diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f9fe65b..b61e7ef 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,14 +1,14 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.17", + "version": "1.8.18", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.cinemachine": { "version": "2.10.1", @@ -17,28 +17,28 @@ "dependencies": { "com.unity.test-framework": "1.1.31" }, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.collab-proxy": { "version": "2.5.2", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.editorcoroutines": { "version": "1.0.0", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.ide.rider": { "version": "3.0.31", @@ -47,7 +47,7 @@ "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.ide.visualstudio": { "version": "2.0.22", @@ -56,14 +56,14 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.ide.vscode": { "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.inputsystem": { "version": "1.11.0", @@ -72,7 +72,7 @@ "dependencies": { "com.unity.modules.uielements": "1.0.0" }, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.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.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.mathematics": { "version": "1.2.6", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.memoryprofiler": { "version": "1.1.1", @@ -98,7 +98,7 @@ "dependencies": { "com.unity.editorcoroutines": "1.0.0" }, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.recorder": { "version": "4.0.3", @@ -107,7 +107,7 @@ "dependencies": { "com.unity.timeline": "1.0.0" }, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.render-pipelines.core": { "version": "14.0.11", @@ -145,14 +145,14 @@ "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.settings-manager": { "version": "2.0.1", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.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.tuanjie.cn" + "url": "https://packages.unity.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.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.textmeshpro": { "version": "3.0.7", @@ -192,7 +192,7 @@ "dependencies": { "com.unity.ugui": "1.0.0" }, - "url": "https://packages.tuanjie.cn" + "url": "https://packages.unity.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.tuanjie.cn" + "url": "https://packages.unity.cn" }, "com.unity.ugui": { "version": "1.0.0", @@ -237,10 +237,7 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.animation": "1.0.0" - } + "dependencies": {} }, "com.unity.modules.audio": { "version": "1.0.0", diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 29adbd0..597cef8 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:yousandi.cn,2023: +%TAG !u! tag:unity3d.com,2011: --- !u!114 &1 MonoBehaviour: m_ObjectHideFlags: 61 @@ -21,7 +21,7 @@ MonoBehaviour: m_Registries: - m_Id: main m_Name: - m_Url: https://packages.tuanjie.cn + m_Url: https://packages.unity.cn m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 @@ -31,6 +31,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -868 - m_OriginalInstanceId: -870 + m_UserModificationsInstanceId: -834 + m_OriginalInstanceId: -836 m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index d9a9dc0..71b159c 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,3 +1,2 @@ -m_EditorVersion: 2022.3.48t1 -m_EditorVersionWithRevision: 2022.3.48t1 (8ad5b9288c6b) -m_TuanjieEditorVersion: 1.3.4 +m_EditorVersion: 2022.3.51f1c1 +m_EditorVersionWithRevision: 2022.3.51f1c1 (e9648b0586b8) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index 8ad2e55..3250b06 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:yousandi.cn,2023: +%TAG !u! tag:unity3d.com,2011: --- !u!114 &1 MonoBehaviour: m_ObjectHideFlags: 61 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index c3d7d29..f62c9b3 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -1,5 +1,5 @@ %YAML 1.1 -%TAG !u! tag:yousandi.cn,2023: +%TAG !u! tag:unity3d.com,2011: --- !u!162 &1 EditorUserSettings: m_ObjectHideFlags: 0 @@ -15,10 +15,10 @@ EditorUserSettings: value: 5b00515154055e035459547042705a44154f1e2c2e2e7f677e7d4567e1b9376d flags: 0 RecentlyUsedSceneGuid-3: - value: 57050d5004060d590f56087046700f4445164c7e7a7824312e7c4e6bb0e1376d + value: 5a57555407545f0b5e0f5f764277594914161e2b787977692b714e64e4b2363b flags: 0 RecentlyUsedSceneGuid-4: - value: 5a57555407545f0b5e0f5f764277594914161e2b787977692b714e64e4b2363b + value: 57050d5004060d590f56087046700f4445164c7e7a7824312e7c4e6bb0e1376d flags: 0 vcSharedLogLevel: value: 0d5e400f0650