lzx преди 1 месец
родител
ревизия
000745398a

+ 18 - 4
Assets/Scripts/GameLogic/Shop/ShopManger.cs

@@ -290,11 +290,24 @@ public class ShopManger : Singleton<ShopManger>
 #endif
         }
         //看广告
-        else if (shopItemConfig.costItemId == 1032)
+        else if (shopItemConfig.costItemId == 1007)
         {
+            isOk = true;
+#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
+            if (TakuSDKManager.Instance.IsReady())
+            {
+                isOk = await TakuSDKManager.Instance.ShowAutoAd();
+            }
+            else
+            {
+                isOk = false;
+            }
+
+#endif
+
             var dic = new Dictionary<string, string>();
             dic.Add("buyItem", shopItemConfig.ID.ToString());
-            isOk = true;
+
 
             if (isOk)
             {
@@ -304,7 +317,8 @@ public class ShopManger : Singleton<ShopManger>
         }
         else
         {
-            if (PlayerManager.Instance.BagController.DeductItem(shopItemConfig.costItemId, shopItemConfig.price * count))
+            if (PlayerManager.Instance.BagController.DeductItem(shopItemConfig.costItemId,
+                    shopItemConfig.price * count))
             {
                 isOk = true;
             }
@@ -331,7 +345,7 @@ public class ShopManger : Singleton<ShopManger>
                 dic.Add("ShopItemId", shopItemConfig.ID.ToString());
             }
 
-        
+
             return itemList;
         }
         else

+ 50 - 10
Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -26,16 +26,36 @@ namespace Fort23.Mono
             }
             else
             {
-                //验证道具是否足够
-                if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID, openBoxConfig.tenConsume))
+                if (openBoxConfig.CostItemID == 1007)
                 {
+#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
+                      if (TakuSDKManager.Instance.IsReady())
+                    {
+                        if (!await TakuSDKManager.Instance.ShowAutoAd())
+                        {
+                            return null;
+                        }
+                    }
+                    else
+                    {
+                        return null;
+                    }
+#endif
                     return PlayerManager.Instance.SummonManager.Summon(configId, 10);
                 }
                 else
                 {
-                    ItemSourcePanel.OpenPanel(openBoxConfig.CostItemID);
-                    // TipMessagePanel.OpenTipMessagePanel("道具不足", Vector2.zero);
-                    return null;
+                    //验证道具是否足够
+                    if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
+                            openBoxConfig.tenConsume))
+                    {
+                        return PlayerManager.Instance.SummonManager.Summon(configId, 10);
+                    }
+                    else
+                    {
+                        ItemSourcePanel.OpenPanel(openBoxConfig.CostItemID);
+                        return null;
+                    }
                 }
             }
         }
@@ -52,16 +72,36 @@ namespace Fort23.Mono
             }
             else
             {
-                //验证道具是否足够
-                if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID, openBoxConfig.oneConsume))
+                if (openBoxConfig.CostItemID == 1007)
                 {
+#if UNITY_ANDROID && !UNITY_EDITOR && Taptap
+                    if (TakuSDKManager.Instance.IsReady())
+                    {
+                        if (!await TakuSDKManager.Instance.ShowAutoAd())
+                        {
+                            return null;
+                        }
+                    }
+                    else
+                    {
+                        return null;
+                    }
+#endif
                     return PlayerManager.Instance.SummonManager.Summon(configId, 1);
                 }
                 else
                 {
-                    ItemSourcePanel.OpenPanel(openBoxConfig.CostItemID);
-                    // TipMessagePanel.OpenTipMessagePanel("道具不足", Vector2.zero);
-                    return null;
+                    //验证道具是否足够
+                    if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
+                            openBoxConfig.oneConsume))
+                    {
+                        return PlayerManager.Instance.SummonManager.Summon(configId, 1);
+                    }
+                    else
+                    {
+                        ItemSourcePanel.OpenPanel(openBoxConfig.CostItemID);
+                        return null;
+                    }
                 }
             }
         }

+ 15 - 0
Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -1,4 +1,5 @@
 using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Core.Audio;
@@ -58,6 +59,20 @@ namespace Fort23.Mono
         {
             tenButton.onClick.AddListener(() =>
             {
+#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
+                     if (TakuSDKManager.Instance.IsReady())
+                    {
+                        if (!await TakuSDKManager.Instance.ShowAutoAd())
+                        {
+                            return null;
+                        }
+                    }
+                    else
+                    {
+                        return null;
+                    }
+#endif
+
                 tenButton.gameObject.SetActive(false);
                 float beLv =
                     Utility.UtilTools.GetRandomByWeight(_openBoxConfig.betPara1.ToList(), _openBoxConfig.betPara2);

+ 35 - 35
Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidget.cs

@@ -40,41 +40,41 @@ namespace Fort23.Mono
             oneButton.onClick.AddListener(OnButtonCallBack);
             tenButton.onClick.AddListener(TenButtonCallBack);
 
-            Btn_AdsFree.onClick.AddListener(async () =>
-            {
-                if (AccountFileInfo.Instance.playerData.boxFree)
-                {
-                    TipMessagePanel.OpenTipMessagePanel(938, Vector2.zero);
-                    return;
-                }
-
-                if (isStartAd)
-                    return;
-                isStartAd = true;
-
-                var dic = new Dictionary<string, string>();
-                dic.Add("Chouka", "");
-                // YouLoftSDK.Instance.CustomEvent("OnclickAds", dic);
-                // bool isOK = await YouLoftSDK.Instance.ShowAd();
-                bool isOK = true;
-                isStartAd = false;
-
-                if (!isOK)
-                {
-                    return;
-                }
-
-                dic = new Dictionary<string, string>();
-                dic.Add("Chouka", "");
-                // YouLoftSDK.Instance.CustomEvent("AdsPlayOver", dic);
-                AccountFileInfo.Instance.playerData.boxFree = true;
-                AccountFileInfo.Instance.SavePlayerData();
-                // Btn_AdsFree.gameObject.SetActive(false);
-
-                List<ItemInfo> allIitem = await BoxHelper.TenBox(openBoxConfig.ID, true);
-                if (allIitem != null)
-                    GachaPanel.OpenPanel(allIitem, 2, openBoxConfig.ID);
-            });
+            // Btn_AdsFree.onClick.AddListener(async () =>
+            // {
+            //     if (AccountFileInfo.Instance.playerData.boxFree)
+            //     {
+            //         TipMessagePanel.OpenTipMessagePanel(938, Vector2.zero);
+            //         return;
+            //     }
+            //
+            //     if (isStartAd)
+            //         return;
+            //     isStartAd = true;
+            //
+            //     var dic = new Dictionary<string, string>();
+            //     dic.Add("Chouka", "");
+            //     // YouLoftSDK.Instance.CustomEvent("OnclickAds", dic);
+            //     // bool isOK = await YouLoftSDK.Instance.ShowAd();
+            //     bool isOK = true;
+            //     isStartAd = false;
+            //
+            //     if (!isOK)
+            //     {
+            //         return;
+            //     }
+            //
+            //     dic = new Dictionary<string, string>();
+            //     dic.Add("Chouka", "");
+            //     // YouLoftSDK.Instance.CustomEvent("AdsPlayOver", dic);
+            //     AccountFileInfo.Instance.playerData.boxFree = true;
+            //     AccountFileInfo.Instance.SavePlayerData();
+            //     // Btn_AdsFree.gameObject.SetActive(false);
+            //
+            //     List<ItemInfo> allIitem = await BoxHelper.TenBox(openBoxConfig.ID, true);
+            //     if (allIitem != null)
+            //         GachaPanel.OpenPanel(allIitem, 2, openBoxConfig.ID);
+            // });
         }
 
 

+ 14 - 1
Assets/Scripts/GameUI/UI/ShopPanel/ShopGachaPanel.cs

@@ -53,6 +53,19 @@ namespace Fort23.Mono
         {
             Btn_ShuangBei.onClick.AddListener(() =>
             {
+#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
+                      if (TakuSDKManager.Instance.IsReady())
+                    {
+                        if (!await TakuSDKManager.Instance.ShowAutoAd())
+                        {
+                            return null;
+                        }
+                    }
+                    else
+                    {
+                        return null;
+                    }
+#endif
                 float beLv =
                     Utility.UtilTools.GetRandomByWeight(_openBoxConfig.betPara1.ToList(), _openBoxConfig.betPara2);
 
@@ -140,7 +153,7 @@ namespace Fort23.Mono
                     UILayer.Middle,
                     uiData: new object[] { itemInfos, type, configId }, isShowBG: true);
             }
-            
+
             AudioManager.Instance.PlayAudio("ui_jianglimianban.wav");
         }
     }