엿보기 작업 중...2 , 일부 버그 수정

This commit is contained in:
Ino 2025-09-04 06:42:31 +09:00
parent 1e484ff542
commit 3be0898dab
8 changed files with 79 additions and 3234 deletions

View File

@ -869,9 +869,9 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 7212562384654579656} m_Father: {fileID: 7212562384654579656}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -45, y: 0} m_AnchoredPosition: {x: 34, y: 0}
m_SizeDelta: {x: 50, y: 50} m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5606400887757685784 --- !u!222 &5606400887757685784
@ -1305,7 +1305,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: 100 m_text: 100 / 000
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2} m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
m_sharedMaterial: {fileID: -6508382273668546854, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2} m_sharedMaterial: {fileID: -6508382273668546854, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
@ -1413,7 +1413,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 99} m_AnchoredPosition: {x: 0, y: 99}
m_SizeDelta: {x: 150, y: 50} m_SizeDelta: {x: 350, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8106258314246835861 --- !u!222 &8106258314246835861
CanvasRenderer: CanvasRenderer:

File diff suppressed because it is too large Load Diff

View File

@ -96,9 +96,9 @@ public class UIManager : MonoBehaviour
} }
else if (_stkActivatedPopupbases.Count <= 0) else if (_stkActivatedPopupbases.Count <= 0)
{ {
if (Escapeable) if (Escapeable && GamePanel.Instance != null)
{ {
if (GamePanel.Instance.gameObject.activeInHierarchy) if (!GamePanel.Instance.GameOver)
{ {
if (GameManager.UI.IsOpendPopup(EPopupType.PausePopup) == false) if (GameManager.UI.IsOpendPopup(EPopupType.PausePopup) == false)
GameManager.UI.ShowNStackPopup(EPopupType.PausePopup); GameManager.UI.ShowNStackPopup(EPopupType.PausePopup);

View File

@ -95,7 +95,7 @@ public class BottomPanel : MonoBehaviour
MainButtonPanel.SetActive(true); MainButtonPanel.SetActive(true);
this.ClickCategory(1); CanvasControl.Ins.Go_Main();
} }
private void OnReturnToHunting() private void OnReturnToHunting()

View File

@ -153,7 +153,6 @@ public partial class GamePanel : MonoBehaviour
{ {
if (gameObject.activeInHierarchy != b) if (gameObject.activeInHierarchy != b)
this.gameObject.SetActive(b); this.gameObject.SetActive(b);
} }
private void StartNormalGame() private void StartNormalGame()

View File

@ -1,4 +1,5 @@
using TMPro; using TMPro;
using UnityEngine;
public class PreviewPopup : PopupBase public class PreviewPopup : PopupBase
{ {
@ -7,14 +8,6 @@ public class PreviewPopup : PopupBase
int m_price = 100; int m_price = 100;
public override void ShowPopup(int drawOrder) public override void ShowPopup(int drawOrder)
{
base.ShowPopup(drawOrder);
GameManager.Sound.PlaySFX(ESFXType.Open_Popup);
t_price.text = m_price.ToString();
}
public void ClickYes()
{ {
if (GamePanel.Instance.IsPreview) if (GamePanel.Instance.IsPreview)
{ {
@ -23,14 +16,23 @@ public class PreviewPopup : PopupBase
} }
else else
{ {
if (GameManager.DB.Gold >= m_price) base.ShowPopup(drawOrder);
{ GameManager.Sound.PlaySFX(ESFXType.Open_Popup);
GameManager.DB.SubGold(m_price, name);
GameManager.DB.SaveDatas(); t_price.text = $"{m_price} / {GameManager.DB.Key}";
GamePanel.Instance.IsPreview = true; t_price.color = m_price > GameManager.DB.Key ? Color.red : Color.green;
GameManager.UI.HideTopPopup(); }
GameManager.UI.ShowNStackPopup(EPopupType.PreViewUIPopup); }
}
public void ClickYes()
{
if (!GamePanel.Instance.IsPreview && GameManager.DB.Key >= m_price)
{
GameManager.DB.SubKey(m_price, name);
GameManager.DB.SaveDatas();
GamePanel.Instance.IsPreview = true;
GameManager.UI.HideTopPopup();
GameManager.UI.ShowNStackPopup(EPopupType.PreViewUIPopup);
} }
} }

View File

@ -1,10 +1,12 @@
using TMPro; using TMPro;
using UnityEngine;
public class PreviewUIPopup : PopupBase public class PreviewUIPopup : PopupBase
{ {
public TextMeshProUGUI[] texts; // 0 소지금, 1 레벨, 2 0점 X 0배, 3 고, 4 흔듦, 5 뻑 public TextMeshProUGUI[] texts; // 0 소지금, 1 레벨, 2 0점 X 0배, 3 고, 4 흔듦, 5 뻑
public TextMeshProUGUI[] texts_mission; // 0 메인 미션, 1 서브 미션 public TextMeshProUGUI[] texts_mission; // 0 메인 미션, 1 서브 미션
public TextMeshProUGUI[] texts_cardcount; // 0 광, 1 열끗, 2 띠, 3 피 public TextMeshProUGUI[] texts_cardcount; // 0 광, 1 열끗, 2 띠, 3 피
public Transform tf_main, tf_sub, tf_gwang, tf_yulggeut, tf_ddee, tf_pee, tf_cards;
public override void ShowPopup(int drawOrder) public override void ShowPopup(int drawOrder)
{ {

View File

@ -12,8 +12,8 @@ public class QuitPopup : PopupBase
{ {
GameManager.Sound.PlaySFX(ESFXType.Button_Hit); GameManager.Sound.PlaySFX(ESFXType.Button_Hit);
GameManager.DB.SaveDatas(); GameManager.DB.SaveDatas();
Application.Quit();
GameManager.UI.HideTopPopup(); GameManager.UI.HideTopPopup();
DSUtil.Quit();
} }
public void ClickCancel() public void ClickCancel()