diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index 2621c5cb3..92a61128a 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:07414ade5c9ce30e2bd64aeaba279b959964c8d62448e72d06aa64c57490cc8f -size 5224 +oid sha256:b979c11e4f07bdd2a3dc74b1da80d9ebe48f35ad16665e62dfb8c0b440b88c6c +size 9212 diff --git a/Assets/_DDD/Common/Shaders/PlayerStencil.shadergraph b/Assets/_DDD/Common/Shaders/PlayerStencil.shadergraph index 637e58a7e..a3e14a37b 100644 --- a/Assets/_DDD/Common/Shaders/PlayerStencil.shadergraph +++ b/Assets/_DDD/Common/Shaders/PlayerStencil.shadergraph @@ -44,6 +44,15 @@ }, { "m_Id": "a3c80b347ef046c0bc1d3269273f6fea" + }, + { + "m_Id": "50de2268964d4fc4b3bd4f1dc0c002bb" + }, + { + "m_Id": "61fab68b2f3b4369a28caf60c643eae9" + }, + { + "m_Id": "2aa776757f104079b20228516f4622f8" } ], "m_GroupDatas": [], @@ -77,6 +86,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2aa776757f104079b20228516f4622f8" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "3b485b1e5ced4f53b41de1bdc5151215" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -91,20 +114,6 @@ "m_SlotId": 1 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "d0ce7d094dec447ea6fcc3f96774f923" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "3b485b1e5ced4f53b41de1bdc5151215" - }, - "m_SlotId": 0 - } - }, { "m_OutputSlot": { "m_Node": { @@ -148,6 +157,9 @@ }, { "m_Id": "f7faf4f9d58c4df9b044e747a4d72a9a" + }, + { + "m_Id": "50de2268964d4fc4b3bd4f1dc0c002bb" } ] }, @@ -323,12 +335,12 @@ "m_Id": "0d29c53938814b749a04f0e8a61b89af" }, "m_AllowMaterialOverride": false, - "m_SurfaceType": 1, + "m_SurfaceType": 0, "m_ZTestMode": 4, "m_ZWriteControl": 2, "m_AlphaMode": 0, "m_RenderFace": 2, - "m_AlphaClip": false, + "m_AlphaClip": true, "m_CastShadows": true, "m_ReceiveShadows": true, "m_DisableTint": false, @@ -399,6 +411,42 @@ "m_MipSamplingMode": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "2aa776757f104079b20228516f4622f8", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 160.60818481445313, + "y": 507.3179931640625, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "6b0a7bb9e7de4867be29dabbfe3bc520" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "e85348c3d1dc479f8575b5791d30c9bc" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", @@ -566,6 +614,108 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "50de2268964d4fc4b3bd4f1dc0c002bb", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "c0c87694f3bc4ea6a6b5a1c364ac3045" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1Node", + "m_ObjectId": "61fab68b2f3b4369a28caf60c643eae9", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Float", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -138.9999542236328, + "y": 805.0000610351563, + "width": 116.00003814697266, + "height": 34.00006103515625 + } + }, + "m_Slots": [ + { + "m_Id": "7c3303decfbd40d59761cb44dc0a3d31" + }, + { + "m_Id": "c6020c17b22846ba9235ab60da67e7c3" + } + ], + "synonyms": [ + "Vector 1", + "1", + "v1", + "vec1", + "scalar" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Value": 0.0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "6b0a7bb9e7de4867be29dabbfe3bc520", + "m_Id": 0, + "m_DisplayName": "BaseColor", + "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_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", @@ -590,6 +740,21 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7c3303decfbd40d59761cb44dc0a3d31", + "m_Id": 1, + "m_DisplayName": "X", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "X", + "m_StageCapability": 3, + "m_Value": 0.5, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -654,8 +819,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 129.0, - "y": 108.0, + "x": 83.9999771118164, + "y": 90.99998474121094, "width": 208.0, "height": 302.0 } @@ -797,6 +962,21 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c0c87694f3bc4ea6a6b5a1c364ac3045", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -849,6 +1029,21 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c6020c17b22846ba9235ab60da67e7c3", + "m_Id": 0, + "m_DisplayName": "Out", + "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.BlockNode", diff --git a/Assets/_DDD/Restaurant/Characters/Player/Spine/MainCharacter_Stencil_Material.mat b/Assets/_DDD/Restaurant/Characters/Player/Spine/MainCharacter_Stencil_Material.mat index e34b96000..feba544be 100644 --- a/Assets/_DDD/Restaurant/Characters/Player/Spine/MainCharacter_Stencil_Material.mat +++ b/Assets/_DDD/Restaurant/Characters/Player/Spine/MainCharacter_Stencil_Material.mat @@ -63,6 +63,7 @@ Material: - _Cutoff: 0.1 - _DoubleSidedLighting: 0 - _LightAffectsAdditive: 0 + - _Opacity: 0.5 - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 diff --git a/Assets/_DDD/Restaurant/Environments/Geometries/RestaurantGround/RestaurantGround.prefab b/Assets/_DDD/Restaurant/Environments/Geometries/RestaurantGround/RestaurantGround.prefab index 8132dea3e..f03f66814 100644 --- a/Assets/_DDD/Restaurant/Environments/Geometries/RestaurantGround/RestaurantGround.prefab +++ b/Assets/_DDD/Restaurant/Environments/Geometries/RestaurantGround/RestaurantGround.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 8835311167308124458} - component: {fileID: 241574284133009341} - component: {fileID: 15447880633616622} - m_Layer: 0 + m_Layer: 3 m_Name: Plane m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 1.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 1.prefab index 65b3fa6ef..92eaf0009 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 1.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 1.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 7857189672518433004} - component: {fileID: 2501614416472258473} - component: {fileID: 9017823610648423131} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_004 m_TagString: Untagged m_Icon: {fileID: 0} @@ -97,7 +97,7 @@ GameObject: - component: {fileID: 6727915351210375460} - component: {fileID: 7518404612132152582} - component: {fileID: 4098434064772308400} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_003 m_TagString: Untagged m_Icon: {fileID: 0} @@ -183,7 +183,7 @@ GameObject: - component: {fileID: 7205601819533780546} - component: {fileID: 1351338171002337622} - component: {fileID: 4532696157954143371} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_005 m_TagString: Untagged m_Icon: {fileID: 0} @@ -269,7 +269,7 @@ GameObject: - component: {fileID: 8211332538887232571} - component: {fileID: 5693985379922020792} - component: {fileID: 2540024809278599235} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -355,7 +355,7 @@ GameObject: - component: {fileID: 8032813968137285366} - component: {fileID: 7775287767503856352} - component: {fileID: 4398746862490504318} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_006 m_TagString: Untagged m_Icon: {fileID: 0} @@ -441,7 +441,7 @@ GameObject: - component: {fileID: 4754284760536505136} - component: {fileID: 6086511103358333044} - component: {fileID: 6389774304370644126} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_002 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 2.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 2.prefab index bee8ecc5e..f44ebdbb6 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 2.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_GrillMeat 2.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 8927441586151414980} - component: {fileID: 5512123271003375021} - component: {fileID: 5210367358241826992} - m_Layer: 0 + m_Layer: 8 m_Name: VisualLook_002 m_TagString: Untagged m_Icon: {fileID: 0} @@ -97,7 +97,7 @@ GameObject: - component: {fileID: 8211332538887232571} - component: {fileID: 5693985379922020792} - component: {fileID: 2540024809278599235} - m_Layer: 0 + m_Layer: 8 m_Name: VisualLook_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -334,6 +334,10 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} propertyPath: m_StaticEditorFlags value: 0 diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_Refrigerator.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_Refrigerator.prefab index f2ce04cce..34d426923 100644 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_Refrigerator.prefab +++ b/Assets/_DDD/Restaurant/Environments/Props/Prop_Refrigerator.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 5034705976361966992} - component: {fileID: 6814456922268065288} - component: {fileID: 8026521092434122185} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_002 m_TagString: Untagged m_Icon: {fileID: 0} @@ -97,7 +97,7 @@ GameObject: - component: {fileID: 7159781468411195695} - component: {fileID: 8988209345456356862} - component: {fileID: 3757411897572263444} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_001 m_TagString: Untagged m_Icon: {fileID: 0} @@ -183,7 +183,7 @@ GameObject: - component: {fileID: 3703768966387483766} - component: {fileID: 6496825391945974316} - component: {fileID: 3907416760919235474} - m_Layer: 0 + m_Layer: 7 m_Name: VisualLook_003 m_TagString: Untagged m_Icon: {fileID: 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 d19b9804b..d6da5cf75 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_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 833125971660403034, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_SortingOrder value: 0 @@ -30,7 +34,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Layer - value: 16 + value: 7 objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -38,7 +42,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7835622629792856689, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_Layer - value: 16 + value: 7 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} propertyPath: m_LocalScale.x @@ -156,7 +160,7 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1267130311855284124 MonoBehaviour: diff --git a/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab index 42ba72ba8..51c531400 100644 --- a/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab +++ b/Assets/_DDD/_Addressables/Environments/Prop/Lantern/PropLantern.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 8812663732067019518} - component: {fileID: 3007032601211948582} - component: {fileID: 1974374480108892137} - m_Layer: 0 + m_Layer: 1 m_Name: VisualLook_Flame m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab index bafd45c81..013c5ef5f 100644 --- a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4318885206818761415 +--- !u!1 &6964515026568296306 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,9 +8,130 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 92685501732061756} - - component: {fileID: 4837437381441246234} - - component: {fileID: 7189397998236803397} + - component: {fileID: 7476222657412110048} + - component: {fileID: 4277184008289255055} + - component: {fileID: 1989103694703995626} + m_Layer: 0 + m_Name: CharacterLight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7476222657412110048 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6964515026568296306} + serializedVersion: 2 + m_LocalRotation: {x: 0.42261827, y: -0, z: -0, w: 0.9063079} + m_LocalPosition: {x: 0, y: 1.5, z: -0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7511707580127947132} + m_LocalEulerAnglesHint: {x: 50, y: 0, z: 0} +--- !u!108 &4277184008289255055 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6964515026568296306} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 2 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 5 + m_Range: 2.5 + m_SpotAngle: 120 + m_InnerSpotAngle: 90 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.1 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 64 + m_RenderingLayerMask: 2 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!114 &1989103694703995626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6964515026568296306} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 2 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1 &7889117055561491011 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7902811446395955698} + - component: {fileID: 1021115348555494531} + - component: {fileID: 6813050995913811272} m_Layer: 0 m_Name: Point Light m_TagString: Untagged @@ -18,34 +139,34 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &92685501732061756 +--- !u!4 &7902811446395955698 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4318885206818761415} + m_GameObject: {fileID: 7889117055561491011} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalPosition: {x: 0, y: 1, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7511707580127947132} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!108 &4837437381441246234 +--- !u!108 &1021115348555494531 Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4318885206818761415} + m_GameObject: {fileID: 7889117055561491011} m_Enabled: 1 serializedVersion: 11 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 5 - m_Range: 4 + m_Range: 20 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 @@ -81,7 +202,7 @@ Light: m_RenderMode: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 1 + m_Bits: 9 m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 @@ -98,134 +219,13 @@ Light: m_LightUnit: 1 m_LuxAtDistance: 1 m_EnableSpotReflector: 1 ---- !u!114 &7189397998236803397 +--- !u!114 &6813050995913811272 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4318885206818761415} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1 &6964515026568296306 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7476222657412110048} - - component: {fileID: 4277184008289255055} - - component: {fileID: 1989103694703995626} - m_Layer: 0 - m_Name: Spot Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7476222657412110048 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6964515026568296306} - serializedVersion: 2 - m_LocalRotation: {x: 0.42261827, y: -0, z: -0, w: 0.9063079} - m_LocalPosition: {x: 0, y: 2.009, z: -0.507} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7511707580127947132} - m_LocalEulerAnglesHint: {x: 50, y: 0, z: 0} ---- !u!108 &4277184008289255055 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6964515026568296306} - m_Enabled: 1 - serializedVersion: 11 - m_Type: 0 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 10 - m_Range: 2.5 - m_SpotAngle: 120 - m_InnerSpotAngle: 90 - m_CookieSize: 10 - m_Shadows: - m_Type: 0 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 64 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ForceVisible: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 - m_LightUnit: 1 - m_LuxAtDistance: 1 - m_EnableSpotReflector: 1 ---- !u!114 &1989103694703995626 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6964515026568296306} + m_GameObject: {fileID: 7889117055561491011} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} @@ -318,6 +318,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2182479135931305606, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 3095965496140440094, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: _initialSkinName value: Basic @@ -330,6 +334,10 @@ PrefabInstance: propertyPath: m_Name value: RestaurantPlayer objectReference: {fileID: 0} + - target: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 6791841979869644848, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_Layer value: 6 @@ -354,6 +362,10 @@ PrefabInstance: propertyPath: m_LightProbeUsage value: 0 objectReference: {fileID: 0} + - target: {fileID: 8683566178618629536, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_RenderingLayerMask + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 3365694194251356714, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} - {fileID: 127430239903465757, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} @@ -362,10 +374,10 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 4993183601549197863, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} insertIndex: -1 - addedObject: {fileID: 92685501732061756} + addedObject: {fileID: 7476222657412110048} - targetCorrespondingSourceObject: {fileID: 4993183601549197863, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} insertIndex: -1 - addedObject: {fileID: 7476222657412110048} + addedObject: {fileID: 7902811446395955698} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} insertIndex: -1