lzx 1 vecka sedan
förälder
incheckning
e7fa381264
1 ändrade filer med 32 tillägg och 18 borttagningar
  1. 32 18
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

+ 32 - 18
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -98,33 +98,47 @@ namespace Fort23.Mono
                     }
                 }
 
-                //扣除道具
-                // foreach (var breakthroughItemWidget in breakthroughItemWidgets)
-                // {
-                //     if (breakthroughItemWidget.itemInfo != null)
-                //     {
-                //         if (!PlayerManager.Instance.BagController.IsEnough(breakthroughItemWidget.itemInfo.itemID, 1))
-                //         {
-                //             TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足!");
-                //             return;
-                //         }
-                //     }
-                // }
+                // 扣除道具
+                foreach (var breakthroughItemWidget in breakthroughItemWidgets)
+                {
+                    if (breakthroughItemWidget.itemInfo != null)
+                    {
+                        if (!PlayerManager.Instance.BagController.IsEnough(breakthroughItemWidget.itemInfo.itemID, 1))
+                        {
+                            TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足!");
+                            return;
+                        }
+                    }
+                }
 
                 for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
                 {
-                    if (!PlayerManager.Instance.BagController.IsEnough(
-                            PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1))
+                    foreach (var breakthroughItemWidget in breakthroughItemWidgets)
                     {
-                        TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足!");
-                        return;
+                        if (breakthroughItemWidget.itemInfo != null && breakthroughItemWidget.itemInfo.itemID ==
+                            PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i])
+                        {
+                            if (!PlayerManager.Instance.BagController.IsEnough(breakthroughItemWidget.itemInfo.itemID,
+                                    1))
+                            {
+                                TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足!");
+                                return;
+                            }
+                        }
                     }
+
+                    // if (!PlayerManager.Instance.BagController.IsEnough(
+                    //         PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1))
+                    // {
+                    //     TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足!");
+                    //     return;
+                    // }
                 }
 
-                for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
+                for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs.Length; i++)
                 {
                     if (!PlayerManager.Instance.BagController.DeductItem(
-                            PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i], 1))
+                            PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs[i], 1))
                     {
                         TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足!");
                         return;