Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -98,6 +98,17 @@ namespace Fort23.Mono
                     }
                 }
 
+                //先验证必须道具够不够 够了成功后扣除
+                for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
+                {
+                    if (!PlayerManager.Instance.BagController.IsEnough(
+                            PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i],
+                            1))
+                    {
+                        TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足！");
+                        return;
+                    }
+                }
                 // 扣除道具
                 // foreach (var breakthroughItemWidget in breakthroughItemWidgets)
                 // {
@@ -139,12 +150,6 @@ namespace Fort23.Mono
                 {
                     PlayerManager.Instance.BagController.DeductItem(
                         PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs[i], 1);
-                    // if (!PlayerManager.Instance.BagController.DeductItem(
-                    //         PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs[i], 1))
-                    // {
-                    //     TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足！");
-                    //     return;
-                    // }
                 }
 
                 HeroInformationPanel heroInformationPanel =
@@ -189,6 +194,13 @@ namespace Fort23.Mono
 
                     if (isTuPoSuccess)
                     {
+                        //渡劫成功扣除道具
+                        for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
+                        {
+                            PlayerManager.Instance.BagController.DeductItem(
+                                PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1);
+                        }
+
                         AudioManager.Instance.PlayAudio("ui_tupo.wav");
                         await UpHero(type1);
                     }