diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 2b30a75ef..1996c895b 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -4670,6 +4670,124 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 451270140} m_CullTransparentMesh: 1 +--- !u!1 &451518522 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 451518523} + - component: {fileID: 451518525} + - component: {fileID: 451518524} + - component: {fileID: 451518527} + - component: {fileID: 451518526} + m_Layer: 5 + m_Name: TextBox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &451518523 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451518522} + 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: 1 + m_Children: + - {fileID: 601028891} + m_Father: {fileID: 1185670929} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 1, y: 0} +--- !u!114 &451518524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451518522} + 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: c7ef1b7221f0b5b4f94a1d2685ff92c2, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1.5 +--- !u!222 &451518525 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451518522} + m_CullTransparentMesh: 1 +--- !u!114 &451518526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451518522} + 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 &451518527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451518522} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 15 + m_Right: 15 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &453498914 GameObject: m_ObjectHideFlags: 0 @@ -6665,6 +6783,7 @@ RectTransform: - {fileID: 1483442182} - {fileID: 562911824} - {fileID: 879980064258291461} + - {fileID: 3444289701290488300} m_Father: {fileID: 1049919592} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -6672,6 +6791,142 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &601028890 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 601028891} + - component: {fileID: 601028893} + - component: {fileID: 601028892} + m_Layer: 5 + m_Name: OpenManualKeyText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &601028891 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601028890} + 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: 451518523} + 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: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &601028892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601028890} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Q + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 10 + m_fontSizeMax: 20 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &601028893 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601028890} + m_CullTransparentMesh: 1 --- !u!1 &613509647 GameObject: m_ObjectHideFlags: 0 @@ -12242,7 +12497,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 451518523} m_Father: {fileID: 1701833860} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -19820,6 +20076,7 @@ MonoBehaviour: SwitchMapsOpened: 2 SwitchMapsClosed: 1 _panel: {fileID: 2097912643} + _openManualKeyText: {fileID: 601028892} _cocktailButtons: {fileID: 450220855} cocktailImage: {fileID: 1793342540} cocktailName: {fileID: 788752399} @@ -24865,6 +25122,36 @@ RectTransform: m_AnchoredPosition: {x: 440, y: 0} m_SizeDelta: {x: 120, y: 150} m_Pivot: {x: 0, y: 0.5} +--- !u!114 &667631706165908267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7842015228343821818} + 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: 20615443db7d4384da64072b059d65d4, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0.665 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!224 &879980064258291461 RectTransform: m_ObjectHideFlags: 0 @@ -24901,6 +25188,36 @@ MonoBehaviour: _healthPointPrefab: {fileID: 4356182340925070836, guid: b7ec42093fecf23439afbcf6ebd755db, type: 3} _maxHeartCount: 5 _healthPoints: [] +--- !u!114 &950079053514633698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3980806253149075077} + 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: 0} + 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: -2413806693520163455, guid: e074a9b4b276847b0b578d2c96d2c1db, 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!1001 &1232916638049353559 PrefabInstance: m_ObjectHideFlags: 0 @@ -24958,6 +25275,479 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1614514235215fe4b877ab0945881d27, type: 3} +--- !u!222 &1430353491084534525 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7842015228343821818} + m_CullTransparentMesh: 1 +--- !u!224 &2047332073539274622 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6379056552638072153} + 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: 7648211068268552030} + - {fileID: 6924699666765409378} + - {fileID: 2275366414873234882} + - {fileID: 4925185709700530424} + - {fileID: 2391905837938296680} + m_Father: {fileID: 3444289701290488300} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -100, y: 20} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 1, y: 0} +--- !u!1 &2209458169418236949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4598399664671681700} + - component: {fileID: 4541560578827747123} + - component: {fileID: 2490743419069592745} + m_Layer: 5 + m_Name: DashKeyText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2275366414873234882 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6464859655898444729} + 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: 2047332073539274622} + 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 &2304147871499649077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4034400065725330771} + 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: c7ef1b7221f0b5b4f94a1d2685ff92c2, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1.5 +--- !u!224 &2391905837938296680 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4034400065725330771} + 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: 4598399664671681700} + m_Father: {fileID: 2047332073539274622} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 50, y: 0} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 1, y: 0} +--- !u!114 &2490743419069592745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2209458169418236949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Space + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 20 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &2684932054530050287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6464859655898444729} + 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: b710f775d111c9845900d091221ab212, 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!224 &3444289701290488300 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5001841760030154045} + 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: 2047332073539274622} + m_Father: {fileID: 588336991} + 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 &3631155652996040652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4765696093421747498} + 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: 507a816ff4b7b3148be49ece761a2c00, 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!1 &3980806253149075077 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4925185709700530424} + - component: {fileID: 8990309080533297816} + - component: {fileID: 950079053514633698} + m_Layer: 5 + m_Name: FlashImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &4034400065725330771 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2391905837938296680} + - component: {fileID: 5241677952093193496} + - component: {fileID: 2304147871499649077} + - component: {fileID: 5241677952093193498} + - component: {fileID: 5241677952093193497} + m_Layer: 5 + m_Name: TextBox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &4541560578827747123 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2209458169418236949} + m_CullTransparentMesh: 1 +--- !u!224 &4598399664671681700 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2209458169418236949} + 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: 2391905837938296680} + 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: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4765696093421747498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7648211068268552030} + - component: {fileID: 5904233351964813160} + - component: {fileID: 3631155652996040652} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4925185709700530424 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3980806253149075077} + 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: 2047332073539274622} + 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!1 &5001841760030154045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3444289701290488300} + - component: {fileID: 5001841760030154046} + m_Layer: 5 + m_Name: DashUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &5001841760030154046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5001841760030154045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4689fc0e69f4c504196472d1c89361a8, type: 3} + m_Name: + m_EditorClassIdentifier: + _filled: {fileID: 667631706165908267} + _flash: {fileID: 950079053514633698} + _dashKeyText: {fileID: 2490743419069592745} + _fadeInOutDuration: 0.2 +--- !u!222 &5241677952093193496 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4034400065725330771} + m_CullTransparentMesh: 1 +--- !u!114 &5241677952093193497 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4034400065725330771} + 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 &5241677952093193498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4034400065725330771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 15 + m_Right: 15 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1001 &5626406452199475265 PrefabInstance: m_ObjectHideFlags: 0 @@ -26847,6 +27637,22 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} +--- !u!222 &5904233351964813160 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4765696093421747498} + m_CullTransparentMesh: 1 +--- !u!222 &5925074313005225046 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6464859655898444729} + m_CullTransparentMesh: 1 --- !u!224 &6232410505084427856 RectTransform: m_ObjectHideFlags: 0 @@ -26871,6 +27677,40 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -20} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &6379056552638072153 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2047332073539274622} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &6464859655898444729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2275366414873234882} + - component: {fileID: 5925074313005225046} + - component: {fileID: 2684932054530050287} + m_Layer: 5 + m_Name: DashImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &6899510603013594002 GameObject: m_ObjectHideFlags: 0 @@ -26912,6 +27752,70 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 2 m_ConstraintCount: 1 +--- !u!224 &6924699666765409378 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7842015228343821818} + 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: 2047332073539274622} + 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!224 &7648211068268552030 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4765696093421747498} + 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: 2047332073539274622} + 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!1 &7842015228343821818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6924699666765409378} + - component: {fileID: 1430353491084534525} + - component: {fileID: 667631706165908267} + m_Layer: 5 + m_Name: Filled + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!222 &8990309080533297816 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3980806253149075077} + m_CullTransparentMesh: 1 --- !u!1 &9026075076208309556 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs index d2ef5fe7d..5c0cf7868 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs @@ -68,8 +68,8 @@ namespace BlueWater.Npcs.Customers [field: SerializeField] public InteractionCanvas InteractionCanvas { get; private set; } - [field: SerializeField] - public BalloonUi BalloonUi { get; private set; } + // [field: SerializeField] + // public BalloonUi BalloonUi { get; private set; } [SerializeField] private PayMoneyUi _payMoneyUiObject; @@ -96,6 +96,12 @@ namespace BlueWater.Npcs.Customers [SerializeField] private Vomiting _vomiting; + [SerializeField] + private Color _startColor = Color.green; + + [SerializeField] + private Color _endColor = Color.red; + [field: Title("실시간 데이터")] [field: SerializeField] public LevelData CurrentLevelData { get; private set; } @@ -210,7 +216,7 @@ namespace BlueWater.Npcs.Customers MeshRenderer = VisualLook.GetComponent(); BarkTrigger = transform.Find("DialogueSystem").GetComponent(); InteractionCanvas = transform.GetComponentInChildren(); - BalloonUi = InteractionCanvas.transform.GetComponentInChildren(); + // BalloonUi = InteractionCanvas.transform.GetComponentInChildren(); SpineController = GetComponent(); AIMovement = GetComponent(); @@ -282,7 +288,7 @@ namespace BlueWater.Npcs.Customers public void ServedItem(CocktailData cocktailData) { - BalloonUi.ReceiveItem(cocktailData); + CurrentTableSeat.MenuBalloonUi.ReceiveItem(cocktailData); if (IsOrderedCorrected) { CurrentTableSeat.SetFood(); @@ -419,7 +425,7 @@ namespace BlueWater.Npcs.Customers public bool IsWaitTimeOver() { - var isWaitTimeOver = BalloonUi.IsWaitTimeOver(); + var isWaitTimeOver = CurrentTableSeat.MenuBalloonUi.IsWaitTimeOver(); if (isWaitTimeOver) { EventManager.InvokeOrderResult(this, false); @@ -499,7 +505,7 @@ namespace BlueWater.Npcs.Customers IsOrderedCorrected = false; OrderedCocktailData = TycoonManager.Instance.TycoonIngredientController.GetRandomCocktailData(); var hurryTime = CurrentLevelData.HurryTime + TycoonManager.Instance.TycoonStatus.CustomerHurryTimeIncrease; - BalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, hurryTime); + CurrentTableSeat.MenuBalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, hurryTime, true, _startColor, _endColor); _customerInteractionType = CustomerInteractionType.ServedCocktail; RegisterPlayerInteraction(); @@ -546,7 +552,7 @@ namespace BlueWater.Npcs.Customers { if (!IsOrderedCocktail()) return; - BalloonUi.ResetGauge(); + CurrentTableSeat.MenuBalloonUi.ResetGauge(); CurrentBill.ResetGauge(); } diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs index af43283fb..bb8a36a51 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonMovement.cs @@ -244,6 +244,7 @@ namespace BlueWater.Players.Tycoons { dashCooldown = DashCooldown; } + EventManager.InvokeDashCooldown(dashCooldown); StartCoroutine(Utils.CoolDownCoroutine(dashCooldown, () => IsDashCoolDownActive = false)); } diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index ba972863b..b6e1d8ad9 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -109,6 +109,12 @@ namespace BlueWater } // 플레이어 + public static Action OnDashCooldown; + public static void InvokeDashCooldown(float cooldown) + { + OnDashCooldown?.Invoke(cooldown); + } + // 레벨업 이벤트 public static Action OnLevelUp; public static void InvokeLevelUp(LevelData levelData) diff --git a/Assets/02.Scripts/PlayerInputKeyManager.cs b/Assets/02.Scripts/PlayerInputKeyManager.cs index 1a80ef74e..e577a628f 100644 --- a/Assets/02.Scripts/PlayerInputKeyManager.cs +++ b/Assets/02.Scripts/PlayerInputKeyManager.cs @@ -152,6 +152,64 @@ namespace BlueWater } return action; } + + public string GetBoundKey(InputActionMaps actionMapName, string actionName) + { + if (IsNullCurrentPlayerInput()) return null; + + var actionMap = _currentPlayerInput.actions.FindActionMap(actionMapName.ToString(), true); + if (actionMap == null) + { + Debug.LogError($"Action Map '{actionMapName}' not found!"); + return null; + } + + var action = actionMap.FindAction(actionName, true); + if (action == null) + { + Debug.LogError($"Action '{actionName}' not found in Action Map '{actionMapName}'!"); + return null; + } + + // 첫 번째 바인딩에서 키 이름 가져오기 + foreach (var binding in action.bindings) + { + if (!string.IsNullOrEmpty(binding.path)) + { + // 키 이름만 추출 + var key = InputControlPath.ToHumanReadableString(binding.path, InputControlPath.HumanReadableStringOptions.OmitDevice); + return key; + } + } + + Debug.LogWarning($"No bindings found for action '{actionName}' in Action Map '{actionMapName}'."); + return null; + } + + public string GetBoundKey(InputAction inputAction) + { + if (IsNullCurrentPlayerInput()) return null; + + if (inputAction == null) + { + Debug.LogError($"Action not found'!"); + return null; + } + + // 첫 번째 바인딩에서 키 이름 가져오기 + foreach (var binding in inputAction.bindings) + { + if (!string.IsNullOrEmpty(binding.path)) + { + // 키 이름만 추출 + var key = InputControlPath.ToHumanReadableString(binding.path, InputControlPath.HumanReadableStringOptions.OmitDevice); + return key; + } + } + + Debug.LogWarning($"No bindings found for action '{inputAction}'"); + return null; + } public bool IsCurrentActionMap(InputActionMaps inputActionMaps) { diff --git a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs index bcc889f3a..8a58e938c 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs @@ -12,6 +12,9 @@ namespace BlueWater.Tycoons [Serializable] public class TableSeat : InteractionFurniture, ICrewInteraction { + [field: SerializeField] + public BalloonUi MenuBalloonUi { get; private set; } + [SerializeField] private PayMoneyUi _payMoneyUiObject; @@ -39,6 +42,12 @@ namespace BlueWater.Tycoons [field: SerializeField] public int TableNumber; + [SerializeField] + private Sprite _fullBeerGlass; + + [SerializeField] + private Sprite _emptyBeerGlass; + [SerializeField] private float _playerHoldingTime = 3f; @@ -49,8 +58,6 @@ namespace BlueWater.Tycoons private string _cleaningSfxName = "CleaningTable"; private LevelData _currentLevelData; - private Sprite _fullBeerGlass; - private Sprite _emptyBeerGlass; private Coroutine _findCleanerCrewInstance; private bool _isPlayerInteracting; private bool _isCrewInteracting; @@ -69,9 +76,6 @@ namespace BlueWater.Tycoons base.Start(); EventManager.OnCleaningAll += Cleaning; - - _fullBeerGlass = DataManager.Instance.SpriteDataSo.FullBeerGlass; - _emptyBeerGlass = DataManager.Instance.SpriteDataSo.EmptyBeerGlass; } private void Update() diff --git a/Assets/02.Scripts/SceneController.cs b/Assets/02.Scripts/SceneController.cs index f10503e0c..011574978 100644 --- a/Assets/02.Scripts/SceneController.cs +++ b/Assets/02.Scripts/SceneController.cs @@ -50,6 +50,8 @@ namespace BlueWater private void OnSceneLoaded(Scene scene, LoadSceneMode mode) { + PopupUiController.ClearPopup(); + if (scene.name == "01.Tycoon") { if (_isMovedCombatScene) diff --git a/Assets/02.Scripts/SpriteDataSo.cs b/Assets/02.Scripts/SpriteDataSo.cs index 2ae3c53b8..ad5243012 100644 --- a/Assets/02.Scripts/SpriteDataSo.cs +++ b/Assets/02.Scripts/SpriteDataSo.cs @@ -11,12 +11,6 @@ namespace BlueWater [field: SerializeField] public Sprite Gold02 { get; private set; } - [field: SerializeField] - public Sprite EmptyBeerGlass { get; private set; } - - [field: SerializeField] - public Sprite FullBeerGlass { get; private set; } - [field: SerializeField] public Sprite BarrelLock { get; private set; } diff --git a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs index c2033b086..8dae5d193 100644 --- a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs +++ b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs @@ -48,11 +48,6 @@ namespace BlueWater.Titles private bool _isQuitting; private bool _onButtonClicked; - private void Awake() - { - PopupUiController.ClearPopup(); - } - private void Start() { _playerInputKeyManager = PlayerInputKeyManager.Instance; @@ -116,15 +111,6 @@ namespace BlueWater.Titles } else { - if (!PopupUiController.IsPopupListEmpty()) - { - foreach (var element in PopupUiController.PopupUis) - { - print(element.gameObject.name); - } - return; - } - _openAction.performed -= OnOpen; VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); _playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.TycoonUi); diff --git a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs index 30c39b797..5c5fc0605 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs @@ -31,7 +31,8 @@ namespace BlueWater.Uis [SerializeField, DisableIf("@true")] private bool _isItemReceived; - private Tween _tween; + private Tween _fillTween; + private Tween _colorTween; private CocktailData _orderCocktailData; private void Awake() @@ -39,11 +40,6 @@ namespace BlueWater.Uis InitializeComponents(); } - private void OnDestroy() - { - _tween.Kill(); - } - [Button("컴포넌트 초기화")] private void InitializeComponents() { @@ -89,7 +85,7 @@ namespace BlueWater.Uis SetEmpty(); } - public void OrderItem(string itemIdx, float waitTime, float hurryTime) + public void OrderItem(string itemIdx, float waitTime, float hurryTime, bool isReverse = false, Color? startColor = null, Color? endColor = null) { _orderCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(itemIdx); _isOrdered = true; @@ -97,10 +93,10 @@ namespace BlueWater.Uis _isItemReceived = false; SetItemImage(_orderCocktailData); - SetTween(waitTime, hurryTime); + SetTween(waitTime, hurryTime, isReverse, startColor, endColor); } - public void OrderItem(Sprite sprite, float waitTime, float hurryTime) + public void OrderItem(Sprite sprite, float waitTime, float hurryTime, bool isReverse = false, Color? startColor = null, Color? endColor = null) { _isOrdered = true; _isWaitTimeOver = false; @@ -108,29 +104,40 @@ namespace BlueWater.Uis SetItemSprite(sprite); ShowUi(); - SetTween(waitTime, hurryTime); + SetTween(waitTime, hurryTime, isReverse, startColor, endColor); } - public void SetTween(float waitTime, float hurryTime) + public void SetTween(float waitTime, float hurryTime, bool isReverse = false, Color? startColor = null, Color? endColor = null) { - _tween?.Kill(); - _tween = _fillImage.DOFillAmount(1f, hurryTime) - .From(0f) + float startValue = isReverse ? 1f : 0f; + float endValue = isReverse ? 0f : 1f; + + _fillTween = _fillImage.DOFillAmount(endValue, hurryTime) + .From(startValue) .SetEase(Ease.Linear) .SetDelay(waitTime) .OnComplete(OnTweenComplete) - .SetAutoKill(false); + .SetAutoKill(true); + + if (startColor != null && endColor != null) + { + _colorTween = _fillImage.DOColor((Color)endColor, hurryTime) + .From((Color)startColor) + .SetEase(Ease.Linear) + .SetDelay(waitTime) + .SetAutoKill(true); + } } public void ResetGauge() { - if (_tween == null) + if (_fillTween == null) { Debug.LogError("BalloonUi 게이지 리셋 오류"); return; } - _tween.Restart(); + _fillTween.Restart(); } public void PayMoney(int waitTime, int hurryTime) @@ -141,7 +148,7 @@ namespace BlueWater.Uis SetItemSprite(DataManager.Instance.SpriteDataSo.Gold01); ShowUi(); - _tween = _fillImage.DOFillAmount(1f, hurryTime) + _fillTween = _fillImage.DOFillAmount(1f, hurryTime) .From(0f) .SetEase(Ease.Linear) .SetDelay(waitTime) @@ -160,7 +167,7 @@ namespace BlueWater.Uis public void ReceiveItem(IPickup pickupItem) { - _tween.Kill(); + _fillTween.Kill(); HideUi(); _isItemReceived = true; } diff --git a/Assets/02.Scripts/Ui/Tycoon/DashUi.cs b/Assets/02.Scripts/Ui/Tycoon/DashUi.cs new file mode 100644 index 000000000..2181e5e7f --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/DashUi.cs @@ -0,0 +1,68 @@ +using DG.Tweening; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace BlueWater.Uis +{ + public class DashUi : MonoBehaviour + { + [SerializeField] + private Image _filled; + + [SerializeField] + private Image _flash; + + [SerializeField] + private TMP_Text _dashKeyText; + + [SerializeField] + private float _fadeInOutDuration = 0.2f; + + private Tween _dashCooldownTween; + private Tween _flashFadeTween; + private string _dashKeyBinding; + + private void Awake() + { + EventManager.OnDashCooldown += DashCooldown; + } + + private void Start() + { + _filled.fillAmount = 1f; + + _flashFadeTween = _flash.DOFade(1f, _fadeInOutDuration) + .From(0f) + .SetLoops(2, LoopType.Yoyo) + .SetEase(Ease.Linear) + .SetAutoKill(false) + .Pause(); + + _dashKeyBinding = PlayerInputKeyManager.Instance.GetBoundKey(InputActionMaps.Tycoon, TycoonActions.Dash); + SetKeyText(_dashKeyBinding); + } + + private void OnDestroy() + { + EventManager.OnDashCooldown -= DashCooldown; + + _dashCooldownTween.Kill(); + _flashFadeTween.Kill(); + } + + private void SetKeyText(string bindingKey) + { + _dashKeyText.text = bindingKey; + } + + public void DashCooldown(float cooldown) + { + _dashCooldownTween = _filled.DOFillAmount(1f, cooldown) + .From(0f) + .SetEase(Ease.Linear) + .OnComplete(() => _flashFadeTween.Restart()) + .SetAutoKill(true); + } + } +} diff --git a/Assets/02.Scripts/Ui/Tycoon/DashUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/DashUi.cs.meta new file mode 100644 index 000000000..276c39014 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/DashUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4689fc0e69f4c504196472d1c89361a8 \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/IndicatorUi.cs b/Assets/02.Scripts/Ui/Tycoon/IndicatorUi.cs index d357a61e5..815413f4a 100644 --- a/Assets/02.Scripts/Ui/Tycoon/IndicatorUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/IndicatorUi.cs @@ -1,91 +1,91 @@ -using System.Collections.Generic; -using BlueWater.Npcs.Customers; -using BlueWater.Tycoons; -using Sirenix.OdinInspector; -using UnityEngine; - -namespace BlueWater.Uis -{ - public class IndicatorUi : MonoBehaviour - { - [SerializeField, Required] - private GameObject _uiIndicator; - - [SerializeField] - private Vector2 _widthPadding; - - [SerializeField] - private Vector2 _heightPadding; - - private RectTransform _canvasRectTransform; - private Camera _mainCamera; - private Dictionary _customerindicators = new(); - private int _screenWidth; - private int _screenHeight; - - private void Start() - { - _canvasRectTransform = GetComponent(); - _mainCamera = TycoonCameraManager.Instance.MainCamera; - - //EventManager.OnCreateCustomer += AddUiIndicator; - } - - private void OnDestroy() - { - //EventManager.OnCreateCustomer -= AddUiIndicator; - } - - private void LateUpdate() - { - _screenWidth = Screen.width; - _screenHeight = Screen.height; - - foreach (var element in _customerindicators) - { - var customer = element.Key; - var indicator = element.Value; - if (!customer) - { - _customerindicators.Remove(customer); - Destroy(indicator.gameObject); - return; - } - var target = customer.BalloonUi.transform; - var screenPosition = _mainCamera.WorldToScreenPoint(target.position); - - if (!target.gameObject.activeSelf) - { - indicator.SetActive(false); - continue; - } - - if (screenPosition.z > 0 && screenPosition.x > 0 && screenPosition.x < _screenWidth && screenPosition.y > 0 && screenPosition.y < _screenHeight) - { - indicator.SetActive(false); - } - else - { - indicator.SetActive(true); - var clampedScreenPosition = screenPosition; - clampedScreenPosition.x = Mathf.Clamp(screenPosition.x, 0f + _widthPadding.x, _screenWidth - _widthPadding.y); - clampedScreenPosition.y = Mathf.Clamp(screenPosition.y, 0f + _heightPadding.x, _screenHeight - _heightPadding.y); - RectTransformUtility.ScreenPointToLocalPointInRectangle(_canvasRectTransform, clampedScreenPosition, _mainCamera, out var localPoint); - indicator.transform.localPosition = localPoint; - - var cameraCenterPosition = new Vector3(_screenWidth * 0.5f, _screenHeight * 0.5f, screenPosition.z); - var direction = (screenPosition - cameraCenterPosition).normalized; - var angle = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg; - indicator.transform.localRotation = Quaternion.Euler(0f, 0f, angle - 90f); - } - } - } - - private void AddUiIndicator(Customer customer) - { - var newUiIndicator = Instantiate(_uiIndicator, transform); - newUiIndicator.SetActive(false); - _customerindicators.Add(customer, newUiIndicator); - } - } -} \ No newline at end of file +// using System.Collections.Generic; +// using BlueWater.Npcs.Customers; +// using BlueWater.Tycoons; +// using Sirenix.OdinInspector; +// using UnityEngine; +// +// namespace BlueWater.Uis +// { +// public class IndicatorUi : MonoBehaviour +// { +// [SerializeField, Required] +// private GameObject _uiIndicator; +// +// [SerializeField] +// private Vector2 _widthPadding; +// +// [SerializeField] +// private Vector2 _heightPadding; +// +// private RectTransform _canvasRectTransform; +// private Camera _mainCamera; +// private Dictionary _customerindicators = new(); +// private int _screenWidth; +// private int _screenHeight; +// +// private void Start() +// { +// _canvasRectTransform = GetComponent(); +// _mainCamera = TycoonCameraManager.Instance.MainCamera; +// +// //EventManager.OnCreateCustomer += AddUiIndicator; +// } +// +// private void OnDestroy() +// { +// //EventManager.OnCreateCustomer -= AddUiIndicator; +// } +// +// private void LateUpdate() +// { +// _screenWidth = Screen.width; +// _screenHeight = Screen.height; +// +// foreach (var element in _customerindicators) +// { +// var customer = element.Key; +// var indicator = element.Value; +// if (!customer) +// { +// _customerindicators.Remove(customer); +// Destroy(indicator.gameObject); +// return; +// } +// var target = customer.BalloonUi.transform; +// var screenPosition = _mainCamera.WorldToScreenPoint(target.position); +// +// if (!target.gameObject.activeSelf) +// { +// indicator.SetActive(false); +// continue; +// } +// +// if (screenPosition.z > 0 && screenPosition.x > 0 && screenPosition.x < _screenWidth && screenPosition.y > 0 && screenPosition.y < _screenHeight) +// { +// indicator.SetActive(false); +// } +// else +// { +// indicator.SetActive(true); +// var clampedScreenPosition = screenPosition; +// clampedScreenPosition.x = Mathf.Clamp(screenPosition.x, 0f + _widthPadding.x, _screenWidth - _widthPadding.y); +// clampedScreenPosition.y = Mathf.Clamp(screenPosition.y, 0f + _heightPadding.x, _screenHeight - _heightPadding.y); +// RectTransformUtility.ScreenPointToLocalPointInRectangle(_canvasRectTransform, clampedScreenPosition, _mainCamera, out var localPoint); +// indicator.transform.localPosition = localPoint; +// +// var cameraCenterPosition = new Vector3(_screenWidth * 0.5f, _screenHeight * 0.5f, screenPosition.z); +// var direction = (screenPosition - cameraCenterPosition).normalized; +// var angle = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg; +// indicator.transform.localRotation = Quaternion.Euler(0f, 0f, angle - 90f); +// } +// } +// } +// +// private void AddUiIndicator(Customer customer) +// { +// var newUiIndicator = Instantiate(_uiIndicator, transform); +// newUiIndicator.SetActive(false); +// _customerindicators.Add(customer, newUiIndicator); +// } +// } +// } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs index 7ec06b53b..4a81f71d1 100644 --- a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs +++ b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs @@ -1,4 +1,3 @@ -using System; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -21,6 +20,9 @@ namespace BlueWater.Uis [SerializeField] private GameObject _panel; + [SerializeField] + private TMP_Text _openManualKeyText; + [SerializeField] private Transform _cocktailButtons; @@ -51,16 +53,20 @@ namespace BlueWater.Uis private List _button; private Coroutine _changedLocaleInstance; private ManualCocktailButton _selectedManualCocktailButton; - private InputAction _openManualBookAction; private InputAction _pressQAction; private InputAction _cancelAction; + private string _openManualKeyBinding; + private void Start() { _openManualBookAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.OpenManualBook); _pressQAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.PressQ); _cancelAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel); + + _openManualKeyBinding = PlayerInputKeyManager.Instance.GetBoundKey(_openManualBookAction); + SetKeyText(_openManualKeyBinding); _openManualBookAction.performed += OnOpen; @@ -213,6 +219,11 @@ namespace BlueWater.Uis _pressQAction.performed -= OnClose; _cancelAction.performed -= OnClose; } + + private void SetKeyText(string bindingKey) + { + _openManualKeyText.text = bindingKey; + } private void Update_Cocktails() //해금된 칵테일의 활성 표시 유무 { diff --git a/Assets/03.Images/Props/Environment/Tycoons/Dirty01.png b/Assets/03.Images/Props/Environment/Tycoons/Dirty01.png new file mode 100644 index 000000000..83e6a574b Binary files /dev/null and b/Assets/03.Images/Props/Environment/Tycoons/Dirty01.png differ diff --git a/Assets/03.Images/Props/Furniture/RandomBox.png.meta b/Assets/03.Images/Props/Environment/Tycoons/Dirty01.png.meta similarity index 98% rename from Assets/03.Images/Props/Furniture/RandomBox.png.meta rename to Assets/03.Images/Props/Environment/Tycoons/Dirty01.png.meta index 43aadfa2b..91af870d9 100644 --- a/Assets/03.Images/Props/Furniture/RandomBox.png.meta +++ b/Assets/03.Images/Props/Environment/Tycoons/Dirty01.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3484bcfbb75f8d54bb1f209c301f86ee +guid: 40f70d2d9885b81438020deea9904c0f TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/03.Images/Props/Environment/Tycoons/Dirty02.png b/Assets/03.Images/Props/Environment/Tycoons/Dirty02.png new file mode 100644 index 000000000..cbd077303 Binary files /dev/null and b/Assets/03.Images/Props/Environment/Tycoons/Dirty02.png differ diff --git a/Assets/03.Images/Props/Environment/Tycoons/Dirty02.png.meta b/Assets/03.Images/Props/Environment/Tycoons/Dirty02.png.meta new file mode 100644 index 000000000..52c6de99d --- /dev/null +++ b/Assets/03.Images/Props/Environment/Tycoons/Dirty02.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 7c1658b7a58af9249803946e883a2258 +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: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + 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/03.Images/Props/Furniture/CustomerTable.png b/Assets/03.Images/Props/Furniture/CustomerTable.png new file mode 100644 index 000000000..44e8d1a64 Binary files /dev/null and b/Assets/03.Images/Props/Furniture/CustomerTable.png differ diff --git a/Assets/03.Images/Props/Furniture/CustomerTable.png.meta b/Assets/03.Images/Props/Furniture/CustomerTable.png.meta new file mode 100644 index 000000000..a8de083dd --- /dev/null +++ b/Assets/03.Images/Props/Furniture/CustomerTable.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: bc4b1b16bd2ea7e4eb17eaf33c65951a +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: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + 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/03.Images/Props/Furniture/RandomBox.png b/Assets/03.Images/Props/Furniture/RandomBox.png deleted file mode 100644 index f1456f30f..000000000 Binary files a/Assets/03.Images/Props/Furniture/RandomBox.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Dash.png b/Assets/03.Images/Ui/Tycoon/Dash.png new file mode 100644 index 000000000..fe5e1ee6d Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Dash.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Dash.png.meta b/Assets/03.Images/Ui/Tycoon/Dash.png.meta new file mode 100644 index 000000000..ef0031887 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Dash.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: b710f775d111c9845900d091221ab212 +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/03.Images/Ui/Tycoon/DashBackground.png b/Assets/03.Images/Ui/Tycoon/DashBackground.png new file mode 100644 index 000000000..81b65393d Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/DashBackground.png differ diff --git a/Assets/03.Images/Ui/Tycoon/DashBackground.png.meta b/Assets/03.Images/Ui/Tycoon/DashBackground.png.meta new file mode 100644 index 000000000..7cb73ca4c --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/DashBackground.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 507a816ff4b7b3148be49ece761a2c00 +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/03.Images/Ui/Tycoon/DashFilled.png b/Assets/03.Images/Ui/Tycoon/DashFilled.png new file mode 100644 index 000000000..f57e4aa24 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/DashFilled.png differ diff --git a/Assets/03.Images/Ui/Tycoon/DashFilled.png.meta b/Assets/03.Images/Ui/Tycoon/DashFilled.png.meta new file mode 100644 index 000000000..b7c3fbb76 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/DashFilled.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 20615443db7d4384da64072b059d65d4 +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/03.Images/Ui/Tycoon/MenuBalloon.png b/Assets/03.Images/Ui/Tycoon/MenuBalloon.png new file mode 100644 index 000000000..0da48e9b6 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/MenuBalloon.png differ diff --git a/Assets/03.Images/Ui/Tycoon/MenuBalloon.png.meta b/Assets/03.Images/Ui/Tycoon/MenuBalloon.png.meta new file mode 100644 index 000000000..6518aea5c --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/MenuBalloon.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: a41f2edf0c6ec134fabd09dccc16d34a +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/03.Images/Ui/Tycoon/MenuBalloonFilled.png b/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png new file mode 100644 index 000000000..cda7fd62c Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png differ diff --git a/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png.meta b/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png.meta new file mode 100644 index 000000000..20d1520c9 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/MenuBalloonFilled.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 2b940926419a5dd44af7663f4b5c31b6 +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/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab similarity index 76% rename from Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab rename to Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab index 75e7af93e..622dffdfa 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 321954324799972663} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.2} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -55,9 +55,10 @@ MonoBehaviour: k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} k__BackingField: {fileID: 0} k__BackingField: 1 - k__BackingField: 0.6 + k__BackingField: 0.7 k__BackingField: IsOpened: 0 + k__BackingField: {fileID: 33491772595899250} _payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3} _offset: {x: 0, y: 1.5, z: 0} k__BackingField: 0 @@ -67,8 +68,11 @@ MonoBehaviour: k__BackingField: {fileID: 8752266548893034047} TableDirection: {x: -1, y: 0, z: 0} TableNumber: 0 + _fullBeerGlass: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3} + _emptyBeerGlass: {fileID: 21300000, guid: 7c1658b7a58af9249803946e883a2258, type: 3} _playerHoldingTime: 3 _crewHoldingTime: 9 + _cleaningSfxName: CleaningTable --- !u!114 &3964937737965122596 MonoBehaviour: m_ObjectHideFlags: 0 @@ -135,7 +139,7 @@ Transform: m_GameObject: {fileID: 1352874222752200122} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 0.22, y: 0.312, z: 0.058} + m_LocalPosition: {x: 0.265, y: 0.275, z: 0.23} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 1 m_Children: [] @@ -222,7 +226,7 @@ Transform: m_GameObject: {fileID: 2118957188813578234} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -0.22, y: 0.31199998, z: 0.058000024} + m_LocalPosition: {x: -0.179, y: 0.19, z: 0.16} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 1 m_Children: [] @@ -309,7 +313,7 @@ Transform: m_GameObject: {fileID: 3743511312082143294} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.235, z: 0} + m_LocalPosition: {x: 0, y: 0.115, z: 0} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 1 m_Children: [] @@ -397,7 +401,7 @@ Transform: m_GameObject: {fileID: 5899113663160612507} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.2} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -425,9 +429,10 @@ MonoBehaviour: k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} k__BackingField: {fileID: 0} k__BackingField: 1 - k__BackingField: 0.6 + k__BackingField: 0.7 k__BackingField: IsOpened: 0 + k__BackingField: {fileID: 2583013143388010830} _payMoneyUiObject: {fileID: 1722793422445764049, guid: d89dc1946bb6ee448a113d28d6bf2dce, type: 3} _offset: {x: 0, y: 1.5, z: 0} k__BackingField: 0 @@ -437,8 +442,11 @@ MonoBehaviour: k__BackingField: {fileID: 4724775134085759924} TableDirection: {x: 1, y: 0, z: 0} TableNumber: 0 + _fullBeerGlass: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3} + _emptyBeerGlass: {fileID: 21300000, guid: 40f70d2d9885b81438020deea9904c0f, type: 3} _playerHoldingTime: 3 _crewHoldingTime: 9 + _cleaningSfxName: CleaningTable --- !u!114 &4593866383055317665 MonoBehaviour: m_ObjectHideFlags: 0 @@ -537,7 +545,7 @@ Transform: m_GameObject: {fileID: 7008066670828516977} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: 0.22, y: 0, z: 0.058000013} + m_LocalPosition: {x: 0.22, y: 0, z: 0.1} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 0 m_Children: [] @@ -599,7 +607,7 @@ Transform: m_GameObject: {fileID: 7591088015737457221} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} - m_LocalPosition: {x: -0.22, y: 0, z: 0.058000013} + m_LocalPosition: {x: -0.22, y: 0, z: 0.1} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_ConstrainProportionsScale: 0 m_Children: [] @@ -636,6 +644,264 @@ Transform: m_Children: [] m_Father: {fileID: 7272068659984017056} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &873700564209760516 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 297355777426450409} + m_Modifications: + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_SizeDelta.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_SizeDelta.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalScale.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalScale.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalScale.z + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.45 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2941398232897783445, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_Name + value: MenuBalloonUi + objectReference: {fileID: 0} + - target: {fileID: 4609128235759643923, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} +--- !u!114 &33491772595899250 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 889177932113506934, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + m_PrefabInstance: {fileID: 873700564209760516} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &257426657215236219 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + m_PrefabInstance: {fileID: 873700564209760516} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3426758121118452536 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4062855172287724115} + m_Modifications: + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_SizeDelta.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_SizeDelta.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalScale.x + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalScale.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalScale.z + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.2 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.45 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2941398232897783445, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_Name + value: MenuBalloonUi + objectReference: {fileID: 0} + - target: {fileID: 4609128235759643923, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} +--- !u!224 &2322969535150520903 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1131127152402510207, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + m_PrefabInstance: {fileID: 3426758121118452536} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2583013143388010830 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 889177932113506934, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3} + m_PrefabInstance: {fileID: 3426758121118452536} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4945635487706215153 PrefabInstance: m_ObjectHideFlags: 0 @@ -774,7 +1040,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + insertIndex: 1 + addedObject: {fileID: 257426657215236219} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} --- !u!224 &297355777426450409 stripped @@ -852,7 +1121,7 @@ PrefabInstance: - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} + objectReference: {fileID: 21300000, guid: bc4b1b16bd2ea7e4eb17eaf33c65951a, type: 3} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_SortingOrder value: 1 @@ -863,7 +1132,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Name - value: CustomerTable3 + value: CustomerTable objectReference: {fileID: 0} - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive @@ -871,15 +1140,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x @@ -1130,7 +1399,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} + insertIndex: 1 + addedObject: {fileID: 2322969535150520903} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} --- !u!114 &1675779991655778469 stripped diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab.meta rename to Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab.meta diff --git a/Assets/05.Prefabs/Uis/MenuBalloonUi.prefab b/Assets/05.Prefabs/Uis/MenuBalloonUi.prefab new file mode 100644 index 000000000..96aba64b4 --- /dev/null +++ b/Assets/05.Prefabs/Uis/MenuBalloonUi.prefab @@ -0,0 +1,167 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4130534282591498878 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Name + value: MenuBalloonUi + objectReference: {fileID: 0} + - target: {fileID: 1505211282054036597, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 2b940926419a5dd44af7663f4b5c31b6, type: 3} + - target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_FillAmount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_FillMethod + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2173167918881327799, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_FillOrigin + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_SizeDelta.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_SizeDelta.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.2 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4586681201290156434, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a41f2edf0c6ec134fabd09dccc16d34a, type: 3} + - target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_SizeDelta.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_SizeDelta.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000023841858 + objectReference: {fileID: 0} + - target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.05 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3} diff --git a/Assets/05.Prefabs/Uis/MenuBalloonUi.prefab.meta b/Assets/05.Prefabs/Uis/MenuBalloonUi.prefab.meta new file mode 100644 index 000000000..6e8c2dbd8 --- /dev/null +++ b/Assets/05.Prefabs/Uis/MenuBalloonUi.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a645940ec5c735140b5569f76725b81f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Uis/Tycoons/MenuBalloonUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/MenuBalloonUi.prefab new file mode 100644 index 000000000..ddcbe1978 --- /dev/null +++ b/Assets/05.Prefabs/Uis/Tycoons/MenuBalloonUi.prefab @@ -0,0 +1,320 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &249317892450259276 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4417059956531144164} + - component: {fileID: 5189939095282011000} + - component: {fileID: 1491349371811006708} + m_Layer: 19 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4417059956531144164 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249317892450259276} + 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: 2472143638630082580} + 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!222 &5189939095282011000 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249317892450259276} + m_CullTransparentMesh: 1 +--- !u!114 &1491349371811006708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249317892450259276} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a41f2edf0c6ec134fabd09dccc16d34a, 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!1 &410106872850796187 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8341219880361789620} + - component: {fileID: 4744022902879271135} + - component: {fileID: 6420120053108935114} + m_Layer: 19 + m_Name: FoodImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8341219880361789620 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410106872850796187} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00000023841858} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2472143638630082580} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0.05} + m_SizeDelta: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4744022902879271135 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410106872850796187} + m_CullTransparentMesh: 1 +--- !u!114 &6420120053108935114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410106872850796187} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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!1 &2941398232897783445 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1131127152402510207} + - component: {fileID: 889177932113506934} + m_Layer: 19 + m_Name: MenuBalloonUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1131127152402510207 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2941398232897783445} + 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: 1 + m_Children: + - {fileID: 2472143638630082580} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.2, y: 1.5} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &889177932113506934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2941398232897783445} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3} + m_Name: + m_EditorClassIdentifier: + _fillImage: {fileID: 3836460704259562449} + _itemImage: {fileID: 6420120053108935114} + _panel: {fileID: 4609128235759643923} + _isOrdered: 0 + _isWaitTimeOver: 0 + _isItemReceived: 0 +--- !u!1 &4609128235759643923 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2472143638630082580} + m_Layer: 19 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2472143638630082580 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4609128235759643923} + 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: 8549903804392921738} + - {fileID: 4417059956531144164} + - {fileID: 8341219880361789620} + m_Father: {fileID: 1131127152402510207} + 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!1 &5580711947596628469 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8549903804392921738} + - component: {fileID: 8438734531649324286} + - component: {fileID: 3836460704259562449} + m_Layer: 19 + m_Name: FillImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8549903804392921738 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5580711947596628469} + 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: 2472143638630082580} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000000009313226, y: 0} + m_SizeDelta: {x: 0.099999964, y: 0.10000001} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8438734531649324286 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5580711947596628469} + m_CullTransparentMesh: 1 +--- !u!114 &3836460704259562449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5580711947596628469} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2b940926419a5dd44af7663f4b5c31b6, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/05.Prefabs/Uis/Tycoons/MenuBalloonUi.prefab.meta b/Assets/05.Prefabs/Uis/Tycoons/MenuBalloonUi.prefab.meta new file mode 100644 index 000000000..7150a2d85 --- /dev/null +++ b/Assets/05.Prefabs/Uis/Tycoons/MenuBalloonUi.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 659c0c56362b31b47ac12feb1a51d0b3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a4937e147..bbc735240 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.3.4.5 + bundleVersion: 0.3.4.8 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}