diff --git a/Assets/01.Scenes/00.TycoonTitle.unity b/Assets/01.Scenes/00.TycoonTitle.unity index 106d50ea9..6a5fcd96e 100644 --- a/Assets/01.Scenes/00.TycoonTitle.unity +++ b/Assets/01.Scenes/00.TycoonTitle.unity @@ -7514,11 +7514,7 @@ PrefabInstance: value: 82.81 objectReference: {fileID: 0} - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} @@ -7538,11 +7534,7 @@ PrefabInstance: value: 82.81 objectReference: {fileID: 0} - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} @@ -7686,11 +7678,7 @@ PrefabInstance: value: 175.73 objectReference: {fileID: 0} - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 2b30a75ef..f3d809a63 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 @@ -10780,7 +11035,6 @@ GameObject: - component: {fileID: 1049919590} - component: {fileID: 1049919589} - component: {fileID: 1049919593} - - component: {fileID: 1049919594} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -10898,21 +11152,6 @@ MonoBehaviour: k__BackingField: {fileID: 1049919591} k__BackingField: {fileID: 410235869} _fadeImage: {fileID: 2055805162} ---- !u!114 &1049919594 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1049919588} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e393933351b7da9489595d2aeb25135d, type: 3} - m_Name: - m_EditorClassIdentifier: - _uiIndicator: {fileID: 5148248962339400161, guid: 9c308e38b5681564fbdbad324594baee, type: 3} - _widthPadding: {x: 70, y: 70} - _heightPadding: {x: 70, y: 70} --- !u!1 &1054626872 GameObject: m_ObjectHideFlags: 0 @@ -12212,6 +12451,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1176872992} m_CullTransparentMesh: 1 +--- !u!1 &1184003924 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6766070068783270828, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3} + m_PrefabInstance: {fileID: 532586499} + m_PrefabAsset: {fileID: 0} --- !u!1 &1185670928 GameObject: m_ObjectHideFlags: 0 @@ -12242,7 +12486,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} @@ -13431,6 +13676,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 192967474504919650, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 206150334458064667, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 271976367226201846, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -13567,6 +13820,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 854623182969124375, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 906431724544234919, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -13619,6 +13876,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1123204253135645794, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1200502737992636705, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -13879,6 +14140,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2378963517708785758, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410038165437406503, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2505930409410496090, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -13999,6 +14268,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2914518436451484715, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2936459360025051519, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Mesh value: @@ -14039,6 +14312,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3186336333613178462, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3277011480977519073, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -14407,6 +14684,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4966564567404332244, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4987975325252724506, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -14463,6 +14744,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 5140175868285499029, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5227324930555586236, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -14715,6 +15000,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6097027034377089568, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6198619660343708688, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_Mesh value: @@ -14875,6 +15164,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7276650302940742825, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7304138290650449805, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -14903,6 +15196,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7440650799058384616, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7456244596060221628, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -15099,6 +15396,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8589127114732290076, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8742177585021775170, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -18653,7 +18954,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} + m_FirstSelected: {fileID: 1184003924} m_sendNavigationEvents: 1 m_DragThreshold: 10 --- !u!4 &1619849090 @@ -19820,6 +20121,7 @@ MonoBehaviour: SwitchMapsOpened: 2 SwitchMapsClosed: 1 _panel: {fileID: 2097912643} + _openManualKeyText: {fileID: 601028892} _cocktailButtons: {fileID: 450220855} cocktailImage: {fileID: 1793342540} cocktailName: {fileID: 788752399} @@ -24865,6 +25167,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 +25233,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 +25320,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 +27682,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 +27722,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 +27797,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..81870b204 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, startColor: _startColor, endColor: _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..8a93fbf14 100644 --- a/Assets/02.Scripts/SceneController.cs +++ b/Assets/02.Scripts/SceneController.cs @@ -17,8 +17,8 @@ namespace BlueWater protected override void OnAwake() { - _fadeIn = _fadeImage.DOFade(1f, 2f).From(0f).SetUpdate(true).SetAutoKill(false).Pause().OnComplete(MoveCombatScene); - _fadeOut = _fadeImage.DOFade(0f, 2f).From(1f).SetUpdate(true).SetAutoKill(false).Pause().SetDelay(3f).OnComplete(EventManager.InvokeInitializedPlayerInput); + _fadeIn = _fadeImage.DOFade(1f, 1f).From(0f).SetUpdate(true).SetAutoKill(false).Pause().OnComplete(MoveCombatScene); + _fadeOut = _fadeImage.DOFade(0f, 0.5f).From(1f).SetUpdate(true).SetAutoKill(false).Pause().SetDelay(3f).OnComplete(EventManager.InvokeInitializedPlayerInput); _fadeImage.color = new Color(0, 0, 0, 0); } @@ -34,7 +34,7 @@ namespace BlueWater SceneManager.sceneLoaded -= OnSceneLoaded; _fadeIn.Kill(); - _fadeIn.Kill(); + _fadeOut.Kill(); } public void FadeIn() @@ -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/ScriptableObject/LevelDataTable.asset b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset index 2bf3e8acf..d4d78cac4 100644 --- a/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset @@ -20,8 +20,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 100 - k__BackingField: 25 - k__BackingField: 25 + k__BackingField: 0 + k__BackingField: 50 k__BackingField: 15 k__BackingField: Upgrade0 k__BackingField: 0 @@ -33,8 +33,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 200 - k__BackingField: 25 - k__BackingField: 25 + k__BackingField: 0 + k__BackingField: 50 k__BackingField: 15 k__BackingField: k__BackingField: 0 @@ -46,8 +46,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 200 - k__BackingField: 25 - k__BackingField: 25 + k__BackingField: 0 + k__BackingField: 50 k__BackingField: 15 k__BackingField: k__BackingField: 0 @@ -59,8 +59,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 200 - k__BackingField: 25 - k__BackingField: 25 + k__BackingField: 0 + k__BackingField: 50 k__BackingField: 15 k__BackingField: k__BackingField: 0 @@ -72,8 +72,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 200 - k__BackingField: 25 - k__BackingField: 25 + k__BackingField: 0 + k__BackingField: 50 k__BackingField: 15 k__BackingField: Upgrade1 k__BackingField: 1 @@ -85,8 +85,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 23 - k__BackingField: 23 + k__BackingField: 0 + k__BackingField: 46 k__BackingField: 13 k__BackingField: k__BackingField: 0 @@ -98,8 +98,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 23 - k__BackingField: 23 + k__BackingField: 0 + k__BackingField: 46 k__BackingField: 13 k__BackingField: k__BackingField: 0 @@ -111,8 +111,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 23 - k__BackingField: 23 + k__BackingField: 0 + k__BackingField: 46 k__BackingField: 13 k__BackingField: k__BackingField: 0 @@ -124,8 +124,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 23 - k__BackingField: 23 + k__BackingField: 0 + k__BackingField: 46 k__BackingField: 13 k__BackingField: k__BackingField: 0 @@ -137,8 +137,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 300 - k__BackingField: 23 - k__BackingField: 23 + k__BackingField: 0 + k__BackingField: 46 k__BackingField: 13 k__BackingField: Upgrade2 k__BackingField: 1 @@ -150,8 +150,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 20 - k__BackingField: 20 + k__BackingField: 0 + k__BackingField: 40 k__BackingField: 10 k__BackingField: k__BackingField: 0 @@ -163,8 +163,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 20 - k__BackingField: 20 + k__BackingField: 0 + k__BackingField: 40 k__BackingField: 10 k__BackingField: k__BackingField: 0 @@ -176,8 +176,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 20 - k__BackingField: 20 + k__BackingField: 0 + k__BackingField: 40 k__BackingField: 10 k__BackingField: k__BackingField: 0 @@ -189,8 +189,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 20 - k__BackingField: 20 + k__BackingField: 0 + k__BackingField: 40 k__BackingField: 10 k__BackingField: k__BackingField: 0 @@ -202,8 +202,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 400 - k__BackingField: 20 - k__BackingField: 20 + k__BackingField: 0 + k__BackingField: 40 k__BackingField: 10 k__BackingField: Upgrade3 k__BackingField: 1 @@ -215,8 +215,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 18 - k__BackingField: 18 + k__BackingField: 0 + k__BackingField: 36 k__BackingField: 8 k__BackingField: k__BackingField: 0 @@ -228,8 +228,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 18 - k__BackingField: 18 + k__BackingField: 0 + k__BackingField: 36 k__BackingField: 8 k__BackingField: k__BackingField: 0 @@ -241,8 +241,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 18 - k__BackingField: 18 + k__BackingField: 0 + k__BackingField: 36 k__BackingField: 8 k__BackingField: k__BackingField: 0 @@ -254,8 +254,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 18 - k__BackingField: 18 + k__BackingField: 0 + k__BackingField: 36 k__BackingField: 8 k__BackingField: k__BackingField: 0 @@ -267,8 +267,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 500 - k__BackingField: 18 - k__BackingField: 18 + k__BackingField: 0 + k__BackingField: 36 k__BackingField: 8 k__BackingField: Upgrade4 k__BackingField: 1 @@ -280,8 +280,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 16 - k__BackingField: 16 + k__BackingField: 0 + k__BackingField: 32 k__BackingField: 6 k__BackingField: k__BackingField: 0 @@ -293,8 +293,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 16 - k__BackingField: 16 + k__BackingField: 0 + k__BackingField: 32 k__BackingField: 6 k__BackingField: k__BackingField: 0 @@ -306,8 +306,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 16 - k__BackingField: 16 + k__BackingField: 0 + k__BackingField: 32 k__BackingField: 6 k__BackingField: k__BackingField: 0 @@ -319,8 +319,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 16 - k__BackingField: 16 + k__BackingField: 0 + k__BackingField: 32 k__BackingField: 6 k__BackingField: k__BackingField: 0 @@ -332,8 +332,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 600 - k__BackingField: 16 - k__BackingField: 16 + k__BackingField: 0 + k__BackingField: 32 k__BackingField: 6 k__BackingField: Upgrade5 k__BackingField: 1 @@ -345,8 +345,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 700 - k__BackingField: 14 - k__BackingField: 14 + k__BackingField: 0 + k__BackingField: 28 k__BackingField: 6 k__BackingField: k__BackingField: 0 @@ -358,8 +358,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 700 - k__BackingField: 14 - k__BackingField: 14 + k__BackingField: 0 + k__BackingField: 28 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -371,8 +371,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 700 - k__BackingField: 14 - k__BackingField: 14 + k__BackingField: 0 + k__BackingField: 28 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -384,8 +384,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 700 - k__BackingField: 14 - k__BackingField: 14 + k__BackingField: 0 + k__BackingField: 28 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -397,8 +397,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 700 - k__BackingField: 14 - k__BackingField: 14 + k__BackingField: 0 + k__BackingField: 28 k__BackingField: 4 k__BackingField: Upgrade6 k__BackingField: 1 @@ -410,8 +410,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 800 - k__BackingField: 12 - k__BackingField: 12 + k__BackingField: 0 + k__BackingField: 24 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -423,8 +423,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 800 - k__BackingField: 12 - k__BackingField: 12 + k__BackingField: 0 + k__BackingField: 24 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -436,8 +436,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 800 - k__BackingField: 12 - k__BackingField: 12 + k__BackingField: 0 + k__BackingField: 24 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -449,8 +449,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 800 - k__BackingField: 12 - k__BackingField: 12 + k__BackingField: 0 + k__BackingField: 24 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -462,8 +462,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 800 - k__BackingField: 12 - k__BackingField: 12 + k__BackingField: 0 + k__BackingField: 24 k__BackingField: 4 k__BackingField: k__BackingField: 1 @@ -475,8 +475,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 0 + k__BackingField: 20 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -488,8 +488,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 0 + k__BackingField: 20 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -501,8 +501,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 0 + k__BackingField: 20 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -514,8 +514,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 0 + k__BackingField: 20 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -527,8 +527,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 10 - k__BackingField: 10 + k__BackingField: 0 + k__BackingField: 20 k__BackingField: 4 k__BackingField: k__BackingField: 1 @@ -540,8 +540,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 8 - k__BackingField: 8 + k__BackingField: 0 + k__BackingField: 16 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -553,8 +553,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 8 - k__BackingField: 8 + k__BackingField: 0 + k__BackingField: 16 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -566,8 +566,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 8 - k__BackingField: 8 + k__BackingField: 0 + k__BackingField: 16 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -579,8 +579,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 8 - k__BackingField: 8 + k__BackingField: 0 + k__BackingField: 16 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -592,8 +592,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 8 - k__BackingField: 8 + k__BackingField: 0 + k__BackingField: 16 k__BackingField: 4 k__BackingField: k__BackingField: 1 @@ -605,8 +605,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 6 - k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 12 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -618,8 +618,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 6 - k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 12 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -631,8 +631,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 6 - k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 12 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -644,8 +644,8 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 6 - k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 12 k__BackingField: 4 k__BackingField: k__BackingField: 0 @@ -657,7 +657,7 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 100 k__BackingField: 900 - k__BackingField: 6 + k__BackingField: 0 k__BackingField: 6 k__BackingField: 4 k__BackingField: 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/TitleOptions.cs b/Assets/02.Scripts/Ui/Title/TitleOptions.cs index 2ae94cf9c..379b20d43 100644 --- a/Assets/02.Scripts/Ui/Title/TitleOptions.cs +++ b/Assets/02.Scripts/Ui/Title/TitleOptions.cs @@ -1,64 +1,109 @@ +using System; using System.Collections; using BlueWater; using BlueWater.Audios; +using BlueWater.Uis; using TMPro; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.InputSystem; using UnityEngine.UI; -public class TitleOptions : MonoBehaviour +public class TitleOptions : PopupUi { [SerializeField] private GameObject _panel; - + [SerializeField] private Slider _masterVolume; - + [SerializeField] private Slider _bgmVolume; - + [SerializeField] private Slider _sfxVolume; [SerializeField] private TMP_Dropdown _languageDropdown; - + private AudioManager _audioManager; - - public InputAction CancelAction { get; private set; } - + + private InputAction _interactionEAction; + private InputAction _closeOptionsAction; + public Action CloseOptions; + private void Start() { - CancelAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel); - + _interactionEAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE); + _closeOptionsAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel); + _audioManager = AudioManager.Instance; var masterVolume = ES3.Load("MasterVolume", 1f); SetMasterVolume(masterVolume); - + var bgmVolume = ES3.Load("BgmVolume", 1f); SetBgmVolume(bgmVolume); - + var sfxVolume = ES3.Load("SfxVolume", 1f); SetSfxVolume(sfxVolume); StartCoroutine(nameof(InitializeLanguage)); } + private void OnDestroy() + { + if (_interactionEAction != null) + { + _interactionEAction.performed -= OnInteractionE; + } + + if (_closeOptionsAction != null) + { + _closeOptionsAction.performed -= OnCloseOptions; + } + } + + public override void Open() + { + PopupUiController.RegisterPopup(this); + _panel.SetActive(true); + IsOpened = true; + } + + public override void Close() + { + _panel.SetActive(false); + PopupUiController.UnregisterPopup(this); + IsOpened = false; + } + + public override void EnableInput() + { + _interactionEAction.performed += OnInteractionE; + _closeOptionsAction.performed += OnCloseOptions; + } + + public override void DisableInput() + { + _interactionEAction.performed -= OnInteractionE; + _closeOptionsAction.performed -= OnCloseOptions; + } + public void SetMasterVolume(float value) { _audioManager.SetMasterVolume(value); _masterVolume.value = value; ES3.Save("MasterVolume", value); } - + public void SetBgmVolume(float value) { _audioManager.SetBgmVolume(value); _bgmVolume.value = value; ES3.Save("BgmVolume", value); } - + public void SetSfxVolume(float value) { _audioManager.SetSfxVolume(value); @@ -69,7 +114,7 @@ public class TitleOptions : MonoBehaviour private IEnumerator InitializeLanguage() { yield return new WaitUntil(() => LocalizationManager.Instance.IsInitialized); - + var languageIndex = LocalizationManager.Instance.GetCurrentLocaleIndex(); _languageDropdown.value = languageIndex; } @@ -79,14 +124,18 @@ public class TitleOptions : MonoBehaviour _languageDropdown.value = localeType; LocalizationManager.Instance.ChangeLocale((LocaleType)localeType); } - - public void ShowUi() + + public void OnInteractionE(InputAction.CallbackContext context) { - _panel.SetActive(true); + var current = EventSystem.current.currentSelectedGameObject; + if (!current) return; + + var currenButton = current.GetComponent