From 25bc1ff025213c9b979cc01381648b63197d87df Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Tue, 12 Aug 2025 16:25:38 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=80=EB=A1=9C=EB=B2=8C=20=EC=9D=BC?= =?UTF-8?q?=EB=A3=A8=EB=AF=B8=EB=84=A4=EC=9D=B4=EC=85=98=20=EC=85=8B?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Settings/PC_Renderer.asset | 2 +- .../Common/Shaders/LitEnvironment.shadergraph | 649 +++++++++++++++++- .../BackgroundWall/BackgroundWall.prefab | 24 + .../Environments/Props/Fish/Fish.mat | 19 +- .../Props/FloorDoor/FloorDoor.mat | 17 + .../Props/Prop_BartenderTable.prefab | 6 +- .../Environments/Props/Prop_FloorDoor.prefab | 6 +- .../Environments/Props/Prop_WallBar.prefab | 6 +- .../Props/Prop_WallColumn01.prefab | 84 +-- .../Environments/Props/Prop_Window.prefab | 4 +- .../Environments/Props/Window2/WindowBack.mat | 2 + .../Props/_old/Prefabs/Old/Coral02.prefab | 4 + .../Prop/Lantern/PropLantern.prefab | 20 +- .../_Addressables/Scenes/Restaurant.unity | 174 ++++- .../Scenes/Restaurant/LightingData.asset | 4 +- .../Scenes/Restaurant/Lightmap-0_comp_dir.png | 4 +- .../Restaurant/Lightmap-0_comp_light.exr | 4 +- .../Scenes/Restaurant/Lightmap-1_comp_dir.png | 4 +- .../Restaurant/Lightmap-1_comp_light.exr | 4 +- .../Scenes/Restaurant/Lightmap-2_comp_dir.png | 4 +- .../Restaurant/Lightmap-2_comp_light.exr | 4 +- .../Scenes/Restaurant/Lightmap-3_comp_dir.png | 4 +- .../Restaurant/Lightmap-3_comp_light.exr | 4 +- .../Scenes/Restaurant/Lightmap-4_comp_dir.png | 4 +- .../Restaurant/Lightmap-4_comp_light.exr | 4 +- ...staurant Baking Set-Default.CellData.bytes | 2 +- ... Baking Set-Default.CellOptionalData.bytes | 2 +- ...Restaurant Baking Set.CellBricksData.bytes | 4 +- ...Restaurant Baking Set.CellSharedData.bytes | 2 +- ...estaurant Baking Set.CellSupportData.bytes | 2 +- .../Restaurant/Restaurant Baking Set.asset | 4 +- .../Environments/Env_Mesh_Geometry.prefab | 6 +- 32 files changed, 905 insertions(+), 178 deletions(-) diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index cb8b6f764..2621c5cb3 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3d94f40456ea85cdaa3cf04c9ffdb7eee4aad4501ad610b0cada66a00fc208a +oid sha256:07414ade5c9ce30e2bd64aeaba279b959964c8d62448e72d06aa64c57490cc8f size 5224 diff --git a/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph b/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph index 021257ebf..509d22d0c 100644 --- a/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph +++ b/Assets/_DDD/Common/Shaders/LitEnvironment.shadergraph @@ -47,6 +47,12 @@ }, { "m_Id": "72f0899fbf5c470f8ef90d70cdb5784c" + }, + { + "m_Id": "8fbf6b35e6e24eb78351203a51a3677b" + }, + { + "m_Id": "98c441d6e85a44fea743d7f1404eaabc" } ], "m_Keywords": [ @@ -91,6 +97,9 @@ }, { "m_Id": "463ea6973807410dabf0e3fad02dc93a" + }, + { + "m_Id": "f60a04c5451b47a79ebfb6bfe470f0fe" } ], "m_Nodes": [ @@ -261,6 +270,18 @@ }, { "m_Id": "c2aac6b4cbdb4350a02fdebd568e2de7" + }, + { + "m_Id": "ac9b749414aa44ba841083b2139f70d5" + }, + { + "m_Id": "1e7190b1f3b7443aadc9ed0c552e6139" + }, + { + "m_Id": "fd650abb3b5040fd9ccdc4ec64fba141" + }, + { + "m_Id": "a6a41bd4b9b74520a86d1da1472cde76" } ], "m_GroupDatas": [ @@ -293,6 +314,9 @@ }, { "m_Id": "3923201a51e041c9a8a1c2dad2fbf086" + }, + { + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" } ], "m_StickyNoteDatas": [], @@ -423,6 +447,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1e7190b1f3b7443aadc9ed0c552e6139" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ac9b749414aa44ba841083b2139f70d5" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -670,7 +708,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "c2aac6b4cbdb4350a02fdebd568e2de7" + "m_Id": "f913165a0168454a83d6f1ebe45f2604" }, "m_SlotId": 0 } @@ -768,7 +806,21 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "4d1430013dcb4815a91820d9d840532e" + "m_Id": "fd650abb3b5040fd9ccdc4ec64fba141" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a6a41bd4b9b74520a86d1da1472cde76" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "fd650abb3b5040fd9ccdc4ec64fba141" }, "m_SlotId": 1 } @@ -787,6 +839,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ac9b749414aa44ba841083b2139f70d5" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "8bef4ad136d34d1699462cbf5d39c11d" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -838,9 +904,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "f913165a0168454a83d6f1ebe45f2604" + "m_Id": "ac9b749414aa44ba841083b2139f70d5" }, - "m_SlotId": 0 + "m_SlotId": 1 } }, { @@ -1011,6 +1077,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "fd650abb3b5040fd9ccdc4ec64fba141" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4d1430013dcb4815a91820d9d840532e" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1034,7 +1114,21 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "8bef4ad136d34d1699462cbf5d39c11d" + "m_Id": "ac9b749414aa44ba841083b2139f70d5" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "fe14a7ba65b24516a6dc92571c6ecd71" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "c2aac6b4cbdb4350a02fdebd568e2de7" }, "m_SlotId": 0 } @@ -1084,8 +1178,8 @@ ], "m_VertexContext": { "m_Position": { - "x": 1098.9998779296875, - "y": -543.9999389648438 + "x": 2079.0, + "y": -556.9999389648438 }, "m_Blocks": [ { @@ -1101,8 +1195,8 @@ }, "m_FragmentContext": { "m_Position": { - "x": 1098.9998779296875, - "y": -331.9999694824219 + "x": 2079.0, + "y": -344.99993896484377 }, "m_Blocks": [ { @@ -1877,6 +1971,20 @@ "m_MipSamplingMode": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "18953a18e84f41809a0485d7d3bc5e50", + "m_Id": 0, + "m_DisplayName": "Predicate", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Predicate", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ParallaxMappingNode", @@ -2014,7 +2122,7 @@ "m_AlphaMode": 0, "m_RenderFace": 0, "m_AlphaClip": true, - "m_CastShadows": false, + "m_CastShadows": true, "m_ReceiveShadows": true, "m_DisableTint": false, "m_AdditionalMotionVectorMode": 0, @@ -2103,6 +2211,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "1e7190b1f3b7443aadc9ed0c552e6139", + "m_Group": { + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1989.0, + "y": -1061.0, + "width": 118.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "64ff16502e5f4a108a9bfea02d90615a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "8fbf6b35e6e24eb78351203a51a3677b" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -3004,16 +3148,16 @@ "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", "m_ObjectId": "4d1430013dcb4815a91820d9d840532e", "m_Group": { - "m_Id": "" + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" }, "m_Name": "Multiply", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 383.0000305175781, - "y": 171.00003051757813, - "width": 207.99996948242188, + "x": 1422.0, + "y": -1084.0, + "width": 208.0, "height": 302.0 } }, @@ -3148,10 +3292,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 846.0, - "y": -252.99998474121095, - "width": 183.0, - "height": 34.0 + "x": 1825.9998779296875, + "y": -265.99993896484377, + "width": 183.0001220703125, + "height": 33.999969482421878 } }, "m_Slots": [ @@ -3172,6 +3316,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "54047b877a134a07abf761376e4b051b", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -3443,6 +3635,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5fa6eb0c430c4a2fb4046c0296651a44", + "m_Id": 1, + "m_DisplayName": "True", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "True", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.RedirectNodeData", @@ -3588,6 +3804,20 @@ "m_Space": 3 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "64ff16502e5f4a108a9bfea02d90615a", + "m_Id": 0, + "m_DisplayName": "ApplyGI", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + { "m_SGVersion": 2, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", @@ -3629,6 +3859,30 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "6812b5978ed345c99d1d498937833607", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", @@ -3795,6 +4049,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "6ede6feb75334e24ac10a3bf9ce1a684", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", @@ -4639,6 +4941,29 @@ "m_SerializedDescriptor": "SurfaceDescription.BaseColor" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", + "m_ObjectId": "8fbf6b35e6e24eb78351203a51a3677b", + "m_Guid": { + "m_GuidSerialized": "7c5560c7-277d-4bd4-939c-efdb7595530c" + }, + "m_Name": "ApplyGI", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "ApplyGI", + "m_DefaultReferenceName": "_ApplyGI", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": true +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4669,6 +4994,17 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "9432d5284a6b497a8096b7ae4723a7a3", + "m_Title": "GI", + "m_Position": { + "x": 857.0, + "y": -1294.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", @@ -4734,6 +5070,34 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "98c441d6e85a44fea743d7f1404eaabc", + "m_Guid": { + "m_GuidSerialized": "337bed26-e402-42b3-81b1-8a0c1e5652fc" + }, + "m_Name": "GlobalIlluminationIntensity", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "GlobalIlluminationIntensity", + "m_DefaultReferenceName": "_GlobalIlluminationIntensity", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 1.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", @@ -4764,6 +5128,21 @@ "m_ColorMode": 1 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "99ea492be1164bb180eb5ffb8ff271ed", + "m_Id": 0, + "m_DisplayName": "GlobalIlluminationIntensity", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -4902,17 +5281,17 @@ "m_Type": "UnityEditor.ShaderGraph.BakedGINode", "m_ObjectId": "9ea7841f7742473eac1d80cc97d2726c", "m_Group": { - "m_Id": "" + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" }, "m_Name": "Baked GI", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 237.0, - "y": 453.9999694824219, - "width": 183.0001220703125, - "height": 184.00003051757813 + "x": 882.0, + "y": -999.0, + "width": 183.0, + "height": 184.0 } }, "m_Slots": [ @@ -5013,6 +5392,42 @@ "m_IsEditable": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "a6a41bd4b9b74520a86d1da1472cde76", + "m_Group": { + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 895.0, + "y": -762.0, + "width": 212.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "99ea492be1164bb180eb5ffb8ff271ed" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "98c441d6e85a44fea743d7f1404eaabc" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.CategoryData", @@ -5190,6 +5605,52 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BranchNode", + "m_ObjectId": "ac9b749414aa44ba841083b2139f70d5", + "m_Group": { + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" + }, + "m_Name": "Branch", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1989.0, + "y": -1027.0, + "width": 208.0, + "height": 326.0 + } + }, + "m_Slots": [ + { + "m_Id": "18953a18e84f41809a0485d7d3bc5e50" + }, + { + "m_Id": "5fa6eb0c430c4a2fb4046c0296651a44" + }, + { + "m_Id": "e6c9e2a3f74c4a618a4e0e466ba835dd" + }, + { + "m_Id": "6812b5978ed345c99d1d498937833607" + } + ], + "synonyms": [ + "switch", + "if", + "else" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5619,15 +6080,15 @@ "m_Type": "UnityEditor.ShaderGraph.AddNode", "m_ObjectId": "c2aac6b4cbdb4350a02fdebd568e2de7", "m_Group": { - "m_Id": "" + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" }, "m_Name": "Add", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 644.0, - "y": 171.00003051757813, + "x": 1686.0, + "y": -1235.0, "width": 208.0, "height": 302.0 } @@ -6019,6 +6480,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "cdb63927f0624cfb9d76cef04110f3a5", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -6572,6 +7081,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "e6c9e2a3f74c4a618a4e0e466ba835dd", + "m_Id": 2, + "m_DisplayName": "False", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "False", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -6875,6 +7408,21 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "f60a04c5451b47a79ebfb6bfe470f0fe", + "m_Name": "Global Illumination", + "m_ChildObjectList": [ + { + "m_Id": "8fbf6b35e6e24eb78351203a51a3677b" + }, + { + "m_Id": "98c441d6e85a44fea743d7f1404eaabc" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -7012,6 +7560,49 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "fd650abb3b5040fd9ccdc4ec64fba141", + "m_Group": { + "m_Id": "9432d5284a6b497a8096b7ae4723a7a3" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1136.0, + "y": -901.0, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "6ede6feb75334e24ac10a3bf9ce1a684" + }, + { + "m_Id": "54047b877a134a07abf761376e4b051b" + }, + { + "m_Id": "cdb63927f0624cfb9d76cef04110f3a5" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -7039,10 +7630,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 944.9999389648438, - "y": -384.9999694824219, + "x": 366.0000305175781, + "y": -957.0, "width": 55.99993896484375, - "height": 23.999969482421876 + "height": 24.00006103515625 } }, "m_Slots": [ diff --git a/Assets/_DDD/Restaurant/Environments/Geometries/BackgroundWall/BackgroundWall.prefab b/Assets/_DDD/Restaurant/Environments/Geometries/BackgroundWall/BackgroundWall.prefab index 29c091f40..4d953ec07 100644 --- a/Assets/_DDD/Restaurant/Environments/Geometries/BackgroundWall/BackgroundWall.prefab +++ b/Assets/_DDD/Restaurant/Environments/Geometries/BackgroundWall/BackgroundWall.prefab @@ -60,6 +60,30 @@ PrefabInstance: propertyPath: m_Name value: BackgroundWall objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 7856941568993672895, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7856941568993672895, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8282162905857597943, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8282162905857597943, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 5b92de080ada94a51853bbc4570a6c12, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: diff --git a/Assets/_DDD/Restaurant/Environments/Props/Fish/Fish.mat b/Assets/_DDD/Restaurant/Environments/Props/Fish/Fish.mat index 472523ae9..4ddeb0dfa 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Fish/Fish.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/Fish/Fish.mat @@ -31,7 +31,7 @@ Material: - _OCCLUSIONMAP - _PARALLAXMAP m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 2450 @@ -63,10 +63,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -75,10 +83,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _ParallaxMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -137,6 +153,7 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseOpacityMask: 0 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZTest: 4 diff --git a/Assets/_DDD/Restaurant/Environments/Props/FloorDoor/FloorDoor.mat b/Assets/_DDD/Restaurant/Environments/Props/FloorDoor/FloorDoor.mat index 610c75257..541e49111 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/FloorDoor/FloorDoor.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/FloorDoor/FloorDoor.mat @@ -50,10 +50,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Emiss: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MOHS: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -62,10 +70,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _OpacityMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _ParallaxMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -124,6 +140,7 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _UseOpacityMask: 0 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 - _ZTest: 4 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_BartenderTable.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_BartenderTable.prefab index e10b528e4..670c5f12e 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_BartenderTable.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_BartenderTable.prefab @@ -58,7 +58,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer @@ -66,7 +66,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer @@ -74,7 +74,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_FloorDoor.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_FloorDoor.prefab index e5b143d83..0aeacbf34 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_FloorDoor.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_FloorDoor.prefab @@ -70,7 +70,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer @@ -78,7 +78,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer @@ -86,7 +86,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallBar.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallBar.prefab index 829863e5e..568d93b5d 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallBar.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallBar.prefab @@ -58,7 +58,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer @@ -66,7 +66,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer @@ -74,7 +74,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab index 69d3689d7..3fe481047 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_WallColumn01.prefab @@ -180,14 +180,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8881739536043914635} m_Modifications: - - target: {fileID: 469687031743160198, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 469687031743160198, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalScale.x value: 0.19592836 @@ -210,7 +202,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalPosition.z - value: 0.48826963 + value: 0.47600007 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalRotation.w @@ -256,38 +248,6 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} - - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Lightmapping - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7122967726149048717, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalPosition.z - value: -0.06 - objectReference: {fileID: 0} - - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8142201499108093331, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 8142201499108093331, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -432,14 +392,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8881739536043914635} m_Modifications: - - target: {fileID: 469687031743160198, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 469687031743160198, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalScale.x value: 0.19592836 @@ -462,7 +414,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalPosition.z - value: 0.48826963 + value: 0.476 objectReference: {fileID: 0} - target: {fileID: 2060291783277227268, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_LocalRotation.w @@ -508,38 +460,6 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} - - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5358278810492944094, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Lightmapping - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7122967726149048717, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_LocalPosition.z - value: -0.06 - objectReference: {fileID: 0} - - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 8000566592514339547, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8142201499108093331, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_Layer - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 8142201499108093331, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Window.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_Window.prefab index 098e1eba0..17af20956 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_Window.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_Window.prefab @@ -137,7 +137,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &1651310607354768263 Transform: @@ -277,7 +277,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags - value: 0 + value: 2147483647 objectReference: {fileID: 0} - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_Layer diff --git a/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowBack.mat b/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowBack.mat index 66be7fda2..96c7bbf25 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowBack.mat +++ b/Assets/_DDD/Restaurant/Environments/Props/Window2/WindowBack.mat @@ -104,6 +104,7 @@ Material: - _AddPrecomputedVelocity: 0 - _AlphaClip: 1 - _AlphaToMask: 1 + - _ApplyGI: 1 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 @@ -118,6 +119,7 @@ Material: - _DstBlendAlpha: 0 - _EMISSION: 0 - _EnvironmentReflections: 1 + - _GlobalIlluminationIntensity: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 diff --git a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral02.prefab b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral02.prefab index 03639ae26..d19b9804b 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral02.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/_old/Prefabs/Old/Coral02.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 833125971660403034, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Sprite value: diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab index 72578bf64..42ba72ba8 100644 --- a/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab +++ b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab @@ -16,7 +16,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!4 &8812663732067019518 Transform: @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 469687031743160198} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 0, y: 0, z: 0.01} + m_LocalPosition: {x: 0, y: 0, z: 0.001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -114,7 +114,7 @@ Transform: m_GameObject: {fileID: 5358278810492944094} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.557, z: -0.022} + m_LocalPosition: {x: 0, y: 0.6, z: 0.001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -173,7 +173,7 @@ Light: m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 10 + m_BounceIntensity: 500 m_ColorTemperature: 6570 m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} @@ -260,6 +260,18 @@ PrefabInstance: propertyPath: m_Name value: PropLantern objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index e6e275586..52fdb7f9e 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -1496,6 +1496,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 405711182} m_Modifications: + - target: {fileID: 3406375906160120237, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3511876579184512741, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3782685999912116715, guid: 15c73973805ba914cbcc9929659591d9, type: 3} propertyPath: m_Size.x value: 1.05 @@ -1572,6 +1580,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 15c73973805ba914cbcc9929659591d9, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2130,6 +2142,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 589983953} m_Modifications: + - target: {fileID: 1924183298637050373, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -2182,6 +2198,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8283425785690863959, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_Name value: Prop_WallColumn01_004 @@ -2376,7 +2396,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3406375906160120237, guid: e4b1fd7999823d1489c618510cb4b1a7, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3511876579184512741, guid: e4b1fd7999823d1489c618510cb4b1a7, type: 3} propertyPath: m_Layer @@ -2384,7 +2404,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3511876579184512741, guid: e4b1fd7999823d1489c618510cb4b1a7, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: e4b1fd7999823d1489c618510cb4b1a7, type: 3} propertyPath: m_LocalScale.x @@ -2448,7 +2468,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: e4b1fd7999823d1489c618510cb4b1a7, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -5602,6 +5622,14 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Type + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Strength + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 4689806172687901599, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y value: 0 @@ -5796,6 +5824,10 @@ PrefabInstance: propertyPath: m_Lightmapping value: 1 objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_BounceIntensity value: 1 @@ -5827,6 +5859,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 969165171} m_Modifications: + - target: {fileID: 3392632814396210413, guid: ece30713fe5c65b4d9b7b3806e45408f, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3782685999912116715, guid: ece30713fe5c65b4d9b7b3806e45408f, type: 3} propertyPath: m_Enabled value: 1 @@ -6314,6 +6350,10 @@ PrefabInstance: propertyPath: m_Name value: Prop_FrontWall objectReference: {fileID: 0} + - target: {fileID: 3360314925300997339, guid: eb64f5e965ab06a4090e0dec428c911c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -6425,6 +6465,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 589983953} m_Modifications: + - target: {fileID: 1924183298637050373, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -6477,6 +6521,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8283425785690863959, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_Name value: Prop_WallColumn01_005 @@ -7075,6 +7123,10 @@ PrefabInstance: propertyPath: m_Lightmapping value: 1 objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_BounceIntensity value: 1 @@ -7219,6 +7271,14 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Type + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Strength + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 4689806172687901599, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y value: 0 @@ -7801,6 +7861,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 589983953} m_Modifications: + - target: {fileID: 1924183298637050373, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -7853,6 +7917,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8283425785690863959, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_Name value: Prop_WallColumn01_003 @@ -8675,6 +8743,14 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Type + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Strength + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.x value: -12.88694 @@ -9313,6 +9389,10 @@ PrefabInstance: propertyPath: m_Lightmapping value: 1 objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_BounceIntensity value: 1 @@ -9701,6 +9781,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 589983953} m_Modifications: + - target: {fileID: 1924183298637050373, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -9753,6 +9837,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8283425785690863959, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_Name value: Prop_WallColumn01_002 @@ -10510,6 +10598,10 @@ PrefabInstance: propertyPath: m_Lightmapping value: 1 objectReference: {fileID: 0} + - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5668719828645021795, guid: 1242b8c74c7b44c2ebdadb10189c01d7, type: 3} propertyPath: m_BounceIntensity value: 1 @@ -10687,6 +10779,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 589983953} m_Modifications: + - target: {fileID: 1924183298637050373, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -10739,6 +10835,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8283425785690863959, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_Name value: Prop_WallColumn01_001 @@ -12108,6 +12208,14 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Type + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Strength + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 4689806172687901599, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y value: 0 @@ -12184,6 +12292,10 @@ PrefabInstance: propertyPath: m_Name value: Prop_Window2_003 objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -13013,7 +13125,7 @@ Light: m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 - m_Strength: 0.5 + m_Strength: 0.6 m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.1 @@ -14808,6 +14920,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 405711182} m_Modifications: + - target: {fileID: 3406375906160120237, guid: 39c2bad790435fc448f5b3222198ef3f, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3511876579184512741, guid: 39c2bad790435fc448f5b3222198ef3f, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3782685999912116715, guid: 39c2bad790435fc448f5b3222198ef3f, type: 3} propertyPath: m_Enabled value: 0 @@ -14912,6 +15032,14 @@ PrefabInstance: propertyPath: m_Name value: Prop_FloorDoor_001 objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 39c2bad790435fc448f5b3222198ef3f, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9211739394093953175, guid: 39c2bad790435fc448f5b3222198ef3f, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -16251,6 +16379,14 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Type + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4478174117522877021, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} + propertyPath: m_Shadows.m_Strength + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 4689806172687901599, guid: 3c87e3a8fbdc65542a1bb2761b7518c0, type: 3} propertyPath: m_LocalPosition.y value: 0 @@ -18023,18 +18159,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1428769370} m_Modifications: - - target: {fileID: 43200463158696774, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 502577561992037683, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 2698668723082114449, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - target: {fileID: 3782685999912116715, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} propertyPath: m_Size.x value: 1.02 @@ -18061,7 +18185,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} propertyPath: m_LocalPosition.x - value: 8.05 + value: 8.127 objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 80e8672c53bf68341b6948acf3a4e04c, type: 3} propertyPath: m_LocalPosition.y @@ -19116,6 +19240,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 589983953} m_Modifications: + - target: {fileID: 1924183298637050373, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6689525833630355058, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -19168,6 +19296,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8283425785690863959, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} + propertyPath: m_Shadows.m_Type + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9211739394093953175, guid: 43fa7bdf6264bc14799847f99fbb63c9, type: 3} propertyPath: m_Name value: Prop_WallColumn01_006 @@ -19275,6 +19407,10 @@ PrefabInstance: propertyPath: m_Name value: Prop_SideWall_001 objectReference: {fileID: 0} + - target: {fileID: 3360314925300997339, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -19737,6 +19873,10 @@ PrefabInstance: propertyPath: m_Name value: Prop_SideWall objectReference: {fileID: 0} + - target: {fileID: 3360314925300997339, guid: 16126e3678ee6df4f9b33c1ea1e8497d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/LightingData.asset b/Assets/_DDD/_Addressables/Scenes/Restaurant/LightingData.asset index b34445ae0..d3654b834 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/LightingData.asset +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/LightingData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82dcc695096adb8d0bdb5ab22339e833ca714d91435a171c2d50a089c1891b88 -size 29857 +oid sha256:9ac8a6472c44a59e97d7642bc8e34a84aab8cec18abe5b1b4910c237ff285e2d +size 26769 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_dir.png index fa945c118..a56c478c8 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:022aa44cf18b62d8cb3574089047b87fd8d7cc9b52415242badd2540b331e0a7 -size 227354 +oid sha256:e2f79700d2ff3f812bb9e941e2cc71b153b02425996b260e6a1d223469088f5b +size 411792 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_light.exr index 1e74b16a4..21e203b20 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-0_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:644bd9c1f7341aef35daed7ab54b039b422ee64fa1eb9f32e68191b5b9d2b383 -size 4184975 +oid sha256:28c42bad91c266b645a2902ed22c68bb6cbed230a22e269efc55afab497804df +size 6153629 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_dir.png index c7fff91e4..aeae60a3c 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:215bb1e3c0e45aeaba8630be8e7858dfa762756c2ba9aab9c6612bfec604b48d -size 537295 +oid sha256:9dbafe0334cfcf101199aad128a84fe1c1e180af6ee76dd396a83a52ff6d8dd8 +size 628217 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_light.exr index 735cd3e29..6bd8d882e 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-1_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d5b567f6ab1d060a2b02651f9b18193191092b09027b05f4f2e4b0c7e0c6f70 -size 9574644 +oid sha256:177f941e83792d6591020eac497714ee6488ec37b7039105acc3975348d93729 +size 9057678 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_dir.png index ff3ba74fb..bfa9cee76 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f20d0c848b70887c25c6a38059d895170a9481d1a37e8fd76052374d7699f2f -size 745273 +oid sha256:15f879540b2e79f593c1b241cff7106db269f83e3ccbd96450391aa2bf2fb4b2 +size 850982 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_light.exr index 0826857d0..6379385dd 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-2_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55b51fa5c8cef1b4e14f50bab37e863f89ba33324e6f95f67ca36631fadeb67a -size 11803586 +oid sha256:54d9af136bcae3c19e4aaa63b33804b81a1d72205159ad283688f8236eaf5689 +size 11634515 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_dir.png index 171a86018..109719347 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c2f80b1a6df95a69d52089e3d37f6ad4962b3e38d80f9846423fdcf89306ec4 -size 487047 +oid sha256:a781954251c93c388d17a6e5f3d05c5d128a4b9e734cbe515f26e90abb6272ba +size 671278 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_light.exr index 82f74434e..2ec3b3bd8 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-3_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77e02c14664b51236582bd3b585c8b85729fd9b8cc34708565d09ff60a66c18b -size 7832853 +oid sha256:c2239352988528c43decd800fe01254f9da7ff4dea0ccabd69d8d22b1ad620fe +size 9180172 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_dir.png b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_dir.png index fa172aed1..b41632a6e 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_dir.png +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_dir.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99297166f913f2282b4bffb1c9b5d9d72c3e263bc12cb8dc196242c0b15a1300 -size 50330 +oid sha256:4a0a2d7b2c52e8695b236b0d6f0c5627b1ad908a998a520def70c1ea7fd28612 +size 1117 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_light.exr b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_light.exr index 4fe1c88e3..2f9960cc2 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_light.exr +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Lightmap-4_comp_light.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3faee729ba7a09dcfcb261dfb12c7daa6488d807f193fdd1812f643ea0dbe8ce -size 737909 +oid sha256:5779e068473823158defb11033c46536f98b051f435485bddc950c1f7e8872df +size 5643 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes index f27388fdf..dab2afad4 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellData.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7bdfbe3af83cef7a1ffc468a404e87a25380bea232140d8debc177024938867 +oid sha256:d0f502596a47e25072955e0ee0e5c6c7d8cca9f911ff34977efdc14d6b92d7fb size 262144 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes index 0ef4ca58c..b5e9315c0 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set-Default.CellOptionalData.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4937e47affd56b29576e2070bc262abc3441c658bd7df9f3fa544297644e237a +oid sha256:49dbf9a5a16788d39caa039bf720a08bc4c59260f2e2bcba371cdf34e438d98d size 262144 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes index 3bf7cc671..12bac61ac 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellBricksData.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd261e7861addcff9ead87ca048c0f07089a6b0f70017389feb83540b85f0237 -size 3520 +oid sha256:9078ca525e9954b8dd3488916cc0e3270f5076b3eef88bbccd31fe8f1ef45066 +size 3024 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes index 704302dba..a615801b3 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSharedData.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fad5915e7492e249bc036af7c3911a7ea29acf093a4c53310336cecf2daa7fd +oid sha256:58e947e9a4d04a03b8adb6c35ce11766c1dd0fd6fb8a2acf57a1d666386faf34 size 147456 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes index 5e9af9a7a..7aacb86ab 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.CellSupportData.bytes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:331b06b5c63e15d2a6b38fc8dca892bf5b1904e39b369ed69835d9e43faff262 +oid sha256:8c26ac4d13e976a2643c40faa0e06a6a62972f65275df5afc3d67a9d1c05ec9f size 524288 diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset index 0e9df0cb7..a465792f0 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant/Restaurant Baking Set.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9f59bf317639095fc1758c8e4ef76796847e298e944f7dcbcfc8b381e0b6560 -size 331733 +oid sha256:897d51ae5962fbd5d7179c943d84365bac8cd8f5abc57ca775187e4a412c66f0 +size 17821 diff --git a/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab b/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab index 9b5bca0d0..cb542d1f4 100644 --- a/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab +++ b/Assets/_DDD/_Raw/Environments/Env_Mesh_Geometry.prefab @@ -18,7 +18,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1063320636771556828, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1241020487330251412, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_Layer @@ -26,7 +26,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1241020487330251412, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_Name @@ -38,7 +38,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4732070946668798894, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7109183892527308107, guid: 470067ee89f8f4e63ababdb9c302bd74, type: 3} propertyPath: m_LocalPosition.x