Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -506,15 +506,13 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("未选择升级材料");
                 return;
             }
-            if (itemMoneyNum > ItemDataManager.GetItemNum(itemMoneyId))
+            if (!ItemUtil.CheckItemEnough(itemMoneyId, itemMoneyNum))
             {
-                ItemUtil.AddGold(UpLv);
-            }
-            else
-            {
-                this.UpLv();
+                long has = ItemDataManager.GetItemNum(itemMoneyId);
+                ItemUtil.BuyCurrency(itemMoneyId, itemMoneyNum - has);
+                return;
             }
-
+            this.UpLv();
         }
         private async void UpLv()
         {
@@ -712,24 +710,19 @@ namespace GFGGame
                 return;
             }
 
-            int state = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString());
-            if (state == 0)
+            if (!ItemUtil.CheckItemEnough(cardStarCfg.costID, cardStarCfg.costNum))
             {
-                PromptController.Instance.ShowFloatTextPrompt("材料不足");
+                long has = ItemDataManager.GetItemNum(cardStarCfg.costID);
+                ItemUtil.BuyCurrency(cardStarCfg.costID, cardStarCfg.costID - has);
                 return;
             }
-            long costHas = ItemDataManager.GetItemNum(cardStarCfg.costID);
-            int costNeed = cardStarCfg.costNum;
-            if (costHas < costNeed)
-            {
-                ItemUtil.AddGold(UpStar);
 
-            }
-            else
+            for (int i = 0; i < cardStarCfg.materiarsArr.Length; i++)
             {
-                this.UpStar();
+                if (!ItemUtil.CheckItemEnough(cardStarCfg.materiarsArr[i][0], cardStarCfg.materiarsArr[i][1], true)) return;
             }
 
+            this.UpStar();
         }
         private async void UpStar()
         {

GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -128,25 +128,18 @@ namespace GFGGame
         }
         private async void OnClickBtnUp()
         {
-            if (ItemDataManager.GetItemNum(skillLvCfg.costID) < skillLvCfg.costNum)
+
+            if (!ItemUtil.CheckItemEnough(skillLvCfg.costID, skillLvCfg.costNum))
             {
-                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(skillLvCfg.costID);
-                PromptController.Instance.ShowFloatTextPrompt(itemCfg.name + "不足");
+                long has = ItemDataManager.GetItemNum(skillLvCfg.costID);
+                ItemUtil.BuyCurrency(skillLvCfg.costID, skillLvCfg.costNum - has);
                 return;
             }
-            bool isEnough = true;
+
             for (int i = 0; i < skillLvCfg.materiarsArr.Length; i++)
             {
-                int needCount = skillLvCfg.materiarsArr[i][1];
-                long hasCount = ItemDataManager.GetItemNum(skillLvCfg.materiarsArr[i][0]);
-                if (hasCount < needCount)
-                {
-                    isEnough = false;
-                    PromptController.Instance.ShowFloatTextPrompt("升级材料不足");
-                    break;
-                }
+                if (!ItemUtil.CheckItemEnough(skillLvCfg.materiarsArr[i][0], skillLvCfg.materiarsArr[i][1], true)) return;
             }
-            if (!isEnough) return;
 
             bool result = await SkillSProxy.ReqUpgradeCardSkill(_cardId, _skillId);
             if (result)