diff --git a/Assets/01.Scenes/00.TycoonTitle.unity b/Assets/01.Scenes/00.TycoonTitle.unity index 956e00f28..16a717c13 100644 --- a/Assets/01.Scenes/00.TycoonTitle.unity +++ b/Assets/01.Scenes/00.TycoonTitle.unity @@ -1073,6 +1073,8 @@ GameObject: - component: {fileID: 70018144} - component: {fileID: 70018142} - component: {fileID: 70018145} + - component: {fileID: 70018147} + - component: {fileID: 70018146} m_Layer: 5 m_Name: StartGameButton m_TagString: Untagged @@ -1096,11 +1098,11 @@ RectTransform: - {fileID: 730470678} m_Father: {fileID: 573655920} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 120} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -80} + m_SizeDelta: {x: 175.73, y: 120} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &70018142 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1168,6 +1170,46 @@ MonoBehaviour: _targetButton: {fileID: 70018142} _selectedImage: {fileID: 706003670} _highlightedColor: {r: 1, g: 1, b: 1, a: 0.19607843} +--- !u!114 &70018146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70018140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &70018147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 70018140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &86081048 GameObject: m_ObjectHideFlags: 0 @@ -1560,6 +1602,8 @@ GameObject: - component: {fileID: 163348049} - component: {fileID: 163348048} - component: {fileID: 163348050} + - component: {fileID: 163348052} + - component: {fileID: 163348051} m_Layer: 5 m_Name: ExitButton m_TagString: Untagged @@ -1583,11 +1627,11 @@ RectTransform: - {fileID: 591341634} m_Father: {fileID: 573655920} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 120} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -320} + m_SizeDelta: {x: 82.81, y: 120} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &163348048 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1667,6 +1711,46 @@ MonoBehaviour: _targetButton: {fileID: 163348048} _selectedImage: {fileID: 1421227664} _highlightedColor: {r: 1, g: 1, b: 1, a: 0.19607843} +--- !u!114 &163348051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163348046} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &163348052 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163348046} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &170113648 GameObject: m_ObjectHideFlags: 0 @@ -4944,7 +5028,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &550723026 Transform: m_ObjectHideFlags: 0 @@ -5416,8 +5500,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 299.76233, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 421, y: -225} + m_SizeDelta: {x: 500, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &573655921 MonoBehaviour: @@ -5436,7 +5520,7 @@ MonoBehaviour: m_Right: 0 m_Top: 20 m_Bottom: 0 - m_ChildAlignment: 1 + m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 @@ -5690,6 +5774,7 @@ GameObject: - component: {fileID: 591341636} - component: {fileID: 591341635} - component: {fileID: 591341637} + - component: {fileID: 591341638} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -5711,11 +5796,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 163348047} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 82.81, y: 65.17} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &591341635 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5855,6 +5940,20 @@ MonoBehaviour: references: version: 2 RefIds: [] +--- !u!114 &591341638 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 591341633} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &616574999 GameObject: m_ObjectHideFlags: 0 @@ -6601,6 +6700,7 @@ GameObject: - component: {fileID: 706003669} - component: {fileID: 706003671} - component: {fileID: 706003670} + - component: {fileID: 706003672} m_Layer: 5 m_Name: SelectedImage m_TagString: Untagged @@ -6665,6 +6765,26 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 706003668} m_CullTransparentMesh: 1 +--- !u!114 &706003672 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706003668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &709350487 GameObject: m_ObjectHideFlags: 0 @@ -6752,6 +6872,7 @@ GameObject: - component: {fileID: 730470680} - component: {fileID: 730470679} - component: {fileID: 730470681} + - component: {fileID: 730470682} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -6773,11 +6894,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 70018141} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 175.73, y: 65.17} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &730470679 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6917,6 +7038,20 @@ MonoBehaviour: references: version: 2 RefIds: [] +--- !u!114 &730470682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730470677} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &755062056 GameObject: m_ObjectHideFlags: 0 @@ -9478,6 +9613,7 @@ GameObject: - component: {fileID: 1014201908} - component: {fileID: 1014201907} - component: {fileID: 1014201910} + - component: {fileID: 1014201911} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -9598,11 +9734,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 2014710031} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 82.81, y: 65.17} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &1014201910 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9643,6 +9779,20 @@ MonoBehaviour: references: version: 2 RefIds: [] +--- !u!114 &1014201911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014201906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &1033584364 GameObject: m_ObjectHideFlags: 0 @@ -9738,6 +9888,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2060160391} - {fileID: 709350488} - {fileID: 1647468188} - {fileID: 140910077} @@ -9844,6 +9995,10 @@ PrefabInstance: propertyPath: m_Name value: Island objectReference: {fileID: 0} + - target: {fileID: 3288155046874829109, guid: b5b345652819a96468b021a97fe70a51, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3936467027728691424, guid: b5b345652819a96468b021a97fe70a51, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: @@ -11517,6 +11672,7 @@ GameObject: - component: {fileID: 1421227663} - component: {fileID: 1421227665} - component: {fileID: 1421227664} + - component: {fileID: 1421227666} m_Layer: 5 m_Name: SelectedImage m_TagString: Untagged @@ -11581,6 +11737,26 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1421227662} m_CullTransparentMesh: 1 +--- !u!114 &1421227666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1421227662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1473962532 GameObject: m_ObjectHideFlags: 0 @@ -15407,6 +15583,7 @@ GameObject: - component: {fileID: 1951388999} - component: {fileID: 1951389001} - component: {fileID: 1951389000} + - component: {fileID: 1951389002} m_Layer: 5 m_Name: SelectedImage m_TagString: Untagged @@ -15471,6 +15648,26 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1951388998} m_CullTransparentMesh: 1 +--- !u!114 &1951389002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951388998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1954553891 GameObject: m_ObjectHideFlags: 0 @@ -16083,6 +16280,8 @@ GameObject: - component: {fileID: 2014710030} - component: {fileID: 2014710029} - component: {fileID: 2014710032} + - component: {fileID: 2014710034} + - component: {fileID: 2014710033} m_Layer: 5 m_Name: SettingButton m_TagString: Untagged @@ -16170,11 +16369,11 @@ RectTransform: - {fileID: 1014201909} m_Father: {fileID: 573655920} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 120} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -200} + m_SizeDelta: {x: 82.81, y: 120} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &2014710032 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16190,6 +16389,46 @@ MonoBehaviour: _targetButton: {fileID: 2014710029} _selectedImage: {fileID: 1951389000} _highlightedColor: {r: 1, g: 1, b: 1, a: 0.19607843} +--- !u!114 &2014710033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014710028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &2014710034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014710028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &2029384859 GameObject: m_ObjectHideFlags: 0 @@ -16374,6 +16613,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2059140797} m_CullTransparentMesh: 1 +--- !u!1 &2060160390 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2060160391} + - component: {fileID: 2060160393} + - component: {fileID: 2060160392} + m_Layer: 5 + m_Name: TycoonTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2060160391 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060160390} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1033584370} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2060160392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060160390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b21fa7828e26d14489d898dc2773b2e5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2060160393 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2060160390} + m_CullTransparentMesh: 1 --- !u!1 &2075790671 GameObject: m_ObjectHideFlags: 0 @@ -17326,6 +17640,6 @@ SceneRoots: - {fileID: 1033584370} - {fileID: 582179850} - {fileID: 1146332831} - - {fileID: 550723026} - {fileID: 55913709} + - {fileID: 550723026} - {fileID: 1047375462} diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index ca911d284..f3ede986f 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -427,6 +427,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2500239} m_CullTransparentMesh: 1 +--- !u!114 &9798283 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1795547803945282972, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + m_PrefabInstance: {fileID: 1336734153} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &12215793 GameObject: m_ObjectHideFlags: 0 @@ -2422,6 +2433,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 181191665} m_CullTransparentMesh: 1 +--- !u!114 &185244174 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5623516395497252574, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + m_PrefabInstance: {fileID: 1336734153} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &186139407 GameObject: m_ObjectHideFlags: 0 @@ -5605,17 +5627,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 536447447} m_CullTransparentMesh: 1 ---- !u!114 &538755283 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1795547803945282972, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - m_PrefabInstance: {fileID: 1336734153} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &545850347 GameObject: m_ObjectHideFlags: 0 @@ -5646,7 +5657,7 @@ Transform: m_GameObject: {fileID: 545850347} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 1.13, y: 7.4278765, z: -16.466446} + m_LocalPosition: {x: 1.06, y: 7.4278765, z: -17.090446} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -10185,6 +10196,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3997465226346976133, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} m_PrefabInstance: {fileID: 1008526203} m_PrefabAsset: {fileID: 0} +--- !u!114 &1035249716 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6711412744544918905, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + m_PrefabInstance: {fileID: 1336734153} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1045083343 GameObject: m_ObjectHideFlags: 0 @@ -13492,6 +13514,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2936459360025051519, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 2972499440354587145, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -14332,6 +14358,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 7103986099458610737, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 7117426219321237378, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -14962,17 +14992,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} m_PrefabInstance: {fileID: 1344016398} m_PrefabAsset: {fileID: 0} ---- !u!114 &1344705174 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 352929351692761553, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - m_PrefabInstance: {fileID: 1336734153} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1355183323 GameObject: m_ObjectHideFlags: 0 @@ -15345,17 +15364,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1362014170} m_CullTransparentMesh: 1 ---- !u!114 &1365105883 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5623516395497252574, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - m_PrefabInstance: {fileID: 1336734153} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1377077532 GameObject: m_ObjectHideFlags: 0 @@ -16406,6 +16414,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} m_PrefabInstance: {fileID: 1466852068} m_PrefabAsset: {fileID: 0} +--- !u!114 &1468463503 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 352929351692761553, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + m_PrefabInstance: {fileID: 1336734153} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1472541870 PrefabInstance: m_ObjectHideFlags: 0 @@ -17038,6 +17057,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1511189140} m_CullTransparentMesh: 1 +--- !u!114 &1516749603 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6311786782779888448, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + m_PrefabInstance: {fileID: 1336734153} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1540383230 GameObject: m_ObjectHideFlags: 0 @@ -17605,17 +17635,6 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!114 &1566815109 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 529622739828575346, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - m_PrefabInstance: {fileID: 1336734153} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1572330888 GameObject: m_ObjectHideFlags: 0 @@ -17981,17 +18000,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1599866058} m_CullTransparentMesh: 1 ---- !u!114 &1602586436 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6711412744544918905, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - m_PrefabInstance: {fileID: 1336734153} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1613900033 GameObject: m_ObjectHideFlags: 0 @@ -19079,13 +19087,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72638ccfaf7778d42808e233d2eb6e8c, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: {fileID: 538755283} - k__BackingField: {fileID: 1755165095} - k__BackingField: {fileID: 1365105883} - k__BackingField: {fileID: 1344705174} - k__BackingField: {fileID: 1602586436} - k__BackingField: {fileID: 1566815109} - k__BackingField: {fileID: 2081560311} + k__BackingField: {fileID: 9798283} + k__BackingField: {fileID: 1516749603} + k__BackingField: {fileID: 185244174} + k__BackingField: {fileID: 1468463503} + k__BackingField: {fileID: 1035249716} + k__BackingField: {fileID: 1979728764} + k__BackingField: {fileID: 1853687859} --- !u!114 &1665075874 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20374,17 +20382,6 @@ MonoBehaviour: m_ChildScaleWidth: 1 m_ChildScaleHeight: 1 m_ReverseArrangement: 0 ---- !u!114 &1755165095 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6311786782779888448, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - m_PrefabInstance: {fileID: 1336734153} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1758507564 GameObject: m_ObjectHideFlags: 0 @@ -20984,7 +20981,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uD655\uC778" + m_text: "\uBAA8\uB450 \uD68D\uB4DD" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2} @@ -21079,7 +21076,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7 m_TableEntryReference: - m_KeyId: 667711001395200 + m_KeyId: 2755079634694144 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -21646,6 +21643,17 @@ MonoBehaviour: - IsEmpty: 1 IsMoving: 0 k__BackingField: {x: 220, y: -65, z: 0} +--- !u!114 &1853687859 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 964886447486857263, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + m_PrefabInstance: {fileID: 1336734153} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e4a707caef9cf544a63781c28d1244d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1876905823 GameObject: m_ObjectHideFlags: 0 @@ -22842,6 +22850,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1978426833} m_CullTransparentMesh: 1 +--- !u!114 &1979728764 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5131285107321857889, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + m_PrefabInstance: {fileID: 1336734153} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e4a707caef9cf544a63781c28d1244d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1983229437 GameObject: m_ObjectHideFlags: 0 @@ -24181,17 +24200,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &2081560311 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7860033871478238356, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - m_PrefabInstance: {fileID: 1336734153} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &2097912643 GameObject: m_ObjectHideFlags: 0 @@ -24902,7 +24910,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x - value: 1.13 + value: 1.06 objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.y @@ -24910,7 +24918,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.z - value: -8.806 + value: -9.43 objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/01.Scenes/99.T45.unity b/Assets/01.Scenes/99.T45.unity index 3a3e06677..801818d42 100644 --- a/Assets/01.Scenes/99.T45.unity +++ b/Assets/01.Scenes/99.T45.unity @@ -3789,7 +3789,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3dd7358ce993836479029d580437bb79, type: 3} m_Name: m_EditorClassIdentifier: - cardPrefab: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} + _panel: {fileID: 0} + _contents: {fileID: 0} --- !u!1 &194818728 GameObject: m_ObjectHideFlags: 0 @@ -12497,7 +12498,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &779175120 @@ -13868,7 +13869,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 8 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: d06d254a10c13c9459caeb44918f6d54, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -13888,12 +13889,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 843019840} serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} m_LocalPosition: {x: -5.2, y: 1.47, z: -4.934} m_LocalScale: {x: 6.0738773, y: 6.0738773, z: 6.0738773} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1181618019} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!1 &843993086 GameObject: @@ -17451,11 +17452,6 @@ MonoBehaviour: _persistent: 0 k__BackingField: {fileID: 1049919591} k__BackingField: {fileID: 410235869} - k__BackingField: {fileID: 437358694} - k__BackingField: {fileID: 1496452083} - k__BackingField: {fileID: 102499729} - k__BackingField: {fileID: 1733600343} - k__BackingField: {fileID: 1701833861} _fadeImage: {fileID: 2055805162} --- !u!114 &1049919594 MonoBehaviour: @@ -19834,6 +19830,40 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1 &1181618018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1181618019} + m_Layer: 0 + m_Name: WallBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1181618019 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1181618018} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 843019842} + - {fileID: 1998354599} + - {fileID: 1801915446} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1222632320 GameObject: m_ObjectHideFlags: 0 @@ -22131,6 +22161,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 717738981833467386, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 761558860074504813, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_LocalPosition.x value: 1.115 @@ -22355,6 +22389,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1577506234011472445, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 1640519134656571484, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -22615,6 +22653,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2936459360025051519, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 2972499440354587145, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -23515,6 +23557,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 7103986099458610737, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} - target: {fileID: 7117426219321237378, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -28954,17 +29000,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} m_PrefabInstance: {fileID: 1562271984} m_PrefabAsset: {fileID: 0} ---- !u!114 &1566815109 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 529622739828575346, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - m_PrefabInstance: {fileID: 1336734153} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1567220254 GameObject: m_ObjectHideFlags: 0 @@ -31295,6 +31330,7 @@ MonoBehaviour: k__BackingField: {fileID: 1665075874} k__BackingField: {fileID: 1665075876} k__BackingField: {fileID: 1665075875} + k__BackingField: {fileID: 0} _dailyBgm: TycoonBgm02 k__BackingField: _maxLevel: 0 @@ -31372,8 +31408,8 @@ MonoBehaviour: k__BackingField: {fileID: 1365105883} k__BackingField: {fileID: 1344705174} k__BackingField: {fileID: 1602586436} - k__BackingField: {fileID: 1566815109} - k__BackingField: {fileID: 2081560311} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} --- !u!114 &1665075874 MonoBehaviour: m_ObjectHideFlags: 0 @@ -31723,6 +31759,8 @@ MonoBehaviour: m_EditorClassIdentifier: SwitchMapsOpened: 2 SwitchMapsClosed: 1 + _panel: {fileID: 0} + _cocktailButtons: {fileID: 0} cocktailImage: {fileID: 1793342540} cocktailName: {fileID: 788752399} manualCocktailsPrefabs: {fileID: 6667137138327223632, guid: 52e209f6535e22848b973ed5de9cbc18, type: 3} @@ -35026,7 +35064,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 8 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: 519b9cce348e8344abb958b71088e03f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -35046,12 +35084,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801915444} serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} m_LocalPosition: {x: -7.73, y: 0, z: -6.088} m_LocalScale: {x: 4, y: 4, z: 4} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1181618019} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!1 &1810507245 GameObject: @@ -35861,7 +35899,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1849201577 @@ -39484,7 +39522,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 8 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: 6bc3aeba13d12984587c915855b8297c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -39504,12 +39542,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1998354597} serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} m_LocalPosition: {x: -2.7, y: 0, z: -6.088} m_LocalScale: {x: 4, y: 4, z: 4} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1181618019} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!1001 &2000350246 PrefabInstance: @@ -40665,17 +40703,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &2081560311 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7860033871478238356, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} - m_PrefabInstance: {fileID: 1336734153} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &2105041732 GameObject: m_ObjectHideFlags: 0 @@ -43506,9 +43533,7 @@ SceneRoots: - {fileID: 5626406452199475265} - {fileID: 1006730365} - {fileID: 20736010} - - {fileID: 843019842} - - {fileID: 1998354599} - - {fileID: 1801915446} + - {fileID: 1181618019} - {fileID: 809391721} - {fileID: 1583865388} - {fileID: 1715242746} diff --git a/Assets/02.Scripts/Character/Player/Tycoon/State/DashState.cs b/Assets/02.Scripts/Character/Player/Tycoon/State/DashState.cs index 02d0cfe2e..ca8887312 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/State/DashState.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/State/DashState.cs @@ -18,7 +18,8 @@ namespace BlueWater.Players.Tycoons { character.StateMachineController.TransitionToState(character.WalkingState, character); } - else if (character.IsMakingCocktail || character.IsCleaningFloor || character.IsCleaningTable || character.IsPumping) + else if (character.IsMakingCocktail || character.IsCleaningFloor || character.IsCleaningTable || character.IsPumping || + character.IsInteractedSlimeGarnish || character.IsInteractedLimeTreeGarnish) { character.StateMachineController.TransitionToState(character.InteractionState, character); } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/State/IdleState.cs b/Assets/02.Scripts/Character/Player/Tycoon/State/IdleState.cs index ce1820fed..4a27d4f63 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/State/IdleState.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/State/IdleState.cs @@ -18,7 +18,8 @@ namespace BlueWater.Players.Tycoons { character.StateMachineController.TransitionToState(character.WalkingState, character); } - else if (character.IsMakingCocktail || character.IsCleaningFloor || character.IsCleaningTable || character.IsPumping) + else if (character.IsMakingCocktail || character.IsCleaningFloor || character.IsCleaningTable || character.IsPumping || + character.IsInteractedSlimeGarnish || character.IsInteractedLimeTreeGarnish) { character.StateMachineController.TransitionToState(character.InteractionState, character); } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/State/InteractionState.cs b/Assets/02.Scripts/Character/Player/Tycoon/State/InteractionState.cs index cfc1a13fc..e8d211a07 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/State/InteractionState.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/State/InteractionState.cs @@ -19,7 +19,8 @@ namespace BlueWater.Players.Tycoons public void UpdateState(TycoonPlayer character) { - if (character.IsMakingCocktail || character.IsCleaningFloor || character.IsCleaningTable || character.IsPumping) + if (character.IsMakingCocktail || character.IsCleaningFloor || character.IsCleaningTable || character.IsPumping || + character.IsInteractedSlimeGarnish || character.IsInteractedLimeTreeGarnish) { EnterState(character); } @@ -58,6 +59,14 @@ namespace BlueWater.Players.Tycoons { return TycoonPlayerSpineAnimation.Pumping; } + if (character.IsInteractedSlimeGarnish) + { + return TycoonPlayerSpineAnimation.AttackSlime; + } + if (character.IsInteractedLimeTreeGarnish) + { + return TycoonPlayerSpineAnimation.AttackBat; + } return null; } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/State/WalkingState.cs b/Assets/02.Scripts/Character/Player/Tycoon/State/WalkingState.cs index 77ef36805..a3eb0ecdb 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/State/WalkingState.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/State/WalkingState.cs @@ -18,7 +18,8 @@ namespace BlueWater.Players.Tycoons { EnterState(character); } - else if (character.IsMakingCocktail || character.IsCleaningFloor || character.IsCleaningTable || character.IsPumping) + else if (character.IsMakingCocktail || character.IsCleaningFloor || character.IsCleaningTable || character.IsPumping || + character.IsInteractedSlimeGarnish || character.IsInteractedLimeTreeGarnish) { character.StateMachineController.TransitionToState(character.InteractionState, character); } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index ee1240ed9..1ef80138e 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -74,6 +74,8 @@ namespace BlueWater.Players.Tycoons public bool IsCleaningTable { get; set; } public bool IsMakingCocktail { get; set; } public bool IsPumping { get; set; } + public bool IsInteractedSlimeGarnish { get; set; } + public bool IsInteractedLimeTreeGarnish { get; set; } // State public StateMachineController StateMachineController { get; private set; } diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs index 1455ad956..624c51494 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs @@ -1,39 +1,23 @@ using System; using BlueWater.Items; using BlueWater.Players; -using BlueWater.Utility; -using Sirenix.OdinInspector; using UnityEngine; namespace BlueWater.Tycoons { - public static class BarrelSpineAnimation - { - public const string Idle = "IdleNormal"; - public const string Mold = "IdleDirty"; - public const string ChangeIdle = "ChangeClean"; - public const string ChangeMold = "ChangeDirty"; - } - - public class Barrel : InteractionFurniture + public abstract class Barrel : InteractionFurniture { [SerializeField] - private SpineController _spineController; - - [SerializeField, Required] - private SpriteRenderer _liquidImage; - - [SerializeField, Required] - private SpriteRenderer _fill; - - [SerializeField, Range(1f, 5f), Tooltip("목표 색상 * 밝기")] - private float _colorIntensity = 2f; + protected SpineController SpineController; [SerializeField] - private string _idx; + private string Idx; [SerializeField] - private LiquidData _liquidData; + protected LiquidData LiquidData; + + [SerializeField] + protected float VisualMaxFill = 4000f; [field: SerializeField] public int CurrentAmount { get; private set; } @@ -47,90 +31,27 @@ namespace BlueWater.Tycoons [field: SerializeField] public bool IsAutoSupply { get; private set; } - [field: SerializeField] - public bool IsMoldy { get; private set; } + protected float SupplyElapsedTime; - [SerializeField] - private float _playerHoldingTime = 3f; - - private Material _instanceMaterial; - private float _supplyElapsedTime; - private bool _isPlayerInteracting; - - public static event Action OnBarrelInteracted; - public static event Action OnBarrelCancelInteracted; - - // Hashes - private static readonly int LiquidAmountHash = Shader.PropertyToID("_LiquidAmount"); - private static readonly int LiquidColorHash = Shader.PropertyToID("_LiquidColor"); + public static Action OnBarrelInteracted; + public static Action OnBarrelCancelInteracted; protected override void Awake() { base.Awake(); - _spineController = GetComponent(); - _instanceMaterial = Instantiate(_fill.material); - _fill.material = _instanceMaterial; - _liquidData = ItemManager.Instance.LiquidDataSo.GetDataByIdx(_idx); - SetCurrentAmount(0); + SpineController = GetComponent(); + LiquidData = ItemManager.Instance.LiquidDataSo.GetDataByIdx(Idx); + + EventManager.OnAddBarrels += AddCurrentAmount; + EventManager.OnAutoSupplyBarrels += AutoSupply; } protected override void Start() { base.Start(); - EventManager.OnAddBarrels += AddCurrentAmount; - EventManager.OnAutoSupplyBarrels += AutoSupply; - - _liquidImage.sprite = IsActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock; - _instanceMaterial.SetColor(LiquidColorHash, _liquidData.Color * _colorIntensity); - - if (_spineController) - { - _spineController.PlayAnimation(BarrelSpineAnimation.Idle, false); - } - } - - private void Update() - { - if (IsShowing) - { - var holdingGauge = Mathf.Clamp(HoldingElapsedTime / _playerHoldingTime, 0f, 1f); - EventManager.InvokeHoldInteracting(holdingGauge); - } - - if (IsMoldy) - { - if (HoldingElapsedTime >= _playerHoldingTime) - { - Recovery(); - } - - if (_isPlayerInteracting) - { - HoldingElapsedTime += Time.deltaTime; - } - else - { - if (HoldingElapsedTime > 0f) - { - HoldingElapsedTime -= Time.deltaTime; - } - } - } - else - { - if (!IsAutoSupply) return; - - if (_supplyElapsedTime >= 1f) - { - AddCurrentAmount(TycoonManager.Instance.TycoonStatus.BarrelAutoIncrease); - - _supplyElapsedTime -= 1f; - } - - _supplyElapsedTime += Time.deltaTime; - } + SetCurrentAmount(0); } private void OnDestroy() @@ -139,85 +60,17 @@ namespace BlueWater.Tycoons EventManager.OnAutoSupplyBarrels -= AutoSupply; } - public override void Interaction() - { - if (!IsMoldy) - { - OnBarrelInteracted?.Invoke(this); - GameManager.Instance.CurrentTycoonPlayer.IsMakingCocktail = true; - } - else - { - _isPlayerInteracting = true; - } - } - - public override void CancelInteraction() - { - if (!IsMoldy) - { - OnBarrelCancelInteracted?.Invoke(); - GameManager.Instance.CurrentTycoonPlayer.IsMakingCocktail = false; - } - else - { - _isPlayerInteracting = false; - HoldingElapsedTime = 0f; - } - } - - /// - /// 1. 플레이어가 빈 잔을 들고 있거나 완성되지 않은 잔을 들고 있을 때 - /// - public override bool CanInteraction() - { - return IsActivated && !CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpItem && - ((!IsMoldy && CanConsume(1)) || IsMoldy); - } - - public override void ShowInteractionUi() - { - if (IsMoldy) - { - UpdateLocalizedString("InteractionMold"); - } - else - { - InteractionMessage = $"{Utils.GetLocalizedString(_liquidData.Idx)} {Utils.GetLocalizedString("Pour")}"; - } - - if (IsStatue) - { - base.ShowInteractionUi(); - } - else - { - _spineController.EnableCustomMaterial(); - EventManager.InvokeShowInteractionUi(InteractionMessage); - IsShowing = true; - } - } - - public override void HideInteractionUi() - { - if (IsStatue) - { - base.HideInteractionUi(); - } - else - { - _spineController.DisableCustomMaterial(); - EventManager.InvokeHideInteractionUi(); - IsShowing = false; - } - } + public abstract override void Interaction(); + public abstract bool CanMakingCocktailCrew(int amount); + public abstract bool CanMold(); + public abstract void Mold(); public bool CanConsume(int amount) { return CurrentAmount - amount > 0; } - public void Consume(int amount) + public virtual void Consume(int amount) { if (CurrentAmount == int.MaxValue) { @@ -236,9 +89,9 @@ namespace BlueWater.Tycoons return true; } - public LiquidData GetLiquidData() => _liquidData; + public LiquidData GetLiquidData() => LiquidData; - public void SetCurrentAmount(int amount) + public virtual void SetCurrentAmount(int amount) { if (CurrentAmount == int.MaxValue) { @@ -246,15 +99,12 @@ namespace BlueWater.Tycoons } CurrentAmount = amount; - var liquidAmount = CurrentAmount / 4000f; - _instanceMaterial.SetFloat(LiquidAmountHash, liquidAmount); } - public void Activate() + public virtual void Activate() { IsActivated = true; - _liquidImage.sprite = IsActivated ? _liquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock; - SetCurrentAmount(_liquidData.GetMaxAmount()); + SetCurrentAmount(LiquidData.GetMaxAmount()); } public void AutoSupply() @@ -262,31 +112,11 @@ namespace BlueWater.Tycoons IsAutoSupply = true; } - public void AddCurrentAmount(int addedValue) + public virtual void AddCurrentAmount(int addedValue) { if (!IsActivated) return; SetCurrentAmount(CurrentAmount + addedValue); } - - public bool CanMold() - { - return _liquidData.Idx != "LiquidA" && IsActivated && !IsMoldy; - } - - public void Mold() - { - IsMoldy = true; - _spineController.PlayAnimation(BarrelSpineAnimation.ChangeMold, false); - _spineController.AddAnimation(BarrelSpineAnimation.Mold, true); - } - - public void Recovery() - { - CancelInteraction(); - IsMoldy = false; - _spineController.PlayAnimation(BarrelSpineAnimation.ChangeIdle, false); - _spineController.AddAnimation(BarrelSpineAnimation.Idle, false); - } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs.meta b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs.meta index 113cff08c..27ced52b9 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs.meta +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs.meta @@ -1,2 +1,2 @@ fileFormatVersion: 2 -guid: 2568fe8d4d702ed4698ed46b9c2ad25a +guid: 2e17837060823cf4fb6f1312db8196f6 diff --git a/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs b/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs new file mode 100644 index 000000000..cc8ca4ec6 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs @@ -0,0 +1,215 @@ + using BlueWater.Utility; +using UnityEngine; + +namespace BlueWater.Tycoons +{ + public static class GarnishBarrelSpineAnimation + { + public const string IdleLevel1 = "Idle0"; + public const string IdleLevel2 = "Idle10"; + public const string IdleLevel3 = "Idle50"; + public const string IdleLevel4 = "Idle100"; + public const string FillToLevel2 = "Fill0to10"; + public const string FillToLevel3 = "Fill10to50"; + public const string FillToLevel4 = "Fill50to100"; + public const string UnFillToLevel1 = "Change10to0"; + public const string UnFillToLevel2 = "Change50to10"; + public const string UnFillToLevel3 = "Change100to50"; + } + + public class GarnishBarrel : Barrel + { + private int _currentLevel; + + protected override void Start() + { + base.Start(); + + SpineController.PlayAnimation(GarnishBarrelSpineAnimation.IdleLevel1, true); + } + + private void Update() + { + if (!IsAutoSupply) return; + + if (SupplyElapsedTime >= 1f) + { + AddCurrentAmount(TycoonManager.Instance.TycoonStatus.BarrelAutoIncrease); + + SupplyElapsedTime -= 1f; + } + + SupplyElapsedTime += Time.deltaTime; + } + + public override void Interaction() + { + OnBarrelInteracted?.Invoke(this); + + if (LiquidData.Idx == "Garnish1") + { + GameManager.Instance.CurrentTycoonPlayer.IsInteractedSlimeGarnish = true; + } + else if (LiquidData.Idx == "Garnish2") + { + GameManager.Instance.CurrentTycoonPlayer.IsInteractedLimeTreeGarnish = true; + } + } + + public override void CancelInteraction() + { + OnBarrelCancelInteracted?.Invoke(); + + if (LiquidData.Idx == "Garnish1") + { + GameManager.Instance.CurrentTycoonPlayer.IsInteractedSlimeGarnish = false; + } + else if (LiquidData.Idx == "Garnish2") + { + GameManager.Instance.CurrentTycoonPlayer.IsInteractedLimeTreeGarnish = false; + } + } + + /// + /// 1. 플레이어가 빈 잔을 들고 있거나 완성되지 않은 잔을 들고 있을 때 + /// + public override bool CanInteraction() + { + return IsActivated && !CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpItem && CanConsume(1); + } + + public override void ShowInteractionUi() + { + InteractionMessage = $"{Utils.GetLocalizedString(LiquidData.Idx)} {Utils.GetLocalizedString("Pour")}"; + SpineController.EnableCustomMaterial(); + EventManager.InvokeShowInteractionUi(InteractionMessage); + EventManager.InvokeHoldInteracting(HoldingElapsedTime); + IsShowing = true; + } + + public override void HideInteractionUi() + { + SpineController.DisableCustomMaterial(); + EventManager.InvokeHideInteractionUi(); + IsShowing = false; + } + + public override bool CanMold() + { + return false; + } + + public override void Mold() + { + + } + + public override bool CanMakingCocktailCrew(int amount) + { + return IsActivated && CanConsume(amount); + } + + public override void Activate() + { + base.Activate(); + + FillAnimation(); + } + + public override void Consume(int amount) + { + base.Consume(amount); + + var newLevel = GetCurrentLevel(); + if (_currentLevel != newLevel) + { + UnfillAnimation(); + } + } + + public override void AddCurrentAmount(int addedValue) + { + base.AddCurrentAmount(addedValue); + + var newLevel = GetCurrentLevel(); + if (_currentLevel != newLevel) + { + FillAnimation(); + } + } + + private int GetCurrentLevel() + { + int max = (int)VisualMaxFill; + if (CurrentAmount >= max) + { + return 4; + } + if (CurrentAmount >= max / 2) + { + return 3; + } + if (CurrentAmount > 0) + { + return 2; + } + return 1; + } + + private void FillAnimation() + { + int max = (int)VisualMaxFill; + if (CurrentAmount >= max) + { + SpineController.PlayAnimation(GarnishBarrelSpineAnimation.FillToLevel4, false); + SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel4, true); + _currentLevel = 4; + } + else if (CurrentAmount >= max / 2) + { + SpineController.PlayAnimation(GarnishBarrelSpineAnimation.FillToLevel3, false); + SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel3, true); + _currentLevel = 3; + } + else if (CurrentAmount > 0) + { + SpineController.PlayAnimation(GarnishBarrelSpineAnimation.FillToLevel2, false); + SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel2, true); + _currentLevel = 2; + } + else + { + SpineController.PlayAnimation(GarnishBarrelSpineAnimation.IdleLevel1, true); + _currentLevel = 1; + } + } + + private void UnfillAnimation() + { + int max = (int)VisualMaxFill; + if (CurrentAmount >= max) + { + SpineController.PlayAnimation(GarnishBarrelSpineAnimation.IdleLevel4, true); + _currentLevel = 4; + } + else if (CurrentAmount >= max / 2) + { + SpineController.PlayAnimation(GarnishBarrelSpineAnimation.UnFillToLevel3, false); + SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel3, true); + _currentLevel = 3; + } + else if (CurrentAmount > 0) + { + SpineController.PlayAnimation(GarnishBarrelSpineAnimation.UnFillToLevel2, false); + SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel2, true); + _currentLevel = 2; + } + else + { + SpineController.PlayAnimation(GarnishBarrelSpineAnimation.UnFillToLevel1, false); + SpineController.AddAnimation(GarnishBarrelSpineAnimation.IdleLevel1, true); + _currentLevel = 1; + } + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs.meta b/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs.meta new file mode 100644 index 000000000..1ba7161da --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3e4a707caef9cf544a63781c28d1244d diff --git a/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs new file mode 100644 index 000000000..7d6e59455 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs @@ -0,0 +1,215 @@ +using BlueWater.Utility; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Tycoons +{ + public static class LiquidBarrelSpineAnimation + { + public const string Idle = "IdleNormal"; + public const string Mold = "IdleDirty"; + public const string ChangeIdle = "ChangeClean"; + public const string ChangeMold = "ChangeDirty"; + } + + public class LiquidBarrel : Barrel + { + [SerializeField, Required] + private SpriteRenderer _liquidImage; + + [SerializeField, Required] + private SpriteRenderer _fill; + + [SerializeField, Range(1f, 5f), Tooltip("목표 색상 * 밝기")] + private float _colorIntensity = 2f; + + [field: SerializeField] + public bool IsMoldy { get; private set; } + + [SerializeField] + private float _playerHoldingTime = 3f; + + private Material _instanceMaterial; + private bool _isPlayerInteracting; + + // Hashes + private static readonly int LiquidAmountHash = Shader.PropertyToID("_LiquidAmount"); + private static readonly int LiquidColorHash = Shader.PropertyToID("_LiquidColor"); + + protected override void Awake() + { + base.Awake(); + + _instanceMaterial = Instantiate(_fill.material); + _fill.material = _instanceMaterial; + } + + protected override void Start() + { + base.Start(); + + _liquidImage.sprite = IsActivated ? LiquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock; + _instanceMaterial.SetColor(LiquidColorHash, LiquidData.Color * _colorIntensity); + + if (!IsStatue) + { + SpineController.PlayAnimation(LiquidBarrelSpineAnimation.Idle, false); + } + } + + private void Update() + { + if (IsShowing) + { + var holdingGauge = Mathf.Clamp(HoldingElapsedTime / _playerHoldingTime, 0f, 1f); + EventManager.InvokeHoldInteracting(holdingGauge); + } + + if (IsMoldy) + { + if (HoldingElapsedTime >= _playerHoldingTime) + { + Recovery(); + } + + if (_isPlayerInteracting) + { + HoldingElapsedTime += Time.deltaTime; + } + else + { + if (HoldingElapsedTime > 0f) + { + HoldingElapsedTime -= Time.deltaTime; + } + } + } + else + { + if (!IsAutoSupply) return; + + if (SupplyElapsedTime >= 1f) + { + AddCurrentAmount(TycoonManager.Instance.TycoonStatus.BarrelAutoIncrease); + + SupplyElapsedTime -= 1f; + } + + SupplyElapsedTime += Time.deltaTime; + } + } + + public override void Interaction() + { + if (!IsMoldy) + { + OnBarrelInteracted?.Invoke(this); + GameManager.Instance.CurrentTycoonPlayer.IsMakingCocktail = true; + } + else + { + _isPlayerInteracting = true; + } + } + + public override void CancelInteraction() + { + if (!IsMoldy) + { + OnBarrelCancelInteracted?.Invoke(); + GameManager.Instance.CurrentTycoonPlayer.IsMakingCocktail = false; + } + else + { + _isPlayerInteracting = false; + HoldingElapsedTime = 0f; + } + } + + /// + /// 1. 플레이어가 빈 잔을 들고 있거나 완성되지 않은 잔을 들고 있을 때 + /// + public override bool CanInteraction() + { + return IsActivated && !CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpItem && + ((!IsMoldy && CanConsume(1)) || IsMoldy); + } + + public override void ShowInteractionUi() + { + if (IsMoldy) + { + UpdateLocalizedString("InteractionMold"); + } + else + { + InteractionMessage = $"{Utils.GetLocalizedString(LiquidData.Idx)} {Utils.GetLocalizedString("Pour")}"; + } + + if (IsStatue) + { + base.ShowInteractionUi(); + } + else + { + SpineController.EnableCustomMaterial(); + EventManager.InvokeShowInteractionUi(InteractionMessage); + IsShowing = true; + } + } + + public override void HideInteractionUi() + { + if (IsStatue) + { + base.HideInteractionUi(); + } + else + { + SpineController.DisableCustomMaterial(); + EventManager.InvokeHideInteractionUi(); + IsShowing = false; + } + } + + public override void SetCurrentAmount(int amount) + { + base.SetCurrentAmount(amount); + + var liquidAmount = CurrentAmount / VisualMaxFill; + _instanceMaterial.SetFloat(LiquidAmountHash, liquidAmount); + } + + public override void Activate() + { + base.Activate(); + + _liquidImage.sprite = IsActivated ? LiquidData.Sprite : DataManager.Instance.SpriteDataSo.BarrelLock; + } + + public override bool CanMakingCocktailCrew(int amount) + { + return IsActivated && !IsMoldy && CanConsume(amount); + } + + public override bool CanMold() + { + return !IsStatue && IsActivated && !IsMoldy; + } + + public override void Mold() + { + IsMoldy = true; + SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeMold, false); + SpineController.AddAnimation(LiquidBarrelSpineAnimation.Mold, true); + } + + public void Recovery() + { + CancelInteraction(); + IsMoldy = false; + SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeIdle, false); + SpineController.AddAnimation(LiquidBarrelSpineAnimation.Idle, false); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs.meta b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs.meta new file mode 100644 index 000000000..113cff08c --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2568fe8d4d702ed4698ed46b9c2ad25a diff --git a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs index 6cdec53b8..22a2a5fd8 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs @@ -1,6 +1,5 @@ using BlueWater.Items; using BlueWater.Players; -using Sirenix.OdinInspector; using UnityEngine; namespace BlueWater.Tycoons @@ -11,9 +10,9 @@ namespace BlueWater.Tycoons public const string RandomBoxHolding = "RandomBoxHold"; public const string RandomBoxIdle = "RandomBoxIdle"; public const string RandomBoxSpit = "RandomBoxSpit"; - public const string Open = "TrachcanOpen"; - public const string Close = "TrashcanClose"; - public const string Stop = "TrashcanCloseStop"; + public const string Open = "TrashCanOpen"; + public const string Close = "TrashCanClose"; + public const string Stop = "TrashCanCloseStop"; } public class TrashCan : InteractionFurniture @@ -171,10 +170,8 @@ namespace BlueWater.Tycoons HoldingElapsedTime = 0f; _isPlayerInteracting = false; - print("실행 전"); _spineController.PlayAnimation(TrashCanSpineAnimation.Open, false); _spineController.AddAnimation(TrashCanSpineAnimation.Close, false); - print("실행 후"); } private void ChangeRandomCocktail() diff --git a/Assets/02.Scripts/Tycoon/Garnish.cs b/Assets/02.Scripts/Tycoon/Garnish.cs index 7cc51352f..8bd5f7390 100644 --- a/Assets/02.Scripts/Tycoon/Garnish.cs +++ b/Assets/02.Scripts/Tycoon/Garnish.cs @@ -5,26 +5,37 @@ namespace BlueWater.Tycoons { public class Garnish : LiquidIngredient { + [SerializeField] + private float _autoDestroyTime = 2f; + private IObjectPool _managedPool; - public void Initialize(Vector3 spawnPosition, Quaternion rotation, Collider2D targetCollider, Vector3 pushForce, Sprite sprite) + public void Initialize(Vector3 spawnPosition, Quaternion rotation, Collider2D targetCollider, Vector3 pushForce, Color color) { transform.position = spawnPosition; transform.rotation = rotation; TargetCollider = targetCollider; - SpriteRenderer.sprite = sprite; + SpriteRenderer.color = color; Rigidbody2D.linearVelocity = Vector2.zero; CanInteraction = true; gameObject.SetActive(true); Rigidbody2D.AddForce(pushForce, ForceMode2D.Impulse); + + Invoke(nameof(ReachedObject), _autoDestroyTime); } public void SetManagedPool(IObjectPool pool) => _managedPool = pool; - public void Destroy() => _managedPool.Release(this); + public void Destroy() + { + CancelInvoke(nameof(ReachedObject)); + _managedPool.Release(this); + } public override void ReachedObject() { + base.ReachedObject(); + CanInteraction = false; Destroy(); } diff --git a/Assets/02.Scripts/Tycoon/LiquidController.cs b/Assets/02.Scripts/Tycoon/LiquidController.cs index d449fcca8..3b84cfbae 100644 --- a/Assets/02.Scripts/Tycoon/LiquidController.cs +++ b/Assets/02.Scripts/Tycoon/LiquidController.cs @@ -231,8 +231,8 @@ namespace BlueWater EventManager.OnCocktailServedToCustomer -= ReleaseAllObject; EventManager.OnChangedRandomCocktail -= ReleaseAllObject; LiquidIngredient.OnReachedTarget -= OnTargetReached; - Barrel.OnBarrelInteracted -= HandleBarrelInteraction; - Barrel.OnBarrelCancelInteracted -= HandleBarrelCancelInteraction; + LiquidBarrel.OnBarrelInteracted -= HandleBarrelInteraction; + LiquidBarrel.OnBarrelCancelInteracted -= HandleBarrelCancelInteraction; } #endregion @@ -279,8 +279,8 @@ namespace BlueWater private void OnGetGarnishObject(Garnish garnish) { _instanceLiquidCount++; - var liquidSprite = _currentBarrel.GetLiquidData().Sprite; - garnish.Initialize(_spawnTransform.position, Quaternion.identity, _reachedCollider, _pushDirection.normalized * _pushPower, liquidSprite); + var liquidColor = _currentBarrel.GetLiquidData().Color; + garnish.Initialize(_spawnTransform.position, Quaternion.identity, _reachedCollider, _pushDirection.normalized * _pushPower, liquidColor); _activeGarnishDatas.Add(garnish); } diff --git a/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs b/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs index f37406fde..091ac46db 100644 --- a/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonIngredientController.cs @@ -10,25 +10,25 @@ namespace BlueWater.Tycoons public class TycoonIngredientController: MonoBehaviour { [field: SerializeField] - public Barrel LiquidBarrelA { get; private set; } + public LiquidBarrel LiquidBarrelA { get; private set; } [field: SerializeField] - public Barrel LiquidBarrelB { get; private set; } + public LiquidBarrel LiquidBarrelB { get; private set; } [field: SerializeField] - public Barrel LiquidBarrelC { get; private set; } + public LiquidBarrel LiquidBarrelC { get; private set; } [field: SerializeField] - public Barrel LiquidBarrelD { get; private set; } + public LiquidBarrel LiquidBarrelD { get; private set; } [field: SerializeField] - public Barrel LiquidBarrelE { get; private set; } + public LiquidBarrel LiquidBarrelE { get; private set; } [field: SerializeField] - public Barrel GarnishBarrel1 { get; private set; } + public GarnishBarrel GarnishBarrel1 { get; private set; } [field: SerializeField] - public Barrel GarnishBarrel2 { get; private set; } + public GarnishBarrel GarnishBarrel2 { get; private set; } private List _barrels; @@ -94,7 +94,7 @@ namespace BlueWater.Tycoons { var activatedBarrels = GetActivatedBarrels(); return cocktailIngredients.All(element => - activatedBarrels.Find(barrel => barrel.GetLiquidData().Idx == element.Idx && !barrel.IsMoldy && barrel.CurrentAmount >= element.Amount)); + activatedBarrels.Find(barrel => barrel.GetLiquidData().Idx == element.Idx && barrel.CanMakingCocktailCrew(element.Amount))); } public void ConsumeMakingCocktailIngredient(List cocktailIngredients) diff --git a/Assets/03.Images/Props/Furniture/Statue03.png b/Assets/03.Images/Props/Furniture/Statue03.png index 6d071d9b1..5ce40a224 100644 Binary files a/Assets/03.Images/Props/Furniture/Statue03.png and b/Assets/03.Images/Props/Furniture/Statue03.png differ diff --git a/Assets/03.Images/Ui/Title/TycoonTitle.jpg b/Assets/03.Images/Ui/Title/TycoonTitle.jpg new file mode 100644 index 000000000..6942b7669 Binary files /dev/null and b/Assets/03.Images/Ui/Title/TycoonTitle.jpg differ diff --git a/Assets/03.Images/Ui/Title/TycoonTitle.jpg.meta b/Assets/03.Images/Ui/Title/TycoonTitle.jpg.meta new file mode 100644 index 000000000..a6f430735 --- /dev/null +++ b/Assets/03.Images/Ui/Title/TycoonTitle.jpg.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: b21fa7828e26d14489d898dc2773b2e5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/Outline/LimeTreeGarnishOutlineUnlit.mat b/Assets/04.Materials/Outline/LimeTreeGarnishOutlineUnlit.mat new file mode 100644 index 000000000..9b6a7235a --- /dev/null +++ b/Assets/04.Materials/Outline/LimeTreeGarnishOutlineUnlit.mat @@ -0,0 +1,152 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LimeTreeGarnishOutlineUnlit + m_Shader: {fileID: -6465566751694194690, guid: 8daa1b13f763ae74f8630c7a631dd327, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + 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} + - _MainTex: + m_Texture: {fileID: 2800000, guid: e8e66bdcffe17824ca37cb054b60d48f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + 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} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FadeDistance: 150 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _ISCORNER: 0 + - _IsCorner: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _StencilComp: 8 + - _StencilRef: 1 + - _Surface: 0 + - _Thickness: 0.01 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &6323663459513743005 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/04.Materials/Outline/LimeTreeGarnishOutlineUnlit.mat.meta b/Assets/04.Materials/Outline/LimeTreeGarnishOutlineUnlit.mat.meta new file mode 100644 index 000000000..16bcc21f9 --- /dev/null +++ b/Assets/04.Materials/Outline/LimeTreeGarnishOutlineUnlit.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4840518b8b8f88043a5dec7a5809f0df +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/Outline/SlimeGarnishOutlineUnlit.mat b/Assets/04.Materials/Outline/SlimeGarnishOutlineUnlit.mat new file mode 100644 index 000000000..f2cd5c66c --- /dev/null +++ b/Assets/04.Materials/Outline/SlimeGarnishOutlineUnlit.mat @@ -0,0 +1,152 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SlimeGarnishOutlineUnlit + m_Shader: {fileID: -6465566751694194690, guid: 8daa1b13f763ae74f8630c7a631dd327, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + 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} + - _MainTex: + m_Texture: {fileID: 2800000, guid: e0ca67a8665c046418717eb32ebc1f51, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + 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} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FadeDistance: 150 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _ISCORNER: 0 + - _IsCorner: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _StencilComp: 8 + - _StencilRef: 1 + - _Surface: 0 + - _Thickness: 0.01 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &6323663459513743005 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/04.Materials/Outline/SlimeGarnishOutlineUnlit.mat.meta b/Assets/04.Materials/Outline/SlimeGarnishOutlineUnlit.mat.meta new file mode 100644 index 000000000..26578bdbd --- /dev/null +++ b/Assets/04.Materials/Outline/SlimeGarnishOutlineUnlit.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09f648588be08eb45b484bf05408bf98 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/GarnishObject.prefab b/Assets/05.Prefabs/GarnishObject.prefab index 364026da4..ac18f70e4 100644 --- a/Assets/05.Prefabs/GarnishObject.prefab +++ b/Assets/05.Prefabs/GarnishObject.prefab @@ -79,7 +79,7 @@ SpriteRenderer: m_SortingLayerID: -403788685 m_SortingLayer: 1 m_SortingOrder: 12 - m_Sprite: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3} + m_Sprite: {fileID: 21300000, guid: c6fd44c44ec0c504c9d09e9c3e421708, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -125,7 +125,7 @@ CircleCollider2D: m_CompositeOperation: 0 m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} - m_Radius: 0.2 + m_Radius: 0.1 --- !u!50 &3470010340248184897 Rigidbody2D: serializedVersion: 5 @@ -141,7 +141,7 @@ Rigidbody2D: m_Mass: 10 m_LinearDamping: 0 m_AngularDamping: 0 - m_GravityScale: 3 + m_GravityScale: 6 m_Material: {fileID: 6200000, guid: 98be3277bd162b947a951461d0862c30, type: 2} m_IncludeLayers: serializedVersion: 2 @@ -168,3 +168,4 @@ MonoBehaviour: SpriteRenderer: {fileID: 3772201455671009312} Rigidbody2D: {fileID: 3470010340248184897} _distanceThreshold: 0.5 + _autoDestroyTime: 2 diff --git a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab index 29cb90525..38c74d0f3 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab @@ -32,6 +32,10 @@ Transform: m_Children: - {fileID: 1233910271586488284} - {fileID: 6336830780491525739} + - {fileID: 6866329568871890363} + - {fileID: 148289292509839455} + - {fileID: 2895932636958694884} + - {fileID: 1706241281351292212} - {fileID: 1550884414748587662} - {fileID: 8057480779888453785} - {fileID: 4007732918041893956} @@ -79,7 +83,7 @@ Transform: m_GameObject: {fileID: 720351507586470018} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -7.35, y: 2.55, z: -4.93} + m_LocalPosition: {x: -7.42, y: 3.89, z: -4.47} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -309,7 +313,7 @@ Transform: m_GameObject: {fileID: 833462480456262630} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.18, y: 4.46, z: -0.94} + m_LocalPosition: {x: 1.08, y: 4.21, z: -0.938} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -902,6 +906,93 @@ Transform: - {fileID: 6688107239458686954} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2854134827141126314 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1706241281351292212} + - component: {fileID: 4326304310849963514} + m_Layer: 0 + m_Name: WallBigColumn (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1706241281351292212 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2854134827141126314} + serializedVersion: 2 + m_LocalRotation: {x: 0.32619035, y: 0.102847405, z: -0.28257096, w: 0.89620084} + m_LocalPosition: {x: 2.08, y: 8.33, z: 0.96} + m_LocalScale: {x: 18.864992, y: 18.86499, z: 18.864988} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3043377211119969757} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: -35} +--- !u!212 &4326304310849963514 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2854134827141126314} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 21300000, guid: a4d5c7b7ffec77b4eb1c7e53e60fec9b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2984908257173085434 GameObject: m_ObjectHideFlags: 0 @@ -1022,7 +1113,7 @@ Transform: - {fileID: 3038071019104820635} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3139670917886171866 +--- !u!1 &3140698508934244418 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1030,44 +1121,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9037838875476760303} - - component: {fileID: 2880507045120802762} - - component: {fileID: 5101600636172457447} + - component: {fileID: 1658569693343960890} + - component: {fileID: 2735483199337484926} + - component: {fileID: 3881417552296021548} m_Layer: 0 - m_Name: Point Light (14) + m_Name: Point Light (9) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &9037838875476760303 +--- !u!4 &1658569693343960890 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3139670917886171866} + m_GameObject: {fileID: 3140698508934244418} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.11, y: 2.55, z: -4.93} + m_LocalPosition: {x: -2.76, y: 3.89, z: -4.47} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3965676124384496161} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!108 &2880507045120802762 +--- !u!108 &2735483199337484926 Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3139670917886171866} + m_GameObject: {fileID: 3140698508934244418} m_Enabled: 1 serializedVersion: 11 m_Type: 2 m_Color: {r: 0.27865788, g: 0.5032396, b: 0.5849056, a: 1} m_Intensity: 40 - m_Range: 4 + m_Range: 2.5 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 @@ -1120,13 +1211,13 @@ Light: m_LightUnit: 1 m_LuxAtDistance: 1 m_EnableSpotReflector: 1 ---- !u!114 &5101600636172457447 +--- !u!114 &3881417552296021548 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3139670917886171866} + m_GameObject: {fileID: 3140698508934244418} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} @@ -1143,6 +1234,93 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!1 &3161957670814730168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 148289292509839455} + - component: {fileID: 5436036196903630543} + m_Layer: 0 + m_Name: WallBigColumn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &148289292509839455 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3161957670814730168} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: 0.903, y: 4.258, z: -2.566} + m_LocalScale: {x: 18.86499, y: 18.86499, z: 18.86499} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3043377211119969757} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &5436036196903630543 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3161957670814730168} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 21300000, guid: a4d5c7b7ffec77b4eb1c7e53e60fec9b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3213574012824102535 GameObject: m_ObjectHideFlags: 0 @@ -1479,127 +1657,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &4054498097100553161 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7160680560296398733} - - component: {fileID: 4726708560521194797} - - component: {fileID: 2243790551643979920} - m_Layer: 0 - m_Name: Point Light (7) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7160680560296398733 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4054498097100553161} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.66, y: 2.55, z: -5.412} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3965676124384496161} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!108 &4726708560521194797 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4054498097100553161} - m_Enabled: 1 - serializedVersion: 11 - m_Type: 2 - m_Color: {r: 0.27865788, g: 0.5032396, b: 0.5849056, a: 1} - m_Intensity: 40 - m_Range: 4 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - 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: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 0 - 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 &2243790551643979920 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4054498097100553161} - 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 &4230584681293406090 GameObject: m_ObjectHideFlags: 0 @@ -1954,6 +2011,115 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4547298787856124758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6866329568871890363} + - component: {fileID: 7647637798655887398} + - component: {fileID: 1777620573868959157} + m_Layer: 7 + m_Name: SpriteWall3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6866329568871890363 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4547298787856124758} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: 0.88, y: 8.52, z: 1.18} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3043377211119969757} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &7647637798655887398 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4547298787856124758} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: 3c873d1f63abbb8459c91a67c6e48712, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 9.37, y: 5.24} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!65 &1777620573868959157 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4547298787856124758} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 9.37, y: 5.24, z: 0.20000005} + m_Center: {x: 0, y: 0, z: 0.1} --- !u!1 &5080749585704891928 GameObject: m_ObjectHideFlags: 0 @@ -1982,7 +2148,7 @@ Transform: m_GameObject: {fileID: 5080749585704891928} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.3, y: 0, z: -6.2} + m_LocalPosition: {x: -6.593, y: 0, z: -6.2} m_LocalScale: {x: 6, y: 1, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2718,8 +2884,8 @@ Transform: - {fileID: 5057389930774175573} - {fileID: 918752350534418522} - {fileID: 6126708932032161010} - - {fileID: 1115857063536227833} - - {fileID: 7291811772210861343} + - {fileID: 2411605176887912356} + - {fileID: 7719650949094224106} m_Father: {fileID: 1402113424960589398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5780312286541217170 @@ -2878,12 +3044,220 @@ Transform: - {fileID: 761558860074504813} - {fileID: 5495525894007307580} - {fileID: 3834249266432028486} - - {fileID: 7160680560296398733} - - {fileID: 3451280625101792058} - {fileID: 3703827150791370242} - - {fileID: 9037838875476760303} + - {fileID: 7041082238051734314} + - {fileID: 1658569693343960890} + - {fileID: 452327814530280805} m_Father: {fileID: 2700294535905665279} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5927794856557423084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2895932636958694884} + - component: {fileID: 2016925236646901003} + m_Layer: 0 + m_Name: WallBigColumn (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2895932636958694884 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5927794856557423084} + serializedVersion: 2 + m_LocalRotation: {x: 0.32619035, y: -0.102847405, z: 0.28257096, w: 0.89620084} + m_LocalPosition: {x: -0.42, y: 8.24, z: 0.89} + m_LocalScale: {x: 18.864992, y: 18.86499, z: 18.864988} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3043377211119969757} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 35} +--- !u!212 &2016925236646901003 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5927794856557423084} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 21300000, guid: a4d5c7b7ffec77b4eb1c7e53e60fec9b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &5930667420185574756 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7041082238051734314} + - component: {fileID: 4334165609843612117} + - component: {fileID: 8252413920886259781} + m_Layer: 0 + m_Name: Point Light (10) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7041082238051734314 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5930667420185574756} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.61, y: 3.89, z: -4.47} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3965676124384496161} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &4334165609843612117 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5930667420185574756} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 2 + m_Color: {r: 0.27865788, g: 0.5032396, b: 0.5849056, a: 1} + m_Intensity: 40 + m_Range: 2.5 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + 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: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 0 + 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 &8252413920886259781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5930667420185574756} + 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 &6025306343922063044 GameObject: m_ObjectHideFlags: 0 @@ -3323,7 +3697,7 @@ Transform: m_GameObject: {fileID: 6602221549203288876} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.21} + m_LocalPosition: {x: 0, y: 0, z: -1.53} m_LocalScale: {x: 20, y: 20, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3490,127 +3864,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &6743158595218866940 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3451280625101792058} - - component: {fileID: 2743958048090307090} - - component: {fileID: 8815086386277891742} - m_Layer: 0 - m_Name: Point Light (9) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3451280625101792058 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6743158595218866940} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 9.32, y: 2.55, z: -4.93} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3965676124384496161} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!108 &2743958048090307090 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6743158595218866940} - m_Enabled: 1 - serializedVersion: 11 - m_Type: 2 - m_Color: {r: 0.27865788, g: 0.5032396, b: 0.5849056, a: 1} - m_Intensity: 40 - m_Range: 2.5 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - 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: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 0 - 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 &8815086386277891742 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6743158595218866940} - 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 &6763660083076659525 GameObject: m_ObjectHideFlags: 0 @@ -3686,6 +3939,7 @@ Transform: - {fileID: 4119089025960676272} - {fileID: 7640850047456124134} - {fileID: 8858452115783968250} + - {fileID: 5676067596936288460} m_Father: {fileID: 1402113424960589398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6909776819859385971 @@ -4089,9 +4343,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7464281245467043594} - - {fileID: 2303817030398950878} - - {fileID: 625408443779082937} + - {fileID: 1410175272594425540} + - {fileID: 585429925142607109} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7275254627196952520 @@ -4459,6 +4712,127 @@ Transform: - {fileID: 7306049618087509122} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7612511759461793804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 452327814530280805} + - component: {fileID: 8279839231379435417} + - component: {fileID: 2787631767932492263} + m_Layer: 0 + m_Name: Point Light (11) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &452327814530280805 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7612511759461793804} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 9.27, y: 3.89, z: -4.47} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3965676124384496161} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &8279839231379435417 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7612511759461793804} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 2 + m_Color: {r: 0.27865788, g: 0.5032396, b: 0.5849056, a: 1} + m_Intensity: 40 + m_Range: 2.5 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + 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: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 0 + 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 &2787631767932492263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7612511759461793804} + 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 &7612584646610321492 GameObject: m_ObjectHideFlags: 0 @@ -4525,7 +4899,7 @@ Transform: m_GameObject: {fileID: 7671313022360079293} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 1.12, y: 0.01, z: -3.56} + m_LocalPosition: {x: 1.12, y: 0.01, z: -7.835} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -4618,6 +4992,7 @@ Transform: - {fileID: 3139401203256771042} - {fileID: 5128199735897506476} - {fileID: 11141612720054821} + - {fileID: 1376671198123935973} - {fileID: 4715404908742687508} - {fileID: 869534564193479129} - {fileID: 4307167678708421440} @@ -5233,7 +5608,7 @@ Transform: m_GameObject: {fileID: 8697754653569273504} serializedVersion: 2 m_LocalRotation: {x: 0.24184473, y: -0.24184473, z: 0.66446304, w: 0.66446304} - m_LocalPosition: {x: 2.79, y: 5, z: 3.04} + m_LocalPosition: {x: 2.79, y: 5, z: 1.8} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: [] @@ -5343,7 +5718,7 @@ Transform: m_GameObject: {fileID: 8854654418663393334} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.6, y: 0, z: -6.2} + m_LocalPosition: {x: 7.756, y: 0, z: -6.2} m_LocalScale: {x: 4, y: 1, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5795,7 +6170,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.x - value: -2.88 + value: 10.358999 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.y @@ -5803,7 +6178,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.z - value: -6.875372 + value: -12.228 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalRotation.w @@ -6041,96 +6416,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 303007263462811651} m_PrefabAsset: {fileID: 0} ---- !u!1001 &306601987844090139 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3032369304281183765} - m_Modifications: - - target: {fileID: 183186261584935481, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 0} - - target: {fileID: 203741387490724426, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalScale.x - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: _idx - value: Garnish1 - objectReference: {fileID: 0} - - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: _interactionEntryName - value: InteractionGarnishBarrel1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalPosition.x - value: -1.3 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalPosition.z - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1653087204473300138, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_StringReference.m_TableEntryReference.m_KeyId - value: 41099917012992 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_Name - value: Garnish1 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6817574259189873408, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} ---- !u!4 &1115857063536227833 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - m_PrefabInstance: {fileID: 306601987844090139} - m_PrefabAsset: {fileID: 0} --- !u!1001 &337472688778289832 PrefabInstance: m_ObjectHideFlags: 0 @@ -6279,6 +6564,10 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -1 objectReference: {fileID: 0} + - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} + propertyPath: Idx + value: LiquidD + objectReference: {fileID: 0} - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: _idx value: LiquidD @@ -6578,6 +6867,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} m_PrefabInstance: {fileID: 768054145390819379} m_PrefabAsset: {fileID: 0} +--- !u!1001 &859425380814242701 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6171473393154591264} + m_Modifications: + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalPosition.x + value: 12.4 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2196312868861311423, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_Name + value: WallBar (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} +--- !u!4 &585429925142607109 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + m_PrefabInstance: {fileID: 859425380814242701} + m_PrefabAsset: {fileID: 0} --- !u!1001 &971332650246923267 PrefabInstance: m_ObjectHideFlags: 0 @@ -6816,7 +7167,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.x - value: -3.540001 + value: -2.01 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.y @@ -6824,7 +7175,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.z - value: -4.812372 + value: -4.715 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalRotation.w @@ -6952,7 +7303,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7947dcd65a3517948a2892d06222f5ae, type: 3} propertyPath: m_LocalPosition.z - value: -3.758 + value: -8 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 7947dcd65a3517948a2892d06222f5ae, type: 3} propertyPath: m_LocalRotation.w @@ -7066,6 +7417,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 1129546663280585032} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1180898916160680012 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6171473393154591264} + m_Modifications: + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2196312868861311423, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + propertyPath: m_Name + value: WallBar + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} +--- !u!4 &1410175272594425540 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 284456572525049480, guid: 27673e5b9de6fd94c802273ab449c470, type: 3} + m_PrefabInstance: {fileID: 1180898916160680012} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1232868977171210295 PrefabInstance: m_ObjectHideFlags: 0 @@ -7612,6 +8025,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 3032369304281183765} m_Modifications: + - target: {fileID: 223172209862223209, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} + propertyPath: Idx + value: LiquidA + objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} propertyPath: m_LocalScale.x value: 5.5 @@ -7634,7 +8051,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} propertyPath: m_LocalPosition.z - value: -1.68 + value: -3 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} propertyPath: m_LocalRotation.w @@ -7740,6 +8157,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 2f14b0ed498881e448631d49713ffd42, type: 3} m_PrefabInstance: {fileID: 2065163030245425221} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2135002106183891506 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3500050107750040134} + m_Modifications: + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.x + value: 1.0377901 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.y + value: 1.0377901 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalScale.z + value: 1.0377901 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.x + value: 4.025 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalPosition.z + value: -4.715 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6075426784951483330, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + propertyPath: m_Name + value: Box (8) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} +--- !u!4 &1376671198123935973 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} + m_PrefabInstance: {fileID: 2135002106183891506} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2145365198109136230 PrefabInstance: m_ObjectHideFlags: 0 @@ -8225,7 +8720,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.z - value: -9.032 + value: -9.248 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalRotation.w @@ -8299,7 +8794,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.z - value: -9.48 + value: -9.696 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalRotation.w @@ -8699,6 +9194,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} m_PrefabInstance: {fileID: 2917561276444148358} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3047433734579714886 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3032369304281183765} + m_Modifications: + - target: {fileID: 183186261584935481, guid: 18213e533ac275e429ee601785bff676, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 18213e533ac275e429ee601785bff676, type: 3} + propertyPath: m_LocalPosition.x + value: 5.17 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 18213e533ac275e429ee601785bff676, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 18213e533ac275e429ee601785bff676, type: 3} + propertyPath: m_LocalPosition.z + value: -6.6 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 18213e533ac275e429ee601785bff676, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 18213e533ac275e429ee601785bff676, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 18213e533ac275e429ee601785bff676, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 18213e533ac275e429ee601785bff676, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 18213e533ac275e429ee601785bff676, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 18213e533ac275e429ee601785bff676, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 18213e533ac275e429ee601785bff676, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: 18213e533ac275e429ee601785bff676, type: 3} + propertyPath: m_Name + value: SlimeGarnish + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 18213e533ac275e429ee601785bff676, type: 3} +--- !u!4 &2411605176887912356 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 18213e533ac275e429ee601785bff676, type: 3} + m_PrefabInstance: {fileID: 3047433734579714886} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3085654335900240032 PrefabInstance: m_ObjectHideFlags: 0 @@ -9367,7 +9928,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalPosition.z - value: -9.262 + value: -9.478001 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} propertyPath: m_LocalRotation.w @@ -9632,7 +10193,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.x - value: 0.3 + value: -2 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.y @@ -9640,7 +10201,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.z - value: -7.6 + value: -8.1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalRotation.w @@ -10334,7 +10895,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1061695247072719575, guid: f977329fa9f0f114995ec6ce55524484, type: 3} propertyPath: m_LocalScale.x - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: f977329fa9f0f114995ec6ce55524484, type: 3} propertyPath: m_LocalScale.y @@ -10346,7 +10907,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: f977329fa9f0f114995ec6ce55524484, type: 3} propertyPath: m_LocalPosition.x - value: -5.28 + value: -5.2 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: f977329fa9f0f114995ec6ce55524484, type: 3} propertyPath: m_LocalPosition.y @@ -10456,92 +11017,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} m_PrefabInstance: {fileID: 4454847877275915547} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4470604464960345971 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6171473393154591264} - m_Modifications: - - target: {fileID: 249691834857601388, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_Name - value: WallPart (2) - objectReference: {fileID: 0} - - target: {fileID: 4770427915188035189, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LayerOverridePriority - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5796819295798372049, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalScale.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalScale.y - value: 7.5 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalScale.z - value: 7.5 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalPosition.x - value: -5.248 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalPosition.z - value: -6 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} ---- !u!4 &7464281245467043594 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - m_PrefabInstance: {fileID: 4470604464960345971} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4657099110603615857 PrefabInstance: m_ObjectHideFlags: 0 @@ -11010,6 +11485,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 5039457716745075142} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5041893704645854254 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4798925548635759970} + m_Modifications: + - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} + propertyPath: m_LocalPosition.x + value: 4.1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} + propertyPath: m_LocalPosition.z + value: -8.1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} + propertyPath: m_Name + value: ServingTable02 (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} +--- !u!4 &5676067596936288460 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} + m_PrefabInstance: {fileID: 5041893704645854254} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5042544421409611692 PrefabInstance: m_ObjectHideFlags: 0 @@ -11072,92 +11609,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 6af382c51f597ce40afe53c93080938e, type: 3} m_PrefabInstance: {fileID: 5042544421409611692} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5072317961834614183 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6171473393154591264} - m_Modifications: - - target: {fileID: 249691834857601388, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_Name - value: WallPart (3) - objectReference: {fileID: 0} - - target: {fileID: 4770427915188035189, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LayerOverridePriority - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5796819295798372049, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalScale.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalScale.y - value: 7.5 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalScale.z - value: 7.5 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalPosition.x - value: 7.3 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalPosition.z - value: -6 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} ---- !u!4 &2303817030398950878 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - m_PrefabInstance: {fileID: 5072317961834614183} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5075343917806718172 PrefabInstance: m_ObjectHideFlags: 0 @@ -11452,7 +11903,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.x - value: -3.1499996 + value: 10.089 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.y @@ -11460,7 +11911,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.z - value: -6.5153723 + value: -11.868 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalRotation.w @@ -11846,6 +12297,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 0} + - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} + propertyPath: Idx + value: LiquidC + objectReference: {fileID: 0} - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: _idx value: LiquidC @@ -11856,7 +12311,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.x - value: 4.5 + value: 3.3 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.y @@ -11864,7 +12319,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: -4 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalRotation.w @@ -12296,93 +12751,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} m_PrefabInstance: {fileID: 5836542928189845586} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5850552530100787904 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6171473393154591264} - m_Modifications: - - target: {fileID: 249691834857601388, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_Name - value: WallPart (7) - objectReference: {fileID: 0} - - target: {fileID: 4770427915188035189, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LayerOverridePriority - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5796819295798372049, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalScale.x - value: 8.6 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalScale.y - value: 7.5 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalScale.z - value: 7.5 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalPosition.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalPosition.z - value: -6.05 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 4770427915188035189, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} ---- !u!4 &625408443779082937 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6457232975130062969, guid: b598d6dcbf4fb7541a28f33dad36b424, type: 3} - m_PrefabInstance: {fileID: 5850552530100787904} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5938849513838622013 PrefabInstance: m_ObjectHideFlags: 0 @@ -12393,7 +12761,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1061695247072719575, guid: f977329fa9f0f114995ec6ce55524484, type: 3} propertyPath: m_LocalScale.x - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: f977329fa9f0f114995ec6ce55524484, type: 3} propertyPath: m_LocalScale.y @@ -12792,6 +13160,10 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -1 objectReference: {fileID: 0} + - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} + propertyPath: Idx + value: LiquidB + objectReference: {fileID: 0} - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: _idx value: LiquidB @@ -12802,7 +13174,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.x - value: -2.4 + value: -1.2 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.y @@ -12810,7 +13182,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalPosition.z - value: -3 + value: -4 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_LocalRotation.w @@ -13378,6 +13750,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 0} + - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} + propertyPath: Idx + value: LiquidE + objectReference: {fileID: 0} - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: _idx value: LiquidE @@ -13448,6 +13824,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} m_PrefabInstance: {fileID: 6790134818994829328} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6925589922020289544 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3032369304281183765} + m_Modifications: + - target: {fileID: 183186261584935481, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + propertyPath: m_LocalPosition.x + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + propertyPath: m_LocalPosition.z + value: -6.6 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + propertyPath: m_Name + value: LimeTreeGarnish + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} +--- !u!4 &7719650949094224106 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3} + m_PrefabInstance: {fileID: 6925589922020289544} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6934448979949371676 PrefabInstance: m_ObjectHideFlags: 0 @@ -13594,7 +14036,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.x - value: 1 + value: -1.3 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.y @@ -13602,7 +14044,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.z - value: -7.6 + value: -8.1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalRotation.w @@ -14480,96 +14922,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3} m_PrefabInstance: {fileID: 7877281783251375932} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7929905287357270525 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3032369304281183765} - m_Modifications: - - target: {fileID: 183186261584935481, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 0} - - target: {fileID: 203741387490724426, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: _idx - value: Garnish2 - objectReference: {fileID: 0} - - target: {fileID: 223172209862223209, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: _interactionEntryName - value: InteractionGarnishBarrel2 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalPosition.x - value: 3.6 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalPosition.z - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1653087204473300138, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_StringReference.m_TableEntryReference.m_KeyId - value: 41100923645952 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_Name - value: Garnish2 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6817574259189873408, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 1506abfb2ff26fa4aacdeb4b0efc9663, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} ---- !u!4 &7291811772210861343 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} - m_PrefabInstance: {fileID: 7929905287357270525} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8021190882530232665 PrefabInstance: m_ObjectHideFlags: 0 @@ -14729,7 +15081,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.x - value: 1.7 + value: 3.4 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.y @@ -14737,7 +15089,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalPosition.z - value: -7.6 + value: -8.1 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1a59e4ec0cefb354688d7a267e281ffc, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/WallBar.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/WallBar.prefab new file mode 100644 index 000000000..9afafcaaa --- /dev/null +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/WallBar.prefab @@ -0,0 +1,297 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1667578709333948506 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3099205625050259910} + - component: {fileID: 5432278246480817430} + m_Layer: 8 + m_Name: WallPartUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3099205625050259910 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1667578709333948506} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -5.2, y: 1.47, z: -4.934} + m_LocalScale: {x: 6.0738773, y: 6.0738773, z: 6.0738773} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 284456572525049480} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &5432278246480817430 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1667578709333948506} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: d06d254a10c13c9459caeb44918f6d54, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2132406094339672878 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2913355400573563851} + - component: {fileID: 4049733563461517547} + m_Layer: 8 + m_Name: WallColumn (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2913355400573563851 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132406094339672878} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -2.7, y: 0, z: -6.088} + m_LocalScale: {x: 4, y: 4, z: 4} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 284456572525049480} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &4049733563461517547 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132406094339672878} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: 6bc3aeba13d12984587c915855b8297c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2196312868861311423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 284456572525049480} + m_Layer: 8 + m_Name: WallBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &284456572525049480 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2196312868861311423} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3099205625050259910} + - {fileID: 2913355400573563851} + - {fileID: 7634283806787626977} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8045429205136852072 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7634283806787626977} + - component: {fileID: 4989549013751493551} + m_Layer: 8 + m_Name: WallColumn (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7634283806787626977 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8045429205136852072} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -7.73, y: 0, z: -6.088} + m_LocalScale: {x: 4, y: 4, z: 4} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 284456572525049480} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &4989549013751493551 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8045429205136852072} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: 519b9cce348e8344abb958b71088e03f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/WallBar.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/WallBar.prefab.meta new file mode 100644 index 000000000..cc060170b --- /dev/null +++ b/Assets/05.Prefabs/Props/Environment/Tycoon/WallBar.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 27673e5b9de6fd94c802273ab449c470 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab new file mode 100644 index 000000000..1bb899ebf --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab @@ -0,0 +1,451 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7343451337687172630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Size.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Size.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Size.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Center.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Center.z + value: 0.125 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 11d1c47204e2d8b4d94e7b57e388252f, type: 3} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Name + value: LimeTreeGarnish + objectReference: {fileID: 0} + - target: {fileID: 3779548209033231211, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: d98551edcbd98e542af000fc7aaaf794, type: 3} + - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.125 + objectReference: {fileID: 0} + - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9396927 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.3420201 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 11d1c47204e2d8b4d94e7b57e388252f, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_RemovedGameObjects: + - {fileID: 8884531212319162473, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 7890117756044024871} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 3688680572007923171} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1653087204473300138} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 881146744873694949} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 9135412363656340666} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 183186261584935481} + m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!1 &672328621937310823 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!23 &881146744873694949 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ccbbcb7a799826b4995493200a5d7c0f, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &9135412363656340666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: 5257f31f5b6e8664fbe9e62e0df7094b, type: 2} + initialSkinName: + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: Idle0 + loop: 0 + timeScale: 1 +--- !u!33 &183186261584935481 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Mesh: {fileID: 0} +--- !u!1 &5897095096647521783 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7890117756044024871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e4a707caef9cf544a63781c28d1244d, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 5927803667513949971} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 6533109861150454071} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 1653087204473300138} + k__BackingField: 1 + k__BackingField: 0.9 + k__BackingField: + IsOpened: 0 + SpineController: {fileID: 3688680572007923171} + Idx: Garnish2 + LiquidData: + k__BackingField: + k__BackingField: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: {r: 0, g: 0, b: 0, a: 0} + VisualMaxFill: 4000 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 +--- !u!114 &3688680572007923171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 9135412363656340666} + _originalMaterial: {fileID: 2100000, guid: ccbbcb7a799826b4995493200a5d7c0f, type: 2} + _replacementMaterial: {fileID: 2100000, guid: 4840518b8b8f88043a5dec7a5809f0df, type: 2} + _initialSkinName: default + _isRandomSkin: 0 + _isRandomRange: 0 + _randomRange: {x: 0, y: 0} + _randomStrings: [] +--- !u!114 &1653087204473300138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: + - name: global + variable: + rid: 5889118636641091760 + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: [] + references: + version: 2 + RefIds: + - rid: 5889118636641091760 + type: {class: NestedVariablesGroup, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, asm: Unity.Localization} + data: + m_Value: {fileID: 11400000, guid: f81887433cf7f6c4a991e214ea0eda59, type: 2} +--- !u!4 &5927803667513949971 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6533109861150454071 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4558604739080582945, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab.meta new file mode 100644 index 000000000..8de8ea0b4 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 92f5a0c86ec9cef4681b00068e5e7746 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab index 8a6038378..9cd379af0 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab @@ -711,22 +711,23 @@ MonoBehaviour: k__BackingField: 0.8 k__BackingField: IsOpened: 0 - _spineController: {fileID: 3688680572007923171} - _liquidImage: {fileID: 6817574259189873408} - _fill: {fileID: 7052380446467937511} - _colorIntensity: 2 - _idx: - _interactionEntryName: - _liquidData: + SpineController: {fileID: 3688680572007923171} + Idx: + LiquidData: k__BackingField: k__BackingField: k__BackingField: 0 k__BackingField: 0 k__BackingField: {fileID: 0} k__BackingField: {r: 0, g: 0, b: 0, a: 0} + VisualMaxFill: 4000 k__BackingField: 0 + k__BackingField: 0 k__BackingField: 0 k__BackingField: 0 + _liquidImage: {fileID: 6817574259189873408} + _fill: {fileID: 7052380446467937511} + _colorIntensity: 2 k__BackingField: 0 _playerHoldingTime: 3 --- !u!114 &3688680572007923171 @@ -769,21 +770,14 @@ MonoBehaviour: m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 - m_LocalVariables: - - name: global - variable: - rid: 5889118636641091760 + m_LocalVariables: [] m_FormatArguments: [] m_UpdateString: m_PersistentCalls: m_Calls: [] references: version: 2 - RefIds: - - rid: 5889118636641091760 - type: {class: NestedVariablesGroup, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, asm: Unity.Localization} - data: - m_Value: {fileID: 11400000, guid: f81887433cf7f6c4a991e214ea0eda59, type: 2} + RefIds: [] --- !u!4 &5927803667513949971 stripped Transform: m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab index 9e068f2b2..6c9c39f61 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab @@ -316,7 +316,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x @@ -391,6 +391,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} insertIndex: -1 addedObject: {fileID: 223172209862223209} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 7478245182548380060} m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} --- !u!4 &203741387490724426 stripped Transform: @@ -418,30 +421,58 @@ MonoBehaviour: k__BackingField: {fileID: 6077686033771388879} k__BackingField: {fileID: 6533109861150454071} k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 7478245182548380060} k__BackingField: 1 - k__BackingField: 0.8 + k__BackingField: 1.5 k__BackingField: IsOpened: 0 - _spineController: {fileID: 0} - _liquidImage: {fileID: 6817574259189873408} - _fill: {fileID: 7052380446467937511} - _colorIntensity: 2 - _idx: LiquidA - _interactionEntryName: InteractionLiquidBarrelA - _liquidData: + SpineController: {fileID: 0} + Idx: + LiquidData: k__BackingField: k__BackingField: k__BackingField: 0 k__BackingField: 0 k__BackingField: {fileID: 0} k__BackingField: {r: 0, g: 0, b: 0, a: 0} + VisualMaxFill: 4000 k__BackingField: 0 k__BackingField: 1 k__BackingField: 0 k__BackingField: 0 + _liquidImage: {fileID: 6817574259189873408} + _fill: {fileID: 7052380446467937511} + _colorIntensity: 2 k__BackingField: 0 _playerHoldingTime: 3 +--- !u!114 &7478245182548380060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: [] + references: + version: 2 + RefIds: [] --- !u!4 &5927803667513949971 stripped Transform: m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/SlimeGarnish.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/SlimeGarnish.prefab new file mode 100644 index 000000000..3c97df7ca --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/SlimeGarnish.prefab @@ -0,0 +1,427 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7343451337687172630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 11d1c47204e2d8b4d94e7b57e388252f, type: 3} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Name + value: SlimeGarnish + objectReference: {fileID: 0} + - target: {fileID: 3779548209033231211, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: d98551edcbd98e542af000fc7aaaf794, type: 3} + - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7122983875714221022, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7192483373850935599, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9396927 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.3420201 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 11d1c47204e2d8b4d94e7b57e388252f, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_RemovedGameObjects: + - {fileID: 8884531212319162473, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 7890117756044024871} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 3688680572007923171} + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1653087204473300138} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 881146744873694949} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 9135412363656340666} + - targetCorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 183186261584935481} + m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!1 &672328621937310823 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!23 &881146744873694949 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c7a5bea35585f1f498dbd5a933c570f9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &9135412363656340666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: 222b980a13e1c414e9abb7ad12ced958, type: 2} + initialSkinName: + fixPrefabOverrideViaMeshFilter: 2 + initialFlipX: 0 + initialFlipY: 0 + updateWhenInvisible: 3 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + fixDrawOrder: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 + _animationName: Idle0 + loop: 0 + timeScale: 1 +--- !u!33 &183186261584935481 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672328621937310823} + m_Mesh: {fileID: 0} +--- !u!1 &5897095096647521783 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7890117756044024871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e4a707caef9cf544a63781c28d1244d, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 5927803667513949971} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 6533109861150454071} + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 1653087204473300138} + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: + IsOpened: 0 + SpineController: {fileID: 3688680572007923171} + Idx: Garnish1 + LiquidData: + k__BackingField: + k__BackingField: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + k__BackingField: {r: 0, g: 0, b: 0, a: 0} + VisualMaxFill: 4000 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 +--- !u!114 &3688680572007923171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 9135412363656340666} + _originalMaterial: {fileID: 2100000, guid: c7a5bea35585f1f498dbd5a933c570f9, type: 2} + _replacementMaterial: {fileID: 2100000, guid: 09f648588be08eb45b484bf05408bf98, type: 2} + _initialSkinName: default + _isRandomSkin: 0 + _isRandomRange: 0 + _randomRange: {x: 0, y: 0} + _randomStrings: [] +--- !u!114 &1653087204473300138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: + - name: global + variable: + rid: 5889118636641091760 + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: [] + references: + version: 2 + RefIds: + - rid: 5889118636641091760 + type: {class: NestedVariablesGroup, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, asm: Unity.Localization} + data: + m_Value: {fileID: 11400000, guid: f81887433cf7f6c4a991e214ea0eda59, type: 2} +--- !u!4 &5927803667513949971 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6533109861150454071 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4558604739080582945, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/SlimeGarnish.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/SlimeGarnish.prefab.meta new file mode 100644 index 000000000..fea9ef806 --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/SlimeGarnish.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 18213e533ac275e429ee601785bff676 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/LimeTreeGarnish.meta b/Assets/08.Spines/Props/LimeTreeGarnish.meta new file mode 100644 index 000000000..d2d3e48eb --- /dev/null +++ b/Assets/08.Spines/Props/LimeTreeGarnish.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5dbd10964f67a9249bc64e70f7838bae +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.atlas.txt b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.atlas.txt new file mode 100644 index 000000000..6797d8292 --- /dev/null +++ b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.atlas.txt @@ -0,0 +1,20 @@ +LimeTree.png +size:1263,986 +filter:Linear,Linear +10 +bounds:1008,12,304,236 +rotate:90 +100 +bounds:1008,652,332,253 +rotate:90 +50 +bounds:1008,318,332,246 +rotate:90 +LimeTree0 +bounds:2,2,501,490 +LimeTree0- +bounds:2,494,501,490 +LimeTree100 +bounds:505,494,501,490 +LimeTree50 +bounds:505,2,501,490 diff --git a/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.atlas.txt.meta b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.atlas.txt.meta new file mode 100644 index 000000000..36ae07a42 --- /dev/null +++ b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 31bee6f5a8d0e5749bb4b772bf90bfad +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.png b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.png new file mode 100644 index 000000000..37b892da1 Binary files /dev/null and b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.png differ diff --git a/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.png.meta b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.png.meta new file mode 100644 index 000000000..8e1dad7fd --- /dev/null +++ b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: e8e66bdcffe17824ca37cb054b60d48f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.skel.bytes b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.skel.bytes new file mode 100644 index 000000000..22e05d884 Binary files /dev/null and b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.skel.bytes differ diff --git a/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.skel.bytes.meta b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.skel.bytes.meta new file mode 100644 index 000000000..1bd3543d2 --- /dev/null +++ b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 01e185a02f5819848a1bef494533728b +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_Atlas.asset b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_Atlas.asset new file mode 100644 index 000000000..7cff02c5d --- /dev/null +++ b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_Atlas.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: LimeTree_Atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: 31bee6f5a8d0e5749bb4b772bf90bfad, type: 3} + materials: + - {fileID: 2100000, guid: ccbbcb7a799826b4995493200a5d7c0f, type: 2} diff --git a/Assets/13.Localization/Global Variables Group Asset.asset.meta b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_Atlas.asset.meta similarity index 79% rename from Assets/13.Localization/Global Variables Group Asset.asset.meta rename to Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_Atlas.asset.meta index bd20f0bb6..9a1c61192 100644 --- a/Assets/13.Localization/Global Variables Group Asset.asset.meta +++ b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_Atlas.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f81887433cf7f6c4a991e214ea0eda59 +guid: e12301499d83e214c8d6463111cbcdc3 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_Material.mat b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_Material.mat new file mode 100644 index 000000000..d11dc3b66 --- /dev/null +++ b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_Material.mat @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LimeTree_Material + m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: e8e66bdcffe17824ca37cb054b60d48f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _DoubleSidedLighting: 0 + - _LightAffectsAdditive: 0 + - _ReceiveShadows: 0 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _TintBlack: 0 + - _ZWrite: 0 + m_Colors: + - _Black: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_Material.mat.meta b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_Material.mat.meta new file mode 100644 index 000000000..4e17ee8b7 --- /dev/null +++ b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ccbbcb7a799826b4995493200a5d7c0f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_SkeletonData.asset b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_SkeletonData.asset new file mode 100644 index 000000000..faf8c79ad --- /dev/null +++ b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_SkeletonData.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: LimeTree_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: e12301499d83e214c8d6463111cbcdc3, type: 2} + scale: 0.002 + skeletonJSON: {fileID: 4900000, guid: 01e185a02f5819848a1bef494533728b, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 1 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_SkeletonData.asset.meta b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_SkeletonData.asset.meta new file mode 100644 index 000000000..ab71798b0 --- /dev/null +++ b/Assets/08.Spines/Props/LimeTreeGarnish/LimeTree_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5257f31f5b6e8664fbe9e62e0df7094b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/SlimeGarnish.meta b/Assets/08.Spines/Props/SlimeGarnish.meta new file mode 100644 index 000000000..fdfa5a24d --- /dev/null +++ b/Assets/08.Spines/Props/SlimeGarnish.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f5c24af72a31d0144962e6cc5b51213a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/SlimeGarnish/Slime.atlas.txt b/Assets/08.Spines/Props/SlimeGarnish/Slime.atlas.txt new file mode 100644 index 000000000..15973068b --- /dev/null +++ b/Assets/08.Spines/Props/SlimeGarnish/Slime.atlas.txt @@ -0,0 +1,17 @@ +Slime.png +size:483,982 +filter:Linear,Linear +Back +bounds:2,687,479,293 +Bottom +bounds:295,180,505,180 +rotate:90 +Front +bounds:2,205,480,291 +rotate:90 +Slime1 +bounds:2,2,71,55 +Slime2 +bounds:239,33,229,145 +Slime3 +bounds:2,59,235,144 diff --git a/Assets/08.Spines/Props/SlimeGarnish/Slime.atlas.txt.meta b/Assets/08.Spines/Props/SlimeGarnish/Slime.atlas.txt.meta new file mode 100644 index 000000000..d14ae5f98 --- /dev/null +++ b/Assets/08.Spines/Props/SlimeGarnish/Slime.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f55895c40b8b2e941a803a4f4c79a56d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/SlimeGarnish/Slime.png b/Assets/08.Spines/Props/SlimeGarnish/Slime.png new file mode 100644 index 000000000..5ae8b90f8 Binary files /dev/null and b/Assets/08.Spines/Props/SlimeGarnish/Slime.png differ diff --git a/Assets/08.Spines/Props/SlimeGarnish/Slime.png.meta b/Assets/08.Spines/Props/SlimeGarnish/Slime.png.meta new file mode 100644 index 000000000..919eee3ce --- /dev/null +++ b/Assets/08.Spines/Props/SlimeGarnish/Slime.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: e0ca67a8665c046418717eb32ebc1f51 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/SlimeGarnish/Slime.skel.bytes b/Assets/08.Spines/Props/SlimeGarnish/Slime.skel.bytes new file mode 100644 index 000000000..26f241729 Binary files /dev/null and b/Assets/08.Spines/Props/SlimeGarnish/Slime.skel.bytes differ diff --git a/Assets/08.Spines/Props/SlimeGarnish/Slime.skel.bytes.meta b/Assets/08.Spines/Props/SlimeGarnish/Slime.skel.bytes.meta new file mode 100644 index 000000000..81b24cbd0 --- /dev/null +++ b/Assets/08.Spines/Props/SlimeGarnish/Slime.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b8707fdcb4b8fff44ab8fa3713737ee5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/SlimeGarnish/Slime_Atlas.asset b/Assets/08.Spines/Props/SlimeGarnish/Slime_Atlas.asset new file mode 100644 index 000000000..a81738e40 --- /dev/null +++ b/Assets/08.Spines/Props/SlimeGarnish/Slime_Atlas.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: Slime_Atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: f55895c40b8b2e941a803a4f4c79a56d, type: 3} + materials: + - {fileID: 2100000, guid: c7a5bea35585f1f498dbd5a933c570f9, type: 2} diff --git a/Assets/08.Spines/Props/SlimeGarnish/Slime_Atlas.asset.meta b/Assets/08.Spines/Props/SlimeGarnish/Slime_Atlas.asset.meta new file mode 100644 index 000000000..30351b31e --- /dev/null +++ b/Assets/08.Spines/Props/SlimeGarnish/Slime_Atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5640af5a25d56434497a2d42f2036cd3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/SlimeGarnish/Slime_Material.mat b/Assets/08.Spines/Props/SlimeGarnish/Slime_Material.mat new file mode 100644 index 000000000..2e6807c26 --- /dev/null +++ b/Assets/08.Spines/Props/SlimeGarnish/Slime_Material.mat @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Slime_Material + m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: e0ca67a8665c046418717eb32ebc1f51, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _DoubleSidedLighting: 0 + - _LightAffectsAdditive: 0 + - _ReceiveShadows: 0 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _TintBlack: 0 + - _ZWrite: 0 + m_Colors: + - _Black: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/08.Spines/Props/SlimeGarnish/Slime_Material.mat.meta b/Assets/08.Spines/Props/SlimeGarnish/Slime_Material.mat.meta new file mode 100644 index 000000000..6fac1333c --- /dev/null +++ b/Assets/08.Spines/Props/SlimeGarnish/Slime_Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c7a5bea35585f1f498dbd5a933c570f9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/SlimeGarnish/Slime_SkeletonData.asset b/Assets/08.Spines/Props/SlimeGarnish/Slime_SkeletonData.asset new file mode 100644 index 000000000..ef949a168 --- /dev/null +++ b/Assets/08.Spines/Props/SlimeGarnish/Slime_SkeletonData.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: Slime_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 5640af5a25d56434497a2d42f2036cd3, type: 2} + scale: 0.002 + skeletonJSON: {fileID: 4900000, guid: b8707fdcb4b8fff44ab8fa3713737ee5, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 1 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/08.Spines/Props/SlimeGarnish/Slime_SkeletonData.asset.meta b/Assets/08.Spines/Props/SlimeGarnish/Slime_SkeletonData.asset.meta new file mode 100644 index 000000000..1d8066138 --- /dev/null +++ b/Assets/08.Spines/Props/SlimeGarnish/Slime_SkeletonData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 222b980a13e1c414e9abb7ad12ced958 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08.Spines/Props/TrashCan/Trashcan.skel.bytes b/Assets/08.Spines/Props/TrashCan/Trashcan.skel.bytes index 704103b52..6c3cecb41 100644 Binary files a/Assets/08.Spines/Props/TrashCan/Trashcan.skel.bytes and b/Assets/08.Spines/Props/TrashCan/Trashcan.skel.bytes differ diff --git a/Assets/13.Localization/Global Variables Group Asset.asset b/Assets/13.Localization/Global Variables Group Asset.asset deleted file mode 100644 index 078d2146c..000000000 --- a/Assets/13.Localization/Global Variables Group Asset.asset +++ /dev/null @@ -1,67 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -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: b1e3e22ff9634e441a479f01f905a2f7, type: 3} - m_Name: Global Variables Group Asset - m_EditorClassIdentifier: - m_Variables: - - name: liquidE - variable: - rid: 5889118636641091764 - - name: liquidD - variable: - rid: 5889118636641091763 - - name: liquidC - variable: - rid: 5889118636641091762 - - name: liquidB - variable: - rid: 5889118636641091761 - - name: liquidA - variable: - rid: 5889118636641091755 - - name: garnish1 - variable: - rid: 5889118636641091769 - - name: garnish2 - variable: - rid: 5889118636641091770 - references: - version: 2 - RefIds: - - rid: 5889118636641091755 - type: {class: StringVariable, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, asm: Unity.Localization} - data: - m_Value: LiquidA - - rid: 5889118636641091761 - type: {class: StringVariable, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, asm: Unity.Localization} - data: - m_Value: LiquidB - - rid: 5889118636641091762 - type: {class: StringVariable, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, asm: Unity.Localization} - data: - m_Value: LiquidC - - rid: 5889118636641091763 - type: {class: StringVariable, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, asm: Unity.Localization} - data: - m_Value: LiquidD - - rid: 5889118636641091764 - type: {class: StringVariable, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, asm: Unity.Localization} - data: - m_Value: LiquidE - - rid: 5889118636641091769 - type: {class: StringVariable, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, asm: Unity.Localization} - data: - m_Value: Garnish1 - - rid: 5889118636641091770 - type: {class: StringVariable, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, asm: Unity.Localization} - data: - m_Value: Garnish2 diff --git a/Assets/13.Localization/Tables/StringDataTable Shared Data.asset b/Assets/13.Localization/Tables/StringDataTable Shared Data.asset index c9d773eb3..844aee692 100644 --- a/Assets/13.Localization/Tables/StringDataTable Shared Data.asset +++ b/Assets/13.Localization/Tables/StringDataTable Shared Data.asset @@ -395,6 +395,10 @@ MonoBehaviour: m_Key: StartShopWarningMessage m_Metadata: m_Items: [] + - m_Id: 2755079634694144 + m_Key: AcquireAll + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/13.Localization/Tables/StringDataTable_en.asset b/Assets/13.Localization/Tables/StringDataTable_en.asset index 69e8ea54b..5a4200f3c 100644 --- a/Assets/13.Localization/Tables/StringDataTable_en.asset +++ b/Assets/13.Localization/Tables/StringDataTable_en.asset @@ -402,6 +402,10 @@ MonoBehaviour: m_Localized: Unused gold will be forfeited. m_Metadata: m_Items: [] + - m_Id: 2755079634694144 + m_Localized: Acquire All + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/13.Localization/Tables/StringDataTable_ko.asset b/Assets/13.Localization/Tables/StringDataTable_ko.asset index 8d1b20a24..6040c6cbf 100644 --- a/Assets/13.Localization/Tables/StringDataTable_ko.asset +++ b/Assets/13.Localization/Tables/StringDataTable_ko.asset @@ -416,6 +416,10 @@ MonoBehaviour: \uC18C\uBA78\uD569\uB2C8\uB2E4." m_Metadata: m_Items: [] + - m_Id: 2755079634694144 + m_Localized: "\uBAA8\uB450 \uD68D\uB4DD" + m_Metadata: + m_Items: [] references: version: 2 RefIds: []