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

FGUIProject/assets/BornLimit/FirstChargeBonusUI.xml

@@ -7,11 +7,11 @@
   </controller>
   <displayList>
     <image id="n0_fqor" name="n0" src="sjiz3" fileName="images/sc_db.png" xy="0,-43"/>
-    <image id="n8_sjiz" name="n8" src="sjiz4" fileName="images/sc_lihui_lnlx.png" xy="10,29"/>
+    <image id="n8_sjiz" name="n8" src="jx6z14" fileName="images/sc_lihui_kxsq.png" xy="-10,113"/>
     <image id="n6_sjiz" name="n6" src="sjiz0" fileName="images/sc_mc_db.png" xy="140,202"/>
     <image id="n9_sjiz" name="n9" src="sjiz2" fileName="images/wz_sc.png" xy="437,139"/>
     <image id="n13_idkd" name="n13" src="idkdtnc" fileName="imagesNew/xsqg_zsx.png" pkg="eg2y0ldp" xy="461,400"/>
-    <text id="n7_sjiz" name="txtName" xy="151,297" size="40,135" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fffdfc" leading="-6" autoSize="height" strokeColor="#d88f4e" text="岭南荔夏"/>
+    <text id="n7_sjiz" name="txtName" xy="152,297" size="40,130" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fffdfc" leading="-6" autoSize="height" strokeColor="#d88f4e" text="快雪时晴"/>
     <list id="n1_fqor" name="list" xy="493,414" size="402,476" layout="flow_hz" overflow="scroll" lineGap="14" colGap="14" defaultItem="ui://eg2y0ldp9jv6tls">
       <item/>
       <item/>

FGUIProject/assets/BornLimit/package.xml

@@ -7,6 +7,7 @@
     <image id="sjiz2" name="wz_sc.png" path="/images/"/>
     <image id="sjiz3" name="sc_db.png" path="/images/"/>
     <image id="sjiz4" name="sc_lihui_lnlx.png" path="/images/"/>
+    <image id="jx6z14" name="sc_lihui_kxsq.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/BornLimit" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/LeaguePrayUI.xml

@@ -5,15 +5,15 @@
     <image id="n14_o9gh" name="n14" src="o9gh4r" fileName="images/biaotizi_7.png" xy="209,107"/>
     <component id="n15_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="914,60"/>
     <component id="n9_rv09" name="comPary0" src="rv0929" fileName="components/ComPary.xml" xy="116,207">
-      <property target="LoaIcon" propertyId="1" value="ui://tw70qm9dofwu8b"/>
+      <property target="LoaIcon" propertyId="1" value="ui://tw70qm9djx6z8h"/>
       <property target="txtName" propertyId="0" value="白檀香"/>
     </component>
     <component id="n10_rv09" name="comPary1" src="rv0929" fileName="components/ComPary.xml" xy="418,207">
-      <property target="LoaIcon" propertyId="1" value="ui://tw70qm9dofwu89"/>
+      <property target="LoaIcon" propertyId="1" value="ui://tw70qm9djx6z8i"/>
       <property target="txtName" propertyId="0" value="苏合香"/>
     </component>
     <component id="n11_rv09" name="comPary2" src="rv0929" fileName="components/ComPary.xml" xy="720,207">
-      <property target="LoaIcon" propertyId="1" value="ui://tw70qm9dofwu8a"/>
+      <property target="LoaIcon" propertyId="1" value="ui://tw70qm9djx6z8j"/>
       <property target="txtName" propertyId="0" value="天木香"/>
     </component>
   </displayList>

FGUIProject/assets/League/components/ComPary.xml

@@ -6,9 +6,10 @@
   </controller>
   <displayList>
     <image id="n14_o9gh" name="n14" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="0,0"/>
+    <image id="n19_jx6z" name="n19" src="jx6z8k" fileName="images/yajiqifu_tb_db.png" xy="47,80"/>
     <image id="n13_o9gh" name="n13" src="o9gh4g" fileName="imagesNew/lm_kuang_icon.png" pkg="eg2y0ldp" xy="32,66"/>
     <image id="n16_o9gh" name="n16" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="17,276"/>
-    <loader id="n2_rv09" name="LoaIcon" xy="66,101" pivot="0.5,0.5" size="144,144" aspect="true" url="ui://eg2y0ldpu2u3tkq" align="center" fill="scale"/>
+    <loader id="n2_rv09" name="LoaIcon" xy="44,100" pivot="0.5,0.5" size="182,163" aspect="true" url="ui://tw70qm9djx6z8h" align="center" fill="scale" autoSize="true"/>
     <text id="n3_rv09" name="txtName" xy="83,270" pivot="0.5,0" size="107,47" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" text="白檀香"/>
     <text id="n9_a0cf" name="n9" xy="15,361" size="103,35" group="n17_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#b08d5c" text="每次祈福"/>
     <component id="n4_rv09" name="comGain" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="170,361" group="n17_o9gh" scale="0.7,0.7" controller="c1,1"/>

FGUIProject/assets/League/package.xml

@@ -208,14 +208,15 @@
     <image id="e05086" name="tb_jn_1.png" path="/images/" exported="true"/>
     <image id="e05087" name="tb_jn_2.png" path="/images/" exported="true"/>
     <image id="e05088" name="tb_jn_4.png" path="/images/" exported="true"/>
-    <image id="ofwu89" name="tb_xiang_suhexiang.png" path="/images/"/>
-    <image id="ofwu8a" name="tb_xiang_tianmuxiang.png" path="/images/"/>
-    <image id="ofwu8b" name="tb_xiang_baitanxiang.png" path="/images/"/>
     <image id="ofwu8c" name="zhj_liaotian_db.png" path="/images/"/>
     <component id="ofwu8d" name="LeagueChatUI.xml" path="/" exported="true"/>
     <component id="ofwu8e" name="ListChatItem.xml" path="/components/" exported="true"/>
     <component id="ofwu8f" name="ListChatItemMine.xml" path="/components/" exported="true"/>
     <image id="ofwu8g" name="lm_tb_liaotian.png" path="/images/"/>
+    <image id="jx6z8h" name="tb_xiang_baitanxiang.png" path="/images/"/>
+    <image id="jx6z8i" name="tb_xiang_suhexiang.png" path="/images/"/>
+    <image id="jx6z8j" name="tb_xiang_tianmuxiang.png" path="/images/"/>
+    <image id="jx6z8k" name="yajiqifu_tb_db.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Store/StoreBlackCardRewardUI.xml

@@ -5,7 +5,7 @@
     <component id="n16_e050" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="896,16" group="n17_e050"/>
     <group id="n17_e050" name="n17" xy="0,0" size="1021,992"/>
     <image id="n6_qik1" name="n6" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="132,796"/>
-    <text id="n7_qik1" name="n7" xy="241,822" size="682,86" fontSize="32" color="#a88656" align="center" autoSize="none" text="黑金卡玩家，每月1日5点起，可免费领取黑金卡 专属单品，请注意及时领取，逾期失效。"/>
+    <text id="n7_qik1" name="n7" xy="241,822" size="682,86" fontSize="32" color="#a88656" align="center" autoSize="none" text="璇玑卡玩家，每月1日5点起，可免费领取黑金卡 专属单品，请注意及时领取，逾期失效。"/>
     <list id="n14_qik1" name="list" xy="147,176" size="809,590" layout="flow_hz" lineGap="10" colGap="20" defaultItem="ui://p9mtgheoqik1tcj" autoClearItems="true">
       <item/>
       <item/>

GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -264,7 +264,7 @@ namespace GFGGame
         /// <param name="cardScore"></param>
         /// <param name="skillLvs"></param>
         /// <returns></returns>
-        public long GetSkillFightScore(double itemScoreSum, int baseScore, int leagueSkillScore, int cardId, int cardScore, List<int> skillLvs)
+        public long GetSkillFightScore(double itemScoreSum, int baseScore, long leagueSkillScore, int cardId, int cardScore, List<int> skillLvs)
         {
             float skillScore = 0;
             float skillBaseScore = (long)itemScoreSum + cardScore + baseScore + leagueSkillScore;

GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -430,11 +430,12 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetClothingRenewRed(int suitId)
         {
-            int index = SuitFosterDataManager.Instance.GetSuitFosterData(suitId).maintainStep;
+            SuitFosterData suitFosterData = SuitFosterDataManager.Instance.GetSuitFosterData(suitId);
+            if (suitFosterData.makeNewState > 0) return false;
             List<SuitFosterCfg> fosterCfgs = SuitFosterCfgArray.Instance.GetCfgsBysuitId(suitId);
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
             SuitRenewCfg renewCfg = SuitRenewCfgArray.Instance.GetCfg(suitCfg.rarity);
-            if (index >= fosterCfgs.Count
+            if (suitFosterData.maintainStep >= fosterCfgs.Count
             && ItemDataManager.GetItemNum(renewCfg.costId) >= renewCfg.costNum
             && ItemDataManager.GetItemNum(renewCfg.materialsArr[0][0]) >= renewCfg.materialsArr[0][1])
             {

GameClient/Assets/Game/HotUpdate/Data/ScoreSystemData.cs

@@ -131,7 +131,7 @@ namespace GFGGame
             double partScore = partBaseScore * ConstScoreSystem.PART_SCORE;
 
             int roleScore = roleData.baseScore;
-            int leagueSkillScore = roleData.leagueSkillScore;
+            long leagueSkillScore = roleData.leagueSkillScore;
             int cardScore = roleData.cardScore;
 
             double clickCoefficient = GetPartItemClickScore(clickType);
@@ -152,7 +152,7 @@ namespace GFGGame
             double partScore = partBaseScore * ConstScoreSystem.PART_SCORE;
 
             int roleScore = robotData.baseScore;
-            int leagueSkillScore = robotData.leagueSkillScore;
+            long leagueSkillScore = robotData.leagueSkillScore;
             int cardScore = robotData.cardScore;
 
             double clickCoefficient = GetPartItemClickScore(clickType);

GameClient/Assets/Game/HotUpdate/Data/VO/FightData.cs

@@ -8,7 +8,7 @@ namespace GFGGame
         public string name;//玩家名字
         public int scoreType;//本次战斗的主题
         public int baseScore;//角色等级分数
-        public int leagueSkillScore;//角色雅集技能分
+        public long leagueSkillScore;//角色雅集技能分
         public int cardId;//卡牌id
         public int cardScore;//卡牌对应主题的属性分数
         public string[] tags = { };////本次战斗要求的标签

GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs

@@ -329,6 +329,13 @@ namespace GFGGame
                         }
                         list[i].itemList = response.DressupList[i].EquipIds;
                         list[i].cardId = response.DressupList[i].CardId;
+                        for (int j = 0; j < response.SkillAttrs.Count; j++)
+                        {
+                            if (response.SkillAttrs[i].Score == list[i].scoreType)
+                            {
+                                list[i].leagueSkillScore = response.SkillAttrs[i].Value;
+                            }
+                        }
                         List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(response.data[i].CardId);
 
                         if (response.data[i].SkillId.Count == skillCfgs.Count)

GameClient/Assets/Game/HotUpdate/ServerProxy/SuitFosterProxy.cs

@@ -48,7 +48,7 @@ namespace ET
                 return maintainSuit.Error;
             }
             SuitFosterDataManager.Instance.SetMaintainSuit(suitId, maintainSuit.MaintainStep);
-
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             return ErrorCode.ERR_Success;
         }
 
@@ -71,7 +71,7 @@ namespace ET
                 return getMaintainSuitBonus.Error;
             }
             SuitFosterDataManager.Instance.SetMaintainBonusSteps(suitId, getMaintainSuitBonus.MaintainStep);
-
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             return ErrorCode.ERR_Success;
         }
 
@@ -94,6 +94,7 @@ namespace ET
                 return makeNewSuit.Error;
             }
             SuitFosterDataManager.Instance.SetMakeNewSuit(suitId, makeNewSuit.MakeNewState);
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             return ErrorCode.ERR_Success;
         }
     }

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, num, 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, long num, Action onSuccess = null)
+        {
+            switch (itemId)
+            {
+                case ConstItemID.GOLD:
+                    AddGold(onSuccess);
+                    return true;
+                case ConstItemID.POWER:
+                    AddPower();
+                    return true;
+                case ConstItemID.DIAMOND_RED:
+                    AddDiamondRed(num);
+                    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, () =>
             {
@@ -62,7 +72,7 @@ namespace GFGGame
         }
 
         //红钻（鲛绡）
-        public static void AddDiamondRed(int value = 0, Action onSuccess = null)
+        public static void AddDiamondRed(long value = 0, Action onSuccess = null)
         {
 
             ItemExchangeCfg currencyRatioCfg = ItemExchangeCfgArray.Instance.GetCfg(ConstItemID.DIAMOND_RED);// GetCurrencyRatioCfgById(ConstItemID.DIAMOND_RED);
@@ -156,9 +166,14 @@ namespace GFGGame
             return itemData;
         }
 
-        public static Boolean CheckItemEnough(int itemId, int num)
+        public static Boolean CheckItemEnough(int itemId, long num, bool showTips = false)
         {
             long hasNum = ItemDataManager.GetItemNum(itemId);
+            if (hasNum < num && showTips)
+            {
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+                PromptController.Instance.ShowFloatTextPrompt(string.Format("【{0}】 不足", itemCfg.name));
+            }
             return hasNum >= num;
         }
 
@@ -324,6 +339,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/ClothingFoster/ClothingFosterView.cs

@@ -119,11 +119,20 @@ namespace GFGGame
         }
         private async void OnClickBtnFoster()
         {
-            if (!_canFoster)
+            SuitFosterCfg cfg = SuitFosterCfgArray.Instance.GetCfgsBysuitId(_suitId)[_index];
+
+            if (!ItemUtil.CheckItemEnough(cfg.costId, cfg.costNum))
             {
-                PromptController.Instance.ShowFloatTextPrompt("材料不足");
+                long has = ItemDataManager.GetItemNum(cfg.costId);
+                ItemUtil.BuyCurrency(cfg.costId, cfg.costNum - has);
                 return;
             }
+
+            for (int i = 0; i < cfg.materialsArr.Length; i++)
+            {
+                if (!ItemUtil.CheckItemEnough(cfg.materialsArr[i][0], cfg.materialsArr[i][1], true)) return;
+            }
+
             int result = await SuitFosterProxy.SendMaintainSuit(_suitId, _index + 1);
             if (result == ErrorCode.ERR_Success)
             {

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -87,6 +87,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.GET_MAINTAIN_SUIT_BONUS, OnListenerGetFosterReward);
             EventAgent.AddEventListener(ConstMessage.MAKE_NEW_SUIT, OnListenerRenew);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateFosterList);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
         protected override void OnShown()
         {
@@ -109,7 +110,7 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fzsj_bg");
 
             UpdateView();
-
+            UpdateRedDot();
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -127,6 +128,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.GET_MAINTAIN_SUIT_BONUS, OnListenerGetFosterReward);
             EventAgent.RemoveEventListener(ConstMessage.MAKE_NEW_SUIT, OnListenerRenew);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateFosterList);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
         private void OnClickBtnBack()
         {
@@ -375,11 +377,6 @@ namespace GFGGame
         private async void OnClickBtnRenew()
         {
 
-            if (!_canRenew)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("材料不足");
-                return;
-            }
             SuitFosterData data = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId);
             SuitFosterListCfg cfg = SuitFosterListCfgArray.Instance.GetCfg(_suitId);
             if (data.maintainStep < cfg.renewOpenLv)
@@ -387,6 +384,23 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt(string.Format("完成{0}开启焕新", SuitFosterDataManager.Instance.stepNames[cfg.renewOpenLv - 1]));
                 return;
             }
+
+            int suitrarity = SuitCfgArray.Instance.GetCfg(_suitId).rarity;
+            SuitRenewCfg renewCfg = SuitRenewCfgArray.Instance.GetCfg(suitrarity);
+
+            if (!ItemUtil.CheckItemEnough(renewCfg.costId, renewCfg.costNum))
+            {
+                long has = ItemDataManager.GetItemNum(renewCfg.costId);
+                ItemUtil.BuyCurrency(renewCfg.costId, renewCfg.costNum - has);
+                return;
+            }
+
+            for (int i = 0; i < renewCfg.materialsArr.Length; i++)
+            {
+                if (!ItemUtil.CheckItemEnough(renewCfg.materialsArr[i][0], renewCfg.materialsArr[i][1], true)) return;
+            }
+
+
             int result = await SuitFosterProxy.SendMakeNewSuit(_suitId);
             if (result == ErrorCode.ERR_Success)
             {
@@ -400,6 +414,13 @@ namespace GFGGame
             Debug.Log("换新奖励：" + ItemDataManager.GetItemNum(10370));
 
         }
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTabFoster, RedDotDataManager.Instance.GetClothingFosterRed(_suitId));
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTabRenew, RedDotDataManager.Instance.GetClothingRenewRed(_suitId));
+            RedDotController.Instance.SetComRedDot(_ui.m_btnRenew, RedDotDataManager.Instance.GetClothingRenewRed(_suitId));
+
+        }
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0)

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -151,27 +151,27 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("不能制作已经拥有的物品");
                 return;
             }
+
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_selectedItemId);
-            //合成消耗判断
-            if (ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum)
+            if (!ItemUtil.CheckItemEnough(itemCfg.syntheticCostID, itemCfg.syntheticCostNum))
             {
-                PromptController.Instance.ShowFloatTextPrompt("消耗不足", MessageType.WARNING);
+                long has = ItemDataManager.GetItemNum(itemCfg.syntheticCostID);
+                ItemUtil.BuyCurrency(itemCfg.syntheticCostID, itemCfg.syntheticCostNum - has);
                 return;
             }
 
-            if (!RedDotDataManager.Instance.CheckCanSynthetic(_selectedItemId))
+            List<ItemData> materiarsOfSelectedItem = ItemUtil.CreateItemDataList(itemCfg.syntheticMateriarsArr);
+            for (int i = 0; i < materiarsOfSelectedItem.Count; i++)
             {
-                PromptController.Instance.ShowFloatTextPrompt("材料不足", MessageType.WARNING);
-                return;
+                ItemData itemData = materiarsOfSelectedItem[i];
+                if (!ItemUtil.CheckItemEnough(materiarsOfSelectedItem[i].id, materiarsOfSelectedItem[i].num, true)) return;
             }
-
             bool result = await ClothingSyntheticSProxy.ClothtingSynthetic(_selectedItemId);
             if (result)
             {
                 _selectedItemId = 0;
                 UpdateClothingList(true);
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_HE_CHENG, 2);
-
             }
 
         }

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

@@ -129,12 +129,12 @@ namespace GFGGame
                 _ui.m_txtBuyTips.text = string.Format("消耗{0}{1}，可兑换{2}{3}", itemExchangeCfg.costNumArr[0], itemCostCfg.name, itemExchangeCfg.num, itemCfg.name);
             }
             GetMoneyIdAndNum(minBuyCount, out _costId, out _costNum, out _buyNum);
-
+            UpdateView();
         }
         protected override void OnShown()
         {
             base.OnShown();
-            UpdateView();
+            // UpdateView();
             Timers.inst.AddUpdate(CheckGuide);
         }
         private void UpdateView()
@@ -219,21 +219,16 @@ namespace GFGGame
 
             if (_count > 0)
             {
-                if (price > ItemDataManager.GetItemNum(_costId))
+                long hasCount = ItemDataManager.GetItemNum(_costId);
+                if (price > hasCount)
                 {
-
-                    if (_openSource)
-                    {
-                        if (_buyId == ConstItemID.DIAMOND_RED)
-                        {
-                            ItemUtil.AddDiamondPurple();
-                        }
-                    }
-                    else
+                    // this.Hide();
+                    if (!ItemUtil.BuyCurrency(_costId, price - hasCount))
                     {
                         ItemCfg costCfg = ItemCfgArray.Instance.GetCfg(_costId);
                         PromptController.Instance.ShowFloatTextPrompt(string.Format("{0}不足", costCfg.name));
                     }
+                    return;
                 }
                 else
                 {

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;