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

FGUIProject/assets/Store/StoreMonthUI.xml

@@ -24,7 +24,7 @@
     <text id="n18_qik1" name="txtPrivilegeCount" xy="736,1025" size="47,41" group="n19_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>
     <group id="n19_qik1" name="n19" xy="654,1025" size="129,43" group="n10_qik1" advanced="true"/>
     <group id="n10_qik1" name="n10" xy="296,1025" size="487,43" advanced="true" layout="hz" colGap="35" excludeInvisibles="true"/>
-    <text id="n21_qik1" name="n21" xy="349,1080" size="241,41" group="n30_qik1" fontSize="30" color="#8c8580" vars="true" text="金卡期间每天获得"/>
+    <text id="n21_qik1" name="txtDesc" xy="349,1080" size="241,42" group="n30_qik1" fontSize="30" color="#8c8580" vars="true" text="{value=金卡}期间每天获得"/>
     <loader id="n22_qik1" name="loaDailyMoney" xy="625,1081" size="40,40" group="n25_qik1" aspect="true" url="ui://eg2y0ldpkztethq" fill="scale"/>
     <text id="n23_qik1" name="n23" xy="666,1081" size="19,41" group="n25_qik1" fontSize="30" color="#8c8580" vars="true" text="*"/>
     <text id="n24_qik1" name="txtDailyMoneyCount" xy="684,1080" size="47,41" group="n25_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -411,7 +411,7 @@ namespace GFGEditor
             return false;
         }
         /// <summary>
-        /// 检测商城-金卡是否产出该物品
+        /// 检测商城-灵犀卡是否产出该物品
         /// </summary>
         /// <param name="itemId"></param>
         /// <returns></returns>

GameClient/Assets/Game/HotUpdate/Constant/ConstStoreSubId.cs

@@ -4,8 +4,8 @@ namespace GFGGame
     {
         public const int STORE_CHARGE = 0;//充值
         public const int STORE_CHARGE_ADDUP = 1;//累计充值
-        public const int STORE_MONTH_GOLD_CARD = 0;//金卡
-        public const int STORE_MONTH_BLACK_CARD = 1;//黑金卡
+        public const int STORE_MONTH_GOLD_CARD = 0;//灵犀卡
+        public const int STORE_MONTH_BLACK_CARD = 1;//璇玑卡
         public const int STORE_GIFT_BAG_ACTIVITY = 0;//活动
         public const int STORE_GIFT_BAG_TIME_LIMIT = 1;//珍珠商城
         public const int STORE_GIFT_BAG_GREATEST = 2;//材料商城

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -2,6 +2,8 @@ using FairyGUI;
 using UnityEngine;
 using ET;
 using static GFGGame.LauncherConfig;
+using System.Collections;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
@@ -102,6 +104,7 @@ namespace GFGGame
 
             LeagueSproxy.ReqGetLeagueInfo().Coroutine();
             await ItemProxy.GetItemInfos();
+
             await RoleLimitSProxy.ReqUnitLimitInfos();
             await InstanceZonesSProxy.GetInstanceZonesInfos();
             await StorageSProxy.ReqGetClientValues();
@@ -247,6 +250,8 @@ namespace GFGGame
 
         private static async void AfterEnterGame(object param)
         {
+            Timers.inst.StartCoroutine(LongRunningTask());
+
             ItemHelper.GetItemAttributeInfos().Coroutine();
             MainStorySProxy.GetStoryInfos().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
@@ -288,9 +293,25 @@ namespace GFGGame
                     ViewManager.Show<FieldFightEndView>();
                 }
             }
-            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
 
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
         }
+        private static IEnumerator LongRunningTask()
+        {
+            Dictionary<int, List<int>> itemDatasDic = DressUpMenuItemDataManager.ItemDatasBySubTypeDic;
 
+            foreach (int subType in itemDatasDic.Keys)
+            {
+                if (DressUpMenuItemCfg1Array.Instance.CheckIsSceneTypeBySubType(subType)) continue;
+
+                List<int> itemDatas = new List<int>(itemDatasDic[subType]);
+                // 进行耗时操作的代码块
+                yield return null; // 让出当前帧
+                DressUpMenuItemDataManager.SortItemListByHighScore(itemDatas);
+                yield return null; // 让出当前帧
+
+            }
+
+        }
     }
 }

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

@@ -350,14 +350,14 @@ namespace GFGGame
                     long itemsScore = GetItemScoreSum(fightDatas[i].itemScoreList);
                     itemSum += itemsScore;
                     clickScore += GetPerfectClickScore(fightDatas[i]);
-                    skillScore += FightDataManager.Instance.GetSkillFightScore(itemsScore, fightDatas[i].baseScore, fightDatas[i].cardId, fightDatas[i].cardScore, fightDatas[i].skillLvs);
+                    skillScore += FightDataManager.Instance.GetSkillFightScore(itemsScore, fightDatas[i].baseScore, fightDatas[i].leagueSkillScore, fightDatas[i].cardId, fightDatas[i].cardScore, fightDatas[i].skillLvs);
                 }
                 else
                 {
                     long itemsScore = GetItemScoreSum(fightDatas[i].itemScoreList);
                     itemSum += itemsScore;
                     clickScore += GetRobotPerfectClickScore(fightDatas[i]);
-                    skillScore += FightDataManager.Instance.GetSkillFightScore(itemsScore, fightDatas[i].baseScore, fightDatas[i].cardId, fightDatas[i].cardScore, fightDatas[i].skillLvs);
+                    skillScore += FightDataManager.Instance.GetSkillFightScore(itemsScore, fightDatas[i].baseScore, fightDatas[i].leagueSkillScore, fightDatas[i].cardId, fightDatas[i].cardScore, fightDatas[i].skillLvs);
                 }
             }
             clickScore = clickScore / ConstScoreSystem.PART_SCORE;
@@ -388,7 +388,7 @@ namespace GFGGame
             foreach (int key in roleData.pardScoreListDic.Keys)
             {
                 double partBaseScore = ScoreSystemData.Instance.GetPartBaseScore(roleData, key);
-                double score = (partBaseScore + (roleData.baseScore + roleData.cardScore) * ConstScoreSystem.PERFECT_SCORE) * ConstScoreSystem.CLICK_SCORE;
+                double score = (partBaseScore + (roleData.baseScore + roleData.leagueSkillScore + roleData.cardScore) * ConstScoreSystem.PERFECT_SCORE) * ConstScoreSystem.CLICK_SCORE;
                 clickScore += score;
             }
             return (long)Math.Ceiling(clickScore);

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

@@ -98,7 +98,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        posItems[i] = "金卡开启";
+                        posItems[i] = "灵犀卡开启";
                     }
                 }
                 else if (GetPosType(i) == MonthCardType.BlackGold)
@@ -109,7 +109,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        posItems[i] = "黑金卡开启";
+                        posItems[i] = "璇玑卡开启";
                     }
                 }
             }

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

@@ -236,10 +236,11 @@ namespace GFGGame
                 }
             }
             int baseScore = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).baseScore;
+            int leagueSkillScore = LeagueDataManager.Instance.GetAllSkillScore(scoreType);
             arrayList.Sort((CardData a, CardData b) =>
             {
-                double scoreA = GetSkillFightScore(itemSum, baseScore, a.id, a.scores[scoreType], SkillDataManager.Instance.GetCardSkillLvs(a.id));
-                double scoreB = GetSkillFightScore(itemSum, baseScore, b.id, b.scores[scoreType], SkillDataManager.Instance.GetCardSkillLvs(b.id));
+                double scoreA = GetSkillFightScore(itemSum, baseScore, leagueSkillScore, a.id, a.scores[scoreType], SkillDataManager.Instance.GetCardSkillLvs(a.id));
+                double scoreB = GetSkillFightScore(itemSum, baseScore, leagueSkillScore, b.id, b.scores[scoreType], SkillDataManager.Instance.GetCardSkillLvs(b.id));
                 if (scoreA < scoreB)
                 {
                     return 1;
@@ -263,10 +264,10 @@ namespace GFGGame
         /// <param name="cardScore"></param>
         /// <param name="skillLvs"></param>
         /// <returns></returns>
-        public long GetSkillFightScore(double itemScoreSum, int baseScore, int cardId, int cardScore, List<int> skillLvs)
+        public long GetSkillFightScore(double itemScoreSum, int baseScore, int leagueSkillScore, int cardId, int cardScore, List<int> skillLvs)
         {
             float skillScore = 0;
-            float skillBaseScore = (long)itemScoreSum + cardScore + baseScore;
+            float skillBaseScore = (long)itemScoreSum + cardScore + baseScore + leagueSkillScore;
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
             for (int j = 0; j < skillCfgs.Count; j++)
             {

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

@@ -85,6 +85,7 @@ namespace GFGGame
             _roleData.name = RoleDataManager.roleName;
             _roleData.scoreType = InstanceZonesDataManager.currentScoreType;
             _roleData.baseScore = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).baseScore;
+            _roleData.leagueSkillScore = LeagueDataManager.Instance.GetAllSkillScore(_roleData.scoreType);
             _roleData.cardId = InstanceZonesDataManager.currentCardId; ;//卡牌id
 
             CardData cardData = CardDataManager.GetCardDataById(_roleData.cardId);
@@ -121,6 +122,7 @@ namespace GFGGame
             _targetData.name = fightCfg.targetName;
             _targetData.scoreType = InstanceZonesDataManager.currentScoreType; //本次战斗的主题
             _targetData.baseScore = fightCfg.targetBaseScore;
+            _targetData.leagueSkillScore = 0;
             _targetData.cardId = fightCfg.targetCardId;
             _targetData.cardScore = fightCfg.targetCardScore;
             _targetData.tags = fightCfg.needTagsArr;

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

@@ -548,7 +548,7 @@ namespace GFGGame
             return false;
         }
         /// <summary>
-        /// 商城-月卡-金卡
+        /// 商城-月卡-灵犀卡
         /// </summary>
         /// <returns></returns>
         public bool GetGoldCardRewardRed()
@@ -556,7 +556,7 @@ namespace GFGGame
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold) && GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldReward) <= 0;
         }
         /// <summary>
-        /// 商城-月卡-黑金卡
+        /// 商城-月卡-璇玑卡
         /// </summary>
         /// <returns></returns>
         public bool GetBlackCardRewardRed()
@@ -564,7 +564,7 @@ namespace GFGGame
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold) && GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldReward) <= 0;
         }
         /// <summary>
-        /// 商城-月卡-黑金卡-单品奖励
+        /// 商城-月卡-璇玑卡-单品奖励
         /// </summary>
         /// <returns></returns>
         public bool GetBlackCardClothingRed()

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

@@ -246,11 +246,11 @@ namespace GFGGame
                 }
                 else if (GetPosType(i) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
                 {
-                    posItems[i] = "金卡开启";
+                    posItems[i] = "灵犀卡开启";
                 }
                 else if (GetPosType(i) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
                 {
-                    posItems[i] = "黑金卡开启";
+                    posItems[i] = "璇玑卡开启";
                 }
             }
             return posItems;

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

@@ -80,7 +80,7 @@ namespace GFGGame
         /// <returns></returns>
         public double GetMainScore(FightData roleData)
         {
-            //（部件属性分数+标签分数+人物基础分+卡牌属性分数）*4
+            //（部件属性分数+标签分数+人物基础分+雅集技能分+卡牌属性分数）*4
 
             // int partScore = 0;
             // double tagScore = 0;
@@ -92,7 +92,9 @@ namespace GFGGame
                 baseScore += GetPartBaseScore(roleData, i + 1);
             }
 
-            return (baseScore + roleData.baseScore + roleData.cardScore) * ConstScoreSystem.MAIN_SCORE;
+
+
+            return (baseScore + roleData.baseScore + roleData.leagueSkillScore + roleData.cardScore) * ConstScoreSystem.MAIN_SCORE;
         }
 
         public double GetRobotMainScore(FightData robotData)
@@ -105,8 +107,7 @@ namespace GFGGame
             {
                 partScore += GetRobotPartBaseScore(robotData, i + 1);
             }
-
-            return (partScore + robotData.baseScore + robotData.cardScore) * ConstScoreSystem.MAIN_SCORE;
+            return (partScore + robotData.baseScore + robotData.leagueSkillScore + robotData.cardScore) * ConstScoreSystem.MAIN_SCORE;
         }
 
 
@@ -123,17 +124,18 @@ namespace GFGGame
         {
 
             //部件评分=部件基础分*部件系数
-            //点击评分=（部件基础分+（人物基础分+卡牌属性分数）*点击系数）*2.22   (新点击公式，防止点击优秀却因为未穿衣服结果是0分)
+            //点击评分=（部件基础分+（人物基础分+雅集技能分+卡牌属性分数）*点击系数）*2.22   (新点击公式，防止点击优秀却因为未穿衣服结果是0分)
             //卡牌评分=总属性*技能配表百分比
             double partBaseScore = GetPartBaseScore(roleData, partId);
 
             double partScore = partBaseScore * ConstScoreSystem.PART_SCORE;
 
             int roleScore = roleData.baseScore;
+            int leagueSkillScore = roleData.leagueSkillScore;
             int cardScore = roleData.cardScore;
 
             double clickCoefficient = GetPartItemClickScore(clickType);
-            double clickScore = (partBaseScore + (roleScore + cardScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
+            double clickScore = (partBaseScore + (roleScore + leagueSkillScore + cardScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
 
             int score = (int)Math.Ceiling(partScore + clickScore + skillScore);
             Debug.Log("clickScore:" + clickScore + "    score:" + score);
@@ -150,10 +152,11 @@ namespace GFGGame
             double partScore = partBaseScore * ConstScoreSystem.PART_SCORE;
 
             int roleScore = robotData.baseScore;
+            int leagueSkillScore = robotData.leagueSkillScore;
             int cardScore = robotData.cardScore;
 
             double clickCoefficient = GetPartItemClickScore(clickType);
-            double clickScore = (partBaseScore + (cardScore + roleScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
+            double clickScore = (partBaseScore + (cardScore + leagueSkillScore + roleScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
 
             int score = (int)Math.Ceiling(partScore + clickScore + skillScore);
             return Math.Max(0, score);

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

@@ -203,7 +203,7 @@ namespace GFGGame
             }
             else if (shopCfg.lockType == LockType.MONTH_CARD_TYPE)
             {
-                return string.Format("开通{0}解锁", shopCfg.lockValue == MonthCardType.Gold ? "金卡" : "黑金卡");
+                return string.Format("开通{0}解锁", shopCfg.lockValue == MonthCardType.Gold ? "灵犀卡" : "璇玑卡");
             }
             else if (shopCfg.lockType == LockType.AREND_GRADE)
             {

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

@@ -8,13 +8,14 @@ namespace GFGGame
         public string name;//玩家名字
         public int scoreType;//本次战斗的主题
         public int baseScore;//角色等级分数
+        public int leagueSkillScore;//角色雅集技能分
         public int cardId;//卡牌id
         public int cardScore;//卡牌对应主题的属性分数
         public string[] tags = { };////本次战斗要求的标签
         public List<int> skillLvs = new List<int>();
         public List<float> itemScoreList = new List<float>();//对应服装当前主题的实际分数
         public Dictionary<int, int> itemScoreDic = new Dictionary<int, int>();//对应服装当前主题的实际分数
-        public int type = 0;
+        public int type = 0;//FightTargetType
         /**********************************************玩家独立数据*****************************************/
 
         public int headId;//头像id

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreMonthUI.cs

@@ -16,6 +16,7 @@ namespace UI.Store
         public GLoader m_loaMoney;
         public GTextField m_txtMoneyCount;
         public GTextField m_txtPrivilegeCount;
+        public GTextField m_txtDesc;
         public GLoader m_loaDailyMoney;
         public GTextField m_txtDailyMoneyCount;
         public GTextField m_txtTime;
@@ -79,6 +80,7 @@ namespace UI.Store
             m_loaMoney = (GLoader)comp.GetChild("loaMoney");
             m_txtMoneyCount = (GTextField)comp.GetChild("txtMoneyCount");
             m_txtPrivilegeCount = (GTextField)comp.GetChild("txtPrivilegeCount");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_loaDailyMoney = (GLoader)comp.GetChild("loaDailyMoney");
             m_txtDailyMoneyCount = (GTextField)comp.GetChild("txtDailyMoneyCount");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
@@ -99,6 +101,7 @@ namespace UI.Store
             m_loaMoney = null;
             m_txtMoneyCount = null;
             m_txtPrivilegeCount = null;
+            m_txtDesc = null;
             m_loaDailyMoney = null;
             m_txtDailyMoneyCount = null;
             m_txtTime = null;

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

@@ -90,7 +90,7 @@ namespace GFGGame
                     for (int i = 0; i < response.ThemeList.Count; i++)
                     {
                         FightData roleData = GetFightRoleData(response.DressupList.Count <= i ? null : response.DressupList[i], roleInfo, i);
-
+                        roleData.leagueSkillScore = LeagueDataManager.Instance.GetAllSkillScore(response.ThemeList[i]);
                         FightDataManager.Instance.SetItemScoreList(roleData);
                         ScoreSystemData.Instance.SetEquipScoresWithPartId(roleData);
                         ArenaDataManager.Instance.DressupList.Add(roleData);
@@ -426,6 +426,7 @@ namespace GFGGame
             fightData.name = robotProto.Name;
             fightData.scoreType = ArenaDataManager.Instance.ThemeList[index];
             fightData.baseScore = RoleLevelCfgArray.Instance.GetCfg(robotCfg.level).baseScore;
+            fightData.leagueSkillScore = 0;
             fightData.cardId = robotProto.CardIdList.Count <= index ? 0 : robotProto.CardIdList[index];//上赛季没有穿戴数据
             if (index == 0)//只有第一个主题才计算标签
             {

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

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using ET;
 
 namespace GFGGame
@@ -220,5 +221,22 @@ namespace GFGGame
 
             return timeLeftFormatted;
         }
+
+        /// <summary>
+        /// 测试函数耗时
+        /// </summary>
+        /// <param name="function"></param>
+        public static void CalculateExecutionTime(Action function)
+        {
+            Stopwatch stopwatch = new Stopwatch();
+            stopwatch.Start();
+
+            // Invoke the provided function
+            function.Invoke();
+
+            stopwatch.Stop();
+
+            ET.Log.Warning("Execution time: " + stopwatch.Elapsed.TotalMilliseconds + " ms");
+        }
     }
 }

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

@@ -149,9 +149,9 @@ namespace GFGGame
         {
             if (LeagueDataManager.Instance.GetSkillProgressByType(_type) < 100 && LeagueDataManager.Instance.GetSkillProgressByType(_type) > 0)
             {
-                if (LeagueDataManager.Instance.CurLayer == _ui.m_comSkill.m_list.numItems)
+                if (LeagueDataManager.Instance.CurLayer == _ui.m_comSkill.m_list.numItems)//最后一层
                 {
-                    _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
+                    _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1, true);
                 }
                 else
                 {
@@ -167,11 +167,11 @@ namespace GFGGame
                     }
                     if (isActive)
                     {
-                        _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer);
+                        _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer, true);
                     }
                     else
                     {
-                        _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);
+                        _ui.m_comSkill.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1, true);
                     }
                 }
                 // _ui.m_list.ScrollToView(LeagueDataManager.Instance.CurLayer - 1);

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -135,13 +135,13 @@ namespace GFGGame
             int index = (int)obj.data;
             if (RoleInfoManager.GetPosType(index) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
             {
-                // PromptController.Instance.ShowFloatTextPrompt("金卡开启");
+                // PromptController.Instance.ShowFloatTextPrompt("灵犀卡开启");
                 ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GOLD_CARD });
                 return;
             }
             if (RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
             {
-                // PromptController.Instance.ShowFloatTextPrompt("黑金卡开启");
+                // PromptController.Instance.ShowFloatTextPrompt("璇玑卡开启");
                 ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_BLACK_CARD });
                 return;
             }

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

@@ -106,6 +106,7 @@ namespace GFGGame
                             privilegeCount++;
                         }
                     }
+                    _ui.m_txtDesc.SetVar("value", "灵犀卡").FlushVars();
                     _ui.m_txtMoneyCount.text = privilegeCfg.value1Arr[0].ToString();
                     _ui.m_txtDailyMoneyCount.text = privilegeCfg.value1Arr[1].ToString();
                     _ui.m_btnBlackReward.visible = false;
@@ -123,7 +124,7 @@ namespace GFGGame
                             privilegeCount++;
                         }
                     }
-
+                    _ui.m_txtDesc.SetVar("value", "璇玑卡").FlushVars();
                     _ui.m_txtMoneyCount.text = privilegeCfg.value2Arr[0].ToString();
                     _ui.m_txtDailyMoneyCount.text = privilegeCfg.value2Arr[1].ToString();
                     _ui.m_btnBlackReward.visible = true;
@@ -152,6 +153,7 @@ namespace GFGGame
             _ui.m_txtTips.SetVar("value", (price * 10).ToString()).FlushVars();
             _ui.m_txtTips.SetVar("day", monthCfg.limitDays.ToString()).FlushVars();
 
+
             _ui.m_loaMoney.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(privilegeCfg.paramsArr[0]).res);
             _ui.m_loaDailyMoney.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(privilegeCfg.paramsArr[0]).res);
             _ui.m_txtPrivilegeCount.text = privilegeCount.ToString();