diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index c3d5a0d..78fc52c 100644 Binary files a/Assets/AddressableAssetsData/Android/addressables_content_state.bin and b/Assets/AddressableAssetsData/Android/addressables_content_state.bin differ diff --git a/Assets/GoogleMobileAds/link.xml.meta b/Assets/GoogleMobileAds/link.xml.meta index 062c7d4..d7e48b7 100644 --- a/Assets/GoogleMobileAds/link.xml.meta +++ b/Assets/GoogleMobileAds/link.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5566bda0cda2df941b2e54b77b279ac7 +guid: a9197e8664a9b3f4f9c6495fca9819db labels: - gvh - gvh_version-9.5.0 diff --git a/Assets/Scripts/SingletonManagers/Managers/ADSManager.cs b/Assets/Scripts/SingletonManagers/Managers/ADSManager.cs index 16ac956..c45548d 100644 --- a/Assets/Scripts/SingletonManagers/Managers/ADSManager.cs +++ b/Assets/Scripts/SingletonManagers/Managers/ADSManager.cs @@ -51,15 +51,27 @@ public class ADSManager : MonoBehaviour adDictionary.Clear(); + // 라이브 + //if (GameManager.DB.IsRemoveADS == false) + //{ + // adDictionary.Add("Game_Interstitial", new InterstitialAd("ca-app-pub-6390804219581974/4957790852", "Game_Interstitial")); + // adDictionary.Add("Top_Banner", new BannerAd("ca-app-pub-6390804219581974/6518284533", "Top_Banner")); + //} + + //adDictionary.Add("Result_Reward", new RewardAd("ca-app-pub-6390804219581974/3644709187", "Result_Reward")); + //adDictionary.Add("Heart_Reward", new RewardAd("ca-app-pub-6390804219581974/3947961516", "Heart_Reward")); + //adDictionary.Add("Gold_Reward", new RewardAd("ca-app-pub-6390804219581974/2331627517", "Gold_Reward")); + + // 테스트 if (GameManager.DB.IsRemoveADS == false) { - adDictionary.Add("Game_Interstitial", new InterstitialAd("ca-app-pub-6390804219581974/4957790852", "Game_Interstitial")); - adDictionary.Add("Top_Banner", new BannerAd("ca-app-pub-6390804219581974/6518284533", "Top_Banner")); + adDictionary.Add("Game_Interstitial", new InterstitialAd("ca-app-pub-3940256099942544/1033173712", "Game_Interstitial")); + adDictionary.Add("Top_Banner", new BannerAd("ca-app-pub-3940256099942544/9214589741", "Top_Banner")); } - adDictionary.Add("Result_Reward", new RewardAd("ca-app-pub-6390804219581974/3644709187", "Result_Reward")); - adDictionary.Add("Heart_Reward", new RewardAd("ca-app-pub-6390804219581974/3947961516", "Heart_Reward")); - adDictionary.Add("Gold_Reward", new RewardAd("ca-app-pub-6390804219581974/2331627517", "Gold_Reward")); + adDictionary.Add("Result_Reward", new RewardAd("ca-app-pub-3940256099942544/5224354917", "Result_Reward")); + adDictionary.Add("Heart_Reward", new RewardAd("ca-app-pub-3940256099942544/5224354917", "Heart_Reward")); + adDictionary.Add("Gold_Reward", new RewardAd("ca-app-pub-3940256099942544/5224354917", "Gold_Reward")); foreach (var ad in adDictionary.Values) diff --git a/Assets/Scripts/SingletonManagers/Managers/IAPManager.cs b/Assets/Scripts/SingletonManagers/Managers/IAPManager.cs index dabeb77..5b12676 100644 --- a/Assets/Scripts/SingletonManagers/Managers/IAPManager.cs +++ b/Assets/Scripts/SingletonManagers/Managers/IAPManager.cs @@ -85,6 +85,11 @@ public class IAPManager : MonoBehaviour, IDetailedStoreListener /* 구매하는 함수 */ public void Purchase(string productId) { + // 게등위 테스트용 + AddProductItem(productId); + OnProcessPurchase?.Invoke(productId); + return; + #if UNITY_EDITOR BuyItem(productId); #else @@ -194,6 +199,10 @@ public class IAPManager : MonoBehaviour, IDetailedStoreListener int Get_Price(string id) { + // 게등위 테스트용 + var data = StorePanel.list_item.Find(f=>f.productID == id); + return data.price; + #if UNITY_EDITOR return (int)storeController.products.WithID(id).metadata.localizedPrice; #else @@ -232,8 +241,8 @@ public class IAPManager : MonoBehaviour, IDetailedStoreListener GameManager.DB.AddKey(500, this.name); GameManager.DB.AddTotalCashPerMonth(Get_Price(id)); break; - case "com.fgb.cash2000": - GameManager.DB.AddKey(2000, this.name); + case "com.fgb.cash1800": + GameManager.DB.AddKey(1800, this.name); GameManager.DB.AddTotalCashPerMonth(Get_Price(id)); break; case "com.fgb.cash7500": diff --git a/Assets/Scripts/UI/ProductSlot.cs b/Assets/Scripts/UI/ProductSlot.cs index 3f660ab..95e4c62 100644 --- a/Assets/Scripts/UI/ProductSlot.cs +++ b/Assets/Scripts/UI/ProductSlot.cs @@ -587,32 +587,32 @@ public class ProductSlot : CardBase break; case CodeJay.Enum.EProductType.IAP: - if (GameManager.Network.IsOnline == true) - { - // 구글 로그인에 관련된 처리는 필요없을듯 하다 - // 결제 실패에 관한 처리가 있어어야 하는가? - // StorePanel에서 결제 실패에 관한 처리를 하면 되는가? - // 결제 실패시 이 팝업 로드 EPopupType.FailIAPPopup + //if (GameManager.Network.IsOnline == true) + //{ + // // 구글 로그인에 관련된 처리는 필요없을듯 하다 + // // 결제 실패에 관한 처리가 있어어야 하는가? + // // StorePanel에서 결제 실패에 관한 처리를 하면 되는가? + // // 결제 실패시 이 팝업 로드 EPopupType.FailIAPPopup - // 70만원 이상이면 결제 금지(한달 기간) - if (GameManager.DB.BuyShopAccumulatedMoney <= 600000) - { - return true; - } - else - { - GameManager.UI.ShowNStackPopup(EPopupType.MonthlyPurchaselimitPopup); - return false; - } - } - else - { - // 팝업 출력 - GameManager.UI.ShowNStackPopup(EPopupType.NotOnline_ClosePopup); - return false; - } + // // 70만원 이상이면 결제 금지(한달 기간) + // if (GameManager.DB.BuyShopAccumulatedMoney <= 600000) + // { + // return true; + // } + // else + // { + // GameManager.UI.ShowNStackPopup(EPopupType.MonthlyPurchaselimitPopup); + // return false; + // } + //} + //else + //{ + // // 팝업 출력 + // GameManager.UI.ShowNStackPopup(EPopupType.NotOnline_ClosePopup); + // return false; + //} - break; + return true; case CodeJay.Enum.EProductType.Gold: // 위에서 처리하기 때문에 비여있는 상태 diff --git a/Assets/Scripts/UI/StorePanel.cs b/Assets/Scripts/UI/StorePanel.cs index 751dfc0..0a41d8e 100644 --- a/Assets/Scripts/UI/StorePanel.cs +++ b/Assets/Scripts/UI/StorePanel.cs @@ -36,7 +36,7 @@ public class StorePanel : MonoBehaviour [SerializeField] private TextMeshProUGUI t_month; private int BuyOneKey = 6; - List list_item = new List(); + public static List list_item = new List(); private void Awake() {