diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index e3232c2..532625b 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 3ec6b44..fc3d8d1 100644 --- a/Assets/GoogleMobileAds/link.xml.meta +++ b/Assets/GoogleMobileAds/link.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 22eb99a4a306de2499c7fee8c1fecbb8 +guid: f14cb87245d513d4d84734780398a51d labels: - gvh - gvh_version-9.5.0 diff --git a/Assets/Memo.txt b/Assets/Memo.txt index 70e3cb6..93bd740 100644 --- a/Assets/Memo.txt +++ b/Assets/Memo.txt @@ -26,6 +26,8 @@ 9. 바닥 카드가 없고 내가 점수를 낸 상태면 스톱으로 내 승리 +ibk 앱에서 휴대폰 본인 인증 시 휴대폰 번호 변경하는 방법 + //////////////// 실제 라이브 시 게등위 관련 주석 처리 필요 diff --git a/Assets/Resources/Prefabs/Popups/NotMinimumVersionPopup.prefab b/Assets/Resources/Prefabs/Popups/NotMinimumVersionPopup.prefab index b9021ba..510627c 100644 --- a/Assets/Resources/Prefabs/Popups/NotMinimumVersionPopup.prefab +++ b/Assets/Resources/Prefabs/Popups/NotMinimumVersionPopup.prefab @@ -708,7 +708,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: df3b4b8deb79a3c49b475a96caa7e28a, type: 3} m_Name: m_EditorClassIdentifier: - storeURL: https://play.google.com/store/apps/details?id=com.SkaGames.GSProject + storeURL: https://onesto.re/0001002187 --- !u!1 &8233679372601912116 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/VersionCode.txt b/Assets/Resources/VersionCode.txt index 7813681..c793025 100644 --- a/Assets/Resources/VersionCode.txt +++ b/Assets/Resources/VersionCode.txt @@ -1 +1 @@ -5 \ No newline at end of file +7 \ No newline at end of file diff --git a/Assets/Scripts/SingletonManagers/Managers/ADSManager.cs b/Assets/Scripts/SingletonManagers/Managers/ADSManager.cs index a38a13c..a1e2403 100644 --- a/Assets/Scripts/SingletonManagers/Managers/ADSManager.cs +++ b/Assets/Scripts/SingletonManagers/Managers/ADSManager.cs @@ -52,26 +52,26 @@ 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-3940256099942544/1033173712", "Game_Interstitial")); - adDictionary.Add("Top_Banner", new BannerAd("ca-app-pub-3940256099942544/9214589741", "Top_Banner")); + 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-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")); + 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-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-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 5b12676..4aaf1af 100644 --- a/Assets/Scripts/SingletonManagers/Managers/IAPManager.cs +++ b/Assets/Scripts/SingletonManagers/Managers/IAPManager.cs @@ -85,10 +85,10 @@ public class IAPManager : MonoBehaviour, IDetailedStoreListener /* 구매하는 함수 */ public void Purchase(string productId) { - // 게등위 테스트용 - AddProductItem(productId); - OnProcessPurchase?.Invoke(productId); - return; + //// 게등위 테스트용 + //AddProductItem(productId); + //OnProcessPurchase?.Invoke(productId); + //return; #if UNITY_EDITOR BuyItem(productId); @@ -199,9 +199,9 @@ public class IAPManager : MonoBehaviour, IDetailedStoreListener int Get_Price(string id) { - // 게등위 테스트용 - var data = StorePanel.list_item.Find(f=>f.productID == id); - return data.price; + //// 게등위 테스트용 + //var data = StorePanel.list_item.Find(f=>f.productID == id); + //return data.price; #if UNITY_EDITOR return (int)storeController.products.WithID(id).metadata.localizedPrice;