lzx пре 8 часа
родитељ
комит
3963ad27c8

+ 4 - 4
Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -100,7 +100,7 @@ namespace GameLogic.Player
                             return null;
                         }
 
-                     
+
 #endif
                     }
                     else
@@ -157,7 +157,7 @@ namespace GameLogic.Player
                     //验证道具是否足够
                     if (openBoxConfig.CostItemID == 1007)
                     {
-#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
+#if UNITY_ANDROID && !UNITY_EDITOR&& Ads
                         if (TakuSDKManager.Instance.IsReady())
                         {
                             bool isOK = await TakuSDKManager.Instance.ShowAutoAd();
@@ -165,13 +165,13 @@ namespace GameLogic.Player
                             {
                                 return null;
                             }
+
+                            await TimerComponent.Instance.WaitAsync(1000);
                         }
                         else
                         {
                             return null;
                         }
-
-                        await TimerComponent.Instance.WaitAsync(1000);
 #endif
                     }
                     else

+ 13 - 4
Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -44,9 +44,18 @@ namespace Fort23.Mono
                     return null;
                 }
 
-                await MarskPanel.OpenPanel();
+                if (!PlayerManager.Instance.BagController.IsEnough(23002, 1))
+                {
+                    await MarskPanel.OpenPanel();
+                }
+
                 List<ItemInfo> itemInfos = await PlayerManager.Instance.SummonManager.Summon(configId, 10);
-                MarskPanel.ClosePanel();
+                if (!PlayerManager.Instance.BagController.IsEnough(23002, 1))
+                {
+                    MarskPanel.ClosePanel();
+                }
+
+            
                 return itemInfos;
                 // return await PlayerManager.Instance.SummonManager.Summon(configId, 10);
             }
@@ -91,9 +100,9 @@ namespace Fort23.Mono
                     return item;
                 }
 
-                await MarskPanel.OpenPanel();
+                // await MarskPanel.OpenPanel();
                 List<ItemInfo> itemInfos = await PlayerManager.Instance.SummonManager.Summon(configId, 1);
-                MarskPanel.ClosePanel();
+                // MarskPanel.ClosePanel();
                 return itemInfos;
                 // return await PlayerManager.Instance.SummonManager.Summon(configId, 1);
             }

+ 14 - 15
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -190,9 +190,12 @@ namespace Fort23.Mono
                                     1000);
 
             float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
-            // await CreatHero();
+        
             Slider_Exp.maxValue = PlayerManager.Instance.myHero.powerUpConfig.levelUpExp;
             Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp;
+            
+            Text_exp.text =
+                $"{(int)PlayerManager.Instance.myHero.exp.Value + allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
             for (var i = 0; i < JingJieIcons.Count; i++)
             {
@@ -208,6 +211,13 @@ namespace Fort23.Mono
             }
 
             Text_Level.text = $"LV{PlayerManager.Instance.myHero.level}";
+            
+            string jingjie =
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+            Text_Jingjie.text = LanguageManager.Instance.Text(10225, jingjie,
+                PlayerManager.Instance.myHero.powerUpConfig.jingjie3, 10);
 
 
             int miao = (int)((PlayerManager.Instance.myHero.powerUpConfig.levelUpExp -
@@ -329,10 +339,7 @@ namespace Fort23.Mono
                 HeroAttributeWidgets.Add(heroAttributeWidget);
 
 
-                //
-                // heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
-                // heroAttributeWidget.CustomInit("生命", PlayerManager.Instance.myHero.hp.Value.ToString(), (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToString());
-                // HeroAttributeWidgets.Add(heroAttributeWidget);
+  
                 if (PlayerManager.Instance.myHero.heroData.isYuanMan)
                 {
                     Text_Jingjie1.text =
@@ -346,12 +353,7 @@ namespace Fort23.Mono
                         LanguageManager.Instance.Text(10429);
                 }
 
-                string jingjie =
-                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
-                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                    LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
-                Text_Jingjie.text = LanguageManager.Instance.Text(10225, jingjie,
-                    PlayerManager.Instance.myHero.powerUpConfig.jingjie3, 10);
+         
 
 
                 //可以突破特效设置
@@ -390,10 +392,7 @@ namespace Fort23.Mono
                     }
                 }
 
-
-                Text_exp.text =
-                    $"{(int)PlayerManager.Instance.myHero.exp.Value + allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
-
+                
                 //突破按钮图片和文字设置
                 if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1 &&
                     PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)

+ 8 - 2
Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoWidget.cs

@@ -1,4 +1,5 @@
 using GameLogic.Hero;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -24,7 +25,7 @@ namespace Fort23.Mono
             base.AddButtonEvent();
         }
 
-        public void CustomInit(FaBaoInfo faoInfo,bool isShowActive)
+        public void CustomInit(FaBaoInfo faoInfo, bool isShowActive)
         {
             this.faoInfo = faoInfo;
             Text_Level.text = faoInfo.FaBaoData.level.ToString() + "级";
@@ -44,7 +45,12 @@ namespace Fort23.Mono
             {
                 Iocn_Active.gameObject.SetActive(false);
             }
-           
+        }
+
+        public override void DormancyObj()
+        {
+            transform.sizeDelta = new Vector2(139, 173);
+            base.DormancyObj();
         }
     }
 }