diff --git a/Assets/GoogleMobileAds/link.xml.meta b/Assets/GoogleMobileAds/link.xml.meta index eeaec6c..0276e1c 100644 --- a/Assets/GoogleMobileAds/link.xml.meta +++ b/Assets/GoogleMobileAds/link.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cdd4f48712d178f4b807914f2ac9f90c +guid: be474b00c7134174b88a1f4dd1f5b3a8 labels: - gvh - gvh_version-9.5.0 diff --git a/Assets/Memo.txt b/Assets/Memo.txt index 93bd740..0ac249c 100644 --- a/Assets/Memo.txt +++ b/Assets/Memo.txt @@ -34,8 +34,11 @@ ibk 앱에서 휴대폰 본인 인증 시 휴대폰 번호 변경하는 방법 //////////////////////////////////////////////////////////////////////////////////////////////////// 내 돈이 - 가 됨 -구글 및 원스토어 이미지 분기 처리? -구글 및 원스토어 아이콘 분기 처리? + +파이어 베이스 디버그 뷰 +adb shell setprop debug.firebase.analytics.app com.fgb.randomgfgostop +adb shell setprop debug.firebase.analytics.app .none. + diff --git a/Assets/Resources/VersionCode.txt b/Assets/Resources/VersionCode.txt index 9a03714..9d60796 100644 --- a/Assets/Resources/VersionCode.txt +++ b/Assets/Resources/VersionCode.txt @@ -1 +1 @@ -10 \ No newline at end of file +11 \ No newline at end of file diff --git a/Assets/Scripts/UI/GamePanel/CardSlot.cs b/Assets/Scripts/UI/GamePanel/CardSlot.cs index cac3f58..4776de2 100644 --- a/Assets/Scripts/UI/GamePanel/CardSlot.cs +++ b/Assets/Scripts/UI/GamePanel/CardSlot.cs @@ -341,7 +341,8 @@ public class CardSlot : MonoBehaviour, IPointerClickHandler, IPointerDownHandler { if (CardType != ECardType.Max && LocationType == ECardLocationType.Player_Hand && GameManager.UI.IsAnyPopupOpened() == false) { - GamePanel.Instance.Discard(this); + if (GamePanel.Instance.DiscardisNull()) + GamePanel.Instance.Discard(this); } } diff --git a/Assets/Scripts/UI/GamePanel/GamePanel.cs b/Assets/Scripts/UI/GamePanel/GamePanel.cs index b2a32ae..4ce4223 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel.cs @@ -10,7 +10,7 @@ public partial class GamePanel : MonoBehaviour #region Statics public static void LogicalError(string message) { - throw new System.Exception(message); + Debug.LogError(message); } #endregion diff --git a/Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs b/Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs index b1501f6..0c04b3f 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs @@ -1060,6 +1060,7 @@ public partial class GamePanel : MonoBehaviour } public void Discard(CardSlot slot) => _discardSlot = slot; + public bool DiscardisNull() { return _discardSlot == null; } private void BringOtherPlayersPeeCard(int num, bool isPlayer) {