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

FGUIProject/assets/DressUp/components/Button15.xml

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="119,119" extention="Button">
+<component size="105,105" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ygap" name="n0" src="ygapeo" fileName="images/hz_qhdzfz.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <loader id="n1_ygap" name="icon" xy="12,12" size="95,95" aspect="true" url="ui://mbo439wbygaper" fill="scaleFree">
-      <relation target="" sidePair="width-width,height-height"/>
-    </loader>
+    <image id="n0_ygap" name="n0" src="ygapeo" fileName="images/hz_qhdzfz.png" xy="-7,-7" group="n2_vols"/>
+    <loader id="n1_ygap" name="icon" xy="12,12" size="81,81" group="n2_vols" aspect="true" url="ui://mbo439wbygaper" fill="scaleFree"/>
+    <group id="n2_vols" name="n2" xy="-7,-7" size="119,119"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/DressUp/components/ComActionSelect.xml

@@ -2,8 +2,8 @@
 <component size="228,192">
   <displayList>
     <image id="n12_ygap" name="n12" src="ygapen" fileName="images/hz_hzhzmbmb.png" xy="18,0"/>
-    <component id="n13_ygap" name="btnNormal" src="ygapep" fileName="components/Button15.xml" xy="0,53" group="n18_ygap" aspect="true"/>
-    <component id="n14_ygap" name="btnAction" src="ygapep" fileName="components/Button15.xml" xy="109,53" group="n18_ygap" aspect="true"/>
-    <group id="n18_ygap" name="n18" xy="0,53" size="228,119" advanced="true"/>
+    <component id="n13_ygap" name="btnNormal" src="ygapep" fileName="components/Button15.xml" xy="1,53" group="n18_ygap" aspect="true"/>
+    <component id="n14_ygap" name="btnAction" src="ygapep" fileName="components/Button15.xml" xy="122,53" size="141,105" group="n18_ygap"/>
+    <group id="n18_ygap" name="n18" xy="1,53" size="262,105" advanced="true" layout="hz" colGap="16"/>
   </displayList>
 </component>

FGUIProject/assets/DressUp/components/PartsListItem.xml

@@ -8,12 +8,12 @@
     </loader>
     <loader id="n7_d4iw" name="rarity" xy="173,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n5_8xpg" name="ScoreType" xy="24,142" size="50,50" touchable="false" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n6_8xpg" name="txtScore" xy="147,160" pivot="0.5,0" size="61,36" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
+    <text id="n6_8xpg" name="txtScore" xy="150,160" pivot="0.5,0" size="54,36" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
     <image id="n8_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="13,0" size="67,68"/>
     <image id="n10_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,70" size="70,70"/>
     <image id="n2_k6he" name="n2" src="k6he1y" fileName="images/hz_minzikuang.png" xy="13,198" size="208,42" group="n11_wono"/>
-    <text id="n3_k6he" name="txtTitle" xy="42,199" pivot="0.5,0" size="152,42" group="n11_wono" fontSize="30" color="#b58f54" align="center" leading="0" text="繁星点点啊"/>
+    <text id="n3_k6he" name="txtTitle" xy="42,199" pivot="0.5,0" size="152,41" group="n11_wono" fontSize="30" color="#b58f54" align="center" leading="0" text="繁星点点啊"/>
     <group id="n11_wono" name="n11" xy="13,198" size="208,43"/>
-    <component id="n12_ygap" name="comAxtionSelect" src="ygapet" fileName="components/ComActionSelect.xml" xy="4,0" visible="false"/>
+    <component id="n12_ygap" name="comAxtionSelect" src="ygapet" fileName="components/ComActionSelect.xml" xy="2,0" visible="false"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueAnswerRewardUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,647">
   <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n0_pvb4" name="n0" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" pkg="eg2y0ldp"/>
+    <image id="n0_pvb4" name="n0" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0"/>
     <component id="n1_pvb4" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="895,25" size="111,96"/>
     <image id="n6_pvb4" name="n6" src="9jv66i" fileName="images/lm_biaotizi_13.png" xy="260,96"/>
     <image id="n2_pvb4" name="n2" src="wm603d" fileName="images/lm_yeqian_db.png" xy="143,153" size="293,56" group="n5_pvb4"/>
@@ -13,14 +13,14 @@
       <Button checked="true" title="活动奖励" controller="c1" page="1"/>
     </component>
     <group id="n5_pvb4" name="n5" xy="138,150" size="304,63"/>
-    <list id="n19_9jv6" name="listRule" xy="160,240" size="780,311" overflow="scroll" defaultItem="ui://tw70qm9d9jv67b">
+    <list id="n19_9jv6" name="listRule" xy="133,240" size="815,311" overflow="scroll" defaultItem="ui://tw70qm9d9jv67b">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n11_pvb4" name="list" xy="170,235" size="779,318" overflow="scroll" defaultItem="ui://tw70qm9dpvb459" align="center" autoClearItems="true">
+    <list id="n11_pvb4" name="list" xy="133,239" size="816,314" overflow="scroll" defaultItem="ui://tw70qm9dpvb459" align="center" autoClearItems="true">
       <gearDisplay controller="c1" pages="1"/>
       <item/>
       <item/>

FGUIProject/assets/League/ListAnswerRuleItem.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="778,47">
+<component size="815,47">
   <displayList>
     <graph id="n20_9jv6" name="n20" xy="19,26" size="1,21" type="rect" lineSize="0" fillColor="#fff2e8e4">
       <relation target="n18_pvb4" sidePair="height-height"/>
     </graph>
     <image id="n19_9jv6" name="n19" src="9jv664" fileName="images/lm_zsd.png" xy="10,11"/>
-    <text id="n18_pvb4" name="txtRule" xy="45,1" size="733,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a9733e" ubb="true" autoSize="height" text="每天 开启雅集夜宴"/>
+    <text id="n18_pvb4" name="txtRule" xy="45,1" size="769,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a9733e" ubb="true" autoSize="none" text="每天 开启雅集夜宴"/>
   </displayList>
   <relation target="n18_pvb4" sidePair="height-height"/>
 </component>

FGUIProject/assets/League/components/ComLine.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="414,12" overflow="hidden">
+  <displayList>
+    <image id="n22_vols" name="n22" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="-140,0"/>
+  </displayList>
+</component>

FGUIProject/assets/League/components/ListAnswerRewardItem.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="792,50">
+<component size="815,50">
   <displayList>
-    <text id="n19_pvb4" name="txtDesc" xy="55,4" pivot="0.5,0" size="107,42" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#a9733e" align="center" text="答对1题"/>
-    <list id="n20_pvb4" name="listReward" xy="436,0" size="356,50" layout="row" overflow="scroll" colGap="30" defaultItem="ui://eg2y0ldpn3xha1">
+    <text id="n19_pvb4" name="txtDesc" xy="55,4" pivot="0.5,0" size="107,41" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#a9733e" align="center" text="答对1题"/>
+    <list id="n20_pvb4" name="listReward" xy="424,0" size="391,50" layout="row" colGap="35" defaultItem="ui://eg2y0ldpn3xha1">
+      <item/>
       <item/>
       <item/>
     </list>
-    <image id="n21_9jv6" name="n21" src="9jv664" fileName="images/lm_zsd.png" xy="0,15"/>
+    <image id="n21_9jv6" name="n21" src="9jv664" fileName="images/lm_zsd.png" xy="15,15"/>
+    <component id="n22_vols" name="n22" src="vols81" fileName="components/ComLine.xml" xy="161,19" size="262,12"/>
   </displayList>
 </component>

FGUIProject/assets/League/package.xml

@@ -201,6 +201,7 @@
     <image id="l5007y" name="yj_db_zz.png" path="/images/"/>
     <image id="l5007z" name="yj_zz.png" path="/images/"/>
     <component id="idkd80" name="ComSkillUp.xml" path="/"/>
+    <component id="vols81" name="ComLine.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -50,7 +50,7 @@
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xe" name="btnRenWu"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kdhoaif" name="btnBag"/>
-      <item url="ui://mfvz4q8kwg7t8y" name="btnLeague"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnLeague"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xd" name="btnPengYouQuan"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>

FGUIProject/assets/Store/components/ListChargeItem.xml

@@ -3,7 +3,6 @@
   <displayList>
     <image id="n17_dmsi" name="n17" src="hhx9b" fileName="imagesNew/wp_baseboard.png" xy="0,0" size="304,492"/>
     <loader id="n15_d4iw" name="icon" xy="52,166" size="197,197" aspect="true" url="ui://p9mtgheohhx91j" fill="scaleMatchHeight"/>
-    <image id="n12_d4iw" name="imgDouble" src="hhx9a" fileName="imagesNew/wp_save_baseboard.png" xy="-1,338"/>
     <image id="n24_hhx9" name="n24" src="fqortau" fileName="imagesNew/sc_xian.png" xy="33,104" size="236,4"/>
     <text id="n16_d4iw" name="txtName" xy="13,56" pivot="0.5,0" size="275,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#5a3e16" align="center" letterSpacing="-2" text="稀有升星材料(自选)">
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -12,6 +11,8 @@
       <relation target="" sidePair="center-center"/>
     </component>
     <text id="n18_dmsi" name="txtDesc" xy="48,380" pivot="0.5,0" size="204,36" font="ui://eg2y0ldpa0cftks" fontSize="26" color="#ac4100" letterSpacing="-2" text="首充赠送+6000钻石"/>
-    <text id="n23_hhx9" name="n23" xy="9,337" size="122,41" fontSize="30" color="#ffffff" text="首充双倍"/>
+    <image id="n12_d4iw" name="n12" src="hhx9a" fileName="imagesNew/wp_save_baseboard.png" xy="-1,338" group="n25_vols"/>
+    <text id="n23_hhx9" name="n23" xy="9,337" size="122,41" group="n25_vols" fontSize="30" color="#ffffff" text="首充双倍"/>
+    <group id="n25_vols" name="grpDouble" xy="-1,337" size="156,47" advanced="true"/>
   </displayList>
 </component>

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

@@ -38,7 +38,7 @@ namespace GFGGame
             EventAgent.DispatchEvent(ConstMessage.ACTIVITY_ADD, activityInfo.activityId);
             //TODO 判断下时间非法情况
             var remainTime = activityInfo.endTime - TimeHelper.ServerNow();
-            if(remainTime > 0)
+            if (remainTime > 0)
             {
                 Timers.inst.Add(activityInfo.endTime - TimeHelper.ServerNow(), 1, ClientRemoveActivityInfo,
                     activityInfo.activityId);

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

@@ -8,10 +8,10 @@ namespace UI.Store
     {
         public GComponent target;
         public GLoader m_icon;
-        public GImage m_imgDouble;
         public GTextField m_txtName;
         public UI_Component2 m_btnBuy;
         public GTextField m_txtDesc;
+        public GGroup m_grpDouble;
         public const string URL = "ui://p9mtgheohhx91i";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ListChargeItem";
@@ -60,19 +60,19 @@ namespace UI.Store
         private void Init(GComponent comp)
         {
             m_icon = (GLoader)comp.GetChild("icon");
-            m_imgDouble = (GImage)comp.GetChild("imgDouble");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnBuy = (UI_Component2)UI_Component2.Create(comp.GetChild("btnBuy"));
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_grpDouble = (GGroup)comp.GetChild("grpDouble");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_icon = null;
-            m_imgDouble = null;
             m_txtName = null;
             m_btnBuy.Dispose();
             m_btnBuy = null;
             m_txtDesc = null;
+            m_grpDouble = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs

@@ -87,6 +87,7 @@ namespace GFGGame
         private void UpdateView()
         {
             _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
+            _rechargeCfgs = SoreCfg(_rechargeCfgs);
             _ui.m_list.numItems = _rechargeCfgs.Count;
         }
         private void RenderListItem(int index, GObject obj)
@@ -98,7 +99,7 @@ namespace GFGGame
             item.m_txtTitle.text = string.Format("活动期间累计获得{0}会员积分({1}/{2})", _rechargeCfgs[index].value, limitChargeExp, _rechargeCfgs[index].value);
             if (limitChargeExp >= _rechargeCfgs[index].value)
             {
-                item.m_c1.selectedIndex = _activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) > 0 ? 2 : 1;
+                item.m_c1.selectedIndex = _activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) >= 0 ? 2 : 1;
             }
             else
             {
@@ -137,5 +138,24 @@ namespace GFGGame
             int id = (int)obj.data;
             ActivityGlobalSProxy.ReqGetActivityBonus(ActivityDataManager.Instance.actLimitChargeId, id).Coroutine();
         }
+        private List<ActivityRechargeCfg> SoreCfg(List<ActivityRechargeCfg> rechargeCfgs)
+        {
+            rechargeCfgs.Sort((ActivityRechargeCfg a, ActivityRechargeCfg b) =>
+            {
+                int limitChargeExp = GameGlobal.myNumericComponent.GetAsInt(NumericType.TotalRechargeScore);
+                int stateA = _activityInfo.GetRewards.IndexOf(a.id);
+                int stateB = _activityInfo.GetRewards.IndexOf(b.id);
+
+                if (limitChargeExp >= a.value && limitChargeExp < b.value && stateA < 0) return -1;
+                if (limitChargeExp >= b.value && limitChargeExp < a.value && stateB < 0) return 1;
+
+
+                if (stateA >= 0 && stateB < 0) return 1;
+                if (stateB >= 0 && stateA < 0) return -1;
+
+                return a.id - b.id;
+            });
+            return rechargeCfgs;
+        }
     }
 }

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

@@ -1056,11 +1056,14 @@ namespace GFGGame
             }
             if (listTypeItem_FreedomDress != null) GuideController.TryGuide(listTypeItem_FreedomDress.target, ConstGuideId.FREEDOM_DRESS, 3, "套装分类里，可以查看集齐成套的服饰，点击一键换上。");
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.FREEDOM_DRESS, 4, "", 0);
-            UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(0).asCom);
-            GuideController.TryGuide(listItem.m_comAxtionSelect.m_btnNormal, ConstGuideId.FREEDOM_DRESS, 3, "选择普通动作并穿上。");
-            UI_PartsListItem.ProxyEnd();
-            GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 5, "搭配好的服饰，可以保存到主界面显示。");
-            GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.FREEDOM_DRESS, 6, "辛苦搭配完，去拍个照片留念呀~~");
+            if (_ui.m_partsList.m_list.numItems > 0)
+            {
+                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(0).asCom);
+                GuideController.TryGuide(listItem.m_comAxtionSelect.m_btnAction, ConstGuideId.FREEDOM_DRESS, 5, "选择特殊动作并穿上。");
+                UI_PartsListItem.ProxyEnd();
+            }
+            GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 6, "搭配好的服饰，可以保存到主界面显示。");
+            GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.FREEDOM_DRESS, 7, "辛苦搭配完，去拍个照片留念呀~~");
 
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER, 2, "");
 

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

@@ -124,8 +124,8 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_btnClose, ConstGuideId.FREEDOM_DRESS, 9, "");
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 9);
+            GuideController.TryGuide(_ui.m_btnClose, ConstGuideId.FREEDOM_DRESS, 10, "");
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 10);
 
         }
         protected override void TryCompleteGuide()
@@ -133,8 +133,8 @@ namespace GFGGame
             base.TryCompleteGuide();
 
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS);
-            GuideController.TryCompleteGuideIndex(cfg.id, 9);
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 9);
+            GuideController.TryCompleteGuideIndex(cfg.id, 10);
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 10);
         }
     }
 }

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

@@ -618,8 +618,8 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(null, ConstGuideId.FREEDOM_DRESS, 7, "在这里可以选择已获得的背景、道具等，也可以放大缩小物品，增加画面丰富度。", -1, true, _ui.target.height - _ui.m_ComSelectRes.target.height - 250);
-            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.FREEDOM_DRESS, 8, "来记录下这一刻吧。");
+            GuideController.TryGuide(null, ConstGuideId.FREEDOM_DRESS, 8, "在这里可以选择已获得的背景、道具等，也可以放大缩小物品，增加画面丰富度。", -1, true, _ui.target.height - _ui.m_ComSelectRes.target.height - 250);
+            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.FREEDOM_DRESS, 9, "来记录下这一刻吧。");
             // GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 8);
 
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER, 1, "");

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

@@ -46,17 +46,18 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            // _ui.m_txtRule.text = TextDescArray.Instance.GetCfg(300008).text;
+
             _ui.m_list.numItems = LeagueQuestionBonusCfgArray.Instance.dataArray.Length;
 
-            string[] rules = TextDescArray.Instance.GetCfg(300008).text.Split('.');
+            string rule = TextDescCfgArray.Instance.GetCfg(300008).text;
+            string[] rules = rule.Split(new char[] { '.', '\n' });
             for (int i = 0; i < rules.Length; i++)
             {
-                if (i > 0 && rules[i - 1] == ".")
-                {
-                    ruleDatas.Add(rules[i]);
-                }
+                if (i % 2 == 0) continue;
+                ruleDatas.Add(rules[i]);
             }
+            _ui.m_listRule.numItems = ruleDatas.Count;
+
         }
 
         protected override void OnHide()
@@ -85,6 +86,7 @@ namespace GFGGame
             {
                 item.m_listReward.itemRenderer = RenderListIrem;
             }
+            item.m_listReward.data = LeagueQuestionBonusCfgArray.Instance.dataArray[index].bonusArr;
             item.m_listReward.numItems = LeagueQuestionBonusCfgArray.Instance.dataArray[index].bonusArr.Length;
             UI_ListAnswerRewardItem.ProxyEnd();
         }

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

@@ -115,7 +115,10 @@ namespace GFGGame
         private void OnListCardItemClick(EventContext context)
         {
             UpdateView(_ui.m_listCard.selectedIndex);
-            OnCardSelected(cardList[_ui.m_listCard.selectedIndex].id);
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+            {
+                OnCardSelected(cardList[_ui.m_listCard.selectedIndex].id);
+            }
         }
 
         private void OnCardSelected(int cardId)

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

@@ -42,20 +42,20 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateVipProgressCom);
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
 
         }
         protected override void OnShown()
         {
             base.OnShown();
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE);
-            _ui.m_list.numItems = _shopCfgs.Count;
             _valueBarController.OnShown();
-            UpdateVipProgressCom();
+            UpdateView();
         }
 
-        private void UpdateVipProgressCom()
+        private void UpdateView()
         {
+            _ui.m_list.numItems = _shopCfgs.Count;
             ShopViewManager.Instance.UpdateVipProgressCom(_ui.m_comVipLv.target);
         }
         protected override void OnHide()
@@ -66,7 +66,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateVipProgressCom);
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
         }
 
         private void ListItemRenderer(int index, GObject obj)
@@ -83,7 +83,7 @@ namespace GFGGame
             item.m_txtName.text = string.Format("{0}{1}", shopCfg.itemNum, shopCfg.itemName);
             item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", shopCfg.itemNum, shopCfg.itemName);
             bool isDouble = ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id) < shopCfg.doubleTimes;
-            item.m_imgDouble.visible = isDouble;
+            item.m_grpDouble.visible = isDouble;
             item.m_txtDesc.visible = isDouble;
             item.m_icon.url = "ui://Store/sc_zizhuan_" + (index + 1);