Merge remote-tracking branch 'remotes/origin/master' into xiaojie

# Conflicts:
#	GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

FGUIProject/assets/Arena/ArenaUI.xml

@@ -9,18 +9,18 @@
     <image id="n48_jcej" name="n48" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="746,1679" pivot="0.5,0.5" scale="-1,-1">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
-    <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="33,80" group="n28_psph"/>
+    <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="33,80" group="n28_psph"/>
     <component id="n1_psph" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="-12,95" group="n28_psph" controller="c1,12"/>
     <image id="n37_jcej" name="n37" src="jcej3d" fileName="images/jzsjzs_bzztzt.png" xy="358,154" group="n28_psph"/>
-    <component id="n25_psph" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="354,287" group="n38_jcej"/>
-    <loader id="n22_psph" name="loaScore0" xy="460,276" size="58,58" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
-    <image id="n39_jcej" name="n39" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="528,293" group="n38_jcej"/>
-    <loader id="n23_psph" name="loaScore1" xy="564,276" size="58,58" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
-    <image id="n40_jcej" name="n40" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="632,293" group="n38_jcej"/>
-    <loader id="n24_psph" name="loaScore2" xy="668,276" size="58,58" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
-    <group id="n38_jcej" name="grpTheme" xy="354,276" size="372,58" group="n28_psph" advanced="true" layout="hz" colGap="10" excludeInvisibles="true"/>
+    <component id="n25_psph" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="354,282" size="102,38" group="n38_jcej"/>
+    <loader id="n22_psph" name="loaScore0" xy="466,276" size="44,44" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
+    <image id="n39_jcej" name="n39" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="520,287" group="n38_jcej"/>
+    <loader id="n23_psph" name="loaScore1" xy="556,276" size="44,44" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
+    <image id="n40_jcej" name="n40" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="610,287" group="n38_jcej"/>
+    <loader id="n24_psph" name="loaScore2" xy="646,276" size="44,44" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
+    <group id="n38_jcej" name="grpTheme" xy="354,276" size="336,44" group="n28_psph" advanced="true" layout="hz" colGap="10" excludeInvisibles="true"/>
     <image id="n41_jcej" name="n41" src="jcej36" fileName="images/jzsjzs_sjsjdi.png" xy="659,353" group="n42_jcej"/>
-    <text id="n27_psph" name="txtTime" xy="728,359" size="317,42" group="n42_jcej" fontSize="30" color="#fbf6ed" text="赛季时间：01/05-05/21"/>
+    <text id="n27_psph" name="txtTime" xy="728,359" size="313,41" group="n42_jcej" fontSize="30" color="#fbf6ed" text="赛季时间：01/05-05/21"/>
     <component id="n21_psph" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="693,366" size="29,29" group="n42_jcej">
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
@@ -52,10 +52,10 @@
     <image id="n43_jcej" name="n43" src="jcej37" fileName="images/jzsjzs_mpmpdi.png" xy="23,1454" group="n46_jcej"/>
     <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="168,1510" group="n46_jcej"/>
     <loader id="n2_psph" name="loaDanIcon" xy="29,1464" size="149,153" group="n46_jcej" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n7_psph" name="txtName" xy="174,1472" size="122,42" group="n46_jcej" fontSize="30" color="#9a7c56" text="自己名字"/>
-    <text id="n9_psph" name="txtDanTitle" xy="174,1518" size="90,32" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位名称"/>
-    <text id="n8_psph" name="txtRank" xy="174,1550" size="90,32" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位排名"/>
-    <text id="n10_psph" name="txtFightScore" xy="174,1581" size="138,32" group="n46_jcej" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
+    <text id="n7_psph" name="txtName" xy="174,1472" size="122,41" group="n46_jcej" fontSize="30" color="#9a7c56" text="自己名字"/>
+    <text id="n9_psph" name="txtDanTitle" xy="174,1518" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位名称"/>
+    <text id="n8_psph" name="txtRank" xy="174,1550" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位排名"/>
+    <text id="n10_psph" name="txtFightScore" xy="174,1581" size="132,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
     <component id="n45_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="146,1584" size="29,29" group="n46_jcej">
       <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
     </component>
@@ -63,17 +63,17 @@
       <gearDisplay controller="c2" pages="1"/>
     </component>
     <group id="n46_jcej" name="grpMyInfo" xy="23,1401" size="467,227" group="n20_psph"/>
-    <text id="n14_psph" name="txtMoneyCount" xy="779,1574" pivot="0.5,0" size="268,34" group="n20_psph" fontSize="24" color="#ffffff" align="center" strokeColor="#c5a973" strokeSize="2" text="今日和可获得xx次xx货币"/>
+    <text id="n14_psph" name="txtMoneyCount" xy="780,1574" pivot="0.5,0" size="266,34" group="n20_psph" fontSize="24" color="#ffffff" align="center" strokeColor="#c5a973" strokeSize="2" text="今日和可获得xx次xx货币"/>
     <image id="n52_jcej" name="n52" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="746,1613" pivot="0.5,0" group="n51_jcej" scale="-1,1"/>
     <component id="n17_psph" name="btnAddFightCount" src="psph1j" fileName="components/BtnRefresh.xml" xy="743,1616" group="n51_jcej">
       <Button icon="ui://4lc5fhlbjcej3a"/>
     </component>
-    <text id="n15_psph" name="txtFightCount" xy="805,1617" size="226,42" group="n51_jcej" fontSize="30" color="#fbf6ed" align="center" text="剩余次数：10/10"/>
+    <text id="n15_psph" name="txtFightCount" xy="805,1617" size="223,41" group="n51_jcej" fontSize="30" color="#fbf6ed" align="center" text="剩余次数：10/10"/>
     <group id="n51_jcej" name="n51" xy="743,1613" size="356,48" group="n20_psph"/>
-    <text id="n16_psph" name="txtRefreshCount" xy="805,1683" size="226,42" group="n49_jcej" fontSize="30" color="#fbf6ed" align="center" text="免费刷新：10/10"/>
+    <text id="n16_psph" name="txtRefreshCount" xy="805,1683" size="223,41" group="n49_jcej" fontSize="30" color="#fbf6ed" align="center" text="免费刷新：10/10"/>
     <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="743,1682" group="n49_jcej"/>
-    <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="841,1680" group="n49_jcej"/>
-    <group id="n49_jcej" name="n49" xy="743,1680" size="288,46" group="n20_psph"/>
+    <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="841,1680" size="156,46" group="n49_jcej"/>
+    <group id="n49_jcej" name="n49" xy="743,1680" size="285,46" group="n20_psph"/>
     <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="408,1565" group="n20_psph">
       <Button title="快速挑战"/>
     </component>

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -4,7 +4,7 @@
     <loader id="n45_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_j539" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_j539" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n43_g3nf" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
     <component id="n2_j539" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" pivot="1,0" controller="c1,6"/>
     <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,229" touchable="false">
@@ -18,7 +18,7 @@
     <group id="n46_v95q" name="n46" xy="146,343" size="78,418"/>
     <image id="n51_v95q" name="n51" src="v95q2c" fileName="images/hc_zzjsdi.png" xy="874,575" group="n53_v95q"/>
     <text id="n52_v95q" name="n52" xy="911,633" size="122,41" group="n53_v95q" fontSize="30" color="#c09d6b" text="制作进度"/>
-    <text id="n27_j539" name="txtProgress" xy="929,680" pivot="0.5,0" size="84,44" group="n53_v95q" fontSize="32" color="#d7847e" ubb="true" vars="true" text="10/20">
+    <text id="n27_j539" name="txtProgress" xy="931,680" pivot="0.5,0" size="80,44" group="n53_v95q" fontSize="32" color="#d7847e" ubb="true" vars="true" text="10/20">
       <relation target="" sidePair="center-center"/>
     </text>
     <group id="n53_v95q" name="n53" xy="874,575" size="200,200"/>

FGUIProject/assets/CommonGame/components/ComIcon003.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="180,180">
+  <displayList>
+    <image id="n25_pu55" name="n25" src="hhx9j" fileName="imagesNew/wp_baseboard1.png" xy="1,1"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="89,94" pivot="0.5,0.5" anchor="true" size="122,122" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
+    <text id="n17_j48o" name="txtHasCount" xy="90,225" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <loader id="n18_j48o" name="loaRarity" xy="115,38" size="27,58" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale"/>
+    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="8,73" size="160,40" group="n29_pu55"/>
+    <group id="n29_pu55" name="n29" xy="-1,73" size="178,40" group="n30_9jv6" advanced="true"/>
+    <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="32,37" group="n27_pu55"/>
+    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="46,68" size="85,49" group="n27_pu55"/>
+    <group id="n27_pu55" name="grpGot" xy="32,37" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
+    <group id="n30_9jv6" name="n30" xy="-1,33" size="178,228"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -88,7 +88,7 @@
     <image id="9cth90" name="cj_hd_zik.png" path="/imagesExport/"/>
     <component id="ojlzk" name="ListScoreItem.xml" path="/components/" exported="true"/>
     <component id="ih7596" name="ComFilterType.xml" path="/components/" exported="true"/>
-    <component id="j48o98" name="ComItem.xml" path="/components/" exported="true"/>
+    <component id="j48o98" name="ComItem000.xml" path="/components/" exported="true"/>
     <image id="j48o99" name="kp_sjsj_di_3.png" path="/images/" exported="true"/>
     <image id="j48o9a" name="kp_sjsj_di_4.png" path="/images/" exported="true" scale="9grid" scale9grid="68,7,20,14"/>
     <image id="j48o9b" name="yx_yilq.png" path="/images/"/>
@@ -176,7 +176,7 @@
     <image id="orsttis" name="pfjl_ywc.png" path="/images/" exported="true"/>
     <image id="orsttit" name="wpbb_di.png" path="/images/" exported="true"/>
     <image id="pu55tiw" name="pfjl_and.png" path="/images/"/>
-    <component id="ng0itiz" name="ComItemIcon.xml" path="/components/"/>
+    <component id="ng0itiz" name="ComIcon000.xml" path="/components/"/>
     <image id="qqattj1" name="zjm_kuang_2.png" path="/images/"/>
     <image id="qqattj2" name="zjm_gnkuang.png" path="/images/"/>
     <image id="uyuxtj3" name="tujian_zkanniu.png" path="/images/" exported="true"/>
@@ -276,8 +276,8 @@
     <image id="a0cf2l" name="lm_huizhangdk.png" path="/imagesNew/"/>
     <component id="o9ghtlr" name="ComHeadLv1.xml" path="/components/" exported="true"/>
     <image id="a0cf2k" name="lm_db_lvl.png" path="/imagesNew/"/>
-    <component id="9jv6tls" name="ComItemNew.xml" path="/components/" exported="true"/>
-    <component id="9jv6tlt" name="ComItemIconNew.xml" path="/components/"/>
+    <component id="9jv6tls" name="ComItem001_2.xml" path="/components/" exported="true"/>
+    <component id="9jv6tlt" name="ComIcon001.xml" path="/components/"/>
     <image id="9jv6tlu" name="lm_daoju_db.png" path="/images/"/>
     <image id="miy37t" name="tb_suo.png" path="/imagesNew/" exported="true"/>
     <component id="rv091p" name="BtnStyle1Big.xml" path="/components/" exported="true"/>
@@ -300,8 +300,8 @@
     <image id="l500tlv" name="wpk_db_1.png" path="/imagesNew/"/>
     <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
     <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/" exported="true"/>
-    <component id="qik1tly" name="ComItemNew1.xml" path="/components/" exported="true"/>
-    <component id="qik1tlz" name="ComItemIconNew1.xml" path="/components/" exported="true"/>
+    <component id="qik1tly" name="ComItem002.xml" path="/components/" exported="true"/>
+    <component id="qik1tlz" name="ComIcon002.xml" path="/components/" exported="true"/>
     <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
     <component id="qik1tm1" name="BtnStyle000.xml" path="/components/" exported="true"/>
@@ -324,7 +324,7 @@
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
     <image id="qik1tm7" name="db_jiajian_1.png" path="/images/"/>
-    <component id="mdmdtn5" name="ComItemBlue.xml" path="/components/" exported="true"/>
+    <component id="mdmdtn5" name="ComItem001_1.xml" path="/components/" exported="true"/>
     <image id="uxxstma" name="wpk_db_2.png" path="/imagesNew/" exported="true"/>
     <image id="uxxstm5" name="wpk_sz_db2.png" path="/imagesNew/" exported="true"/>
     <image id="mbf14" name="sj_dk.png" path="/imagesNew/" exported="true"/>
@@ -340,6 +340,7 @@
     <image id="idkdtnb" name="hl_jfscibt.png" path="/imagesNew/"/>
     <image id="qqhzk" name="an_yellow_1.png" path="/imagesNew/" exported="true"/>
     <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
+    <component id="volstnd" name="ComIcon003.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/LimitChargeUI.xml

@@ -11,7 +11,8 @@
       <relation target="" sidePair="top-top"/>
     </group>
     <image id="n8_idkd" name="n8" src="nyhm8" fileName="imagesNew/qrhd_db.png" pkg="eg2y0ldp" xy="0,791" group="n12_idkd"/>
-    <list id="n1_fqor" name="list" xy="15,974" size="1040,946" group="n12_idkd" layout="flow_hz" overflow="scroll" lineGap="20" defaultItem="ui://t8nwuj7iidkd15">
+    <text id="n13_vols" name="n13" xy="186,912" size="708,44" group="n12_idkd" fontSize="32" color="#bc8d49" text="活动期间累充达到指定会员积分即可领取绝版套装"/>
+    <list id="n1_fqor" name="list" xy="15,979" size="1040,941" group="n12_idkd" layout="flow_hz" overflow="scroll" lineGap="20" defaultItem="ui://t8nwuj7iidkd15">
       <item/>
       <item/>
       <item/>

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/LuckyBox/package.xml

@@ -71,6 +71,7 @@
     <image id="mbf1tak" name="cj_meirith.png" path="/images/"/>
     <image id="mbf1tal" name="cj_sj_db.png" path="/images/"/>
     <image id="mbf1tam" name="cj_tswz_db.png" path="/images/"/>
+    <image id="volstan" name="bt_tiaoguo.png" path="/imageNews/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" 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/Editor/Excel/ExcelChecker.cs

@@ -13,7 +13,6 @@ namespace GFGEditor
         public static void StartCheck()
         {
             CheckLuckyBoxCfg();
-            CheckBonusListCfg();
             CheckDropOutCfg();
             CheckStoryChapterCfg();
             CheckStoryLevelCfg();
@@ -34,23 +33,6 @@ namespace GFGEditor
             foreach (LuckyBoxCfg boxCfg in dataArray)
             {
                 CheckItemIdExist(boxCfg.costID, "抽奖LuckyBoxCfg.costID");
-                foreach (int valueInt in boxCfg.bonusShowArr)
-                {
-                    CheckBonusExist(valueInt, "抽奖LuckyBoxCfg.bonusShow");
-                }
-            }
-        }
-
-        private static void CheckBonusListCfg()
-        {
-            BonusListCfgArray cfgArray = BonusListCfgArray.Instance;
-            BonusListCfg[] dataArray = cfgArray.dataArray;
-            foreach (BonusListCfg cfg in dataArray)
-            {
-                foreach (int[] values in cfg.bonusListArr)
-                {
-                    CheckItemIdExist(values[0], "抽奖BonusListCfg.bonusList");
-                }
             }
         }
 
@@ -227,16 +209,6 @@ namespace GFGEditor
             }
         }
 
-        private static void CheckBonusExist(int id, string keyName)
-        {
-            BonusListCfgArray cfgArray = BonusListCfgArray.Instance;
-            BonusListCfg cfg = cfgArray.GetCfg(id);
-            if (cfg == null)
-            {
-                Debug.LogErrorFormat("{0}配置的奖励{1}不存在", new object[] { keyName, id });
-            }
-        }
-
         private static void CheckStoryDialogExist(string id, string keyName)
         {
             if (id.Length > 0)

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

@@ -46,7 +46,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/Data/ArenaDataManager.cs

@@ -423,7 +423,7 @@ namespace GFGGame
         }
         public void ReqArenaInfo()
         {
-            if (FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name))
+            if (FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false))
             {
                 ArenaSproxy.ReqArenaInfos().Coroutine();
                 ArenaSproxy.ReqArenaHistory().Coroutine();

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

@@ -1,7 +1,5 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using UnityEngine;
 
 namespace GFGGame
 {
@@ -71,24 +69,101 @@ namespace GFGGame
             LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
             if (!_dicShowList.ContainsKey(boxId))
             {
-                _dicShowList[boxId] = GetBonusDataList(luckyBoxCfg.bonusShowArr);
+                _dicShowList[boxId] = InitBonusDataList(luckyBoxCfg.dropId);
+
             }
         }
-        private List<LuckyBoxBonusData> GetBonusDataList(int[] idsList)
+
+        private List<LuckyBoxBonusData> InitBonusDataList(int dropId)
         {
+            Dictionary<int, LuckyBoxBonusData> dic = new Dictionary<int, LuckyBoxBonusData>();
+            AddToBonusDataDic(dropId, dic);
             List<LuckyBoxBonusData> list = new List<LuckyBoxBonusData>();
-            foreach (int id in idsList)
+            foreach(var t in dic)
             {
-                BonusListCfg bonusListCfg = BonusListCfgArray.Instance.GetCfg(id);
-                LuckyBoxBonusData luckyBoxBonusData = new LuckyBoxBonusData();
-                luckyBoxBonusData.id = id;
-                luckyBoxBonusData.name = bonusListCfg.name;
-                luckyBoxBonusData.itemList = ItemUtil.CreateItemDataList(bonusListCfg.bonusListArr);
-                list.Add(luckyBoxBonusData);
+                list.Add(t.Value);
             }
+            list.Sort(CompareBonusData);
             return list;
         }
 
+        private void AddToBonusDataDic(int dropId, Dictionary<int, LuckyBoxBonusData> dic)
+        {
+            List<DropOutCfg> cfgs = DropOutCfgArray.Instance.GetCfgsByid(dropId);
+            if (cfgs == null)
+            {
+                return;
+            }
+            foreach (DropOutCfg cfg in cfgs)
+            {
+                if (cfg.item > ConstItemID.MAX_ITEM_ID)//掉落id
+                {
+                    AddToBonusDataDic(cfg.item, dic);
+                }
+                else
+                {
+                    var group = cfg.group;
+                    if (cfg.group <= 0)
+                    {
+                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.item);
+                        if (itemCfg == null || itemCfg.suitId <= 0)
+                        {
+                            continue;
+                        }
+                        group = itemCfg.suitId;
+                    }
+                    LuckyBoxBonusData luckyBoxBonusData = GetBonusData(group, dic);
+                    if (luckyBoxBonusData == null)
+                    {
+                        continue;
+                    }
+                    luckyBoxBonusData.itemList.Add(ItemUtil.createItemData(cfg.item, 1));
+                }
+            }
+        }
+
+        private LuckyBoxBonusData GetBonusData(int group, Dictionary<int, LuckyBoxBonusData> dic)
+        {
+            dic.TryGetValue(group, out LuckyBoxBonusData luckyBoxBonusData);
+            if(luckyBoxBonusData != null)
+            {
+                return luckyBoxBonusData;
+            }
+            luckyBoxBonusData = new LuckyBoxBonusData();
+            luckyBoxBonusData.id = group;
+            BonusListCfg bonusListCfg = BonusListCfgArray.Instance.GetCfg(group);
+            if (bonusListCfg != null)
+            {
+                luckyBoxBonusData.name = bonusListCfg.name;
+                luckyBoxBonusData.order = bonusListCfg.sort;
+            }
+            else
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(group);
+                if (suitCfg == null)
+                {
+                    return null;
+                }
+                luckyBoxBonusData.name = suitCfg.name;
+                luckyBoxBonusData.order = 9999;
+            }
+            dic.Add(group, luckyBoxBonusData);
+            return luckyBoxBonusData;
+        }
+
+        public int CompareBonusData(LuckyBoxBonusData a, LuckyBoxBonusData b)
+        {
+            if(b.order < a.order)
+            {
+                return 1;
+            }
+            if(b.order > a.order)
+            {
+                return -1;
+            }
+            return a.id - b.id;
+        }
+
         public void GetOwnedCount(int boxId, out int count, out int totalCount)
         {
             count = 0;

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

@@ -6,6 +6,7 @@ namespace GFGGame
     {
         public int id;
         public string name;
-        public List<ItemData> itemList;
+        public int order;
+        public List<ItemData> itemList = new List<ItemData>();
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIcon.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemIcon
+    public partial class UI_ComIcon000
     {
         public GComponent target;
         public GLoader m_loaIcon;
@@ -16,12 +16,12 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldpng0itiz";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemIcon";
-        private static UI_ComItemIcon _proxy;
+        public const string RES_NAME = "ComIcon000";
+        private static UI_ComIcon000 _proxy;
 
-        public static UI_ComItemIcon Create(GObject gObject = null)
+        public static UI_ComIcon000 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemIcon();
+            var ui = new UI_ComIcon000();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -30,11 +30,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemIcon Proxy(GObject gObject = null)
+        public static UI_ComIcon000 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemIcon();
+                _proxy = new UI_ComIcon000();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 27270b2db69f5bb4a9bcdc40af3f3ee2
+guid: 6ab0ba8a5e22ea948a6f5e2dbe615dd4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemIconNew
+    public partial class UI_ComIcon001
     {
         public GComponent target;
         public GLoader m_bg;
@@ -18,12 +18,12 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldp9jv6tlt";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemIconNew";
-        private static UI_ComItemIconNew _proxy;
+        public const string RES_NAME = "ComIcon001";
+        private static UI_ComIcon001 _proxy;
 
-        public static UI_ComItemIconNew Create(GObject gObject = null)
+        public static UI_ComIcon001 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemIconNew();
+            var ui = new UI_ComIcon001();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -32,11 +32,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemIconNew Proxy(GObject gObject = null)
+        public static UI_ComIcon001 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemIconNew();
+                _proxy = new UI_ComIcon001();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b37e991627d2d46ca8f4e2ecc8288820
+guid: 4ad5e828cb8d0004488ba34ffb26c6e0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemIconNew1
+    public partial class UI_ComIcon002
     {
         public GComponent target;
         public GLoader m_loaIcon;
@@ -16,12 +16,12 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldpqik1tlz";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemIconNew1";
-        private static UI_ComItemIconNew1 _proxy;
+        public const string RES_NAME = "ComIcon002";
+        private static UI_ComIcon002 _proxy;
 
-        public static UI_ComItemIconNew1 Create(GObject gObject = null)
+        public static UI_ComIcon002 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemIconNew1();
+            var ui = new UI_ComIcon002();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -30,11 +30,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemIconNew1 Proxy(GObject gObject = null)
+        public static UI_ComIcon002 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemIconNew1();
+                _proxy = new UI_ComIcon002();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIcon.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7a5d537a09290ee498209390a8913151
+guid: 8aa459e7d8832484abfa8f7737db7902
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComIcon003
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtHasCount;
+        public GLoader m_loaRarity;
+        public GImage m_imgHas;
+        public GImage m_imgNotHas;
+        public GImage m_imgShowTong;
+        public GGroup m_grpGot;
+        public const string URL = "ui://eg2y0ldpvolstnd";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComIcon003";
+        private static UI_ComIcon003 _proxy;
+
+        public static UI_ComIcon003 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComIcon003();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComIcon003 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComIcon003();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_imgHas = (GImage)comp.GetChild("imgHas");
+            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
+            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
+            m_grpGot = (GGroup)comp.GetChild("grpGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtHasCount = null;
+            m_loaRarity = null;
+            m_imgHas = null;
+            m_imgNotHas = null;
+            m_imgShowTong = null;
+            m_grpGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f7099fc706293db4d811169e4e3c899d
+guid: 8e9c5f8ad208b9448aa5016042fa8782
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItem
+    public partial class UI_ComItem000
     {
         public GComponent target;
-        public UI_ComItemIcon m_comItemIcon;
+        public UI_ComIcon000 m_comItemIcon;
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldpj48o98";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItem";
-        private static UI_ComItem _proxy;
+        public const string RES_NAME = "ComItem000";
+        private static UI_ComItem000 _proxy;
 
-        public static UI_ComItem Create(GObject gObject = null)
+        public static UI_ComItem000 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItem();
+            var ui = new UI_ComItem000();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItem Proxy(GObject gObject = null)
+        public static UI_ComItem000 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItem();
+                _proxy = new UI_ComItem000();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIcon)UI_ComItemIcon.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon000)UI_ComIcon000.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1a92c43219c83fc4588b7d799dd4ed57
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemBlue
+    public partial class UI_ComItem001_1
     {
         public GComponent target;
-        public UI_ComItemIconNew m_comItemIcon;
+        public UI_ComIcon001 m_comItemIcon;
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldpmdmdtn5";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemBlue";
-        private static UI_ComItemBlue _proxy;
+        public const string RES_NAME = "ComItem001_1";
+        private static UI_ComItem001_1 _proxy;
 
-        public static UI_ComItemBlue Create(GObject gObject = null)
+        public static UI_ComItem001_1 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemBlue();
+            var ui = new UI_ComItem001_1();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemBlue Proxy(GObject gObject = null)
+        public static UI_ComItem001_1 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemBlue();
+                _proxy = new UI_ComItem001_1();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIconNew)UI_ComItemIconNew.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d31759cc75019a944ab13e924dca08b8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemNew
+    public partial class UI_ComItem001_2
     {
         public GComponent target;
-        public UI_ComItemIconNew m_comItemIcon;
+        public UI_ComIcon001 m_comItemIcon;
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldp9jv6tls";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemNew";
-        private static UI_ComItemNew _proxy;
+        public const string RES_NAME = "ComItem001_2";
+        private static UI_ComItem001_2 _proxy;
 
-        public static UI_ComItemNew Create(GObject gObject = null)
+        public static UI_ComItem001_2 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemNew();
+            var ui = new UI_ComItem001_2();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemNew Proxy(GObject gObject = null)
+        public static UI_ComItem001_2 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemNew();
+                _proxy = new UI_ComItem001_2();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIconNew)UI_ComItemIconNew.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fb4d5413ab9538f4182de3b801f51b22
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem002.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemNew1
+    public partial class UI_ComItem002
     {
         public GComponent target;
-        public UI_ComItemIconNew1 m_comItemIcon;
+        public UI_ComIcon002 m_comItemIcon;
         public GTextField m_txtName;
         public GTextField m_txtCount;
         public const string URL = "ui://eg2y0ldpqik1tly";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemNew1";
-        private static UI_ComItemNew1 _proxy;
+        public const string RES_NAME = "ComItem002";
+        private static UI_ComItem002 _proxy;
 
-        public static UI_ComItemNew1 Create(GObject gObject = null)
+        public static UI_ComItem002 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemNew1();
+            var ui = new UI_ComItem002();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemNew1 Proxy(GObject gObject = null)
+        public static UI_ComItem002 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemNew1();
+                _proxy = new UI_ComItem002();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIconNew1)UI_ComItemIconNew1.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon002)UI_ComIcon002.Create(comp.GetChild("comItemIcon"));
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem002.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 39866ec1b63d9cd46a15d82adaa5f332
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 82763b2a154d64a6e9f64adfccfeca3f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e56694fe656433347a8e56ddb1aabacd
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew1.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 45c34602b5cd145d6986388695fc4c4d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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/Card/CardFosterView.cs

@@ -564,7 +564,7 @@ namespace GFGGame
                     }
                 }
 
-                PromptController.Instance.ShowFloatTextPrompt(string.Format("角色等级达到{0}级", roleLv));
+                PromptController.Instance.ShowFloatTextPrompt(string.Format("角色等级达到{0}级可继续升级词牌", roleLv));
 
                 return true;
             }

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

@@ -347,6 +347,11 @@ namespace GFGGame
             {
                 return;
             }
+            if (ItemDataManager.GetItemNum(_selectedItemId) > 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("该部件已制作完成");
+                return;
+            }
             int index = (int)(context.data as GObject).data;
             _ui.m_listMaterias.selectedIndex = index;
             ItemData itemData = _materiarsOfSelectedItem[index];
@@ -395,7 +400,7 @@ namespace GFGGame
             }
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            int itemId = 10044;
+            int itemId = 10016;
             int itemIndex = 0;
             for (int i = 0; i < _ui.m_listClothing.numItems; i++)
             {

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

@@ -48,7 +48,6 @@ namespace GFGGame
         }
         private void ListItemRender(int index, GObject obj)
         {
-            UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = _rewardDatas[index];
             if (obj.data == null)
             {
@@ -56,7 +55,6 @@ namespace GFGGame
             }
             (obj.data as ItemView).SetData(reward);
 
-            UI_ComItem.ClearProxy();
         }
 
     }

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

@@ -57,7 +57,7 @@ namespace GFGGame
             var itemInfo = GlobalCfgArray.globalCfg.firstChargeBonusArr[0];
             var itemId = itemInfo[0];
             var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            if(itemCfg.suitId > 0)
+            if (itemCfg.suitId > 0)
             {
                 var suitCfg = SuitCfgArray.Instance.GetCfg(itemCfg.suitId);
                 _ui.m_txtName.text = suitCfg.name;
@@ -80,7 +80,7 @@ namespace GFGGame
             {
                 UpdateView();
             }
-        
+
         }
 
         private void OnNumericChange(EventContext context)
@@ -99,7 +99,6 @@ namespace GFGGame
 
         private void ListItemRender(int index, GObject obj)
         {
-            UI_ComItem item = UI_ComItem.Proxy(obj);
             int[] reward = GlobalCfgArray.globalCfg.firstChargeBonusArr[index];
             ItemData itemData = ItemUtil.createItemData(reward);
             if (obj.data == null)
@@ -107,7 +106,6 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
                    (obj.data as ItemView).SetData(itemData);
-            UI_ComItem.ProxyEnd();
         }
 
     }

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

@@ -45,6 +45,7 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.ACTIVITY_REWARD_ADD, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
         }
 
         protected override void OnShown()
@@ -64,6 +65,7 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_REWARD_ADD, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
         }
         private void OnBtnBackClick()
         {
@@ -85,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)
@@ -96,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
             {
@@ -120,7 +123,6 @@ namespace GFGGame
         }
         private void RenderListRewardItem(int index, GObject obj)
         {
-            UI_ComItem item = UI_ComItem.Proxy(obj);
             int[] reward = GlobalCfgArray.globalCfg.firstChargeBonusArr[index];
             ItemData itemData = ItemUtil.createItemData(reward);
             if (obj.data == null)
@@ -128,14 +130,32 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(itemData);
-            UI_ComItem.ProxyEnd();
         }
 
         private void OnBtnGetClick(EventContext context)
         {
             GObject obj = context.sender as GObject;
             int id = (int)obj.data;
-            ActivityGlobalSProxy.ReqGetActivityBonus(id, ActivityDataManager.Instance.actLimitChargeId).Coroutine();
+            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,8 +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);
-            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/FieldGuide/SuitShowView.cs

@@ -65,6 +65,8 @@ namespace GFGGame
             _suitTypeId = (int)datas[0];
             _suitId = (int)datas[1];
             List<int> suitIds = datas[2] as List<int>;
+            _ui.m_imgBonusBox.target.visible = datas.Length >= 4 ? (bool)datas[3] : true;
+
             _suitIds = new List<int>();
             foreach (int suitId in suitIds)
             {
@@ -114,7 +116,7 @@ namespace GFGGame
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_suitId);
             _ui.m_txtSuitName.text = suitCfg.name;
             _dressUpObjUI.ResetSceneObj(100, false, true, null, false);
-            _dressUpObjUI.dressUpObj.PutOnSuitCfg(_suitId, isPic, new int[] { ConstDressUpItemType.BEI_JING });
+            _dressUpObjUI.dressUpObj.PutOnSuitCfg(_suitId, isPic, new int[] { ConstDressUpItemType.BEI_JING }, true, false);
             _dressUpObjUI.UpdateWrapper(_ui.m_holder);
             UpdateSuitBoxStatus();
         }

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/League/LeagueGiftView.cs

@@ -71,7 +71,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateBuyList);
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
             EventAgent.RemoveEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
         }
         private void OnBtnBackClick()

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

@@ -115,15 +115,20 @@ namespace GFGGame
         private void OnListCardItemClick(EventContext context)
         {
             UpdateView(_ui.m_listCard.selectedIndex);
+
             OnCardSelected(cardList[_ui.m_listCard.selectedIndex].id);
+
         }
 
         private void OnCardSelected(int cardId)
         {
-            ArenaDataManager dataManager = ArenaDataManager.Instance;
-            dataManager.DressupList[dataManager.SelectThemeIndex].cardId = cardId;
-            dataManager.SetMineFightAttr(dataManager.DressupList[dataManager.SelectThemeIndex], dataManager.SelectThemeIndex);
-            EventAgent.DispatchEvent(ConstMessage.CARD_SELECTED);
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+            {
+                ArenaDataManager dataManager = ArenaDataManager.Instance;
+                dataManager.DressupList[dataManager.SelectThemeIndex].cardId = cardId;
+                dataManager.SetMineFightAttr(dataManager.DressupList[dataManager.SelectThemeIndex], dataManager.SelectThemeIndex);
+                EventAgent.DispatchEvent(ConstMessage.CARD_SELECTED);
+            }
         }
         private void OnBtnComfirmClick()
         {

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -722,7 +722,8 @@ namespace GFGGame
                 _ui.m_btnActivityLuckyBox.target.title = TimeUtil.FormattingTimeTo_DDHHmm(TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow());
             }
 
-            int actLimitChargeId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitChargeId);
+            List<int> actListChargeIds = ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType.ActLimitChargeId);
+            int actLimitChargeId = actListChargeIds.Count > 0 ? actListChargeIds[0] : 0;
             if (_actLimitChargeId != actLimitChargeId)
             {
                 ActivityDataManager.Instance.actLimitChargeId = actLimitChargeId;

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRewardGetView.cs

@@ -87,7 +87,6 @@ namespace GFGGame
 
         private void RenderListItem(int index, GObject obj)
         {
-            UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = _rewardDatas[index];
             if (obj.data == null)
             {
@@ -97,7 +96,6 @@ namespace GFGGame
             // (obj.data as ItemView).SetComItemScale = 0.72f;
             // (obj.data as ItemView).SetTxtCountScale = 0.8f;
             // (obj.data as ItemView).SetTxtCountPos(185, 155);
-            UI_ComItem.ClearProxy();
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRewardView.cs

@@ -69,7 +69,7 @@ namespace GFGGame
         {
             int rewardIndex = (int)obj.parent.data;
             int[][] rewards = GalleryRewardCfgArray.Instance.dataArray[rewardIndex].itemsArr;
-            UI_ComItem item = UI_ComItem.Proxy(obj);
+            // UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = ItemUtil.createItemData(rewards[index]);//_rewardDatas[index];
             if (obj.data == null)
             {
@@ -79,7 +79,6 @@ namespace GFGGame
             (obj.data as ItemView).SetComItemScale = 0.72f;
             // (obj.data as ItemView).SetTxtCountScale = 0.8f;
             (obj.data as ItemView).SetTxtCountPos(185, 155);
-            UI_ComItem.ClearProxy();
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRuleView.cs

@@ -75,7 +75,6 @@ namespace GFGGame
         {
             int rewardIndex = (int)obj.parent.data;
             int[][] rewards = GalleryRewardCfgArray.Instance.dataArray[rewardIndex].itemsArr;
-            UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = ItemUtil.createItemData(rewards[index]);//_rewardDatas[index];
             if (obj.data == null)
             {
@@ -85,7 +84,6 @@ namespace GFGGame
             (obj.data as ItemView).SetComItemScale = 0.72f;
             // (obj.data as ItemView).SetTxtCountScale = 0.8f;
             (obj.data as ItemView).SetTxtCountPos(185, 155);
-            UI_ComItem.ClearProxy();
         }
     }
 }

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

@@ -154,7 +154,7 @@ namespace GFGGame
             item.m_btnGetWeekGiftBag.data = vipCfg.id;
             bool isWeekGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus), vipCfg.id);
             item.m_btnGetWeekGiftBag.enabled = !isWeekGet;
-            RedDotController.Instance.SetComRedDot(item.m_btnGetGiftBag, !isWeekGet && RoleDataManager.vipLv >= vipCfg.id);
+            RedDotController.Instance.SetComRedDot(item.m_btnGetWeekGiftBag, !isWeekGet && RoleDataManager.vipLv >= vipCfg.id);
             UI_ListVipItem.ProxyEnd();
         }
 
@@ -185,7 +185,7 @@ namespace GFGGame
                     break;
                 }
             }
-            ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, new List<int>() { suitId } });
+            ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, new List<int>() { suitId }, false });
         }
         private void OnBtnGetGiftBagClick(EventContext context)
         {

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);
 

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

@@ -47,6 +47,7 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
 
         }
         protected override void OnShown()
@@ -66,6 +67,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
         }
         private void OnBtnBlackRewardClick()
         {

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

@@ -79,7 +79,6 @@ namespace GFGGame
         {
             int rewardIndex = (int)obj.parent.data;
             int[][] rewards = FilingRewardCfgArray.Instance.GetCfgsByid(StudioDataManager.Instance.filingChapterId)[rewardIndex].itemsArr;
-            UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = ItemUtil.createItemData(rewards[index]);//_rewardDatas[index];
             if (obj.data == null)
             {
@@ -89,7 +88,6 @@ namespace GFGGame
             (obj.data as ItemView).GrpGotVisible = StudioDataManager.Instance.GetFilingRewardStateByIndex(StudioDataManager.Instance.filingChapterId, rewardIndex) == ConstBonusStatus.GOT ? true : false;
             (obj.data as ItemView).SetComItemScale = 0.6f;
             (obj.data as ItemView).SetTxtCountPos(175, 135);
-            UI_ComItem.ClearProxy();
         }
 
         private void OnBtnGetClcik()