消耗金币体力马蹄金提示

GameClient/Assets/Game/HotUpdate/Utils/ItemUtil.cs

@@ -18,22 +18,32 @@ namespace GFGGame
         public static void ExchangeItemById(int itemId, long num, bool showTips = true, Action onSuccess = null, bool openSource = false, int maxCount = 9990, bool showTxtBuyTips = false, string prefix = "")
         {
 
-            if (itemId == ConstItemID.GOLD)
-            {
-                AddGold(num, onSuccess);
-            }
-            else if (itemId == ConstItemID.POWER)
-            {
-                AddPower();
-            }
-            else
+            if (!BuyCurrency(itemId, onSuccess))
             {
                 BuyItemConteoller.Show(itemId, num, ConstBuyType.TYPE_ITEM, onSuccess, showTips, openSource, maxCount);
                 BuyItemConteoller.showTxtBuyTips = showTxtBuyTips;
             }
         }
-
-        public static void AddPower(string prefix = "", Action onSuccess = null, int type = 0)
+        public static bool BuyCurrency(int itemId, Action onSuccess = null)
+        {
+            switch (itemId)
+            {
+                case ConstItemID.GOLD:
+                    AddGold(onSuccess);
+                    return true;
+                case ConstItemID.POWER:
+                    AddPower();
+                    return true;
+                case ConstItemID.DIAMOND_RED:
+                    AddDiamondRed();
+                    return true;
+                case ConstItemID.DIAMOND_PURPLE:
+                    ItemUtil.AddDiamondPurple();
+                    return true;
+            }
+            return false;
+        }
+        public static void AddPower(Action onSuccess = null, int type = 0)
         {
             EnduringGiftBoxController.Show(ConstItemID.POWER, 1, () =>
             {
@@ -44,7 +54,7 @@ namespace GFGGame
             }, "", type);
         }
 
-        public static void AddGold(long value = 0, Action onSuccess = null, int type = 0)
+        public static void AddGold(Action onSuccess = null, int type = 0)
         {
             EnduringGiftBoxController.Show(ConstItemID.GOLD, 1, () =>
             {
@@ -324,6 +334,6 @@ namespace GFGGame
             (component.data as ItemView)?.SetData(itemData);
             (component.data as ItemView)?.ChangeTxtCountStyle();
         }
-        
+
     }
 }

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

@@ -508,7 +508,7 @@ namespace GFGGame
             }
             if (itemMoneyNum > ItemDataManager.GetItemNum(itemMoneyId))
             {
-                ItemUtil.AddGold(itemMoneyNum - ItemDataManager.GetItemNum(itemMoneyId), UpLv);
+                ItemUtil.AddGold(UpLv);
             }
             else
             {
@@ -722,7 +722,7 @@ namespace GFGGame
             int costNeed = cardStarCfg.costNum;
             if (costHas < costNeed)
             {
-                ItemUtil.AddGold(costNeed - costHas, UpStar);
+                ItemUtil.AddGold(UpStar);
 
             }
             else

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -26,11 +26,11 @@ namespace GFGGame
         }
         private void OnClickGold()
         {
-            ItemUtil.AddGold(0, null, 1);
+            ItemUtil.AddGold(null, 1);
         }
         private void OnClickPower()
         {
-            ItemUtil.AddPower("", null, 1);
+            ItemUtil.AddPower(null, 1);
         }
         private void OnClickDiamondPurple()
         {

GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs

@@ -221,15 +221,8 @@ namespace GFGGame
             {
                 if (price > ItemDataManager.GetItemNum(_costId))
                 {
-
-                    if (_openSource)
-                    {
-                        if (_buyId == ConstItemID.DIAMOND_RED)
-                        {
-                            ItemUtil.AddDiamondPurple();
-                        }
-                    }
-                    else
+                    this.Hide();
+                    if (!ItemUtil.BuyCurrency(_costId))
                     {
                         ItemCfg costCfg = ItemCfgArray.Instance.GetCfg(_costId);
                         PromptController.Instance.ShowFloatTextPrompt(string.Format("{0}不足", costCfg.name));

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -478,7 +478,7 @@ namespace GFGGame
             var levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
             if (RoleDataManager.power < levelCfg.power)
             {
-                ItemUtil.AddPower("体力不足", OnClickBtnPhotograph);
+                ItemUtil.AddPower(OnClickBtnPhotograph);
                 return;
             }
             OnClickBtnPhotograph();

GameClient/Assets/Game/HotUpdate/Views/League/LeaguePrayView.cs

@@ -104,7 +104,7 @@ namespace GFGGame
             {
                 if (prayCfg.consumeArr[0][0] == ConstItemID.GOLD)
                 {
-                    ItemUtil.AddGold(0, null, 1);
+                    ItemUtil.AddGold(null, 1);
                 }
                 else if (prayCfg.consumeArr[0][0] == ConstItemID.DIAMOND_RED)
                 {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightQuicklyView.cs

@@ -105,7 +105,7 @@ namespace GFGGame
 
                 if (levelCfg.type == ConstInstanceZonesType.Story)
                 {
-                    ItemUtil.AddPower("体力不足", StartFight);
+                    ItemUtil.AddPower(StartFight);
                 }
                 else if (levelCfg.type == ConstInstanceZonesType.Studio)
                 {
@@ -117,7 +117,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        ItemUtil.AddPower("体力不足", StartFight);
+                        ItemUtil.AddPower(StartFight);
                     }
                 }
                 return;

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -98,7 +98,7 @@ namespace GFGGame
 
                 if (RoleDataManager.power < levelCfg.power)
                 {
-                    ItemUtil.AddPower("体力不足", OnClickBtnStart);
+                    ItemUtil.AddPower(OnClickBtnStart);
                 }
                 else
                 {
@@ -137,7 +137,7 @@ namespace GFGGame
             {
                 if (RoleDataManager.power < levelCfg.power)
                 {
-                    ItemUtil.AddPower("体力不足", OnClickBtnFightOnce);
+                    ItemUtil.AddPower(OnClickBtnFightOnce);
                 }
                 else
                 {

GameClient/Assets/Game/HotUpdate/Views/Store/StoreBlackCardRewardView.cs

@@ -101,7 +101,7 @@ namespace GFGGame
 
             if (GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime) < TimeHelper.ServerNow())
             {
-                PromptController.Instance.ShowFloatTextPrompt("开通黑金卡可领");
+                PromptController.Instance.ShowFloatTextPrompt("开通璇玑卡可领");
                 return;
             }
             ShopSProxy.ReqGetMonthCardItem(month).Coroutine();

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs

@@ -70,8 +70,8 @@ namespace GFGGame
                 if (privilegeCfgs[i].paramsArr[0] == _limitId)
                 {
                     _ui.m_txtNum1.visible = true;
-                    string str0 = privilegeCfgs[i].value1Arr[0] > 0 ? string.Format("金卡+{0}次", privilegeCfgs[i].value1Arr[0]) : "";
-                    string str1 = privilegeCfgs[i].value2Arr[0] > 0 ? string.Format("黑金卡+{0}次", privilegeCfgs[i].value2Arr[0]) : "";
+                    string str0 = privilegeCfgs[i].value1Arr[0] > 0 ? string.Format("灵犀卡+{0}次", privilegeCfgs[i].value1Arr[0]) : "";
+                    string str1 = privilegeCfgs[i].value2Arr[0] > 0 ? string.Format("璇玑卡+{0}次", privilegeCfgs[i].value2Arr[0]) : "";
                     _ui.m_txtNum0.text = string.Format("1.{0}{1}{2}", str0, !string.IsNullOrEmpty(str0) && !string.IsNullOrEmpty(str1) ? "," : "", str1);
                     _ui.m_txtNum1.text = string.Format("2.道具兑换(今天已兑换{0}/{1}次)", _limitData.BuyTimes, _limitCfg.buyNum);
                     break;