From 90967255cf6288db249437771aa4c5696a147bc7 Mon Sep 17 00:00:00 2001 From: Ino Date: Thu, 11 Sep 2025 08:31:41 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=93=A0=20=ED=8C=A8=EB=A5=BC=20?= =?UTF-8?q?=EB=8F=8C=EB=A6=B0=20=EB=92=A4,=20=EC=97=BF=EB=B3=B4=EA=B8=B0?= =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=EC=9D=B4=20=EB=85=B8=EC=B6=9C=EB=90=98?= =?UTF-8?q?=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Main.unity | 1 + Assets/Scripts/UI/GamePanel/GamePanel.cs | 6 +++++- .../GamePanel_CheckMathAfterDiscard.cs | 20 +++++++++---------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 687ca2f..e544da3 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -32385,6 +32385,7 @@ MonoBehaviour: m_EditorClassIdentifier: CardSlotPrefab: {fileID: 8311175157444695672, guid: 35d59081fc3bc2a418fe56d3e0969df1, type: 3} go_toppanel: {fileID: 302272076} + go_previewbtn: {fileID: 663523003} cg: {fileID: 771770705} i_ai: {fileID: 1632661773} AINameTMP: {fileID: 1889396053} diff --git a/Assets/Scripts/UI/GamePanel/GamePanel.cs b/Assets/Scripts/UI/GamePanel/GamePanel.cs index c67c04b..037913b 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel.cs @@ -18,7 +18,7 @@ public partial class GamePanel : MonoBehaviour public static float GameSpeed = 1f; public static GamePanel Instance; - public GameObject CardSlotPrefab, go_toppanel; + public GameObject CardSlotPrefab, go_toppanel, go_previewbtn; public CanvasGroup cg; public Image i_ai; public TMPro.TextMeshProUGUI AINameTMP, t_PointMoney; @@ -205,6 +205,7 @@ public partial class GamePanel : MonoBehaviour GameManager.DB.MinInterstitialADCount(1); // Get Highest Clear level + // TOOD 정인호 Stake = GameManager.DB.NormalGameLevel * DBManager.NORMAL_GAME_STAKE_PER_LEVEL; this.UpdateAIGold(); @@ -426,12 +427,15 @@ public partial class GamePanel : MonoBehaviour CurSubMission = eSubMission.Max; GameManager.DB.Set_Mission(true); } + + go_previewbtn.SetActive(true); } #region Core private void Initialize() { GameManager.Sound.PlayBGM(EBGMType.BGM_2); + go_previewbtn.SetActive(false); m_MissionOpenPopup_Main.gameObject.SetActive(false); m_MissionOpenPopup_Sub.gameObject.SetActive(false); ShowMainMissionPopup = ShowSubMissionPopup = false; diff --git a/Assets/Scripts/UI/GamePanel/GamePanel_CheckMathAfterDiscard.cs b/Assets/Scripts/UI/GamePanel/GamePanel_CheckMathAfterDiscard.cs index b454eae..c999397 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel_CheckMathAfterDiscard.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel_CheckMathAfterDiscard.cs @@ -36,7 +36,7 @@ public partial class GamePanel : MonoBehaviour var matchedFloorCards = GetMatchedCardSlots(ECardLocationType.Floor, _discardSlot.MonthType); - // 4: ڻ / + // ���� �� 4��: �ڻ� / ������ if (matchedFloorCards.Count == 4) { GameManager.Sound.PlaySFX(ESFXType.Card_Hit); @@ -50,19 +50,19 @@ public partial class GamePanel : MonoBehaviour { if (_dicBbug_State.ContainsKey(_discardSlot.MonthType)) { - // ÷̾ ߴٸ + // ���� �÷��̾ �ߴٸ� if (_dicBbug_State[_discardSlot.MonthType] == EBbugState.Player) { _checkDiscardEffectType = PlayerTurn ? EEffectDirectType.GetBbug_Own : EEffectDirectType.GetBbug; _checkIndex = PlayerTurn ? 2 : 1; } - // AI ߴٸ + // ���� AI�� �ߴٸ� else if (_dicBbug_State[_discardSlot.MonthType] == EBbugState.AI) { _checkDiscardEffectType = PlayerTurn ? EEffectDirectType.GetBbug : EEffectDirectType.GetBbug_Own; _checkIndex = PlayerTurn ? 1 : 2; } - // ī带 4 Ȱ̱ ̴. + // ī�带 ���� �� 4���� �Ȱ��̱� ������ �����̴�. else { LogicalError($"{nameof(CheckDiscardMatchedStateMachine)} Logical Error"); @@ -77,7 +77,7 @@ public partial class GamePanel : MonoBehaviour for (int i = 0; i < matchedFloorCards.Count; i++) _lstAvailableCardTypes.Add(matchedFloorCards[i].CardType); - // ִ ʽī嵵 ´. + // ���� �ִ� ���ʽ�ī�嵵 �����´�. if (_dicReservedBonusCard.ContainsKey(ECardType.Bonus_1)) { if (_dicReservedBonusCard[ECardType.Bonus_1] == _discardSlot.MonthType) @@ -100,14 +100,14 @@ public partial class GamePanel : MonoBehaviour _checkMatchedDiscardState = ECheckDiscardMatchedState.Complete; } } - // 3: ī + // ���� �� 3��: ī�� ���� else if (matchedFloorCards.Count == 3) { GameManager.Sound.PlaySFX(ESFXType.Card_Hit); _delay = (CardSlot.TWEEN_DURATION * 1.25f) / GameSpeed; _checkMatchedDiscardState = ECheckDiscardMatchedState.CardSelectLogic; } - // 2: ٴп ġ. + // ���� �� 2��: �ٴ��п� ��ġ��. else if (matchedFloorCards.Count == 2) { GameManager.Sound.PlaySFX(ESFXType.Card_Hit); @@ -117,7 +117,7 @@ public partial class GamePanel : MonoBehaviour _checkMatchedDiscardState = ECheckDiscardMatchedState.Complete; _delay = 0.05f; } - // ٴп ġ . + // �ٴ��п� ��ġ���� ����. else if (matchedFloorCards.Count == 1) { GameManager.Sound.PlaySFX(ESFXType.Card_NoHit); @@ -125,7 +125,7 @@ public partial class GamePanel : MonoBehaviour } else { - // _discardSlot Null п Flip ī带 ۿ . + // _discardSlot�� Null�� ���� �п��� Flip ī�带 ���� �� �ۿ� ����. if (_discardSlot != null) LogicalError($"{nameof(CheckDiscardMatchedStateMachine)} Logical Error"); @@ -158,7 +158,7 @@ public partial class GamePanel : MonoBehaviour bool isDoublePee_left = CodeJay.CodeJayUtility.Utility.IsDoublePee(leftCard, UseSepYulgget_To_Pee); bool isDoublePee_right = CodeJay.CodeJayUtility.Utility.IsDoublePee(rightCard, UseSepYulgget_To_Pee); - // ǰ ƴϰ ī尡 '' + // ���ǰ� �ƴϰ� ��� ī�尡 �� �� '��' �� �� if (isDoublePee_left == false && isDoublePee_right == false && leftScoreType == ECardScoreType.Pee && rightScoreType == ECardScoreType.Pee) { CardSelectCallback_Discard(Random.Range(0, 2) == 0 ? leftCard : rightCard);