From c4277db5c07125cbe8e2764af57a251187e27abd Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Sat, 1 Mar 2025 20:22:00 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B3=A8=EB=93=9C/=EC=83=9D=EC=84=A0?= =?UTF-8?q?=20=EC=B5=9C=EB=8C=80=20=EB=B3=B4=EC=9C=A0=20=EC=88=98=EB=9F=89?= =?UTF-8?q?=20=EC=95=8C=EB=A6=BC=20=ED=8C=9D=EC=97=85=20=EB=85=B8=EC=B6=9C?= =?UTF-8?q?=20=EC=A1=B0=EA=B1=B4=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Gameton/Fonts/warm leaf cat Font.asset | 4 +- .../Resources/UI/Prefabs/UI.OptionUI.prefab | 326 ++++++++++++++++++ .../Assets/Gameton/Scripts/UI/OptionUI.cs | 23 +- 3 files changed, 347 insertions(+), 6 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Fonts/warm leaf cat Font.asset b/Gameton-06/Assets/Gameton/Fonts/warm leaf cat Font.asset index 7196635f..5e312d42 100644 --- a/Gameton-06/Assets/Gameton/Fonts/warm leaf cat Font.asset +++ b/Gameton-06/Assets/Gameton/Fonts/warm leaf cat Font.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fe3c264cf0ead7c994fbb4e2a6ffe43559f242eaaf51293dccdcae2cc817131 -size 633933 +oid sha256:299e9cd5373f1ea529456784d63998bb1566f5e3a91de6296389e14a9be97e3d +size 635572 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab index 776f3acd..498adaa0 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab @@ -104,6 +104,7 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 7880194785073738049} + - {fileID: 2309035583870530441} m_Father: {fileID: 694752155933920904} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -250,6 +251,7 @@ GameObject: - component: {fileID: 4950687460265832273} - component: {fileID: 7587492074973768813} - component: {fileID: 8013294662410834202} + - component: {fileID: 4436145138681851815} m_Layer: 0 m_Name: FishButton m_TagString: Untagged @@ -316,6 +318,138 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4436145138681851815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1914766635330759751} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8013294662410834202} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4409551897287941631} + m_TargetAssemblyTypeName: TON.OptionUI, Assembly-CSharp + m_MethodName: OnClickCashButton + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &2947153531506386602 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2309035583870530441} + - component: {fileID: 529327219126588155} + - component: {fileID: 4362904192485456022} + m_Layer: 0 + m_Name: Warning Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2309035583870530441 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2947153531506386602} + 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: 7220191883467986395} + m_Father: {fileID: 5857252250657883994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -350, y: -100} + m_SizeDelta: {x: 430, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &529327219126588155 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2947153531506386602} + m_CullTransparentMesh: 1 +--- !u!114 &4362904192485456022 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2947153531506386602} + 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: 0.5707547, b: 0.5707547, 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: 042147ed597077d428e0bfc7a9c418a3, 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 &3643790223593400262 GameObject: m_ObjectHideFlags: 0 @@ -450,6 +584,140 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4407904421958070818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7220191883467986395} + - component: {fileID: 6131713397708111482} + - component: {fileID: 7537446584470784318} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7220191883467986395 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4407904421958070818} + 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: 2309035583870530441} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6131713397708111482 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4407904421958070818} + m_CullTransparentMesh: 1 +--- !u!114 &7537446584470784318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4407904421958070818} + 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: "\xA3 \uCD5C\uB300 \uBCF4\uC720 \uC218\uB7C9 : 1,000,000" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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!1 &4515136283427101088 GameObject: m_ObjectHideFlags: 0 @@ -845,6 +1113,7 @@ MonoBehaviour: fishObject: {fileID: 1914766635330759751} settingObject: {fileID: 6902550915144592276} parseObject: {fileID: 7491260442580799649} + warningObject: {fileID: 2947153531506386602} --- !u!1 &8479041208916480579 GameObject: m_ObjectHideFlags: 0 @@ -856,6 +1125,7 @@ GameObject: - component: {fileID: 644337214924361488} - component: {fileID: 5943371146499282711} - component: {fileID: 162122261335224078} + - component: {fileID: 9030977433001539557} m_Layer: 0 m_Name: GoldButton m_TagString: Untagged @@ -922,6 +1192,62 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &9030977433001539557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8479041208916480579} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 162122261335224078} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4409551897287941631} + m_TargetAssemblyTypeName: TON.OptionUI, Assembly-CSharp + m_MethodName: OnClickCashButton + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1001 &285431655934995300 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/OptionUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/OptionUI.cs index 3300123a..6934eafb 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/OptionUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/OptionUI.cs @@ -7,10 +7,11 @@ namespace TON { public class OptionUI : UIBase { - public GameObject goldObject; // 골드 - public GameObject fishObject; // 생선 - public GameObject settingObject; // 더보기(옵션) 버튼 - public GameObject parseObject; // 일시정지 + [SerializeField] private GameObject goldObject; // 골드 + [SerializeField] private GameObject fishObject; // 생선 + [SerializeField] private GameObject settingObject; // 더보기(옵션) 버튼 + [SerializeField] private GameObject parseObject; // 일시정지 + [SerializeField] private GameObject warningObject; // 최대보유수량 경고 팝업업 // 로비 : 골드/생선/인벤토리/더보기 버튼 // 스테이지 : 인벤토리/일시정지 버튼 @@ -55,6 +56,20 @@ namespace TON settingObject.SetActive(false); parseObject.SetActive(false); } + + warningObject.SetActive(false); + } + + public void OnClickCashButton() + { + warningObject.SetActive(true); + + Invoke(nameof(AutoClosePopup), 3f); + } + + private void AutoClosePopup() + { + warningObject.SetActive(false); } public void OnClickSettingButton()