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

* 'master' of http://10.108.64.190:3000/gfg/Client: (40 commits)
  替换tips资源
  福利大厅红点
  sdk
  战斗中途退出再进战斗 卡牌不弹出来
  换装特效命名规则
  画廊推荐作品玩家姓名太挤
  卡牌奖励已领取
  词牌奖励已经领取的奖励文字改成“已领取”
  VIP等级礼包最低级界面去掉向左滑动箭头，最高级去掉向右滑动箭头
  雅集资源
  技能
  sdk
  技能
  竞技场商店兑换
  常驻礼包界面调整
  抽奖特效
  有有必需品箭头
  动画脚本
  增加绿色箭头表示已经收集到该衣服
  竞技场玩家头像
  ...

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1344">
   <displayList>
-    <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
-      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1b"/>
-    </component>
+    <image id="n5_e050" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,-2" size="1021,1346" group="n7_e050"/>
+    <component id="n6_e050" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="896,17" group="n7_e050"/>
+    <group id="n7_e050" name="n7" xy="0,-2" size="1021,1346"/>
     <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
       <item/>
       <item/>

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1344">
   <displayList>
-    <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
-      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1c"/>
-    </component>
+    <image id="n5_e050" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0" size="1021,1346" group="n7_e050"/>
+    <component id="n6_e050" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="896,16" group="n7_e050"/>
+    <group id="n7_e050" name="n7" xy="0,0" size="1021,1346"/>
     <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
       <item/>
       <item/>

FGUIProject/assets/Bag/components/ListSelectorItem.xml

@@ -2,7 +2,7 @@
 <component size="172,241" overflow="hidden">
   <displayList>
     <image id="n2_v5no" name="n2" src="v5notmc" fileName="images/db_jiajian_1.png" xy="23,189"/>
-    <text id="n17_cu9w" name="txtSelNum" xy="56,184" size="60,53" fontSize="39" color="#915e15" align="center" autoSize="none" text="0"/>
+    <text id="n17_cu9w" name="txtSelNum" xy="56,184" size="60,53" fontSize="39" color="#915e15" align="center" vAlign="middle" autoSize="shrink" text="100"/>
     <component id="n15_cu9w" name="btnReduce" src="cu9wtmf" fileName="components/BtnReduce.xml" xy="-1,188"/>
     <component id="n16_cu9w" name="btnAdd" src="cu9wtmg" fileName="components/BtnAdd.xml" xy="121,189"/>
     <image id="n0_v5no" name="n0" src="v5notm7" fileName="images/wpk_db_1_da.png" xy="0,1" group="n20_yjmk"/>

FGUIProject/assets/ClothingShop/components/ComClothingShopItemInfo.xml

@@ -8,17 +8,17 @@
   </controller>
   <displayList>
     <image id="n7_hinb" name="n7" src="hinb3" fileName="images/fzd_diban_1.png" xy="0,0"/>
-    <text id="n8_hinb" name="txtName" xy="57,41" size="323,62" fontSize="46" color="#b59158" text="衣服名字·名字"/>
+    <text id="n8_hinb" name="txtName" xy="57,41" size="323,61" fontSize="46" color="#b59158" text="衣服名字·名字"/>
     <text id="n30_hinb" name="txtDesc" xy="64,143" size="336,39" fontSize="28" color="#af9a7d" autoSize="height" autoClearText="true" text="赵钱孙李周吴郑王"/>
     <loader id="n43_hinb" name="rarity" xy="379,20" size="44,94" visible="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n32_hinb" name="txtOwned" xy="170,610" size="121,36" fontSize="26" color="#c97f7a" align="center" ubb="true" vars="true" text="[color=#B39B75]已拥有：[/color]{v1=0}"/>
+    <text id="n32_hinb" name="txtOwned" xy="170,610" size="119,36" fontSize="26" color="#c97f7a" align="center" ubb="true" vars="true" text="[color=#B39B75]已拥有：[/color]{v1=0}"/>
     <component id="n20_hinb" name="btnBuy" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="83,652">
       <Button title=" "/>
     </component>
     <loader id="n47_ugdz" name="iconPrice" xy="182,674" size="34,34" group="n46_hinb" touchable="false" url="ui://eg2y0ldpq08x3" fill="scale">
       <gearDisplay controller="c1" pages="0,1,2"/>
     </loader>
-    <text id="n48_ugdz" name="txtPrice" xy="226,667" size="93,44" group="n46_hinb" fontSize="32" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" autoClearText="true" text="99999">
+    <text id="n48_ugdz" name="txtPrice" xy="226,667" size="82,44" group="n46_hinb" fontSize="32" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" autoClearText="true" text="99999">
       <gearDisplay controller="c1" pages="0,1,2"/>
     </text>
     <text id="n45_hinb" name="txtBtnBuy" xy="182,662" size="76,49" group="n46_hinb" fontSize="36" color="#fcf2f2" strokeColor="#d89291" strokeSize="2" text="购买">
@@ -35,14 +35,14 @@
     </list>
     <image id="n54_v95q" name="n54" src="9cth60" fileName="images/fzd_xiant_1.png" xy="43,117"/>
     <image id="n55_v95q" name="n55" src="v95qek" fileName="images/fzd_kuangdidi.png" xy="42,353"/>
-    <image id="n33_hinb" name="n33" src="842s6h" fileName="imagesExport/kp_sx_1.png" pkg="eg2y0ldp" xy="60,363" size="36,36" group="n56_v95q" aspect="true"/>
-    <image id="n34_hinb" name="n34" src="842s6i" fileName="imagesExport/kp_sx_2.png" pkg="eg2y0ldp" xy="228,363" size="36,36" group="n56_v95q" aspect="true"/>
-    <image id="n35_hinb" name="n35" src="842s6j" fileName="imagesExport/kp_sx_3.png" pkg="eg2y0ldp" xy="60,418" size="36,36" group="n56_v95q" aspect="true"/>
-    <image id="n36_hinb" name="n36" src="842s6k" fileName="imagesExport/kp_sx_4.png" pkg="eg2y0ldp" xy="228,418" size="36,36" group="n56_v95q" aspect="true"/>
-    <text id="n38_hinb" name="txtGong" xy="106,364" size="52,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n40_hinb" name="txtShang" xy="273,364" size="52,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n42_hinb" name="txtJue" xy="106,420" size="52,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <text id="n39_hinb" name="txtZhi" xy="273,420" size="52,31" group="n56_v95q" fontSize="22" color="#968778" autoClearText="true" text="5000"/>
-    <group id="n56_v95q" name="n56" xy="60,363" size="267,91"/>
+    <image id="n33_hinb" name="n33" src="842s6h" fileName="imagesNew/kp_sx_1.png" pkg="eg2y0ldp" xy="78,384" pivot="0.5,0.5" anchor="true" size="40,40" group="n56_v95q" aspect="true"/>
+    <image id="n34_hinb" name="n34" src="842s6i" fileName="imagesNew/kp_sx_3.png" pkg="eg2y0ldp" xy="246,384" pivot="0.5,0.5" anchor="true" size="40,40" group="n56_v95q" aspect="true"/>
+    <image id="n35_hinb" name="n35" src="842s6j" fileName="imagesNew/kp_sx_2.png" pkg="eg2y0ldp" xy="78,439" pivot="0.5,0.5" anchor="true" size="40,40" group="n56_v95q" aspect="true"/>
+    <image id="n36_hinb" name="n36" src="842s6k" fileName="imagesNew/kp_sx_4.png" pkg="eg2y0ldp" xy="246,439" pivot="0.5,0.5" anchor="true" size="40,40" group="n56_v95q" aspect="true"/>
+    <text id="n38_hinb" name="txtGong" xy="106,362" pivot="0,0.5" size="61,42" group="n56_v95q" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n40_hinb" name="txtShang" xy="273,362" pivot="0,0.5" size="61,42" group="n56_v95q" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n42_hinb" name="txtJue" xy="106,418" pivot="0,0.5" size="61,42" group="n56_v95q" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n39_hinb" name="txtZhi" xy="273,418" pivot="0,0.5" size="61,42" group="n56_v95q" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <group id="n56_v95q" name="n56" xy="58,362" size="276,98"/>
   </displayList>
 </component>

FGUIProject/assets/Common/components/Button24.xml

@@ -5,7 +5,7 @@
     <image id="n0_f2bf" name="n0" src="f2bftjx" fileName="imagesExport/cpjl_anniuty_2.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_f2bf" name="n1" xy="0,-2" size="250,81" fontSize="44" color="#f3efef" align="center" vAlign="middle" autoSize="none" strokeColor="#ac9c9c" strokeSize="2" shadowColor="#a99e9e" shadowOffset="2,2" text="领取">
+    <text id="n1_f2bf" name="title" xy="0,-2" size="250,81" fontSize="44" color="#f3efef" align="center" vAlign="middle" autoSize="none" strokeColor="#ac9c9c" strokeSize="2" shadowColor="#a99e9e" shadowOffset="2,2" text="领取">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1310" opaque="false">
+<component size="1080,1333" opaque="false">
   <displayList>
-    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,1" size="962,1307">
-      <relation target="n17_ohbx" sidePair="height-height,middle-middle"/>
-    </component>
-    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,1" group="n17_ohbx"/>
-    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="0,715" size="962,596" group="n17_ohbx"/>
-    <group id="n17_ohbx" name="grpTips" xy="0,1" size="962,1310" advanced="true" layout="vt" excludeInvisibles="true">
+    <component id="n21_si5z" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,0" size="1080,1333">
       <relation target="" sidePair="middle-middle"/>
+      <relation target="n17_ohbx" sidePair="height-height"/>
+    </component>
+    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="59,132" group="n17_ohbx"/>
+    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="59,809" size="962,506" group="n17_ohbx"/>
+    <group id="n17_ohbx" name="grpTips" xy="59,132" size="962,1183" advanced="true" layout="vt" lineGap="15" excludeInvisibles="true">
+      <relation target="n21_si5z" sidePair="top-top"/>
     </group>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1116">
+<component size="1080,1116">
   <displayList>
-    <image id="n37_qdaz" name="n37" src="qdaztno" fileName="images/tanchuang_2.png" xy="-59,-31" size="1021,1169"/>
-    <text id="n6_si5z" name="txtOwned" xy="750,124" pivot="1,0" size="131,42" group="n12_si5z" fontSize="30" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
-    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="-11,128" size="346,336" group="n12_si5z" aspect="true"/>
-    <loader id="n8_si5z" name="loaRarity" xy="42,197" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
-    <loader id="n9_si5z" name="loaIcon" xy="163,295" pivot="0.5,0.5" anchor="true" size="180,180" group="n12_si5z" aspect="true" autoSize="true"/>
-    <image id="n40_x8jz" name="n40" src="x8jztnr" fileName="images/lm_db_3.png" xy="357,196" size="543,204" group="n12_si5z"/>
-    <text id="n11_si5z" name="txtDesc" xy="375,218" size="506,166" group="n12_si5z" fontSize="32" color="#b08d5c" leading="1" ubb="true" autoSize="shrink" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-    <text id="n28_s5s9" name="txtExchangeCount" xy="240,353" pivot="1,0" size="56,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
-    <image id="n41_x8jz" name="n41" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="177,90" pivot="0.5,0.5" size="123,18" group="n43_x8jz"/>
-    <text id="n5_si5z" name="txtName" xy="341,70" pivot="0.5,0" size="284,54" group="n43_x8jz" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoClearText="true" text="物品名字物品名"/>
-    <image id="n42_x8jz" name="n42" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="666,91" pivot="0.5,0.5" size="119,17" group="n43_x8jz" scale="-1,1"/>
-    <group id="n43_x8jz" name="n43" xy="177,70" size="608,54" group="n12_si5z" advanced="true" layout="hz" colGap="41" excludeInvisibles="true">
-      <relation target="" sidePair="center-center"/>
-    </group>
-    <group id="n12_si5z" name="n12" xy="-11,70" size="911,394" group="n33_l500" advanced="true"/>
-    <list id="n32_l500" name="listItem" xy="205,484" pivot="0.5,0" size="569,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
+    <component id="n37_qdaz" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,0" size="1080,1115"/>
+    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="77,124" size="346,336" group="n12_si5z" aspect="true"/>
+    <loader id="n8_si5z" name="loaRarity" xy="130,193" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <loader id="n9_si5z" name="loaIcon" xy="251,291" pivot="0.5,0.5" anchor="true" size="180,180" group="n12_si5z" aspect="true" autoSize="true"/>
+    <text id="n28_s5s9" name="txtExchangeCount" xy="328,349" pivot="1,0" size="56,49" group="n12_si5z" fontSize="36" color="#8e7c6b" vars="true" text="x{count=20}"/>
+    <image id="n40_x8jz" name="n40" src="x8jztnr" fileName="images/lm_db_3.png" xy="403,192" size="575,230" group="n12_si5z"/>
+    <text id="n6_si5z" name="txtOwned" xy="840,146" pivot="1,0" size="129,41" group="n12_si5z" fontSize="30" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
+    <text id="n11_si5z" name="txtDesc" xy="439,214" size="506,166" group="n12_si5z" fontSize="32" color="#b08d5c" leading="1" ubb="true" autoSize="shrink" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
+    <group id="n12_si5z" name="n12" xy="77,124" size="901,336" group="n33_l500" advanced="true"/>
+    <list id="n32_l500" name="listItem" xy="110,480" pivot="0.5,0" size="859,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -25,31 +19,32 @@
       <item/>
       <item/>
     </list>
-    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,657" size="897,15" group="n4_si5z"/>
-    <text id="n3_si5z" name="txtShow" xy="359,635" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
-    <group id="n4_si5z" name="n4" xy="32,635" size="897,54" group="n34_l500"/>
-    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,712" group="n19_si5z"/>
-    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,710" group="n19_si5z">
+    <image id="n2_si5z" name="n2" src="9jv66j" fileName="imagesNew/lm_zsx0.png" xy="176,657" group="n4_si5z"/>
+    <text id="n3_si5z" name="txtShow" xy="435,649" pivot="0.5,0" size="210,48" group="n4_si5z" fontSize="35" color="#b69566" align="center" text="选择使用数量"/>
+    <graph id="n44_ofwu" name="n44" xy="530,631" size="20,20" group="n4_si5z"/>
+    <group id="n4_si5z" name="n4" xy="176,631" size="727,67" group="n34_l500"/>
+    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="256,726" group="n19_si5z"/>
+    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="234,724" group="n19_si5z">
       <Button icon="ui://eg2y0ldps5s9tip"/>
     </component>
-    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,711" group="n19_si5z"/>
-    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,709" group="n19_si5z">
+    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="549,725" group="n19_si5z"/>
+    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="656,723" group="n19_si5z">
       <Button icon="ui://eg2y0ldpsi5ztil"/>
     </component>
-    <text id="n22_si5z" name="txtCostCount" xy="343,717" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
-    <group id="n19_si5z" name="n19" xy="175,709" size="612,70" group="n34_l500"/>
-    <text id="n24_si5z" name="txtTips" xy="317,799" pivot="0.5,0" size="326,52" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
-    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="415,879" pivot="0.5,0" size="115,46" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
-    <text id="n36_l500" name="txtRmbCost" xy="450,881" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
-    <group id="n26_si5z" name="n26" xy="317,799" size="326,136" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
-    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,948" group="n20_si5z">
+    <text id="n22_si5z" name="txtCostCount" xy="402,731" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
+    <group id="n19_si5z" name="n19" xy="234,723" size="612,70" group="n34_l500"/>
+    <text id="n24_si5z" name="txtTips" xy="377,813" pivot="0.5,0" size="323,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="474,893" pivot="0.5,0" size="115,46" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
+    <text id="n36_l500" name="txtRmbCost" xy="509,895" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
+    <group id="n26_si5z" name="n26" xy="376,813" size="326,136" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
+    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="183,962" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>
-    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,948" size="294,89" group="n20_si5z">
+    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="603,962" size="294,89" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9til"/>
     </component>
-    <group id="n20_si5z" name="n20" xy="124,948" size="714,89" group="n34_l500"/>
-    <group id="n34_l500" name="n34" xy="32,635" size="897,402" group="n33_l500" advanced="true"/>
-    <group id="n33_l500" name="n33" xy="-11,70" size="940,967" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
+    <group id="n20_si5z" name="n20" xy="183,962" size="714,89" group="n34_l500"/>
+    <group id="n34_l500" name="n34" xy="176,631" size="727,420" group="n33_l500" advanced="true"/>
+    <group id="n33_l500" name="n33" xy="77,124" size="901,927" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/BtnStyle006.xml

@@ -8,6 +8,7 @@
     <text id="n1_9qpb" name="title" xy="0,0" size="316,94" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </text>
+    <graph id="n3_e050" name="holder" xy="158,51" size="10,10" type="rect"/>
   </displayList>
   <Button/>
   <relation target="n2_idkd" sidePair="width-width,height-height"/>

FGUIProject/assets/CommonGame/components/BtnStyle1Small.xml

@@ -4,7 +4,7 @@
   <displayList>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="144,43" aspect="true" url="ui://eg2y0ldpo9gh4m" fill="scale" autoSize="true"/>
     <text id="n3_u2u3" name="title" xy="51,4" pivot="0.5,0" size="41,35" font="ui://eg2y0ldpa0cftkz" fontSize="25" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
-      <relation target="" sidePair="middle-middle,left-right"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>
   <Button/>

FGUIProject/assets/CommonGame/components/ComTipsApproach.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,615">
+<component size="962,488">
   <displayList>
-    <image id="n25_si5z" name="n25" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="68,22" group="n21_ohbx"/>
-    <text id="n20_ohbx" name="n20" xy="399,0" size="164,54" group="n21_ohbx" fontSize="40" color="#8a7253" text="获取途径"/>
-    <group id="n21_ohbx" name="n21" xy="68,0" size="825,54"/>
-    <list id="n18_ohbx" name="list" xy="47,80" size="867,486" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpohbxti7">
+    <image id="n25_si5z" name="n25" src="9jv66j" fileName="imagesNew/lm_zsx0.png" xy="117,0" group="n21_ohbx" alpha="0.7"/>
+    <text id="n20_ohbx" name="n20" xy="410,0" size="142,48" group="n21_ohbx" fontSize="35" color="#b69566" text="获取途径"/>
+    <group id="n21_ohbx" name="n21" xy="117,0" size="727,48"/>
+    <list id="n18_ohbx" name="list" xy="47,62" size="867,404" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpohbxti7">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n24_ohbx" name="txtNone" xy="354,256" size="254,56" fontSize="42" color="#a49a86" text="暂无获取途径"/>
+    <text id="n24_ohbx" name="txtNone" xy="354,256" size="254,56" fontSize="42" color="#b69566" text="暂无获取途径"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/ComTipsBase.xml

@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,714">
+<component size="962,662">
   <displayList>
-    <text id="n1_s2cc" name="txtName" xy="65,50" size="186,61" group="n24_u2u3" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
-    <text id="n3_s2cc" name="txtOwned" xy="752,72" pivot="1,0" size="129,41" group="n24_u2u3" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
-    <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,122" group="n24_u2u3"/>
-    <loader id="n8_si5z" name="loaIcon" xy="187,270" pivot="0.5,0.5" anchor="true" size="200,200" group="n24_u2u3" aspect="true" autoSize="true"/>
-    <loader id="n6_ohbx" name="loaRarity" xy="249,156" size="44,94" group="n24_u2u3" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
-    <image id="n20_r9ri" name="n20" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="354,162" group="n24_u2u3"/>
-    <text id="n9_si5z" name="txtDesc" xy="375,181" size="506,166" group="n24_u2u3" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-    <group id="n24_u2u3" name="n24" xy="56,50" size="850,320" group="n25_u2u3" advanced="true"/>
-    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="75,400" size="50,50" group="n19_si5z"/>
-    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesNew/kp_sx_3.png" xy="300,400" size="50,50" group="n19_si5z"/>
-    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesNew/kp_sx_2.png" xy="525,400" size="50,50" group="n19_si5z"/>
-    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="750,400" size="50,50" group="n19_si5z"/>
-    <text id="n15_si5z" name="txtGong" xy="135,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n16_si5z" name="txtShang" xy="360,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n17_si5z" name="txtJue" xy="585,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n18_si5z" name="txtZhi" xy="810,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <group id="n19_si5z" name="grpScore" xy="75,400" size="807,50" group="n25_u2u3" advanced="true"/>
-    <list id="n21_u2u3" name="listTag" xy="71,480" size="377,41" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
+    <image id="n27_ofwu" name="n27" src="x8jztnq" fileName="images/wplb_db.png" xy="0,0" group="n29_ofwu"/>
+    <loader id="n8_si5z" name="loaIcon" xy="183,175" pivot="0.5,0.5" anchor="true" size="200,200" group="n29_ofwu" aspect="true" autoSize="true"/>
+    <loader id="n6_ohbx" name="loaRarity" xy="246,65" size="44,94" group="n29_ofwu" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <group id="n29_ofwu" name="n29" xy="0,0" size="362,351" group="n24_u2u3"/>
+    <image id="n20_r9ri" name="n20" src="x8jztnr" fileName="images/lm_db_3.png" xy="350,49" size="575,274" group="n28_ofwu"/>
+    <text id="n3_s2cc" name="txtOwned" xy="792,6" pivot="1,0" size="122,39" group="n28_ofwu" fontSize="28" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
+    <text id="n9_si5z" name="txtDesc" xy="380,74" size="526,214" group="n28_ofwu" fontSize="32" color="#b08d5c" ubb="true" autoSize="none" autoClearText="true" text="手机课手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
+    <group id="n28_ofwu" name="n28" xy="350,6" size="575,317" group="n24_u2u3"/>
+    <group id="n24_u2u3" name="n24" xy="0,0" size="925,351" group="n25_u2u3" advanced="true"/>
+    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="75,371" size="50,50" group="n19_si5z"/>
+    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesNew/kp_sx_3.png" xy="300,371" size="50,50" group="n19_si5z"/>
+    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesNew/kp_sx_2.png" xy="525,371" size="50,50" group="n19_si5z"/>
+    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="750,371" size="50,50" group="n19_si5z"/>
+    <text id="n15_si5z" name="txtGong" xy="135,375" size="61,41" group="n19_si5z" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n16_si5z" name="txtShang" xy="360,375" size="61,41" group="n19_si5z" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n17_si5z" name="txtJue" xy="585,375" size="61,41" group="n19_si5z" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n18_si5z" name="txtZhi" xy="810,375" size="61,41" group="n19_si5z" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <group id="n19_si5z" name="grpScore" xy="75,371" size="807,50" group="n25_u2u3" advanced="true"/>
+    <list id="n21_u2u3" name="listTag" xy="71,441" size="377,41" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
       <item/>
       <item/>
     </list>
-    <list id="n26_l500" name="listItem" xy="58,551" pivot="0.5,0" size="851,131" group="n25_u2u3" layout="row" overflow="scroll" scroll="horizontal" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+    <list id="n26_l500" name="listItem" xy="58,502" pivot="0.5,0" size="851,131" group="n25_u2u3" layout="row" overflow="scroll" scroll="horizontal" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
       <item/>
       <item/>
       <item/>
@@ -34,7 +35,7 @@
       <item/>
       <item/>
     </list>
-    <group id="n25_u2u3" name="n25" xy="56,50" size="853,632" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
+    <group id="n25_u2u3" name="n25" xy="0,0" size="925,633" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
   </displayList>
   <relation target="n25_u2u3" sidePair="height-height"/>
 </component>

FGUIProject/assets/CommonGame/components/ListTagItem.xml

@@ -2,6 +2,6 @@
 <component size="182,41">
   <displayList>
     <component id="n22_u2u3" name="comTag" src="ih7566" fileName="components/ComTag.xml" xy="0,3"/>
-    <text id="n23_u2u3" name="txtTagScore" xy="110,0" size="72,41" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n23_u2u3" name="txtTagScore" xy="110,0" size="61,41" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/componentsBg/ComBg000.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,992">
   <displayList>
-    <image id="n0_qik1" name="n0" src="qik1tm6" fileName="componentsBg/tanchuang_2.png" xy="0,0"/>
-    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="896,8"/>
+    <image id="n0_qik1" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" xy="0,0" size="1021,992">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <component id="n1_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" xy="903,25"/>
     <image id="n2_qik1" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="220,111" group="n5_qik1"/>
     <text id="n4_qik1" name="txtTitle" xy="380,92" pivot="0.5,0" size="348,54" group="n5_qik1" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" text="稀有升星材料(自选)"/>
     <image id="n3_qik1" name="n3" src="qik1tca" fileName="componentsBg/lm_dt_zsx2.png" xy="758,111" group="n5_qik1"/>

FGUIProject/assets/CommonGame/componentsBg/ComBg001.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,992">
   <displayList>
-    <image id="n0_qik1" name="n0" src="qik1tm6" fileName="componentsBg/tanchuang_2.png" xy="0,0">
+    <image id="n0_qik1" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" xy="0,0" size="1021,989">
       <relation target="" sidePair="height-height"/>
     </image>
-    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="896,8"/>
+    <component id="n1_qik1" name="btnClose" src="e050tob" fileName="componentsBg/Component2.xml" xy="903,24"/>
     <loader id="n6_mbf1" name="loaTitle" xy="264,94" pivot="0.5,0" size="560,34" url="ui://eg2y0ldpmbf1tn6" autoSize="true"/>
   </displayList>
   <customProperty target="loaTitle" propertyId="1"/>

FGUIProject/assets/CommonGame/componentsBg/Component2.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="88,82">
+  <displayList>
+    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -318,7 +318,6 @@
     <image id="qik1tm3" name="jjsjs_txk_2.png" path="/images/"/>
     <image id="qik1tm4" name="pmts_xtk_1.png" path="/images/"/>
     <image id="qik1tm5" name="phbphb_txkk.png" path="/images/"/>
-    <image id="qik1tm6" name="tanchuang_2.png" path="/componentsBg/" scale="9grid" scale9grid="254,247,510,329"/>
     <component id="qik1tcb" name="ComBg000.xml" path="/componentsBg/" exported="true"/>
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
@@ -363,6 +362,7 @@
     <image id="e050to6" name="tb_yajijiangzhang.png" path="/imgItemIcon/" exported="true"/>
     <image id="e050to7" name="tb_yajizijin.png" path="/imgItemIcon/" exported="true"/>
     <image id="e050to8" name="tb_zhizaoli.png" path="/imgItemIcon/" exported="true"/>
+    <component id="e050tob" name="Component2.xml" path="/componentsBg/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/components/Component1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="350,75" overflow="hidden">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n29_pjip" name="n29" src="wonodz" fileName="images/dz_hz_fsk_2.png" xy="31,9">
       <gearDisplay controller="c1" pages="0"/>
@@ -8,7 +8,7 @@
     <image id="n28_pjip" name="n28" src="j48o3y" fileName="images/dz_hz_bxbx.png" xy="0,0">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <text id="n30_pjip" name="txtNeedName" xy="84,16" size="221,39" fontSize="28" color="#b08649" align="center" vAlign="middle" letterSpacing="-2" autoSize="none" autoClearText="true" text="孔雀东">
+    <text id="n30_pjip" name="txtNeedName" xy="74,18" size="208,39" fontSize="28" color="#b08649" align="center" vAlign="middle" letterSpacing="-2" autoSize="none" autoClearText="true" text="孔雀东南飞飞">
       <gearDisplay controller="c1" pages="0"/>
     </text>
     <list id="n31_oixc" name="listTag" xy="24,18" size="220,38" layout="row" lineGap="12" colGap="22" defaultItem="ui://eg2y0ldpih7566" vAlign="middle" autoClearItems="true">
@@ -16,5 +16,6 @@
       <item/>
       <item/>
     </list>
+    <image id="n32_ofwu" name="imgGot" src="ofwuf7" fileName="imagesNew/tb_gou_yiyongyou.png" xy="262,15" visible="false"/>
   </displayList>
 </component>

FGUIProject/assets/DressUp/package.xml

@@ -196,7 +196,7 @@
     <component id="v461f3" name="ComFightScore.xml" path="/components/"/>
     <image id="v461f4" name="jjcdi_jjcdi.png" path="/images/"/>
     <image id="v461f5" name="jjcdi_jjxian.png" path="/images/"/>
-    <image id="rv09f6" name="jjsy_xx_1(1).png" path="/images/"/>
+    <image id="ofwuf7" name="tb_gou_yiyongyou.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/EnduringGiftBox/components/ComLeftGiftBox.xml

@@ -2,7 +2,7 @@
 <component size="204,188">
   <displayList>
     <image id="n0_qqhz" name="n0" src="qqhzf" fileName="images/cz_lbicon_db.png" xy="10,0" group="n7_qqhz"/>
-    <loader id="n9_qqhz" name="loaIcon" xy="47,42" size="120,104" group="n7_qqhz"/>
+    <loader id="n9_qqhz" name="loaIcon" xy="115,94" pivot="0.5,0.5" anchor="true" size="136,120" group="n7_qqhz" fill="scale"/>
     <component id="n6_qqhz" name="comDiscount" src="qqhz1o" fileName="components/ComDiscount.xml" xy="0,2" group="n7_qqhz"/>
     <component id="n8_qqhz" name="comGouMaiGetText" src="qqhz1r" fileName="components/ComGouMaiGetText.xml" xy="10,127" group="n7_qqhz"/>
     <group id="n7_qqhz" name="n7" xy="0,0" size="204,186"/>

FGUIProject/assets/League/LeaguePrayUI.xml

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

FGUIProject/assets/League/components/ComLeader.xml

@@ -6,7 +6,7 @@
     </component>
     <image id="n6_wm60" name="n6" src="wm6037" fileName="images/lm_db_touxiang.png" xy="0,0"/>
     <loader id="n10_wm60" name="loaHeadBorder" xy="157,180" pivot="0.5,0.5" anchor="true" size="230,203" scale="1.2,1.2" url="ui://eg2y0ldpwm60tl7" autoSize="true"/>
-    <loader id="n4_rv09" name="loaTitle" xy="69,100" size="35,113" url="ui://tw70qm9dwm603p" autoSize="true" clearOnPublish="true"/>
+    <loader id="n4_rv09" name="loaTitle" xy="45,112" size="35,113" url="ui://tw70qm9dwm603p" autoSize="true" clearOnPublish="true"/>
     <image id="n8_wm60" name="n8" src="wm6035" fileName="images/lm_mz_db.png" xy="30,257" group="n11_wm60"/>
     <text id="n9_wm60" name="txtLvl" xy="41,259" pivot="0.5,0" size="35,44" group="n11_wm60" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" text="20"/>
     <group id="n11_wm60" name="n11" xy="30,257" size="300,55"/>

FGUIProject/assets/League/components/ComPary.xml

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

FGUIProject/assets/League/components/ListGiftButItem.xml

@@ -4,7 +4,7 @@
     <image id="n19_9jv6" name="n19" src="9jv65t" fileName="images/lm_kp_db_chang.png" xy="0,0" group="n22_9jv6"/>
     <loader id="n12_pvb4" name="loaIcon" xy="134,265" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
     <text id="n15_pvb4" name="txtCount" xy="210,437" pivot="0.5,0" size="144,34" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="24" color="#b08548" letterSpacing="-2" text="今日剩余：1/1"/>
-    <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/BtnStyle1Small.xml" pkg="eg2y0ldp" xy="126,588" group="n22_9jv6">
+    <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/BtnStyle1Small.xml" pkg="eg2y0ldp" xy="109,588" size="156,49" group="n22_9jv6">
       <Button title="采购" icon="ui://eg2y0ldp9jv66c"/>
     </component>
     <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="124,636" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>

FGUIProject/assets/League/components/ListGiftGetItem.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="386,759">
-  <controller name="c1" pages="0,,1," selected="0">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="可领取"/>
     <remark page="1" value="已领取"/>
   </controller>
   <displayList>
-    <loader id="n29_9jv6" name="n29" xy="5,0" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65s" align="center" vAlign="middle" autoSize="true">
+    <loader id="n29_9jv6" name="n29" xy="5,0" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65p" align="center" vAlign="middle" autoSize="true">
       <gearIcon controller="c1" pages="0" values="ui://tw70qm9d9jv65s" default="ui://tw70qm9d9jv65p"/>
     </loader>
     <loader id="n21_9jv6" name="loaType" xy="22,101" size="62,203" group="n28_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
@@ -16,7 +16,7 @@
       <item/>
       <item/>
     </list>
-    <image id="n26_9jv6" name="n26" src="9jv66g" fileName="images/lm_biaoqian_ylq.png" xy="28,300" group="n28_9jv6">
+    <image id="n26_9jv6" name="n26" src="9jv66g" fileName="images/lm_biaoqian_ylq.png" xy="28,312" group="n28_9jv6">
       <gearDisplay controller="c1" pages="1"/>
     </image>
     <group id="n28_9jv6" name="n28" xy="-113,0" size="612,754"/>

FGUIProject/assets/League/components/ListSkillItem.xml

@@ -3,9 +3,7 @@
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n16_gfx4" name="n16" src="miy37n" fileName="images/lm_ch_dldb.png" xy="0,0" pivot="0.5,0"/>
-    <loader id="n23_miy3" name="loaIcon" xy="25,25" pivot="0.5,0.5" size="112,112" url="ui://eg2y0ldpu2u3tkq" autoSize="true">
-      <gearIcon controller="c1" pages="0" values="ui://eg2y0ldpu2u3tkq" default=""/>
-    </loader>
+    <loader id="n23_miy3" name="loaIcon" xy="22,22" pivot="0.5,0.5" size="115,115" url="ui://tw70qm9de05086" autoSize="true"/>
     <image id="n20_miy3" name="n20" src="miy37i" fileName="images/lm_ch_szdk.png" xy="-7,127"/>
     <loader id="n10_pvb4" name="loaScore" xy="28,3" size="44,44" group="n13_pvb4" url="ui://eg2y0ldp842s6h"/>
     <text id="n11_pvb4" name="txtScore" xy="73,0" size="60,50" group="n13_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="37" color="#7c561e" letterSpacing="-2" text="+10"/>

FGUIProject/assets/League/package.xml

@@ -202,6 +202,15 @@
     <component id="idkd80" name="ComSkillUp.xml" path="/"/>
     <component id="vols81" name="ComLine.xml" path="/components/"/>
     <image id="duuf82" name="lm_zjm_lxdwh_db.png" path="/images/"/>
+    <image id="e05083" name="tb_jn_5.png" path="/images/" exported="true"/>
+    <image id="e05084" name="tb_jn_6.png" path="/images/" exported="true"/>
+    <image id="e05085" name="tb_jn_3.png" path="/images/" exported="true"/>
+    <image id="e05086" name="tb_jn_1.png" path="/images/" exported="true"/>
+    <image id="e05087" name="tb_jn_2.png" path="/images/" exported="true"/>
+    <image id="e05088" name="tb_jn_4.png" path="/images/" exported="true"/>
+    <image id="ofwu89" name="tb_xiang_suhexiang.png" path="/images/"/>
+    <image id="ofwu8a" name="tb_xiang_tianmuxiang.png" path="/images/"/>
+    <image id="ofwu8b" name="tb_xiang_baitanxiang.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/LuckyBox/LuckBoxBonusShowUI.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <loader id="n17_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>
+    <graph id="n25_e050" name="holder_star" xy="535,210" size="10,10">
+      <relation target="" sidePair="center-center,top-top"/>
+    </graph>
+    <graph id="n26_e050" name="holder_bg" xy="535,955" size="10,10">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <graph id="n27_e050" name="holder_cloud" xy="535,1810" size="10,10">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </graph>
+    <component id="n14_ga16" name="itemOne" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,960">
+      <gearDisplay controller="c1" pages="0"/>
+    </component>
+    <component id="n1_ga16" name="item0" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="385,475" group="n21_e050"/>
+    <component id="n5_ga16" name="item1" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="695,475" group="n21_e050"/>
+    <group id="n21_e050" name="n21" xy="210,300" size="660,350" group="n15_ga16" advanced="true" layout="hz" colGap="-40" excludeInvisibles="true"/>
+    <component id="n6_ga16" name="item2" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="220,798" group="n22_e050"/>
+    <component id="n7_ga16" name="item3" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,798" group="n22_e050"/>
+    <component id="n8_ga16" name="item4" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="860,798" group="n22_e050"/>
+    <group id="n22_e050" name="n22" xy="45,623" size="990,350" group="n15_ga16" advanced="true" layout="hz" colGap="-30" excludeInvisibles="true"/>
+    <component id="n9_ga16" name="item5" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="220,1121" group="n23_e050"/>
+    <component id="n10_ga16" name="item6" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,1121" group="n23_e050"/>
+    <component id="n11_ga16" name="item7" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="860,1121" group="n23_e050"/>
+    <group id="n23_e050" name="n23" xy="45,946" size="990,350" group="n15_ga16" advanced="true" layout="hz" colGap="-30" excludeInvisibles="true"/>
+    <component id="n12_ga16" name="item8" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="385,1444" group="n24_e050"/>
+    <component id="n13_ga16" name="item9" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="695,1444" group="n24_e050"/>
+    <group id="n24_e050" name="n24" xy="210,1269" size="660,350" group="n15_ga16" advanced="true" layout="hz" colGap="-40" excludeInvisibles="true"/>
+    <group id="n15_ga16" name="grpItems" xy="45,300" size="990,1319" advanced="true" layout="vt" lineGap="-27">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n14_ga16" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n15_ga16" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n14_ga16" value="0"/>
+    <item time="0" type="Alpha" target="n15_ga16" value="0"/>
+  </transition>
+</component>

FGUIProject/assets/LuckyBox/LuckBoxBonusUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <loader id="n17_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"/>

FGUIProject/assets/LuckyBox/LuckyBoxNewDressUI.xml

@@ -4,6 +4,15 @@
     <loader id="n4_duuf" name="loaBg" xy="0,-240" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,center-center,middle-middle"/>
     </loader>
+    <graph id="n10_e050" name="holder_star" xy="535,210" size="10,10">
+      <relation target="" sidePair="center-center,top-top"/>
+    </graph>
+    <graph id="n11_e050" name="holder_bg" xy="535,955" size="10,10">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <graph id="n12_e050" name="holder_cloud" xy="535,1810" size="10,10">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </graph>
     <image id="n5_duuf" name="n5" src="volstat" fileName="imageNews/zx_tx_qianjing.png" xy="9,411" group="n9_duuf"/>
     <image id="n6_duuf" name="n6" src="volstar" fileName="imageNews/zx_tx_hengxiang.png" xy="0,420" group="n9_duuf"/>
     <image id="n7_duuf" name="n7" src="volstav" fileName="imageNews/zx_tx_yuanquan.png" xy="28,381" group="n9_duuf"/>
@@ -14,7 +23,7 @@
     <component id="n0_qdrt" name="comCard" src="qdrt1a" fileName="components/ComCard.xml" xy="66,475" pivot="0.5,0.5" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n3_qdrt" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="917,1802">
+    <component id="n3_qdrt" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="917,1720">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button icon="ui://drx9d1usvolstbo"/>
     </component>

FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://drx9d1usw1qi2n" designImageOffsetY="-240">
-  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="1">
+  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="0">
     <remark page="0" value="买一次"/>
     <remark page="1" value="买十次"/>
   </controller>
@@ -10,6 +10,15 @@
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
+    <graph id="n54_e050" name="holder_star" xy="535,210" size="10,10">
+      <relation target="" sidePair="center-center,top-top"/>
+    </graph>
+    <graph id="n55_e050" name="holder_bg" xy="535,955" size="10,10">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <graph id="n56_e050" name="holder_cloud" xy="535,1810" size="10,10">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </graph>
     <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n20_f5bl" name="comStar0_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="540,960">
       <gearDisplay controller="ctrlBuyType" pages="0"/>
@@ -23,48 +32,50 @@
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
     </component>
-    <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="232,537" group="n19_l5nz"/>
-    <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="449,224" group="n19_l5nz"/>
-    <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="849,557" group="n19_l5nz"/>
-    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="419,676" group="n19_l5nz"/>
-    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="278,861" group="n19_l5nz"/>
-    <component id="n34_o139" name="comStar1_0_5" src="l5nzq" fileName="components/ComStar.xml" xy="828,1066" group="n19_l5nz"/>
-    <component id="n35_o139" name="comStar1_0_6" src="l5nzq" fileName="components/ComStar.xml" xy="253,1398" group="n19_l5nz"/>
-    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="618,1272" group="n19_l5nz"/>
-    <component id="n37_o139" name="comStar1_0_8" src="l5nzq" fileName="components/ComStar.xml" xy="586,1619" group="n19_l5nz"/>
-    <component id="n51_e050" name="comStar1_0_9" src="l5nzq" fileName="components/ComStar.xml" xy="901,438" group="n19_l5nz"/>
-    <group id="n19_l5nz" name="grpComStar0" xy="227,219" size="679,1405" advanced="true">
+    <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="205,477" group="n19_l5nz"/>
+    <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="422,166" group="n19_l5nz"/>
+    <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="822,642" group="n19_l5nz"/>
+    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="392,653" group="n19_l5nz"/>
+    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="251,928" group="n19_l5nz"/>
+    <component id="n34_o139" name="comStar1_0_5" src="l5nzq" fileName="components/ComStar.xml" xy="801,1066" group="n19_l5nz"/>
+    <component id="n35_o139" name="comStar1_0_6" src="l5nzq" fileName="components/ComStar.xml" xy="226,1404" group="n19_l5nz"/>
+    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="591,1272" group="n19_l5nz"/>
+    <component id="n37_o139" name="comStar1_0_8" src="l5nzq" fileName="components/ComStar.xml" xy="522,1705" group="n19_l5nz"/>
+    <component id="n51_e050" name="comStar1_0_9" src="l5nzq" fileName="components/ComStar.xml" xy="874,438" group="n19_l5nz"/>
+    <group id="n19_l5nz" name="grpComStar0" xy="200,161" size="679,1549" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>
-      <relation target="" sidePair="left-center,top-middle"/>
+      <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="420,283" group="n25_iakb"/>
-    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="227,499" group="n25_iakb"/>
-    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="229,848" group="n25_iakb"/>
-    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="431,1035" group="n25_iakb"/>
-    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="186,1279" group="n25_iakb"/>
-    <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="430,1471" group="n25_iakb"/>
-    <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="610,644" group="n25_iakb"/>
-    <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="832,903" group="n25_iakb"/>
-    <component id="n50_w1qi" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="779,1480" group="n25_iakb"/>
-    <group id="n25_iakb" name="grpComStar1" xy="147,244" size="724,1275" advanced="true">
+    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="476,261" group="n25_iakb"/>
+    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="261,534" group="n25_iakb"/>
+    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="215,882" group="n25_iakb"/>
+    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="517,1035" group="n25_iakb"/>
+    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="272,1368" group="n25_iakb"/>
+    <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="516,1728" group="n25_iakb"/>
+    <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="679,567" group="n25_iakb"/>
+    <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="854,865" group="n25_iakb"/>
+    <component id="n50_w1qi" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="865,1426" group="n25_iakb"/>
+    <component id="n52_e050" name="comStar1_1_9" src="l5nzq" fileName="components/ComStar.xml" xy="833,146" group="n25_iakb"/>
+    <group id="n25_iakb" name="grpComStar1" xy="210,141" size="660,1592" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="1" condition="0"/>
-      <relation target="" sidePair="left-center,top-middle"/>
+      <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="722,318" group="n30_iakb"/>
-    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="338,446" group="n30_iakb"/>
-    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="625,1568" group="n30_iakb"/>
-    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="198,708" group="n30_iakb"/>
-    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="341,1060" group="n30_iakb"/>
-    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="276,1365" group="n30_iakb"/>
-    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="819,1405" group="n30_iakb"/>
-    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="797,1132" group="n30_iakb"/>
-    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="708,665" group="n30_iakb"/>
-    <group id="n30_iakb" name="grpComStar2" xy="159,279" size="699,1328" advanced="true">
+    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="861,228" group="n30_iakb"/>
+    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="305,306" group="n30_iakb"/>
+    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="598,1749" group="n30_iakb"/>
+    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="201,766" group="n30_iakb"/>
+    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="492,1217" group="n30_iakb"/>
+    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="312,1475" group="n30_iakb"/>
+    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="835,1478" group="n30_iakb"/>
+    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="879,1091" group="n30_iakb"/>
+    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="587,574" group="n30_iakb"/>
+    <component id="n53_e050" name="comStar1_2_9" src="l5nzq" fileName="components/ComStar.xml" xy="626,867" group="n30_iakb"/>
+    <group id="n30_iakb" name="grpComStar2" xy="196,223" size="688,1531" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
-      <relation target="" sidePair="left-center,top-middle"/>
+      <relation target="" sidePair="center-center,top-top"/>
     </group>
     <movieclip id="n49_hibu" name="effEnd" src="hibu2m" fileName="effect/MovieClip3.jta" xy="0,0" size="1080,1920" visible="false">
       <relation target="" sidePair="width-width,height-height"/>

FGUIProject/assets/LuckyBox/combox/ComBox1.xml

@@ -38,12 +38,14 @@
     <component id="n58_vols" name="btnBuyTen" src="volstng" fileName="components/BtnStyle006.xml" pkg="eg2y0ldp" xy="618,1675" group="n61_vols">
       <Button title="摘星十次" icon="ui://eg2y0ldpvolstnk"/>
     </component>
-    <image id="n59_vols" name="imgSpecial" src="volstbn" fileName="imageNews/bt_jiaobiao_bichu.png" xy="865,1623" group="n61_vols">
-      <relation target="n58_vols" sidePair="left-left,top-top"/>
-    </image>
     <text id="n60_vols" name="txtRemainTimes" xy="539,1538" pivot="0.5,0" anchor="true" size="303,54" group="n61_vols" fontSize="40" color="#915e15" align="center" vars="true" text="今日剩余次数：{v1=0}">
       <relation target="" sidePair="center-center"/>
     </text>
+    <image id="n59_vols" name="imgSpecial" src="volstbn" fileName="imageNews/bt_jiaobiao_bichu.png" xy="865,1623" group="n84_e050"/>
+    <graph id="n83_e050" name="holder" xy="919,1675" size="10,10" group="n84_e050" type="rect"/>
+    <group id="n84_e050" name="grpSpecial" xy="865,1623" size="112,123" group="n61_vols" advanced="true">
+      <relation target="n58_vols" sidePair="right-right,top-top"/>
+    </group>
     <group id="n61_vols" name="n61" xy="140,1538" size="837,287" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>

FGUIProject/assets/LuckyBox/components/ComCard.xml

@@ -2,15 +2,15 @@
 <component size="948,970">
   <displayList>
     <graph id="n6_dcro" name="holder" xy="473,484" size="1,1" visible="false" touchable="false" type="rect"/>
-    <loader id="n2_qdrt" name="loaIcon" xy="332,294" pivot="0.5,0.5" size="350,350" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <loader id="n2_qdrt" name="loaIcon" xy="299,294" pivot="0.5,0.5" size="350,350" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scaleMatchWidth"/>
     <text id="n5_qdrt" name="txtDiscribe" xy="473,1056" pivot="0.5,0" anchor="true" size="406,101" visible="false" fontSize="30" color="#c2a773" autoSize="none" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>
     <image id="n12_duuf" name="n12" src="volstbk" fileName="imageNews/zx_zhuangshi_diaoshi.png" xy="645,164" group="n13_duuf"/>
     <loader id="n1_qdrt" name="loaType" xy="645,299" size="44,94" group="n13_duuf" url="ui://eg2y0ldpo9ghtll" fill="scaleMatchWidth" autoSize="true"/>
     <loader id="n3_qdrt" name="loaProperty" xy="645,242" size="44,44" group="n13_duuf" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
     <group id="n13_duuf" name="n13" xy="645,164" size="54,248"/>
-    <image id="n14_duuf" name="n14" src="volstax" fileName="imageNews/zx_wp_baseboard.png" xy="336,880" size="332,50" group="n15_duuf"/>
-    <text id="n4_qdrt" name="txtName" xy="502,905" pivot="0.5,0.5" anchor="true" size="84,54" group="n15_duuf" fontSize="40" color="#915e15" text="服装"/>
-    <group id="n15_duuf" name="n15" xy="336,878" size="332,54"/>
+    <image id="n14_duuf" name="n14" src="volstax" fileName="imageNews/zx_wp_baseboard.png" xy="308,880" size="332,50" group="n15_duuf"/>
+    <text id="n4_qdrt" name="txtName" xy="474,905" pivot="0.5,0.5" anchor="true" size="84,54" group="n15_duuf" fontSize="40" color="#915e15" text="服装"/>
+    <group id="n15_duuf" name="n15" xy="308,878" size="332,54"/>
     <graph id="n17_duuf" name="holder1" xy="473,484" size="1,1" visible="false" touchable="false" type="rect"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/components/Component2.xml

@@ -1,38 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="385,385">
-  <controller name="c1" pages="0,,1,,2,,3,,4," selected="1"/>
+  <controller name="c1" exported="true" pages="0,,1,,2,,3,,4," selected="3"/>
   <displayList>
-    <image id="n10_v95q" name="n10" src="v95q2u" fileName="images/cj_hd_hdh_1.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="0,4"/>
+    <graph id="n19_e050" name="holder" xy="192,187" size="10,10" group="n9_v95q" type="rect">
+      <gearDisplay controller="c1" pages="3,4"/>
+    </graph>
+    <image id="n10_v95q" name="n10" src="volstb2" fileName="imageNews/zx_wp_jin_bg.png" xy="42,57" pivot="0.5,0.5" group="n9_v95q">
+      <gearDisplay controller="c1" pages="0"/>
     </image>
-    <image id="n11_v95q" name="n11" src="v95q2v" fileName="images/cj_hd_hdh_2.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="2"/>
-    </image>
-    <image id="n12_v95q" name="n12" src="v95q2w" fileName="images/cj_hd_hdh_3.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="3"/>
-    </image>
-    <image id="n13_v95q" name="n13" src="v95q2x" fileName="images/cj_hd_hdh_4.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <loader id="n3_ga16" name="icon" xy="115,120" size="158,158" group="n9_v95q" aspect="true" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
-    <loader id="n4_ga16" name="rarity" xy="272,68" size="42,96" group="n9_v95q" url="ui://eg2y0ldpd4iw52"/>
-    <image id="n7_pzq1" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="76,99" group="n9_v95q" visible="false"/>
-    <image id="n14_v95q" name="n14" src="v95q33" fileName="images/cj_hd_zik_1.png" xy="67,268" group="n9_v95q">
-      <gearDisplay controller="c1" pages="0,4"/>
+    <image id="n12_v95q" name="n12" src="volstay" fileName="imageNews/zx_wp_fen_bg.png" xy="98,117" pivot="0.5,0.5" group="n9_v95q">
+      <gearDisplay controller="c1" pages="0"/>
     </image>
-    <image id="n15_v95q" name="n15" src="v95q34" fileName="images/cj_hd_zik_2.png" xy="67,268" group="n9_v95q">
-      <gearDisplay controller="c1" pages="3"/>
+    <image id="n18_e050" name="n18" src="volstb8" fileName="imageNews/zx_wp_lan_diguang.png" xy="87,90" group="n9_v95q">
+      <gearDisplay controller="c1" pages="2"/>
     </image>
-    <image id="n16_v95q" name="n16" src="v95q35" fileName="images/cj_hd_zik_3.png" xy="67,268" group="n9_v95q">
+    <image id="n11_v95q" name="n11" src="volstb7" fileName="imageNews/zx_wp_lan_bg.png" xy="129,111" pivot="0.5,0.5" group="n9_v95q">
       <gearDisplay controller="c1" pages="2"/>
     </image>
-    <image id="n17_v95q" name="n17" src="v95q36" fileName="images/cj_hd_zik_4.png" xy="67,268" group="n9_v95q">
+    <image id="n13_v95q" name="n13" src="e050tf5" fileName="imageNews/zx_wp_lan_grey.png" xy="88,94" pivot="0.5,0.5" group="n9_v95q">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <text id="n2_ga16" name="txtName" xy="106,268" pivot="0.5,0" size="172,39" group="n9_v95q" fontSize="28" color="#b0967d" align="center" text="岭南荔夏·闲">
-      <gearColor controller="c1" pages="0,1,2,3,4" values="#bf9e73,#000000|#b0967d,#000000|#939b89,#000000|#89a2b0,#000000|#bf9e73,#000000"/>
-      <relation target="" sidePair="center-center"/>
+    <loader id="n3_ga16" name="icon" xy="194,195" pivot="0.5,0.5" anchor="true" size="116,116" group="n9_v95q" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scale" shrinkOnly="true">
+      <gearSize controller="c1" pages="1,2,3,4" values="98,98,1,1|100,100,1,1|116,116,1,1|180,180,1,1" default="158,158,1,1"/>
+    </loader>
+    <loader id="n4_ga16" name="rarity" xy="229,109" pivot="0.5,0" size="38,88" group="n9_v95q" aspect="true" url="ui://eg2y0ldpo9ghtll" align="center" fill="scale">
+      <gearXY controller="c1" pages="1,2,3,4" values="230,131|229,130|229,109|253,76" default="272,68"/>
+      <gearSize controller="c1" pages="1,2,3" values="26,59,1,1|26,60,1,1|38,88,1,1" default="42,96,1,1"/>
+    </loader>
+    <image id="n7_pzq1" name="imgNew" src="volstb5" fileName="imageNews/zx_wp_jin_jiaobiao.png" xy="90,121" pivot="0.5,0.5" size="77,44" group="n9_v95q" aspect="true" visible="false">
+      <gearXY controller="c1" pages="1,2,3,4" values="108,137|108,137|90,121|56,93" default="76,99"/>
+      <gearSize controller="c1" pages="1,2,3" values="63,36,1,1|63,36,1,1|77,44,1,1" default="91,52,1,1"/>
+    </image>
+    <image id="n20_e050" name="n20" src="volstb9" fileName="imageNews/zx_wp_mingcheng_bg.png" xy="192,289" pivot="0.5,0" anchor="true" size="133,32" group="n9_v95q">
+      <relation target="n21_e050" sidePair="width-width,center-center,middle-middle"/>
+    </image>
+    <text id="n21_e050" name="txtName" xy="195,305" pivot="0.5,0.5" anchor="true" size="96,29" group="n9_v95q" fontSize="20" color="#ffffff" align="center" letterSpacing="-2" text="孔雀东南飞">
+      <gearFontSize controller="c1" pages="4" values="28" default="20"/>
+      <relation target="n3_ga16" sidePair="center-center,top-bottom"/>
     </text>
-    <group id="n9_v95q" name="n9" xy="58,60" size="270,270"/>
+    <group id="n9_v95q" name="n9" xy="42,57" size="300,270"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/components/LuckyBoxBonusShowItem.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="350,350" pivot="0.5,0.5" anchor="true">
+  <displayList>
+    <component id="n1_ga16" name="comIcon" src="dcrotaa" fileName="components/Component2.xml" xy="175,157" pivot="0.5,0.5" anchor="true" controller="c1,3"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Scale" target="n1_ga16" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Linear"/>
+  </transition>
+</component>

FGUIProject/assets/LuckyBox/package.xml

@@ -93,7 +93,7 @@
     <image id="volstb6" name="zx_wp_jin_xian.png" path="/imageNews/"/>
     <image id="volstb7" name="zx_wp_lan_bg.png" path="/imageNews/"/>
     <image id="volstb8" name="zx_wp_lan_diguang.png" path="/imageNews/"/>
-    <image id="volstb9" name="zx_wp_mingcheng_bg.png" path="/imageNews/"/>
+    <image id="volstb9" name="zx_wp_mingcheng_bg.png" path="/imageNews/" scale="9grid" scale9grid="23,8,98,16"/>
     <image id="volstba" name="zx_yuan_tx_diandian.png" path="/imageNews/"/>
     <image id="volstbb" name="zx_yuan_tx_hengguang.png" path="/imageNews/"/>
     <image id="volstbc" name="zx_yuan_tx_neiquan.png" path="/imageNews/"/>
@@ -155,6 +155,9 @@
     <component id="duuftec" name="Component3.xml" path="/components/"/>
     <image id="duuftf0" name="zx_title_1.png" path="/imageNews/" exported="true"/>
     <image id="duuftf2" name="zx_bg.png" path="/imageNews/" atlas="alone_npot"/>
+    <component id="e050tf3" name="LuckBoxBonusShowUI.xml" path="/" exported="true"/>
+    <component id="e050tf4" name="LuckyBoxBonusShowItem.xml" path="/components/"/>
+    <image id="e050tf5" name="zx_wp_lan_grey.png" path="/imageNews/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -74,13 +74,13 @@
       <relation target="" sidePair="left-left,top-top"/>
       <Button title="活动" icon="ui://mfvz4q8kvolsof"/>
     </component>
-    <component id="n78_bhmm" name="btnActivityDay7" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,609" size="141,159" group="n89_vols">
+    <component id="n78_bhmm" name="btnActivityDay7" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,609" group="n89_vols">
       <Button title="七日活动" icon="ui://mfvz4q8kvolsoh"/>
     </component>
-    <component id="n75_mbf1" name="btnActivityLuckyBox" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,778" size="141,159" group="n89_vols">
+    <component id="n75_mbf1" name="btnActivityLuckyBox" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,784" group="n89_vols">
       <Button title="镜花水月" icon="ui://mfvz4q8kvolsog"/>
     </component>
-    <group id="n89_vols" name="n89" xy="0,314" size="411,623" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true">
+    <group id="n89_vols" name="n89" xy="0,314" size="411,635" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true">
       <relation target="" sidePair="left-left,top-top"/>
     </group>
     <group id="n52_qqat" name="grpLeft" xy="0,160" size="1130,1760" group="n59_oju1" advanced="true"/>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -20,7 +20,7 @@
     <component id="n51_psph" name="myHead" src="o9ghtlq" fileName="components/ComHead2.xml" pkg="eg2y0ldp" xy="214,228" pivot="0.5,0.5" anchor="true" group="n66_e050" scale="0.7,0.7"/>
     <component id="n52_psph" name="targetHead" src="o9ghtlq" fileName="components/ComHead2.xml" pkg="eg2y0ldp" xy="932,228" pivot="0.5,0.5" anchor="true" group="n66_e050" scale="0.7,0.7"/>
     <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="147,83" pivot="0,0.5" anchor="true" group="n66_e050">
-      <ProgressBar value="100" max="100"/>
+      <ProgressBar value="50" max="100"/>
     </component>
     <group id="n66_e050" name="n66" xy="99,66" size="948,276"/>
   </displayList>

FGUIProject/assets/Main/components/BtnModle2.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="141,159" extention="Button">
+<component size="141,165" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n4_wg7t" name="icon" xy="70,51" pivot="0.5,0.5" anchor="true" size="127,102" group="n14_t6j1" url="ui://mfvz4q8kvolsog" align="center"/>
-    <image id="n5_vols" name="n5" src="volsoe" fileName="imagesNew/zjm_tb_db_hd.png" xy="30,100" pivot="0.5,0" size="81,29" group="n14_t6j1">
+    <loader id="n4_wg7t" name="icon" xy="65,70" pivot="0.5,0.5" anchor="true" size="175,140" group="n14_t6j1" url="ui://mfvz4q8kvolsog" align="center" autoSize="true"/>
+    <image id="n5_vols" name="n5" src="volsoe" fileName="imagesNew/zjm_tb_db_hd.png" xy="30,108" pivot="0.5,0" size="81,29" group="n14_t6j1">
       <relation target="n7_vols" sidePair="width-width,height-height"/>
     </image>
-    <text id="n7_vols" name="title" xy="39,92" pivot="0.5,0" size="63,41" group="n14_t6j1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#ffffff" align="center" strokeColor="#936f37" text="首充"/>
-    <group id="n14_t6j1" name="n14" xy="6,0" size="127,133" advanced="true"/>
-    <image id="n10_vols" name="n10" src="volsoa" fileName="imagesNew/zjm_hd_sj_db.png" xy="14,132" pivot="0.5,0" group="n11_vols">
+    <text id="n7_vols" name="title" xy="39,100" pivot="0.5,0" size="63,41" group="n14_t6j1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#ffffff" align="center" strokeColor="#936f37" text="首充"/>
+    <group id="n14_t6j1" name="n14" xy="-22,0" size="175,141" advanced="true"/>
+    <image id="n10_vols" name="n10" src="volsoa" fileName="imagesNew/zjm_hd_sj_db.png" xy="14,140" pivot="0.5,0" group="n11_vols">
       <relation target="n9_vols" sidePair="width-width,height-height"/>
     </image>
-    <text id="n9_vols" name="txtTime" xy="20,123" pivot="0.5,0" size="100,39" group="n11_vols" fontSize="28" color="#775839" text="03:58:28"/>
-    <group id="n11_vols" name="grpTime" xy="14,123" size="112,39" advanced="true"/>
+    <text id="n9_vols" name="txtTime" xy="20,131" pivot="0.5,0" size="100,39" group="n11_vols" fontSize="28" color="#775839" text="03:58:28"/>
+    <group id="n11_vols" name="grpTime" xy="14,131" size="112,39" advanced="true"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -2,6 +2,7 @@
 <component size="850,33" extention="ProgressBar">
   <displayList>
     <image id="n11_fqor" name="n11" src="qkjsla" fileName="imagesNew/pro_bk_in.png" xy="-36,0"/>
+    <image id="n22_e050" name="n22" src="e050oz" fileName="imagesNew/jdt_shuangrenzd.png" xy="0,4"/>
     <component id="n1_uj53" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,4"/>
     <image id="n8_v95q" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="849,16" pivot="0.518,0.438" anchor="true" alpha="0.76">
       <relation target="n1_uj53" sidePair="right-right"/>

FGUIProject/assets/Main/package.xml

@@ -647,6 +647,7 @@
     <component id="t6j1ow" name="BtnModle2.xml" path="/components/"/>
     <image id="t6j1ox" name="zd_shanghai_db.png" path="/imagesNew/"/>
     <image id="jt8doy" name="db_qipaokuang.png" path="/imagesNew/" scale="9grid" scale9grid="17,9,177,18"/>
+    <image id="e050oz" name="jdt_shuangrenzd.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Store/StoreBlackCardRewardUI.xml

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

FGUIProject/assets/poem/componentsGallery/ListItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="500,900" overflow="hidden" opaque="false">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n24_pac9" name="n24" src="pac9tjx" fileName="imagesGallery/hl_cjkuangdiban.png" xy="4,1" size="493,889" group="n23_pac9">
       <relation target="" sidePair="height-height"/>
@@ -9,7 +9,7 @@
     <image id="n21_r9ri" name="n21" src="r9ri12h" fileName="imagesGallery/hl_cjkuangdi.png" xy="0,0" size="500,903" group="n23_pac9">
       <relation target="n15_r9ri" sidePair="height-height"/>
     </image>
-    <text id="n16_r9ri" name="txtName" xy="20,838" size="187,42" group="n22_r9ri" fontSize="30" color="#ac9370" leading="0" letterSpacing="-4" text="名字名字名字啊"/>
+    <text id="n16_r9ri" name="txtName" xy="20,838" size="211,42" group="n22_r9ri" fontSize="30" color="#ac9370" leading="0" text="名字名字名字啊"/>
     <component id="n19_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="273,841" size="80,42" group="n22_r9ri">
       <Button title="50000" icon="ui://iyz778gkr9ri128" selectedIcon="ui://iyz778gkr9ri127"/>
     </component>

GameClient/Assets/Editor/Xasset/Builds/BuildTask.cs

@@ -141,8 +141,6 @@ namespace VEngine.Editor.Builds
             //特效
             resPath = ResPathUtil.GetDressUpEffectDirPath(res);
             hideDirPahtList.Add(resPath);
-            resPath = ResPathUtil.GetDressUpEffectDirPath(res, true);
-            hideDirPahtList.Add(resPath);
         }
 
         private void HideSuitActionRes(SuitCfg suitCfg, List<string> hideFilePathList, List<string> hideDirPahtList)
@@ -183,8 +181,6 @@ namespace VEngine.Editor.Builds
                 //特效
                 resPath = ResPathUtil.GetDressUpEffectDirPath(suitCfg.aniRes);
                 hideDirPahtList.Add(resPath);
-                resPath = ResPathUtil.GetDressUpEffectDirPath(suitCfg.aniRes, true);
-                hideDirPahtList.Add(resPath);
             }
         }
 

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

@@ -1,3 +1,4 @@
+using System;
 using ET;
 
 namespace GFGGame
@@ -11,6 +12,12 @@ namespace GFGGame
             return activityInfo == null ? 0 : TimeUtil.GetDay5(activityInfo.StartTime);
         }
 
+        public int GetActivityDay7MaxPassDay()
+        {
+            return Math.Min(Activity7DaysTaskCfgArray.Instance.dataArray.Length,
+                ActivityDay7DataManager.Instance.GetActivityDay7Day());
+        }
+
         public long GetScore()
         {
             return ItemDataManager.GetItemNum(ConstItemID.ACTIVITY_DAY_7_SCORE);
@@ -45,12 +52,16 @@ namespace GFGGame
         public bool CheckActivityDay7TaskRewrdCanGetByDay(int day)
         {
             //检查天数
-            var currentDay = ActivityDay7DataManager.Instance.GetActivityDay7Day();
+            var currentDay = ActivityDay7DataManager.Instance.GetActivityDay7MaxPassDay();
             if (currentDay < day)
             {
                 return false;
             }
             var activity7DaysTaskCfg = Activity7DaysTaskCfgArray.Instance.GetCfg(day);
+            if(activity7DaysTaskCfg == null)
+            {
+                return false;
+            }
             var taskIdArr = activity7DaysTaskCfg.taskIdArr;
             foreach(int taskId in taskIdArr)
             {

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

@@ -35,8 +35,8 @@ namespace GFGGame
         public int CurFightIndex = 0;//当前挑战场次下标
         public List<long> myScore = new List<long>();//对战数据，三轮分数
         public List<long> targetScore = new List<long>();//对战数据，三轮分数
-        public List<long> myFightScore = new List<long>();//对战数据，竞技场战力，搭配战力,卓越点击战力,卡牌战力
-        public List<long> targetFightScore = new List<long>();//对战数据，对手竞技场战力，搭配战力,卓越点击战力,卡牌战力
+        public List<long> myFightPower = new List<long>();//对战数据，竞技场战力，搭配战力,卓越点击战力,卡牌战力
+        public List<long> targetFightPower = new List<long>();//对战数据，对手竞技场战力，搭配战力,卓越点击战力,卡牌战力
 
         /*************************************************************************************************************************************/
 
@@ -74,8 +74,8 @@ namespace GFGGame
             // TextureDic.Clear();
             myScore.Clear();
             targetScore.Clear();
-            myFightScore.Clear();
-            targetFightScore.Clear();
+            myFightPower.Clear();
+            targetFightPower.Clear();
             roundTime.Clear();
             targetRoundTime.Clear();
             // LastTargetInfo = null;

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

@@ -68,7 +68,7 @@ namespace GFGGame
             item.m_loaMyCard.m_comCardmask.m_loaCard.url = cardCfg == null ? "" : ResPathUtil.GetCardSmallPath(cardCfg.res);
             ItemCfg targetCardCfg = ItemCfgArray.Instance.GetCfg(targetCardId);
             item.m_loaTargetCard.m_comCardmask.m_loaCard.url = targetCardCfg == null ? "" : ResPathUtil.GetCardSmallPath(targetCardCfg.res);
-            RoleInfoManager.Instance.UpdateHead(item.m_comMyHead, myHeadId, myHeadBorderId);
+            RoleInfoManager.Instance.UpdateHead(item.m_comMyHead, RoleDataManager.headId, RoleDataManager.headBorderId);
             if (targetHeadId > 0)
             {
                 RoleInfoManager.Instance.UpdateHead(item.m_comTargetHead, targetHeadId, targetBorderId);
@@ -116,7 +116,7 @@ namespace GFGGame
             com.m_txtTargetFightScore.text = targetAllScore.ToString();
             UI_ComAllScore.ProxyEnd();
 
-            bool isWin = winCount >= 2;
+            bool isWin = myAllScore > targetAllScore;
             return isWin;
         }
         /// <summary>

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

@@ -124,7 +124,14 @@ namespace GFGGame
             _targetData.cardId = fightCfg.targetCardId;
             _targetData.cardScore = fightCfg.targetCardScore;
             _targetData.tags = fightCfg.needTagsArr;
-            _targetData.skillLvs = new List<int>(fightCfg.targetSkillLvsArr);
+
+            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_targetData.cardId);
+            _targetData.skillLvs.Clear();
+            for (int i = 0; i < skillCfgs.Count; i++)
+            {
+                _targetData.skillLvs.Add(fightCfg.targetSkillLvs);
+            }
+            _targetData.itemScoreList.Clear();
             for (int i = 0; i < fightCfg.targetPartsScoreArr.Length; i++)
             {
                 _targetData.itemScoreList.Add(fightCfg.targetPartsScoreArr[i]);

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

@@ -50,8 +50,8 @@ namespace GFGGame
         public bool GetActivityDay7Red()
         {
             //任务奖励
-            var currentDay = ActivityDay7DataManager.Instance.GetActivityDay7Day();
-            for (var day = currentDay; day > 0; day--)
+            var maxDay = ActivityDay7DataManager.Instance.GetActivityDay7MaxPassDay();
+            for (var day = maxDay; day > 0; day--)
             {
                 if (ActivityDay7DataManager.Instance.CheckActivityDay7TaskRewrdCanGetByDay(day))
                 {
@@ -70,14 +70,7 @@ namespace GFGGame
             return false;
         }
 
-        /// <summary>
-        /// 七天签到
-        /// </summary>
-        /// <returns></returns>
-        public bool GetDailyLoginRed()
-        {
-            return ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET;
-        }
+
 
         /// <summary>
         /// 有邮件未读或未领奖励
@@ -434,25 +427,7 @@ namespace GFGGame
             }
             return false;
         }
-        /// <summary>
-        /// 限时累充可领奖励红点
-        /// </summary>
-        /// <returns></returns>
-        public bool GetLimiteChargeRewardRed()
-        {
-            if (ActivityDataManager.Instance.actLimitChargeId == 0) return false;
-            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
-            if (_activityInfo == null) return false;
-            List<ActivityRechargeCfg> _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(ActivityDataManager.Instance.actLimitChargeId);
-            for (int i = 0; i < _rechargeCfgs.Count; i++)
-            {
-                if (_activityInfo.CountValue >= _rechargeCfgs[i].value && _activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) < 0)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
+
         /// <summary>
         /// 限时抽奖活动奖励
         /// </summary>
@@ -556,6 +531,77 @@ namespace GFGGame
         //
         //     return false;
         // }
+        /// <summary>
+        /// 福利大厅
+        /// </summary>
+        /// <returns></returns>
+        public bool GetDailyWelfareRed()
+        {
+            return GetLimiteChargeRewardRed() || GetSevenDayLoginRed() || DailySignRed() || DailySupplyRed();
+        }
+        /// <summary>
+        ///福利大厅-限时累充可领奖励红点
+        /// </summary>
+        /// <returns></returns>
+        public bool GetLimiteChargeRewardRed()
+        {
+            if (ActivityDataManager.Instance.actLimitChargeId == 0) return false;
+            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
+            if (_activityInfo == null) return false;
+            List<ActivityRechargeCfg> _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(ActivityDataManager.Instance.actLimitChargeId);
+            for (int i = 0; i < _rechargeCfgs.Count; i++)
+            {
+                if (_activityInfo.CountValue >= _rechargeCfgs[i].value && _activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) < 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        /// <summary>
+        /// 福利大厅-七天登录
+        /// </summary>
+        /// <returns></returns>
+        public bool GetSevenDayLoginRed()
+        {
+            return ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET;
+        }
+        /// <summary>
+        /// 福利大厅-每日签到
+        /// </summary>
+        /// <returns></returns>
+        public bool DailySignRed()
+        {
+            int _signCount = MathHelper.CountOnes(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignDay));
+            List<DailySignCfg> signCfgs = DailySignCfgArray.Instance.GetCfgsBymonth(TimeUtil.GetCurMonth());
+            for (int i = 0; i < signCfgs.Count; i++)
+            {
+                bool isGot = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignReward), signCfgs[i].day);
+                if (_signCount >= signCfgs[i].day && !isGot) return true;
+            }
+            return !MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignDay), TimeUtil.GetCurDay());
+        }
+        /// <summary>
+        /// 福利大厅-每日补给
+        /// </summary>
+        /// <returns></returns>
+        public bool DailySupplyRed()
+        {
+            for (int i = 0; i < DailySupplyCfgArray.Instance.dataArray.Length; i++)
+            {
+                DailySupplyCfg supplyCfg = DailySupplyCfgArray.Instance.dataArray[i];
+                long openTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.openTime).ToString("HH:mm:ss"));
+                long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.endTime).ToString("HH:mm:ss"));
+
+                bool isGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.DailySupplyReward), supplyCfg.id);
 
+                long curTime = TimeHelper.ServerNow();
+                if (!isGet && curTime > openTime && curTime < endTime)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

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

@@ -23,6 +23,7 @@ namespace GFGGame
         public const int PART_PREFACT_CLICK = 8;//每次优秀点击
         public const int PART_FIGHT_BEGIN = 9;//每回合开始
         public const int PART_FIGHT_END = 10;//每回合结束
+        public const int ALL_PERFECT_START = 11;//登封造极开始
     }
 
 
@@ -300,6 +301,7 @@ namespace GFGGame
           || skillLvlCfg.beginTime == BeginTime.PART_PREFACT_CLICK && currentTime == BeginTime.PART_PREFACT_CLICK
           || skillLvlCfg.beginTime == BeginTime.PART_FIGHT_BEGIN && currentTime == BeginTime.PART_FIGHT_BEGIN
           || skillLvlCfg.beginTime == BeginTime.PART_FIGHT_END && currentTime == BeginTime.PART_FIGHT_END
+          || skillLvlCfg.beginTime == BeginTime.ALL_PERFECT_START && currentTime == BeginTime.ALL_PERFECT_START
           || skillLvlCfg.beginTime <= BeginTime.PART_SCORE_6 && currentTime == BeginTime.PART_FIGHT_BEGIN && partId == skillLvlCfg.beginTime)
             {
                 return true;

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

@@ -9,7 +9,7 @@ namespace GFGGame
         public int Type; //类型，由FightTargetType定义
         public OtherRoleInfoData RoleInfo = new OtherRoleInfoData(); //玩家数据
         public List<FightData> FightDatas = new List<FightData>();//搭配列表，与RobotDressupList只能存在一个，取决于Type
-        public List<long> FightScores = new List<long>();//搭配战力,卓越点击战力,卡牌战力
+        public List<long> FightPower = new List<long>();//搭配战力,卓越点击战力,卡牌战力
 
     }
 
@@ -24,7 +24,7 @@ namespace GFGGame
         public ArenaTargetData targetData;
         public List<long> MyScores = new List<long>();//自己3轮战斗分数
         public List<long> TargetScores = new List<long>();//对手3轮战斗分数
-        public List<long> FightScores = new List<long>();//自己 搭配战力,卓越点击战力,卡牌战力,对方的在targetData里
+        public List<long> FightPower = new List<long>();//自己 搭配战力,卓越点击战力,卡牌战力,对方的在targetData里
 
     }
 }

GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -192,9 +192,9 @@ namespace GFGGame
             TryRemoveObj(parentObj, BODY_SPRITE_NAME);
             if (!string.IsNullOrEmpty(actionRes))
             {
-                AddAnimationObj(actionRes, BODY_ANIMATION_NAME, parentObj, 0);
+                var addAniObj = AddAnimationObj(actionRes, BODY_ANIMATION_NAME, parentObj, 0);
                 //特效
-                TryAddEffectObj(actionRes, BODY_EFFECT_OBJ_NAME, parentObj, 0, false);
+                TryAddEffectObj(actionRes, BODY_EFFECT_OBJ_NAME, parentObj, 0, addAniObj != null);
             }
             else
             {

GameClient/Assets/Game/HotUpdate/Effect.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b35b8e2b0a0f19b4fb3a72e1d19c58c3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Effect/AutoRotation.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AutoRotation : MonoBehaviour
+{
+    public Vector3 EulerAngleSpeed;
+    public bool running = true;
+
+    void Update()
+    {
+        if (running && EulerAngleSpeed != Vector3.zero)
+        {
+            transform.localRotation = Quaternion.Euler(EulerAngleSpeed * Time.deltaTime) * transform.localRotation;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Effect/AutoRotation.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxBonusUI.cs

@@ -7,7 +7,8 @@ namespace UI.ActivityThemeLuckyBox
     public partial class UI_ActivityThemeLuckyBoxBonusUI
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public GImage m_imgBg;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://ubfk2kobmbf16";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
@@ -56,12 +57,14 @@ namespace UI.ActivityThemeLuckyBox
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
+            m_imgBg = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.cs

@@ -7,7 +7,8 @@ namespace UI.ActivityThemeLuckyBox
     public partial class UI_ActivityThemeLuckyBoxTaskUI
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public GImage m_imgBg;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://ubfk2kobmbf1d";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
@@ -56,12 +57,14 @@ namespace UI.ActivityThemeLuckyBox
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
+            m_imgBg = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_BtnStyle006
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public const string URL = "ui://eg2y0ldpvolstng";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "BtnStyle006";
+        private static UI_BtnStyle006 _proxy;
+
+        public static UI_BtnStyle006 Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnStyle006();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BtnStyle006 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnStyle006();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -7,6 +7,7 @@ namespace UI.CommonGame
     public partial class UI_ComBg000
     {
         public GComponent target;
+        public GImage m_imgBg;
         public GButton m_btnClose;
         public GTextField m_txtTitle;
         public const string URL = "ui://eg2y0ldpqik1tcb";
@@ -56,11 +57,13 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_imgBg = (GImage)comp.GetChild("imgBg");
             m_btnClose = (GButton)comp.GetChild("btnClose");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_imgBg = null;
             m_btnClose = null;
             m_txtTitle = null;
             if(disposeTarget && target != null)

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

@@ -7,7 +7,8 @@ namespace UI.CommonGame
     public partial class UI_ComBg001
     {
         public GComponent target;
-        public GButton m_btnClose;
+        public GImage m_imgBg;
+        public UI_Component2 m_btnClose;
         public GLoader m_loaTitle;
         public const string URL = "ui://eg2y0ldpmbf1tn5";
         public const string PACKAGE_NAME = "CommonGame";
@@ -56,11 +57,14 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (UI_Component2)UI_Component2.Create(comp.GetChild("btnClose"));
             m_loaTitle = (GLoader)comp.GetChild("loaTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_imgBg = null;
+            m_btnClose.Dispose();
             m_btnClose = null;
             m_loaTitle = null;
             if(disposeTarget && target != null)

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

@@ -7,10 +7,9 @@ namespace UI.CommonGame
     public partial class UI_ComTipsBase
     {
         public GComponent target;
-        public GTextField m_txtName;
-        public GTextField m_txtOwned;
         public GLoader m_loaIcon;
         public GLoader m_loaRarity;
+        public GTextField m_txtOwned;
         public GTextField m_txtDesc;
         public GTextField m_txtGong;
         public GTextField m_txtShang;
@@ -66,10 +65,9 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtGong = (GTextField)comp.GetChild("txtGong");
             m_txtShang = (GTextField)comp.GetChild("txtShang");
@@ -81,10 +79,9 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtName = null;
-            m_txtOwned = null;
             m_loaIcon = null;
             m_loaRarity = null;
+            m_txtOwned = null;
             m_txtDesc = null;
             m_txtGong = null;
             m_txtShang = null;

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_Component2
+    {
+        public GComponent target;
+        public GButton m_btnClose;
+        public const string URL = "ui://eg2y0ldpe050tob";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "Component2";
+        private static UI_Component2 _proxy;
+
+        public static UI_Component2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component2();
+            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_Component2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component2();
+            }
+            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_btnClose = (GButton)comp.GetChild("btnClose");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnClose = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -7,7 +7,7 @@ namespace UI.CommonGame
     public partial class UI_GoodsItemTips
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public UI_ComBg000 m_comBg;
         public UI_ComTipsBase m_comTipsBase;
         public UI_ComTipsApproach m_comTipsApproach;
         public GGroup m_grpTips;
@@ -58,13 +58,14 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_comBg = (UI_ComBg000)UI_ComBg000.Create(comp.GetChild("comBg"));
             m_comTipsBase = (UI_ComTipsBase)UI_ComTipsBase.Create(comp.GetChild("comTipsBase"));
             m_comTipsApproach = (UI_ComTipsApproach)UI_ComTipsApproach.Create(comp.GetChild("comTipsApproach"));
             m_grpTips = (GGroup)comp.GetChild("grpTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_comBg.Dispose();
             m_comBg = null;
             m_comTipsBase.Dispose();
             m_comTipsBase = null;

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

@@ -7,12 +7,12 @@ namespace UI.CommonGame
     public partial class UI_ItemExchangeUI
     {
         public GComponent target;
-        public GTextField m_txtOwned;
+        public UI_ComBg000 m_comBg;
         public GLoader m_loaRarity;
         public GLoader m_loaIcon;
-        public GTextField m_txtDesc;
         public GTextField m_txtExchangeCount;
-        public GTextField m_txtName;
+        public GTextField m_txtOwned;
+        public GTextField m_txtDesc;
         public GList m_listItem;
         public GTextField m_txtShow;
         public UI_Button2 m_btnMinus;
@@ -71,12 +71,12 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_comBg = (UI_ComBg000)UI_ComBg000.Create(comp.GetChild("comBg"));
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtExchangeCount = (GTextField)comp.GetChild("txtExchangeCount");
-            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_listItem = (GList)comp.GetChild("listItem");
             m_txtShow = (GTextField)comp.GetChild("txtShow");
             m_btnMinus = (UI_Button2)UI_Button2.Create(comp.GetChild("btnMinus"));
@@ -91,12 +91,13 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtOwned = null;
+            m_comBg.Dispose();
+            m_comBg = null;
             m_loaRarity = null;
             m_loaIcon = null;
-            m_txtDesc = null;
             m_txtExchangeCount = null;
-            m_txtName = null;
+            m_txtOwned = null;
+            m_txtDesc = null;
             m_listItem = null;
             m_txtShow = null;
             m_btnMinus.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_Component1.cs

@@ -10,6 +10,7 @@ namespace UI.DressUp
         public Controller m_c1;
         public GTextField m_txtNeedName;
         public GList m_listTag;
+        public GImage m_imgGot;
         public const string URL = "ui://mbo439wbpjip31";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "Component1";
@@ -60,12 +61,14 @@ namespace UI.DressUp
             m_c1 = comp.GetController("c1");
             m_txtNeedName = (GTextField)comp.GetChild("txtNeedName");
             m_listTag = (GList)comp.GetChild("listTag");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_txtNeedName = null;
             m_listTag = null;
+            m_imgGot = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs

@@ -18,8 +18,10 @@ namespace UI.LuckyBox
         public UI_ComCost m_comCostTen;
         public GButton m_btnBuyOne;
         public GButton m_btnBuyTen;
-        public GImage m_imgSpecial;
         public GTextField m_txtRemainTimes;
+        public GImage m_imgSpecial;
+        public GGraph m_holder;
+        public GGroup m_grpSpecial;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
@@ -78,8 +80,10 @@ namespace UI.LuckyBox
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
             m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
             m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
-            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -97,8 +101,10 @@ namespace UI.LuckyBox
             m_comCostTen = null;
             m_btnBuyOne = null;
             m_btnBuyTen = null;
-            m_imgSpecial = null;
             m_txtRemainTimes = null;
+            m_imgSpecial = null;
+            m_holder = null;
+            m_grpSpecial = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Component2.cs

@@ -8,6 +8,7 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public Controller m_c1;
+        public GGraph m_holder;
         public GLoader m_icon;
         public GLoader m_rarity;
         public GImage m_imgNew;
@@ -60,6 +61,7 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_holder = (GGraph)comp.GetChild("holder");
             m_icon = (GLoader)comp.GetChild("icon");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_imgNew = (GImage)comp.GetChild("imgNew");
@@ -68,6 +70,7 @@ namespace UI.LuckyBox
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_holder = null;
             m_icon = null;
             m_rarity = null;
             m_imgNew = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusShowUI.cs

@@ -0,0 +1,136 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_LuckBoxBonusShowUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaBg;
+        public GGraph m_holder_star;
+        public GGraph m_holder_bg;
+        public GGraph m_holder_cloud;
+        public UI_LuckyBoxBonusShowItem m_itemOne;
+        public UI_LuckyBoxBonusShowItem m_item0;
+        public UI_LuckyBoxBonusShowItem m_item1;
+        public UI_LuckyBoxBonusShowItem m_item2;
+        public UI_LuckyBoxBonusShowItem m_item3;
+        public UI_LuckyBoxBonusShowItem m_item4;
+        public UI_LuckyBoxBonusShowItem m_item5;
+        public UI_LuckyBoxBonusShowItem m_item6;
+        public UI_LuckyBoxBonusShowItem m_item7;
+        public UI_LuckyBoxBonusShowItem m_item8;
+        public UI_LuckyBoxBonusShowItem m_item9;
+        public GGroup m_grpItems;
+        public Transition m_t0;
+        public Transition m_t1;
+        public const string URL = "ui://drx9d1use050tf3";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "LuckBoxBonusShowUI";
+        private static UI_LuckBoxBonusShowUI _proxy;
+
+        public static UI_LuckBoxBonusShowUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LuckBoxBonusShowUI();
+            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_LuckBoxBonusShowUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LuckBoxBonusShowUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_holder_star = (GGraph)comp.GetChild("holder_star");
+            m_holder_bg = (GGraph)comp.GetChild("holder_bg");
+            m_holder_cloud = (GGraph)comp.GetChild("holder_cloud");
+            m_itemOne = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("itemOne"));
+            m_item0 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item0"));
+            m_item1 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item1"));
+            m_item2 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item2"));
+            m_item3 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item3"));
+            m_item4 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item4"));
+            m_item5 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item5"));
+            m_item6 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item6"));
+            m_item7 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item7"));
+            m_item8 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item8"));
+            m_item9 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item9"));
+            m_grpItems = (GGroup)comp.GetChild("grpItems");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaBg = null;
+            m_holder_star = null;
+            m_holder_bg = null;
+            m_holder_cloud = null;
+            m_itemOne.Dispose();
+            m_itemOne = null;
+            m_item0.Dispose();
+            m_item0 = null;
+            m_item1.Dispose();
+            m_item1 = null;
+            m_item2.Dispose();
+            m_item2 = null;
+            m_item3.Dispose();
+            m_item3 = null;
+            m_item4.Dispose();
+            m_item4 = null;
+            m_item5.Dispose();
+            m_item5 = null;
+            m_item6.Dispose();
+            m_item6 = null;
+            m_item7.Dispose();
+            m_item7 = null;
+            m_item8.Dispose();
+            m_item8 = null;
+            m_item9.Dispose();
+            m_item9 = null;
+            m_grpItems = null;
+            m_t0 = null;
+            m_t1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusShowUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusShowItem.cs

@@ -0,0 +1,75 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_LuckyBoxBonusShowItem
+    {
+        public GComponent target;
+        public UI_Component2 m_comIcon;
+        public Transition m_t0;
+        public const string URL = "ui://drx9d1use050tf4";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "LuckyBoxBonusShowItem";
+        private static UI_LuckyBoxBonusShowItem _proxy;
+
+        public static UI_LuckyBoxBonusShowItem Create(GObject gObject = null)
+        {
+            var ui = new UI_LuckyBoxBonusShowItem();
+            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_LuckyBoxBonusShowItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LuckyBoxBonusShowItem();
+            }
+            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_comIcon = (UI_Component2)UI_Component2.Create(comp.GetChild("comIcon"));
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comIcon.Dispose();
+            m_comIcon = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusShowItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxNewDressUI.cs

@@ -8,6 +8,9 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GGraph m_holder_star;
+        public GGraph m_holder_bg;
+        public GGraph m_holder_cloud;
         public UI_ComCard m_comCard;
         public GButton m_btnPass;
         public Transition m_t_open;
@@ -60,6 +63,9 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_holder_star = (GGraph)comp.GetChild("holder_star");
+            m_holder_bg = (GGraph)comp.GetChild("holder_bg");
+            m_holder_cloud = (GGraph)comp.GetChild("holder_cloud");
             m_comCard = (UI_ComCard)UI_ComCard.Create(comp.GetChild("comCard"));
             m_btnPass = (GButton)comp.GetChild("btnPass");
             m_t_open = comp.GetTransition("t_open");
@@ -68,6 +74,9 @@ namespace UI.LuckyBox
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_holder_star = null;
+            m_holder_bg = null;
+            m_holder_cloud = null;
             m_comCard.Dispose();
             m_comCard = null;
             m_btnPass = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs

@@ -10,6 +10,9 @@ namespace UI.LuckyBox
         public Controller m_ctrlBuyType;
         public Controller m_ctrlRewardsType;
         public GLoader m_bg;
+        public GGraph m_holder_star;
+        public GGraph m_holder_bg;
+        public GGraph m_holder_cloud;
         public GButton m_btnBack;
         public UI_ComStar m_comStar0_0_0;
         public UI_ComStar m_comStar0_1_0;
@@ -34,6 +37,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_1_6;
         public UI_ComStar m_comStar1_1_7;
         public UI_ComStar m_comStar1_1_8;
+        public UI_ComStar m_comStar1_1_9;
         public GGroup m_grpComStar1;
         public UI_ComStar m_comStar1_2_0;
         public UI_ComStar m_comStar1_2_1;
@@ -44,6 +48,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_2_6;
         public UI_ComStar m_comStar1_2_7;
         public UI_ComStar m_comStar1_2_8;
+        public UI_ComStar m_comStar1_2_9;
         public GGroup m_grpComStar2;
         public GMovieClip m_effEnd;
         public const string URL = "ui://drx9d1usl5nzm";
@@ -96,6 +101,9 @@ namespace UI.LuckyBox
             m_ctrlBuyType = comp.GetController("ctrlBuyType");
             m_ctrlRewardsType = comp.GetController("ctrlRewardsType");
             m_bg = (GLoader)comp.GetChild("bg");
+            m_holder_star = (GGraph)comp.GetChild("holder_star");
+            m_holder_bg = (GGraph)comp.GetChild("holder_bg");
+            m_holder_cloud = (GGraph)comp.GetChild("holder_cloud");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_comStar0_0_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar0_0_0"));
             m_comStar0_1_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar0_1_0"));
@@ -120,6 +128,7 @@ namespace UI.LuckyBox
             m_comStar1_1_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_6"));
             m_comStar1_1_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_7"));
             m_comStar1_1_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_8"));
+            m_comStar1_1_9 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_9"));
             m_grpComStar1 = (GGroup)comp.GetChild("grpComStar1");
             m_comStar1_2_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_0"));
             m_comStar1_2_1 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_1"));
@@ -130,6 +139,7 @@ namespace UI.LuckyBox
             m_comStar1_2_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_6"));
             m_comStar1_2_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_7"));
             m_comStar1_2_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_8"));
+            m_comStar1_2_9 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_9"));
             m_grpComStar2 = (GGroup)comp.GetChild("grpComStar2");
             m_effEnd = (GMovieClip)comp.GetChild("effEnd");
         }
@@ -138,6 +148,9 @@ namespace UI.LuckyBox
             m_ctrlBuyType = null;
             m_ctrlRewardsType = null;
             m_bg = null;
+            m_holder_star = null;
+            m_holder_bg = null;
+            m_holder_cloud = null;
             m_btnBack = null;
             m_comStar0_0_0.Dispose();
             m_comStar0_0_0 = null;
@@ -184,6 +197,8 @@ namespace UI.LuckyBox
             m_comStar1_1_7 = null;
             m_comStar1_1_8.Dispose();
             m_comStar1_1_8 = null;
+            m_comStar1_1_9.Dispose();
+            m_comStar1_1_9 = null;
             m_grpComStar1 = null;
             m_comStar1_2_0.Dispose();
             m_comStar1_2_0 = null;
@@ -203,6 +218,8 @@ namespace UI.LuckyBox
             m_comStar1_2_7 = null;
             m_comStar1_2_8.Dispose();
             m_comStar1_2_8 = null;
+            m_comStar1_2_9.Dispose();
+            m_comStar1_2_9 = null;
             m_grpComStar2 = null;
             m_effEnd = null;
             if(disposeTarget && target != null)

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

@@ -7,7 +7,8 @@ namespace UI.Store
     public partial class UI_StoreBlackCardRewardUI
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public GImage m_imgBg;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://p9mtgheoqik1tc8";
         public const string PACKAGE_NAME = "Store";
@@ -56,12 +57,14 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
+            m_imgBg = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs

@@ -63,6 +63,16 @@
             }
         }
 
+        public static void Pay(int buyID, int count)
+        {
+            switch (LauncherConfig.ChannelId)
+            {
+                default:
+
+                    break;
+            }
+        }
+
         public static void Logout()
         {
             switch (LauncherConfig.ChannelId)
@@ -96,5 +106,13 @@
                 return LauncherConfig.ChannelId == ChannelID.BiliBili;
             }
         }
+
+        public static bool IsHuaWei
+        {
+            get
+            {
+                return LauncherConfig.ChannelId == ChannelID.HUAWEI;
+            }
+        }
     }
 }

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

@@ -47,7 +47,7 @@ namespace GFGGame
 
                     BonusController.TryShowBonusList(rewards);
 
-
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }

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

@@ -351,7 +351,7 @@ namespace GFGGame
             arenaHistory.Grade = arenaHistoryProto.Grade;
             arenaHistory.Rank = arenaHistoryProto.Rank;
             arenaHistory.targetData = GetArenaTargetData(arenaHistoryProto.target);
-            arenaHistory.FightScores = arenaHistoryProto.SelfFightPower;
+            arenaHistory.FightPower = arenaHistoryProto.SelfFightPower;
             arenaHistory.GradeChangeType = arenaHistoryProto.GradeChangeType;
             arenaHistory.MyScores = arenaHistoryProto.SelfRandScore;
             arenaHistory.TargetScores = arenaHistoryProto.TargetRandScore;
@@ -365,7 +365,7 @@ namespace GFGGame
             arenaTarget.Grade = arenaTargetProto.Grade;
             arenaTarget.RankInGrade = arenaTargetProto.RankInGrade;
             arenaTarget.Type = arenaTargetProto.Type;
-            arenaTarget.FightScores = arenaTargetProto.FightPower;
+            arenaTarget.FightPower = arenaTargetProto.FightPower;
             if (arenaTarget.Type == FightTargetType.PLAYER)
             {
                 arenaTarget.RoleInfo = RoleDataManager.GetOtherRoleInfoData(arenaTargetProto.RoleInfo);
@@ -438,7 +438,9 @@ namespace GFGGame
             fightData.res = string.IsNullOrEmpty(robotProto.RobotHead) ? "self" : robotProto.RobotHead;
             double cardScore = (double)robotCfg.cardScore * randoms;
             fightData.cardScore = (int)Math.Ceiling(cardScore);
+
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(fightData.cardId);
+            fightData.skillLvs.Clear();
             for (int i = 0; i < skillCfgs.Count; i++)
             {
                 fightData.skillLvs.Add(robotCfg.skillLvs);

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

@@ -17,6 +17,7 @@ namespace GFGGame
                     // DailyWelfareManager.Instance.DailySignDatas.Add(DateTime.Now.Day);
                     List<ItemData> bonus = ItemUtil.CreateItemDataList(response.reward);
                     BonusController.TryShowBonusList(bonus);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }
@@ -51,6 +52,7 @@ namespace GFGGame
                     // DailyWelfareManager.Instance.AccumulatedSignDatas.Add(day);
                     List<ItemData> bonus = ItemUtil.CreateItemDataList(response.reward);
                     BonusController.TryShowBonusList(bonus);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }
@@ -68,6 +70,7 @@ namespace GFGGame
                     // DailyWelfareManager.Instance.SupplyRewardDatas.Add(id);
                     DailySupplyCfg supplyCfg = DailySupplyCfgArray.Instance.GetCfg(id);
                     BonusController.TryShowBonusList(supplyCfg.bonusArr);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }

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

@@ -151,6 +151,11 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     RoleDataManager.headId = response.HeadItemId;
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
+                    {
+                        LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].RoleInfo.headId = RoleDataManager.headId;
+                    }
+
                     EventAgent.DispatchEvent(ConstMessage.CHANGE_ROLE_HEAD);
                     return true;
                 }
@@ -167,6 +172,10 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     RoleDataManager.headBorderId = response.HeadBorderItemId;
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
+                    {
+                        LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].RoleInfo.headBorderId = RoleDataManager.headBorderId;
+                    }
                     EventAgent.DispatchEvent(ConstMessage.CHANGE_ROLE_HEAD);
                     return true;
                 }

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

@@ -126,18 +126,18 @@ namespace GFGGame
             return VEngine.Versions.Contains(resPath);
         }
 
-        public static string GetDressUpEffectDirPath(string res, bool inAni = false)
+        public static string GetDressUpEffectDirPath(string res)
         {
-            if (inAni)
-            {
-                return $"{EFFECT_DIR_PATH}/DressUpAni/{res}";
-            }
             return $"{EFFECT_DIR_PATH}/DressUp/{res}";
         }
 
         public static string GetDressUpEffectPath(string res, bool inAniDir = false, string extName = "prefab")
         {
-            return $"{GetDressUpEffectDirPath(res, inAniDir)}/{res}.{extName}";
+            if(inAniDir)
+            {
+                return $"{GetDressUpEffectDirPath(res)}/{res}2.{extName}";
+            }
+            return $"{GetDressUpEffectDirPath(res)}/{res}.{extName}";
         }
         public static string GetViewEffectPath(string uiName, string resName, string extName = "prefab")
         {

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -55,9 +55,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            var min = Math.Min(Activity7DaysTaskCfgArray.Instance.dataArray.Length,
-                ActivityDay7DataManager.Instance.GetActivityDay7Day());
-            onClickDayIndex = Math.Max(0, min - 1);
+            var maxDay = ActivityDay7DataManager.Instance.GetActivityDay7MaxPassDay();
+            onClickDayIndex = Math.Max(0, maxDay - 1);
             SetScoreList();
             SetScore();
             SetDayList();
@@ -134,7 +133,7 @@ namespace GFGGame
         {
             if (!(context.sender is GObject typeItem)) return;
             //检查天数
-            var day = ActivityDay7DataManager.Instance.GetActivityDay7Day();
+            var day = ActivityDay7DataManager.Instance.GetActivityDay7MaxPassDay();
             if (day < (int)typeItem.data + 1)
             {
                 PromptController.Instance.ShowFloatTextPrompt("未到开启时间");

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs

@@ -32,6 +32,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_btnClose.onClick.Add(Hide);
 
         }
         protected override void AddEventListener()

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -3,6 +3,7 @@ using ET;
 using FairyGUI;
 using UI.ActivityThemeLuckyBox;
 using UnityEngine;
+using UI.CommonGame;
 
 namespace GFGGame
 {
@@ -32,7 +33,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.itemRenderer = RenderListItem;
-
+            _ui.m_btnClose.onClick.Add(Hide);
         }
         protected override void AddEventListener()
         {

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaFightRecordView.cs

@@ -63,7 +63,7 @@ namespace GFGGame
             item.m_txtTargetName.text = historyData.targetData.RoleInfo.roleName;
             item.m_txtRank.text = historyData.targetData.RankInGrade.ToString();
 
-            item.m_txtTargetFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(historyData.targetData.FightScores));
+            item.m_txtTargetFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(historyData.targetData.FightPower));
             ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, historyData.targetData.Grade);
             TimeUtil.FormattingTime(historyData.FightTime, TimeHelper.ServerNow(), out int num, out string str);
             str = str == "秒" ? "刚刚" : num + str + "前";

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankView.cs

@@ -242,7 +242,7 @@ namespace GFGGame
                 if (arenaData.Type == FightTargetType.PLAYER)
                 {
                     //上榜的玩家一定战斗过，可以直接计算
-                    item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores));
+                    item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightPower));
                     RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
                 }
                 else
@@ -300,10 +300,10 @@ namespace GFGGame
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
                 if (arenaData.Type == FightTargetType.PLAYER)
                 {
-                    long fightScore = _rankType != ArenaRankType.LAST_SEASON && rank > 100 && isSelf ? ArenaDataManager.Instance.GetAllFightScore(ArenaDataManager.Instance.DressupList) : ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores);
+                    long fightScore = _rankType != ArenaRankType.LAST_SEASON && rank > 100 && isSelf ? ArenaDataManager.Instance.GetAllFightScore(ArenaDataManager.Instance.DressupList) : ArenaDataManager.Instance.GetAllFightScore(arenaData.FightPower);
                     //上榜的玩家一定战斗过，可以直接计算
                     item.m_txtFightScore.text = string.Format("飞花令战力：{0}", fightScore);
-                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
+                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.roleId == RoleDataManager.roleId ? RoleDataManager.headId : arenaData.RoleInfo.headId, arenaData.RoleInfo.roleId == RoleDataManager.roleId ? RoleDataManager.headBorderId : arenaData.RoleInfo.headBorderId);
                 }
                 else
                 {