From cd9c8fc712524e9f69709aa4673455ecfbfc18d1 Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Tue, 11 Mar 2025 15:21:03 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Gameton/Scripts/Monster/StateMachine.cs | 2 - .../Assets/Gameton/Scripts/UI/ShopUI.cs | 179 +++--------------- 2 files changed, 24 insertions(+), 157 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs index 23115ce2..80fca6c0 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs @@ -121,7 +121,6 @@ namespace TON // duration 동안에는 항상 idle = 공격 쿨타운 if (_currentDuration < _duration) return this; - // TODO : 데미지 받을 때 // 추적 범위에 들어왔을 때 if (_monsterBase.IsDetect) @@ -186,7 +185,6 @@ namespace TON { _monsterBase = monsterBase; _monsterBase.IsFinishAttack = false; - _lastAttackTime = -_attackDelayTime; // 처음 진입시 바로 공격하도록 설정 } diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/ShopUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/ShopUI.cs index 04a6c2a6..6e00c5f8 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/ShopUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/ShopUI.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using Unity.VisualScripting; using UnityEngine; namespace TON @@ -20,11 +16,8 @@ namespace TON private PlayerDataManager playerDataManager; - // Start is called before the first frame update void Start() { - InitPopUpActive(); - // 싱글톤으로 PlayerDataManager 접근 playerDataManager = PlayerDataManager.Singleton; @@ -34,189 +27,65 @@ namespace TON } } - public void InitPopUpActive() - { - HeartPopUp.SetActive(false); - PositionPopUp.SetActive(false); - } - - // Update is called once per frame - void Update() - { - - } - - public void OnClickLobbyButton() { Main.Singleton.ChangeScene(SceneType.Lobby); } - - public void OnClickHeartPopUpButton() - { - HeartPopUp.SetActive(true); - } - - public void OnClickHeartCloseButton() - { - HeartPopUp.SetActive(false); - } - public void OnClickPositionPopUpButton() + // 포션 구매 메서드 + private void BuyPotion(int price, string potionType, int quantity) { - PositionPopUp.SetActive(true); - } - - public void OnClickPositionCloseButton() - { - PositionPopUp.SetActive(false); - } - - public void OnClickBuyHpPotion1Button() - { - if (playerDataManager.goldAmount >= hpPotionPrice1) + if (playerDataManager.goldAmount >= price) { - playerDataManager.UseGold(hpPotionPrice1, (isSuccess) => + playerDataManager.UseGold(price, (isSuccess) => { if (isSuccess) { - playerDataManager.userItem.hpPotion += 1; - Debug.Log($"HP 포션 구매 성공! 남은 골드: {playerDataManager.goldAmount}, HP 포션 수량: {playerDataManager.userItem.hpPotion}"); + if (potionType == "hp") + { + playerDataManager.userItem.hpPotion += quantity; + } + else if (potionType == "mp") + { + playerDataManager.userItem.mpPotion += quantity; + } + UIManager.Singleton.UpdateCashData(); } - else - { - Debug.Log("골드가 부족하여 HP 포션 구매 실패!"); - } }); } - else - { - Debug.Log("골드가 부족합니다!"); - } + } + + // HP 포션 구매 버튼 클릭 시 호출 + public void OnClickBuyHpPotion1Button() + { + BuyPotion(hpPotionPrice1, "hp", 1); } public void OnClickBuyHpPotion5Button() { - if (playerDataManager.goldAmount >= hpPotionPrice5) - { - playerDataManager.UseGold(hpPotionPrice5, (isSuccess) => - { - if (isSuccess) - { - playerDataManager.userItem.hpPotion += 5; - Debug.Log($"HP 포션 구매 성공! 남은 골드: {playerDataManager.goldAmount}, HP 포션 수량: {playerDataManager.userItem.hpPotion}"); - UIManager.Singleton.UpdateCashData(); - } - else - { - Debug.Log("골드가 부족하여 HP 포션 구매 실패!"); - } - }); - } - else - { - Debug.Log("골드가 부족합니다!"); - } + BuyPotion(hpPotionPrice5, "hp", 5); } public void OnClickBuyHpPotion20Button() { - if (playerDataManager.goldAmount >= hpPotionPrice20) - { - playerDataManager.UseGold(hpPotionPrice20, (isSuccess) => - { - if (isSuccess) - { - playerDataManager.userItem.hpPotion += 20; - Debug.Log($"HP 포션 구매 성공! 남은 골드: {playerDataManager.goldAmount}, HP 포션 수량: {playerDataManager.userItem.hpPotion}"); - UIManager.Singleton.UpdateCashData(); - } - else - { - Debug.Log("골드가 부족하여 HP 포션 구매 실패!"); - } - }); - } - else - { - Debug.Log("골드가 부족합니다!"); - } + BuyPotion(hpPotionPrice20, "hp", 20); } // MP 포션 구매 버튼 클릭 시 호출 public void OnClickBuyMpPotion1Button() { - if (playerDataManager.goldAmount >= mpPotionPrice1) - { - playerDataManager.UseGold(mpPotionPrice1, (isSuccess) => - { - if (isSuccess) - { - playerDataManager.userItem.mpPotion += 1; - Debug.Log($"MP 포션 구매 성공! 남은 골드: {playerDataManager.goldAmount}, MP 포션 수량: {playerDataManager.userItem.mpPotion}"); - UIManager.Singleton.UpdateCashData(); - } - else - { - Debug.Log("골드가 부족하여 MP 포션 구매 실패!"); - } - }); - } - else - { - Debug.Log("골드가 부족합니다!"); - } + BuyPotion(mpPotionPrice1, "mp", 1); } - // MP 포션 구매 버튼 클릭 시 호출 public void OnClickBuyMpPotion5Button() { - if (playerDataManager.goldAmount >= mpPotionPrice5) - { - playerDataManager.UseGold(mpPotionPrice5, (isSuccess) => - { - if (isSuccess) - { - playerDataManager.userItem.mpPotion += 5; - Debug.Log($"MP 포션 구매 성공! 남은 골드: {playerDataManager.goldAmount}, MP 포션 수량: {playerDataManager.userItem.mpPotion}"); - UIManager.Singleton.UpdateCashData(); - } - else - { - Debug.Log("골드가 부족하여 MP 포션 구매 실패!"); - } - }); - } - else - { - Debug.Log("골드가 부족합니다!"); - } + BuyPotion(mpPotionPrice5, "mp", 5); } - // MP 포션 구매 버튼 클릭 시 호출 public void OnClickBuyMpPotion20Button() { - if (playerDataManager.goldAmount >= mpPotionPrice20) - { - playerDataManager.UseGold(mpPotionPrice20, (isSuccess) => - { - if (isSuccess) - { - playerDataManager.userItem.mpPotion += 20; - Debug.Log($"MP 포션 구매 성공! 남은 골드: {playerDataManager.goldAmount}, MP 포션 수량: {playerDataManager.userItem.mpPotion}"); - UIManager.Singleton.UpdateCashData(); - } - else - { - Debug.Log("골드가 부족하여 MP 포션 구매 실패!"); - } - }); - } - else - { - Debug.Log("골드가 부족합니다!"); - } + BuyPotion(mpPotionPrice20, "mp", 20); } } }