diff --git a/Assets/GoogleMobileAds/link.xml.meta b/Assets/GoogleMobileAds/link.xml.meta index 10d701c..975e31a 100644 --- a/Assets/GoogleMobileAds/link.xml.meta +++ b/Assets/GoogleMobileAds/link.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e6c55b600f8006a44921a15d2773fe75 +guid: d9c3a35cda8460c45b0f78edf822ab44 labels: - gvh - gvh_version-9.5.0 diff --git a/Assets/Memo.txt b/Assets/Memo.txt index 0ac249c..b0f4436 100644 --- a/Assets/Memo.txt +++ b/Assets/Memo.txt @@ -43,6 +43,5 @@ adb shell setprop debug.firebase.analytics.app .none. 고스톱 비용 -기장료 110,000원 인증서 110,000원 게등위 480,000원 \ No newline at end of file diff --git a/Assets/Resources/VersionCode.txt b/Assets/Resources/VersionCode.txt index 3cacc0b..ca7bf83 100644 --- a/Assets/Resources/VersionCode.txt +++ b/Assets/Resources/VersionCode.txt @@ -1 +1 @@ -12 \ No newline at end of file +13 \ No newline at end of file diff --git a/Assets/Scripts/UI/GamePanel/GamePanel_DistributeCards.cs b/Assets/Scripts/UI/GamePanel/GamePanel_DistributeCards.cs index 422b0df..35042d7 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel_DistributeCards.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel_DistributeCards.cs @@ -64,13 +64,14 @@ public partial class GamePanel : MonoBehaviour // 테스트 (원하는 카드 세팅) { // 고정시킬 카드 순서 - //var fixedCards = new List { ECardType.Jan_Ghwang, ECardType.Jan_Hongdan, - // ECardType.Jan_Normal_1, ECardType.Jan_Normal_2 }; - //var fixedCards2 = new List { ECardType.May_Yulkkeut, ECardType.May_Chodan, - // ECardType.May_Normal_1, ECardType.May_Normal_2 }; + var fixedCards = new List { ECardType.Jan_Ghwang, ECardType.Jan_Hongdan, + ECardType.Jan_Normal_1, ECardType.Jan_Normal_2 }; + var fixedCards2 = new List { ECardType.May_Yulkkeut, ECardType.May_Chodan, + ECardType.May_Normal_1, ECardType.May_Normal_2 }; //SetCardsAtIndex(_lstCardSlots, fixedCards2, 0); // 플레이어 총통 //SetCardsAtIndex(_lstCardSlots, fixedCards, 9); // AI 총통 + //SetCardsAtIndex(_lstCardSlots, new List { ECardType.May_Chodan, ECardType.May_Normal_1, ECardType.May_Normal_2 }, 0); // 플레이어 총통 //SetCardsAtIndex(_lstCardSlots, // new List { ECardType.Jan_Ghwang, ECardType.Jan_Hongdan, ECardType.Jan_Normal_1 }, 9); // AI 흔들기 } diff --git a/Assets/Scripts/UI/Popup/ShakePopup.cs b/Assets/Scripts/UI/Popup/ShakePopup.cs index 83d47dc..a4730bc 100644 --- a/Assets/Scripts/UI/Popup/ShakePopup.cs +++ b/Assets/Scripts/UI/Popup/ShakePopup.cs @@ -8,9 +8,10 @@ public class ShakePopup : PopupBase public void SetData(ECardType[] cardTypes, bool fourCard) { - if (cardTypes != null && cardTypes.Length == Images.Length) + if (cardTypes != null && cardTypes.Length <= Images.Length) for (int i = 0; i < Images.Length; i++) { + Images[i].gameObject.SetActive(false); if (i == Images.Length - 1) { if (fourCard) @@ -18,11 +19,12 @@ public class ShakePopup : PopupBase Images[i].gameObject.SetActive(true); Images[i].sprite = GameManager.Resource.GetSprite(cardTypes[i]); } - else - Images[i].gameObject.SetActive(false); } else + { + Images[i].gameObject.SetActive(true); Images[i].sprite = GameManager.Resource.GetSprite(cardTypes[i]); + } } StartCoroutine(coroHide()); diff --git a/Assets/Scripts/UI/Popup/ShakeSelectPopup.cs b/Assets/Scripts/UI/Popup/ShakeSelectPopup.cs index a38b74c..f453ed9 100644 --- a/Assets/Scripts/UI/Popup/ShakeSelectPopup.cs +++ b/Assets/Scripts/UI/Popup/ShakeSelectPopup.cs @@ -39,7 +39,8 @@ public class ShakeSelectPopup : PopupBase GameManager.Sound.PlaySFX(ESFXType.Button_Hit); GameManager.Event.InvokeEvent(EEventType.OnSynchronizeGameData); GameManager.UI.HideTopPopup(); - GameManager.UI.ShowNStackPopup(EPopupType.ShakePopup).SetData(cardTypes, _isFourCard); + var sp = GameManager.UI.ShowNStackPopup(EPopupType.ShakePopup); + sp.SetData(cardTypes, _isFourCard); } public void ClickNo()