광고 제거

Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: 965ebc3298ffc3f429a28032069aceb5
   m_currentHash:
     serializedVersion: 2
-    Hash: 5d761c25fffa91ce99c0c254709db5b2
+    Hash: 00000000000000000000000000000000
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_CatalogRequestsTimeout: 0

Assets/ResWork/Table/Export/Shop.json

@@ -1,9 +1,11 @@
-[{"s_ID": "com.fgb.weeklypackage", "e_InAppInitType": "Week", "e_BuyType": "IAP", "n_Price": "1000", "s_PeakEffective": "최대 효율 111%", "s_Items": "코인 x00
+[{"s_ID": "com.fgb.shegotwet.adpack", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "9900", "s_PeakEffective": "최대 효율 111%", "s_Items": "광고 제거
-채팅 코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.minigamepacakge", "e_InAppInitType": "Mini_One", "e_BuyType": "IAP", "n_Price": "25000", "s_PeakEffective": "최대 효율 222%", "s_Items": "보너스 확률 +00%
+하트 x500
-코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.buyone1", "e_InAppInitType": "One1", "e_BuyType": "IAP", "n_Price": "9900", "s_PeakEffective": "123%", "s_Items": "코인 x000
+가챠 코인 x1000", "n_RewardHeart": "500", "n_RewardChatCoin": "0", "n_RewardGacha": "1000", "b_AdRemove": "True"}, {"s_ID": "com.fgb.shegotwet.ad", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "4400", "s_PeakEffective": "", "s_Items": "광고 제거", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "b_AdRemove": "True"}, {"s_ID": "com.fgb.shegotwet.weeklypackage", "e_InAppInitType": "Week", "e_BuyType": "IAP", "n_Price": "1000", "s_PeakEffective": "최대 효율 111%", "s_Items": "코인 x00
-채팅 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.buyone2", "e_InAppInitType": "One2", "e_BuyType": "IAP", "n_Price": "55000", "s_PeakEffective": "135%", "s_Items": "코인 x000
+채팅 코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.minigamepacakge", "e_InAppInitType": "Mini_One", "e_BuyType": "IAP", "n_Price": "25000", "s_PeakEffective": "최대 효율 222%", "s_Items": "보너스 확률 +00%
-가챠 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.chatbot1", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "5500", "s_PeakEffective": "105%", "s_Items": "코인 x00
+코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.buyone1", "e_InAppInitType": "One1", "e_BuyType": "IAP", "n_Price": "9900", "s_PeakEffective": "123%", "s_Items": "코인 x000
-채팅 코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.chatbot2", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "9900", "s_PeakEffective": "102%", "s_Items": "보너스 확률 +00%
+채팅 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.buyone2", "e_InAppInitType": "One2", "e_BuyType": "IAP", "n_Price": "55000", "s_PeakEffective": "135%", "s_Items": "코인 x000
-코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.chatbot3", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "22000", "s_PeakEffective": "100%", "s_Items": "코인 x000
+가챠 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.chatbot1", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "5500", "s_PeakEffective": "105%", "s_Items": "코인 x00
-채팅 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.chatbot4", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "55000", "s_PeakEffective": "99%", "s_Items": "코인 x000
+채팅 코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.chatbot2", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "9900", "s_PeakEffective": "102%", "s_Items": "보너스 확률 +00%
-가챠 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.gacha1", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "1100", "s_PeakEffective": "", "s_Items": "x20", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "20"}, {"s_ID": "com.fgb.gacha2", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "5500", "s_PeakEffective": "", "s_Items": "x110", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "110"}, {"s_ID": "com.fgb.gacha3", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "27500", "s_PeakEffective": "", "s_Items": "x600", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "600"}, {"s_ID": "com.fgb.chatcoin1", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "1100", "s_PeakEffective": "", "s_Items": "x10", "n_RewardHeart": "0", "n_RewardChatCoin": "10", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.chatcoin2", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "5500", "s_PeakEffective": "", "s_Items": "x55", "n_RewardHeart": "0", "n_RewardChatCoin": "55", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.chatcoin3", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "27500", "s_PeakEffective": "", "s_Items": "x300", "n_RewardHeart": "0", "n_RewardChatCoin": "300", "n_RewardGacha": "0"}, {"s_ID": "ad.chatcoin", "e_InAppInitType": "None", "e_BuyType": "AD", "n_Price": "0", "s_PeakEffective": "", "s_Items": "x3", "n_RewardHeart": "0", "n_RewardChatCoin": "3", "n_RewardGacha": "0"}, {"s_ID": "buy.chatcoin", "e_InAppInitType": "None", "e_BuyType": "Coin", "n_Price": "50", "s_PeakEffective": "", "s_Items": "x1", "n_RewardHeart": "0", "n_RewardChatCoin": "1", "n_RewardGacha": "0"}]
+코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.chatbot3", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "22000", "s_PeakEffective": "100%", "s_Items": "코인 x000
+채팅 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.chatbot4", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "55000", "s_PeakEffective": "99%", "s_Items": "코인 x000
+가챠 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.gacha1", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "1100", "s_PeakEffective": "", "s_Items": "x20", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "20", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.gacha2", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "5500", "s_PeakEffective": "", "s_Items": "x110", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "110", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.gacha3", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "27500", "s_PeakEffective": "", "s_Items": "x600", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "600", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.chatcoin1", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "1100", "s_PeakEffective": "", "s_Items": "x10", "n_RewardHeart": "0", "n_RewardChatCoin": "10", "n_RewardGacha": "0", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.chatcoin2", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "5500", "s_PeakEffective": "", "s_Items": "x55", "n_RewardHeart": "0", "n_RewardChatCoin": "55", "n_RewardGacha": "0", "b_AdRemove": "False"}, {"s_ID": "com.fgb.shegotwet.chatcoin3", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "27500", "s_PeakEffective": "", "s_Items": "x300", "n_RewardHeart": "0", "n_RewardChatCoin": "300", "n_RewardGacha": "0", "b_AdRemove": "False"}, {"s_ID": "ad.chatcoin", "e_InAppInitType": "None", "e_BuyType": "AD", "n_Price": "0", "s_PeakEffective": "", "s_Items": "x3", "n_RewardHeart": "0", "n_RewardChatCoin": "3", "n_RewardGacha": "0", "b_AdRemove": "False"}, {"s_ID": "buy.chatcoin", "e_InAppInitType": "None", "e_BuyType": "Coin", "n_Price": "50", "s_PeakEffective": "", "s_Items": "x1", "n_RewardHeart": "0", "n_RewardChatCoin": "1", "n_RewardGacha": "0", "b_AdRemove": "False"}]

Assets/ResWork/Table/table_shop.cs

@@ -16,6 +16,7 @@ public class shoptabledata
     ProtectedInt32 _RewardHeart; public int n_RewardHeart { get { return _RewardHeart; } set { _RewardHeart = value; _RewardHeart.Obfuscate(); } }
     ProtectedInt32 _RewardChatCoin; public int n_RewardChatCoin { get { return _RewardChatCoin; } set { _RewardChatCoin = value; _RewardChatCoin.Obfuscate(); } }
     ProtectedInt32 _RewardGacha; public int n_RewardGacha { get { return _RewardGacha; } set { _RewardGacha = value; _RewardGacha.Obfuscate(); } }
+    ProtectedBool _AdRemove; public bool b_AdRemove { get { return _AdRemove; } set { _AdRemove = value; _AdRemove.Obfuscate(); } }
 }
 
 public class table_shop : table_base

Assets/Scripts/AttachToGameObject/ADInfo.cs

@@ -164,6 +164,12 @@ public class ADInfo : MonoBehaviourSingletonTemplate<ADInfo>
         Action_fail = _fail;
         GetReward = 0;
 
+        if (SaveMgr.Ins.Get_ShopAD())
+        {
+            GetReward = 1;
+            return;
+        }
+
         if (bshort)
         {
             if (m_interstitialAd != null && m_interstitialAd.CanShowAd())
@@ -241,7 +247,8 @@ public class ADInfo : MonoBehaviourSingletonTemplate<ADInfo>
             //// 배너 광고 요청 및 표시
             //var adRequest = new AdRequest();
             //_bannerView.LoadAd(adRequest);
-            _bannerView.Show();
+            if (!SaveMgr.Ins.Get_ShopAD())
+                _bannerView.Show();
         }
         else
         {

Assets/Scripts/AttachToGameObject/SaveMgr.cs

@@ -268,11 +268,11 @@ public class SaveMgr : MonoBehaviourSingletonTemplate<SaveMgr>
         m_SaveData.ShopADTime = InternetTime.Ins.Time.AddSeconds(sec);
         Save();
     }
-    public bool CanBuyShopPackage(eInAppInitType inittype)
+    public bool CanBuyShopPackage(shoptabledata data)
     {
-        switch (inittype)
+        switch (data.e_InAppInitType)
         {
-            default: return true;
+            default: if (data.b_AdRemove) return !m_SaveData.NoAD; else return true;
             case eInAppInitType.Week: return !m_SaveData.BuyShopWeekly;
             case eInAppInitType.Mini_One: return !m_SaveData.BuyShopMiniGame;
             case eInAppInitType.One1: return !m_SaveData.BuyShopOne1;
@@ -289,6 +289,16 @@ public class SaveMgr : MonoBehaviourSingletonTemplate<SaveMgr>
             case eInAppInitType.One2: m_SaveData.BuyShopOne2 = true; break;
         }
     }
+    public void Set_ShopAD(bool noad)
+    {
+        if (!m_SaveData.NoAD)
+        {
+            m_SaveData.NoAD = noad;
+            ADInfo.Ins.Set_Banner(false);
+            SetBannerPos.Run();
+        }
+    }
+    public bool Get_ShopAD() { return m_SaveData.NoAD; }
 
     public class SaveData
     {
@@ -314,6 +324,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate<SaveMgr>
         ProtectedDateTime _GachaADTime; public DateTime GachaADTime { get { return _GachaADTime; } set { _GachaADTime = value; _GachaADTime.Obfuscate(); } }
         ProtectedDateTime _ShopADTime; public DateTime ShopADTime { get { return _ShopADTime; } set { _ShopADTime = value; _ShopADTime.Obfuscate(); } }
 
+        ProtectedBool _NoAD; public bool NoAD { get { return _NoAD; } set { _NoAD = value; _NoAD.Obfuscate(); } }
         ProtectedBool _BuyShopWeekly; public bool BuyShopWeekly { get { return _BuyShopWeekly; } set { _BuyShopWeekly = value; _BuyShopWeekly.Obfuscate(); } }
         ProtectedBool _BuyShopMiniGame; public bool BuyShopMiniGame { get { return _BuyShopMiniGame; } set { _BuyShopMiniGame = value; _BuyShopMiniGame.Obfuscate(); } }
         ProtectedBool _BuyShopOne1; public bool BuyShopOne1 { get { return _BuyShopOne1; } set { _BuyShopOne1 = value; _BuyShopOne1.Obfuscate(); } }

Assets/Scripts/UI/ShopCard.cs

@@ -44,7 +44,7 @@ public class ShopCard : MonoBehaviour
     {
         if (go_BuyComplete != null)
         {
-            go_BuyComplete.SetActive(!SaveMgr.Ins.CanBuyShopPackage(m_Data.e_InAppInitType));
+            go_BuyComplete.SetActive(!SaveMgr.Ins.CanBuyShopPackage(m_Data));
         }
     }
 
@@ -59,11 +59,14 @@ public class ShopCard : MonoBehaviour
                     SaveMgr.Ins.Add_Money(eMoney.Chat, m_Data.n_RewardChatCoin);
                     SaveMgr.Ins.Add_Money(eMoney.Gacha, m_Data.n_RewardGacha);
                     SaveMgr.Ins.Set_ShopInit(m_Data.e_InAppInitType);
+                    SaveMgr.Ins.Set_ShopAD(m_Data.b_AdRemove);
                     SaveMgr.Ins.Save();
 
                     LobbyUI.Ins.m_ToastUI.Set(Get_BuyItemMsg());
 
-                    Set_UI();
+                    var cards = gameObject.transform.parent.GetComponentsInChildren<ShopCard>();
+                    for (int i = 0; i < cards.Length; i++)
+                        cards[i].Set_UI();
                 });
                 break;
             case eShopBuyType.AD:

Assets/Scripts/Util/SetBannerPos.cs

@@ -4,11 +4,9 @@ using UnityEngine;
 public class SetBannerPos : MonoBehaviour
 {
     static List<SetBannerPos> list_SetBannerPos = new List<SetBannerPos>();
+    public static void Run() { list_SetBannerPos.ForEach(f => f.Start()); }
 
-    private void Awake()
+    private void Awake() { list_SetBannerPos.Add(this); }
-    {
-        list_SetBannerPos.Add(this);
-    }
 
     [Header("Need Full Rect")]
     public bool BannerPosIsBottom = true;
@@ -17,8 +15,8 @@ public class SetBannerPos : MonoBehaviour
     {
         var rt = GetComponent<RectTransform>();
         if (BannerPosIsBottom)
-            rt.offsetMin = new Vector2(rt.offsetMin.x, 150f);
+            rt.offsetMin = new Vector2(rt.offsetMin.x, SaveMgr.Ins.Get_ShopAD() ? 0f : 150f);
         else
-            rt.offsetMax = new Vector2(rt.offsetMax.x, -150f);
+            rt.offsetMax = new Vector2(rt.offsetMax.x, SaveMgr.Ins.Get_ShopAD() ? 0f : -150f);
     }
 }

Assets/SheGotWet_Memo.txt

@@ -1,4 +1,4 @@
 상점은 이야기 후 다시
-광고 제거권
+광고 제거
- - 구매 후 UI 처리
+ - 모든 광고 딜레이 주기
 파이어 베이스