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

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

FGUIProject/assets/Card/CardFilterUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,938">
+<component size="962,938">
   <displayList>
-    <image id="n0_pq5x" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,938">
+    <component id="n0_pq5x" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,938">
       <relation target="" sidePair="center-center,middle-middle"/>
-    </image>
+    </component>
     <component id="n1_pq5x" name="n1" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="45,72" group="n4_pq5x">
       <property target="txtName" propertyId="0" value="人物"/>
     </component>

FGUIProject/assets/Card/CardSkillUI.xml

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,1032">
+<component size="962,1032">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_rhha" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,-1" size="936,1032">
+    <component id="n0_rhha" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,-1" size="962,1032">
       <relation target="" sidePair="center-center,middle-middle"/>
-    </image>
-    <image id="n4_rhha" name="n4" src="j48o99" fileName="images/kp_sjsj_di_3.png" pkg="eg2y0ldp" xy="372,38" group="n6_rhha"/>
-    <text id="n3_rhha" name="txtName" xy="467,225" pivot="0.5,0" anchor="true" size="112,49" group="n6_rhha" fontSize="36" color="#85756d" text="赵钱孙"/>
-    <component id="n7_rhha" name="comSkill" src="rhha9l" fileName="components/ComSkill.xml" xy="379,45" size="177,177" group="n6_rhha" aspect="true"/>
-    <group id="n6_rhha" name="n6" xy="372,38" size="192,236"/>
-    <component id="n9_rhha" name="comCurLV" src="rhha9q" fileName="ComSkillDiscribe.xml" xy="50,295"/>
-    <component id="n10_rhha" name="comNextLv" src="rhha9q" fileName="ComSkillDiscribe.xml" xy="50,423" group="n17_mza1"/>
-    <image id="n12_rhha" name="n12" src="pq5x6d" fileName="images/kp_bz_1.png" pkg="eg2y0ldp" xy="60,596" group="n17_mza1"/>
-    <text id="n13_rhha" name="n13" xy="98,578" size="148,49" group="n17_mza1" fontSize="36" color="#876e54" text="升级消耗"/>
-    <list id="n14_rhha" name="listConsume" xy="25,658" pivot="0.5,0" size="884,191" group="n17_mza1" aspect="true" layout="row" overflow="hidden" colGap="160" defaultItem="ui://7l6lvkaywr9a82" align="center" vAlign="middle">
+    </component>
+    <image id="n4_rhha" name="n4" src="j48o99" fileName="images/kp_sjsj_di_3.png" pkg="eg2y0ldp" xy="385,38" group="n6_rhha"/>
+    <text id="n3_rhha" name="txtName" xy="480,225" pivot="0.5,0" anchor="true" size="112,49" group="n6_rhha" fontSize="36" color="#85756d" text="赵钱孙"/>
+    <component id="n7_rhha" name="comSkill" src="rhha9l" fileName="components/ComSkill.xml" xy="392,45" size="177,177" group="n6_rhha" aspect="true"/>
+    <group id="n6_rhha" name="n6" xy="385,38" size="192,236"/>
+    <component id="n9_rhha" name="comCurLV" src="rhha9q" fileName="ComSkillDiscribe.xml" xy="63,295"/>
+    <component id="n10_rhha" name="comNextLv" src="rhha9q" fileName="ComSkillDiscribe.xml" xy="64,423" group="n17_mza1"/>
+    <image id="n12_rhha" name="n12" src="pq5x6d" fileName="images/kp_bz_1.png" pkg="eg2y0ldp" xy="74,596" group="n17_mza1"/>
+    <text id="n13_rhha" name="n13" xy="112,578" size="148,49" group="n17_mza1" fontSize="36" color="#876e54" text="升级消耗"/>
+    <list id="n14_rhha" name="listConsume" xy="39,658" pivot="0.5,0" size="884,191" group="n17_mza1" aspect="true" layout="row" overflow="hidden" colGap="160" defaultItem="ui://7l6lvkaywr9a82" align="center" vAlign="middle">
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n15_rhha" name="comConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="323,856" size="289,42" group="n17_mza1"/>
-    <component id="n16_rhha" name="btnUpLv" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="333,920" size="270,74" group="n17_mza1">
+    <component id="n15_rhha" name="comConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="337,856" size="289,42" group="n17_mza1"/>
+    <component id="n16_rhha" name="btnUpLv" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="347,920" size="270,74" group="n17_mza1">
       <Button title="升级"/>
     </component>
-    <group id="n17_mza1" name="n17" xy="25,423" size="884,571" advanced="true">
+    <group id="n17_mza1" name="n17" xy="39,423" size="884,571" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
     <text id="n18_mza1" name="n18" xy="326,596" size="284,54" fontSize="40" color="#736b64" text="当前技能已满级">

FGUIProject/assets/Card/CardUpUI.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,550">
+<component size="962,550">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n10_lc1j" name="n10" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,550"/>
-    <image id="n11_lc1j" name="n11" src="lc1j8y" fileName="images/sj_xian.png" xy="13,79"/>
-    <text id="n12_lc1j" name="txtTitle" xy="367,50" pivot="0.5,0" size="212,69" fontSize="52" color="#876e54" text="恭喜升级">
+    <component id="n10_lc1j" name="n10" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,550"/>
+    <image id="n11_lc1j" name="n11" src="lc1j8y" fileName="images/sj_xian.png" xy="26,79" group="n13_dhoa"/>
+    <text id="n12_lc1j" name="txtTitle" xy="380,50" pivot="0.5,0" size="212,69" group="n13_dhoa" fontSize="52" color="#876e54" text="恭喜升级">
       <gearText controller="c1" pages="1" values="恭喜升星" default="恭喜升级"/>
     </text>
-    <text id="n4_jzrr" name="txtLast" xy="402,230" pivot="1,0" anchor="true" size="117,64" group="n7_jzrr" fontSize="48" color="#876e54" text="Lv10"/>
-    <text id="n5_jzrr" name="txtNow" xy="534,230" size="117,64" group="n7_jzrr" fontSize="48" color="#d27869" text="Lv20"/>
-    <text id="n6_jzrr" name="n6" xy="466,231" pivot="0.5,0" anchor="true" size="62,64" group="n7_jzrr" fontSize="48" color="#949494" text="&gt;&gt;"/>
-    <group id="n7_jzrr" name="n7" xy="285,230" size="366,65"/>
-    <list id="n8_jzrr" name="listProperty" xy="59,389" size="860,68" layout="row" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
+    <group id="n13_dhoa" name="n13" xy="26,50" size="910,69"/>
+    <text id="n4_jzrr" name="txtLast" xy="415,230" pivot="1,0" anchor="true" size="117,64" group="n7_jzrr" fontSize="48" color="#876e54" text="Lv10"/>
+    <text id="n5_jzrr" name="txtNow" xy="547,230" size="117,64" group="n7_jzrr" fontSize="48" color="#d27869" text="Lv20"/>
+    <text id="n6_jzrr" name="n6" xy="479,231" pivot="0.5,0" anchor="true" size="62,64" group="n7_jzrr" fontSize="48" color="#949494" text="&gt;&gt;"/>
+    <group id="n7_jzrr" name="n7" xy="298,230" size="366,65"/>
+    <list id="n8_jzrr" name="listProperty" xy="65,389" size="860,68" layout="row" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/ClothingDecompose/ClothingDecomposeRuleUI.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,621">
+<component size="962,621">
   <displayList>
-    <loader id="n0_qyr6" name="loaBg" xy="1,1" size="936,621" url="ui://mk0fwx0xlwri5u" fill="scaleFree"/>
-    <image id="n3_qyr6" name="n3" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
-    <text id="n1_qyr6" name="txtTitle" xy="322,44" size="292,64" fontSize="48" color="#9b7853" text="服装分解规则"/>
-    <text id="n2_qyr6" name="txtRule" xy="61,158" size="804,46" fontSize="34" color="#aa865f" autoSize="height" text="分解多余的衣服可获得金币和分解材料1.2."/>
-    <list id="n4_qyr6" name="listReward" xy="-106,315" pivot="0.5,0.5" size="1149,264" scale="0.78,0.78" layout="row" colGap="40" defaultItem="ui://h9mv1l71wlc24" align="center">
+    <component id="n0_qyr6" name="loaBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="1,1" size="962,621"/>
+    <image id="n3_qyr6" name="n3" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
+    <text id="n1_qyr6" name="txtTitle" xy="335,44" size="292,64" fontSize="48" color="#9b7853" text="服装分解规则"/>
+    <text id="n2_qyr6" name="txtRule" xy="71,158" size="804,46" fontSize="34" color="#aa865f" autoSize="height" text="分解多余的衣服可获得金币和分解材料1.2."/>
+    <list id="n4_qyr6" name="listReward" xy="-93,315" pivot="0.5,0.5" size="1149,264" scale="0.78,0.78" layout="row" colGap="40" defaultItem="ui://h9mv1l71wlc24" align="center">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml

@@ -32,7 +32,9 @@
       <item/>
       <item/>
     </list>
-    <component id="n16_wlc2" name="btnDecompose" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="350,1553"/>
+    <component id="n16_wlc2" name="btnDecompose" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="368,1553">
+      <Button title="分解"/>
+    </component>
     <text id="n17_wlc2" name="txtConsume" xy="440,1506" pivot="0.5,0" size="199,41" fontSize="30" color="#da826e" align="center" text="消耗金币X200">
       <relation target="" sidePair="center-center"/>
     </text>

FGUIProject/assets/ClothingFoster/ClothingFosterUI.xml

@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,998">
+<component size="962,998">
   <displayList>
-    <image id="n11_bd1c" name="n11" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,998"/>
-    <text id="n12_bd1c" name="n12" xy="322,50" size="292,64" fontSize="48" color="#9b7853" text="属性提高比例"/>
-    <image id="n13_bd1c" name="n13" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
-    <text id="n1_py5g" name="txtDiscribe" xy="67,179" size="254,56" fontSize="42" color="#9b7853" text="完成套装浆洗"/>
-    <list id="n4_py5g" name="listPropertyAdd" xy="32,287" size="871,126" layout="row" colGap="20" defaultItem="ui://uicwtr5bpy5gt" align="center">
+    <component id="n11_bd1c" name="n11" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,998"/>
+    <text id="n12_bd1c" name="n12" xy="335,50" size="292,64" fontSize="48" color="#9b7853" text="属性提高比例"/>
+    <image id="n13_bd1c" name="n13" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
+    <text id="n1_py5g" name="txtDiscribe" xy="80,179" size="254,56" fontSize="42" color="#9b7853" text="完成套装浆洗"/>
+    <list id="n4_py5g" name="listPropertyAdd" xy="45,287" size="871,126" layout="row" colGap="20" defaultItem="ui://uicwtr5bpy5gt" align="center">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n8_py5g" name="listMaterials" xy="63,491" size="821,289" layout="row" colGap="32" defaultItem="ui://uicwtr5bpy5gu" align="center">
+    <list id="n8_py5g" name="listMaterials" xy="76,491" size="821,289" layout="row" colGap="32" defaultItem="ui://uicwtr5bpy5gu" align="center">
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n9_py5g" name="btnFoster" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,849"/>
-    <component id="n10_j5a5" name="ComConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="328,778"/>
+    <component id="n9_py5g" name="btnFoster" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,849">
+      <Button title="确定"/>
+    </component>
+    <component id="n10_j5a5" name="ComConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="341,778"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/ClothingRewardUI.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,1098">
+<component size="962,1098">
   <displayList>
-    <image id="n3_bd1c" name="n3" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,1098"/>
-    <list id="n2_py5g" name="listReward" xy="30,162" size="875,899" overflow="scroll" lineGap="30" defaultItem="ui://uicwtr5bpy5gw" align="center">
+    <component id="n3_bd1c" name="n3" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1098"/>
+    <list id="n2_py5g" name="listReward" xy="43,162" size="875,899" overflow="scroll" lineGap="30" defaultItem="ui://uicwtr5bpy5gw" align="center">
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n4_bd1c" name="n4" xy="370,50" size="196,64" fontSize="48" color="#9b7853" text="奖励领取"/>
-    <image id="n5_bd1c" name="n5" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
+    <text id="n4_bd1c" name="n4" xy="383,50" size="196,64" fontSize="48" color="#9b7853" text="奖励领取"/>
+    <image id="n5_bd1c" name="n5" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/ClothingropertyShowUI.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,621">
+<component size="962,621">
   <displayList>
-    <image id="n2_bd1c" name="n2" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,621"/>
-    <text id="n3_bd1c" name="n3" xy="322,50" size="292,64" fontSize="48" color="#9b7853" text="属性提高比例"/>
-    <image id="n4_bd1c" name="n4" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
-    <list id="n1_py5g" name="listPropertyShow" xy="-10,166" size="956,409" layout="flow_vt" lineGap="20" colGap="30" defaultItem="ui://uicwtr5bpy5gv" align="center">
+    <component id="n2_bd1c" name="n2" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,621"/>
+    <text id="n3_bd1c" name="n3" xy="335,50" size="292,64" fontSize="48" color="#9b7853" text="属性提高比例"/>
+    <image id="n4_bd1c" name="n4" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
+    <list id="n1_py5g" name="listPropertyShow" xy="3,166" size="956,409" layout="flow_vt" lineGap="20" colGap="30" defaultItem="ui://uicwtr5bpy5gv" align="center">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/ClothingShop/GalleryShopUI.xml

@@ -11,7 +11,7 @@
     <component id="n26_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="17,105" controller="c1,9"/>
     <image id="n19_r9ri" name="n19" src="r9rieh" fileName="images/jfsc_dik.png" xy="625,0"/>
     <image id="n22_r9ri" name="n22" src="r9ri6r" fileName="images/jfsc_xiantiao_1.png" xy="665,371" group="n21_r9ri"/>
-    <component id="n20_r9ri" name="btnBuy" src="r9ritjq" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="706,636" group="n21_r9ri">
+    <component id="n20_r9ri" name="btnBuy" src="r9ritjq" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="706,636" group="n21_r9ri">
       <Button title="兑换"/>
     </component>
     <text id="n23_r9ri" name="txtName" xy="680,310" size="216,59" group="n21_r9ri" font="ui://eg2y0ldpwonotja" fontSize="44" color="#b0884e" letterSpacing="-2" text="孔雀东南飞"/>

FGUIProject/assets/ClothingShop/components/CompItemInfo.xml

@@ -12,7 +12,7 @@
     <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="360,23" size="44,94" visible="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <text id="n32_hinb" name="txtOwned" xy="170,610" size="122,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/Button19.xml" pkg="eg2y0ldp" xy="83,652">
+    <component id="n20_hinb" name="btnBuy" src="r9ritjq" fileName="components/Button19.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">

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n1_j539" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n43_g3nf" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="36,220"/>
+    <component id="n43_g3nf" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
     <component id="n2_j539" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" pivot="1,0" controller="c1,6"/>
     <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,229" touchable="false">
       <relation target="" sidePair="middle-middle"/>
@@ -17,7 +17,7 @@
     </text>
     <group id="n46_v95q" name="n46" xy="146,343" size="78,418"/>
     <image id="n51_v95q" name="n51" src="v95q2c" fileName="images/hc_zzjsdi.png" xy="874,575" group="n53_v95q"/>
-    <text id="n52_v95q" name="n52" xy="911,633" size="122,42" group="n53_v95q" fontSize="30" color="#c09d6b" text="制作进度"/>
+    <text id="n52_v95q" name="n52" xy="911,633" size="122,41" group="n53_v95q" fontSize="30" color="#c09d6b" text="制作进度"/>
     <text id="n27_j539" name="txtProgress" xy="920,680" pivot="0.5,0" size="102,44" group="n53_v95q" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#d7847e" ubb="true" vars="true" text="10/20">
       <relation target="" sidePair="center-center"/>
     </text>
@@ -45,7 +45,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n21_j539" name="btnProduction" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="368,1435" group="n59_v95q">
+    <component id="n21_j539" name="btnProduction" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="368,1435" group="n59_v95q">
       <Button title="制作"/>
     </component>
     <component id="n48_v95q" name="comCostCurrency" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="418,1369" group="n59_v95q"/>

FGUIProject/assets/ClothingSynthetic/components/ClothingListItem.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="280,280" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
     <image id="n3_v95q" name="bg" src="ja9w1g" fileName="images/hc_kuang_2.png" xy="15,16"/>
     <loader id="n4_v95q" name="loaderIcon" xy="65,47" size="150,150" fill="scale" shrinkOnly="true"/>
     <image id="n5_v95q" name="imgOwned" src="j53912" fileName="images/hc_yyy.png" xy="20,117"/>
-    <text id="n6_v95q" name="txtName" xy="74,205" pivot="0.5,0" size="132,44" fontSize="32" color="#a58654" text="服装名称">
+    <text id="n6_v95q" name="txtName" xy="74,205" pivot="0.5,0" size="132,44" fontSize="32" color="#c98988" text="服装名称">
       <gearColor controller="button" pages="1" values="#c98988,#000000" default="#a58654,#000000"/>
     </text>
   </displayList>
-  <Button/>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/ClothingSynthetic/components/MateriasListItem.xml

@@ -13,8 +13,8 @@
       <gearColor controller="button" default="#c8807b,#000000"/>
       <relation target="" sidePair="center-center"/>
     </text>
-    <text id="n7_v95q" name="txtProgess" xy="73,239" pivot="0.5,0.5" size="123,46" fontSize="34" color="#b26b65" letterSpacing="-1" text="100/10">
-      <gearColor controller="button" default="#b26b65,#000000"/>
+    <text id="n7_v95q" name="txtProgess" xy="73,239" pivot="0.5,0.5" size="123,46" fontSize="34" color="#9b7642" letterSpacing="-1" text="100/10">
+      <gearColor controller="button" pages="0" values="#9b7642,#000000" default="#b26b65,#000000"/>
     </text>
   </displayList>
   <Button mode="Radio"/>

FGUIProject/assets/Common/AlertUI.xml

@@ -4,24 +4,21 @@
     <graph id="n6_a8jv" name="graphBg" xy="0,0" size="1080,1920" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <image id="n0_l55o" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" xy="72,766" size="936,388" group="n8_a8jv">
+    <component id="n0_l55o" name="bg" src="si5ztih" fileName="components/ComBg.xml" xy="59,766" size="962,388" pkg="mgs5yrnj">
       <relation target="n5_l55o" sidePair="height-height"/>
-    </image>
-    <text id="n5_l55o" name="txtContent" xy="183,853" size="714,49" group="n8_a8jv" fontSize="36" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="解锁后的照片可随意删除"/>
-    <text id="n9_uyux" name="txtTips" xy="183,912" size="714,41" group="n8_a8jv" fontSize="30" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="（解锁后的照片可随意删除）">
+    </component>
+    <text id="n5_l55o" name="txtContent" xy="170,853" size="740,49" fontSize="36" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="解锁后的照片可随意删除"/>
+    <text id="n9_uyux" name="txtTips" xy="170,912" size="740,41" fontSize="30" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="（解锁后的照片可随意删除）">
       <relation target="n5_l55o" sidePair="top-bottom"/>
     </text>
-    <component id="n3_l55o" name="btnLeft" src="q08x6" fileName="components/Button1.xml" xy="126,1004" group="n8_a8jv">
+    <component id="n3_l55o" name="btnLeft" src="r9ritjh" fileName="components/Button18.xml" xy="147,1019">
       <relation target="n0_l55o" sidePair="bottom-bottom"/>
       <Button title="取消"/>
     </component>
-    <component id="n4_l55o" name="btnRight" src="q08x7" fileName="components/Button2.xml" xy="568,1004" group="n8_a8jv">
+    <component id="n4_l55o" name="btnRight" src="wonody" fileName="components/Button20.xml" xy="589,1019" size="344,97">
       <relation target="n3_l55o" sidePair="top-top"/>
       <Button title="确认"/>
     </component>
-    <group id="n8_a8jv" name="n8" xy="72,766" size="936,388" advanced="true">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </group>
   </displayList>
   <relation target="n0_l55o" sidePair="height-height"/>
 </component>

FGUIProject/assets/Common/components/BtnLog.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="270,111">
-  <controller name="c1" pages="0,,1," selected="1"/>
-  <displayList>
-    <component id="n6_g926" name="btnLog" src="q08x6" fileName="components/Button1.xml" xy="0,11" size="270,100">
-      <Button title="日志"/>
-    </component>
-    <image id="n7_g926" name="imgRed" src="q08x3" fileName="imagesExport/ANNIU_2.png" xy="225,0" size="119,111" scale="0.4,0.4" color="#ff0033">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-  </displayList>
-</component>

FGUIProject/assets/Common/components/Button1.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="380,111" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_q08x" name="n0" src="q08x2" fileName="imagesExport/ANNIU_1.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_q08x" name="title" xy="0,-5" size="380,111" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="666">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/Common/components/Button12.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="324,105" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_ih75" name="icon" src="ih7592" fileName="imagesExport/tctc_anniu_1.png" xy="0,0" size="324,105">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_ih75" name="title" xy="0,0" size="324,105" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#ac904e" singleLine="true" text="确定">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/CommonGame/components/Button19.xml → FGUIProject/assets/Common/components/Button15.xml

@@ -2,8 +2,8 @@
 <component size="284,81" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="284,81" url="ui://eg2y0ldpr9ritjr" autoSize="true"/>
-    <text id="n1_r9ri" name="title" xy="0,-2" size="284,81" font="ui://eg2y0ldpwonotjc" fontSize="44" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#d89291" strokeSize="2" singleLine="true" text="挑战十次">
+    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="284,81" url="ui://mk0fwx0xr9ritjr" autoSize="true"/>
+    <text id="n1_r9ri" name="title" xy="0,-2" size="284,81" font="ui://eg2y0ldpwonotjc" fontSize="44" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#d89291" strokeSize="2" singleLine="true" text="">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/components/Button17.xml → FGUIProject/assets/Common/components/Button17.xml

@@ -2,7 +2,7 @@
 <component size="342,96" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="342,96" url="ui://eg2y0ldpr9ritjd" autoSize="true"/>
+    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="342,96" url="ui://mk0fwx0xr9ritjd" autoSize="true"/>
     <text id="n1_r9ri" name="title" xy="0,0" size="342,96" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf8f2" align="center" vAlign="middle" autoSize="none" singleLine="true" text="挑战十次"/>
   </displayList>
   <Button/>

FGUIProject/assets/CommonGame/components/Button18.xml → FGUIProject/assets/Common/components/Button18.xml

@@ -2,11 +2,10 @@
 <component size="342,96" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="342,96" url="ui://eg2y0ldpr9ritji" autoSize="true"/>
-    <text id="n1_r9ri" name="title" xy="0,0" size="342,96" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#f8eae5" align="center" vAlign="middle" autoSize="none" strokeColor="#c79a89" strokeSize="2" shadowColor="#bc9e91" shadowOffset="1,1" singleLine="true" text="挑战十次">
+    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="342,96" url="ui://mk0fwx0xr9ritji" autoSize="true"/>
+    <text id="n1_r9ri" name="title" xy="0,0" size="342,96" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#f8eae5" align="center" vAlign="middle" autoSize="none" strokeColor="#c79a89" strokeSize="2" shadowColor="#bc9e91" shadowOffset="1,1" singleLine="true" text="">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>
   <Button/>
-  <relation target="n2_r9ri" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/CommonGame/components/Button20.xml → FGUIProject/assets/Common/components/Button19.xml

@@ -2,8 +2,8 @@
 <component size="344,97" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_wono" name="icon" xy="0,0" size="344,97" url="ui://eg2y0ldpr9ritjf" autoSize="true"/>
-    <text id="n5_wono" name="title" xy="0,0" pivot="0.5,0" size="344,97" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#cc8584" strokeSize="2" shadowColor="#c68686" shadowOffset="1,1" text="保存搭配">
+    <loader id="n4_wono" name="icon" xy="0,0" size="344,97" url="ui://mk0fwx0xr9ritjf" autoSize="true"/>
+    <text id="n5_wono" name="title" xy="0,0" pivot="0.5,0" size="344,97" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#cc8584" strokeSize="2" shadowColor="#c68686" shadowOffset="1,1" text="">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/components/Button21.xml → FGUIProject/assets/Common/components/Button21.xml

@@ -2,7 +2,7 @@
 <component size="344,97" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_wono" name="icon" xy="0,0" size="344,97" url="ui://eg2y0ldpr9ritjf" autoSize="true"/>
+    <loader id="n4_wono" name="icon" xy="0,0" size="344,97" url="ui://mk0fwx0xr9ritjf" autoSize="true"/>
     <text id="n5_wono" name="title" xy="0,-2" pivot="0.5,0" size="344,97" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#dc9392" strokeSize="2" shadowColor="#dd8e8e" shadowOffset="1,1" text="保存搭配">
       <relation target="" sidePair="width-width,height-height"/>
     </text>

FGUIProject/assets/Common/components/Button3.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="412,105" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_q08x" name="n0" src="q08xo" fileName="imagesExport/ANNIU_3.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_q08x" name="title" xy="0,-5" size="412,105" fontSize="54" color="#fdfaed" align="center" vAlign="middle" autoSize="none" strokeColor="#ac904e" strokeSize="2" singleLine="true" text="保存搭配">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/Common/package.xml

@@ -2,12 +2,10 @@
 <packageDescription id="mk0fwx0x">
   <resources>
     <component id="q08x7" name="Button2.xml" path="/components/" exported="true"/>
-    <component id="q08x6" name="Button1.xml" path="/components/" exported="true"/>
     <component id="s2cc4k" name="FloatingTextPromptErrUI.xml" path="/" exported="true"/>
     <image id="s2cc4l" name="zx_jq_rwbszik.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="153,7,76,19"/>
     <component id="d4iw4m" name="ModalStatusUI.xml" path="/" exported="true"/>
     <image id="q08xo" name="ANNIU_3.png" path="/imagesExport/" exported="true"/>
-    <component id="q08xu" name="Button3.xml" path="/components/" exported="true"/>
     <sound id="qp4l4p" name="click.mp3" path="/sound/" exported="true"/>
     <image id="qp4l4q" name="zx_jq_rwbszik_normal.png" path="/imagesExport/" exported="true"/>
     <image id="qp4l4r" name="zx_jq_rwbszik_success.png" path="/imagesExport/"/>
@@ -17,7 +15,6 @@
     <component id="qp4l4v" name="FloatingTextPromptSuccessUI.xml" path="/" exported="true"/>
     <component id="g9264w" name="LogUI.xml" path="/" exported="true"/>
     <component id="g9264x" name="ListLogItem.xml" path="/components/"/>
-    <component id="g9264y" name="BtnLog.xml" path="/components/" exported="true"/>
     <component id="g9264z" name="Button7.xml" path="/components/" exported="true"/>
     <image id="g92650" name="kp_anniu_3.png" path="/imagesExport/"/>
     <image id="g92651" name="kp_anniu_4.png" path="/imagesExport/"/>
@@ -35,9 +32,20 @@
     <image id="ih7592" name="tctc_anniu_1.png" path="/imagesExport/"/>
     <image id="ih7591" name="tctc_anniu_2.png" path="/imagesExport/"/>
     <component id="pf2696" name="ComHolder.xml" path="/components/" exported="true"/>
-    <component id="axdi97" name="Button12.xml" path="/components/" exported="true"/>
     <image id="axdi98" name="grxx_anniu_2.png" path="/imagesExport/"/>
     <image id="axdi99" name="grxx_anniu_1.png" path="/imagesExport/"/>
+    <component id="r9ritjh" name="Button18.xml" path="/components/" exported="true"/>
+    <component id="wonody" name="Button19.xml" path="/components/" exported="true"/>
+    <image id="r9ritjf" name="anniuty.png" path="/imagesExport/" exported="true"/>
+    <image id="r9ritji" name="anniuty3.png" path="/imagesExport/" exported="true"/>
+    <component id="r9ritjg" name="Button17.xml" path="/components/" exported="true"/>
+    <image id="r9ritjd" name="anniuty2.png" path="/imagesExport/" exported="true"/>
+    <component id="r9ritjq" name="Button15.xml" path="/components/" exported="true"/>
+    <image id="r9ritjr" name="anniuty4.png" path="/imagesExport/"/>
+    <component id="oqa1tjt" name="Button21.xml" path="/components/" exported="true"/>
+    <component id="v95qtjw" name="Button22.xml" path="/components/" exported="true"/>
+    <image id="v95qtjv" name="anniuty5.png" path="/imagesExport/"/>
+    <image id="r9ritje" name="anniuty_1.png" path="/imagesExport/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Common" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/BonusBoxDetailUI.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,717">
+<component size="962,717">
   <displayList>
-    <loader id="n0_pjip" name="bg" xy="0,0" size="936,717" url="ui://mk0fwx0xlwri5u" fill="scaleFree">
+    <component id="n0_pjip" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,717">
       <relation target="" sidePair="width-width,height-height"/>
-    </loader>
-    <text id="n2_pjip" name="txtTitle" xy="105,56" size="726,66" fontSize="50" color="#9b7853" align="center" autoSize="none" text="礼盒内容"/>
-    <image id="n5_qr4e" name="n5" src="9cth8y" fileName="imagesExport/tctc_xiant_1.png" xy="44,128"/>
-    <list id="n3_pjip" name="listBonus" xy="44,195" size="841,340" layout="flow_hz" overflow="scroll" colGap="40" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
+    </component>
+    <text id="n2_pjip" name="txtTitle" xy="118,56" size="726,66" fontSize="50" color="#9b7853" align="center" autoSize="none" text="礼盒内容"/>
+    <image id="n5_qr4e" name="n5" src="9cth8y" fileName="imagesExport/tctc_xiant_1.png" xy="57,128"/>
+    <list id="n3_pjip" name="listBonus" xy="57,195" size="841,340" layout="flow_hz" overflow="scroll" colGap="40" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -14,7 +14,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n4_pjip" name="btnSure" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="266,594">
+    <component id="n4_pjip" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,588">
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="确认"/>
     </component>

FGUIProject/assets/CommonGame/BuyConfirmUI.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,536">
+<component size="962,536">
   <displayList>
-    <image id="n0_ds62" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,536"/>
-    <text id="n3_ds62" name="txtNeed" xy="328,124" pivot="0.5,0" size="279,56" fontSize="42" color="#876e54" text="还需要购买7个"/>
-    <text id="n4_ds62" name="txtNum" xy="283,294" pivot="0.5,0" size="369,46" fontSize="34" color="#a0845c" text="是否花费700鲛绡购买？">
+    <component id="n0_ds62" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,536"/>
+    <text id="n3_ds62" name="txtNeed" xy="344,124" pivot="0.5,0" size="279,56" fontSize="42" color="#876e54" text="还需要购买7个"/>
+    <text id="n4_ds62" name="txtNum" xy="299,299" pivot="0.5,0" size="369,46" fontSize="34" color="#a0845c" text="是否花费700鲛绡购买？">
       <relation target="n1_ds62" sidePair="bottom-top"/>
     </text>
-    <component id="n2_ds62" name="btnCancel" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="54,360">
+    <component id="n2_ds62" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,379">
       <Button title="取消"/>
     </component>
-    <component id="n1_ds62" name="btnSure" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="496,360">
+    <component id="n1_ds62" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,379">
       <Button title="确认"/>
     </component>
   </displayList>

FGUIProject/assets/CommonGame/BuyCountUI.xml

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,536">
+<component size="962,536">
   <displayList>
-    <image id="n0_hinb" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,536"/>
-    <component id="n23_ai2z" name="btnAll" src="ai2z9f" fileName="components/Button12.xml" xy="731,131"/>
-    <image id="n19_ai2z" name="n19" src="ai2z9e" fileName="imagesExport/hb_kuangdi_2.png" xy="69,267" group="n21_ai2z"/>
-    <loader id="n4_hinb" name="icon" xy="101,66" size="200,200" group="n21_ai2z" aspect="true"/>
-    <loader id="n17_ugdz" name="rarity" xy="257,66" size="44,94" group="n21_ai2z" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n5_hinb" name="txtName" xy="169,266" pivot="0.5,0" size="63,41" group="n21_ai2z" fontSize="30" color="#ffffff" align="center" text="名字"/>
-    <group id="n21_ai2z" name="n21" xy="69,66" size="264,241"/>
-    <image id="n8_hinb" name="n8" src="ai2z9d" fileName="imagesExport/hb_kuangdi_1.png" xy="353,138" group="n22_ai2z"/>
-    <component id="n9_hinb" name="btnPlus" src="hinb5s" fileName="components/ButtonPlus2.xml" xy="618,130" group="n22_ai2z"/>
-    <component id="n10_hinb" name="btnMinus" src="hinb5t" fileName="components/ButtonMinus1.xml" xy="344,130" group="n22_ai2z"/>
-    <text id="n25_t1at" name="txtCount" xy="415,135" size="200,56" group="n22_ai2z" fontSize="42" color="#fdf3d7" align="center" vAlign="middle" autoSize="none" text="找钱"/>
-    <group id="n22_ai2z" name="n22" xy="344,130" size="342,71"/>
-    <image id="n18_ai2z" name="n18" src="a71377" fileName="imagesExport/kp_dikuang_3.png" xy="379,297" group="n16_ugdz"/>
-    <text id="n20_ai2z" name="n20" xy="331,289" size="68,44" group="n16_ugdz" fontSize="32" color="#a17d5f" text="花费"/>
-    <loader id="n14_ugdz" name="iconPrice" xy="402,298" size="32,32" group="n16_ugdz" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n15_ugdz" name="txtPrice" xy="459,288" pivot="0.5,0" size="93,49" group="n16_ugdz" fontSize="36" color="#fdf3d7" autoClearText="true" text="9999"/>
-    <group id="n16_ugdz" name="n16" xy="331,288" size="273,49" advanced="true"/>
-    <component id="n6_hinb" name="btnSure" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="496,354">
-      <Button title="确认"/>
-    </component>
-    <component id="n7_hinb" name="btnCancel" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="54,354">
+    <component id="n0_hinb" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,536"/>
+    <component id="n23_ai2z" name="btnAll" src="ai2z9f" fileName="components/Button12.xml" xy="747,131"/>
+    <image id="n19_ai2z" name="n19" src="ai2z9e" fileName="imagesExport/hb_kuangdi_2.png" xy="85,267" group="n21_ai2z"/>
+    <loader id="n4_hinb" name="icon" xy="117,66" size="200,200" group="n21_ai2z" aspect="true"/>
+    <loader id="n17_ugdz" name="rarity" xy="273,66" size="44,94" group="n21_ai2z" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <text id="n5_hinb" name="txtName" xy="185,266" pivot="0.5,0" size="63,41" group="n21_ai2z" fontSize="30" color="#ffffff" align="center" text="名字"/>
+    <group id="n21_ai2z" name="n21" xy="85,66" size="264,241"/>
+    <image id="n8_hinb" name="n8" src="ai2z9d" fileName="imagesExport/hb_kuangdi_1.png" xy="369,138" group="n22_ai2z"/>
+    <component id="n9_hinb" name="btnPlus" src="hinb5s" fileName="components/ButtonPlus2.xml" xy="634,130" group="n22_ai2z"/>
+    <component id="n10_hinb" name="btnMinus" src="hinb5t" fileName="components/ButtonMinus1.xml" xy="360,130" group="n22_ai2z"/>
+    <text id="n25_t1at" name="txtCount" xy="431,135" size="200,56" group="n22_ai2z" fontSize="42" color="#fdf3d7" align="center" vAlign="middle" autoSize="none" text="找钱"/>
+    <group id="n22_ai2z" name="n22" xy="360,130" size="342,71"/>
+    <image id="n18_ai2z" name="n18" src="a71377" fileName="imagesExport/kp_dikuang_3.png" xy="395,297" group="n16_ugdz"/>
+    <text id="n20_ai2z" name="n20" xy="347,289" size="68,44" group="n16_ugdz" fontSize="32" color="#a17d5f" text="花费"/>
+    <loader id="n14_ugdz" name="iconPrice" xy="418,298" size="32,32" group="n16_ugdz" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n15_ugdz" name="txtPrice" xy="475,288" pivot="0.5,0" size="93,49" group="n16_ugdz" fontSize="36" color="#fdf3d7" autoClearText="true" text="9999"/>
+    <group id="n16_ugdz" name="n16" xy="347,288" size="273,49" advanced="true"/>
+    <text id="n24_ai2z" name="txtBuyTips" xy="317,471" pivot="0.5,0" size="333,36" fontSize="26" color="#a0845c" text="消耗1珍珠，可兑换10马蹄金"/>
+    <component id="n7_hinb" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,354">
       <Button title="取消"/>
     </component>
-    <text id="n24_ai2z" name="txtBuyTips" xy="301,471" pivot="0.5,0" size="333,36" fontSize="26" color="#a0845c" text="消耗1珍珠，可兑换10马蹄金"/>
+    <component id="n6_hinb" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,354">
+      <Button title="确认"/>
+    </component>
   </displayList>
   <relation target="n0_hinb" sidePair="height-height"/>
 </component>

FGUIProject/assets/CommonGame/BuyTipsUI.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,536">
+<component size="962,536">
   <displayList>
-    <image id="n0_ds62" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,536"/>
-    <text id="n3_ds62" name="txtNeed" xy="244,124" size="279,56" fontSize="42" color="#876e54" text="还需要购买7个"/>
-    <text id="n4_ds62" name="txtCost" xy="244,222" size="456,56" fontSize="42" color="#876e54" text="是否花费700鲛绡购买？"/>
-    <loader id="n5_ds62" name="loaNeed" xy="543,114" size="74,74" aspect="true" url="ui://eg2y0ldply9g8m" fill="scaleFree">
+    <component id="n0_ds62" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,536"/>
+    <text id="n3_ds62" name="txtNeed" xy="260,124" size="279,56" fontSize="42" color="#876e54" text="还需要购买7个"/>
+    <text id="n4_ds62" name="txtCost" xy="260,222" size="456,56" fontSize="42" color="#876e54" text="是否花费700鲛绡购买？"/>
+    <loader id="n5_ds62" name="loaNeed" xy="559,114" size="74,74" aspect="true" url="ui://eg2y0ldply9g8m" fill="scaleFree">
       <relation target="n3_ds62" sidePair="left-right"/>
     </loader>
-    <component id="n2_ds62" name="btnCancel" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="54,360">
+    <component id="n2_ds62" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,360">
       <Button title="取消"/>
     </component>
-    <component id="n1_ds62" name="btnSure" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="496,360">
+    <component id="n1_ds62" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,360">
       <Button title="确认"/>
     </component>
   </displayList>

FGUIProject/assets/CommonGame/DressUpItemTips.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,656">
+<component size="962,656">
   <displayList>
-    <image id="n0_d4iw" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,656"/>
-    <text id="n1_d4iw" name="txtName" xy="298,43" size="340,64" fontSize="48" color="#9b7853" align="center" autoClearText="true" text="物品名字几个字">
+    <component id="n0_d4iw" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,656"/>
+    <text id="n1_d4iw" name="txtName" xy="317,43" size="340,64" fontSize="48" color="#9b7853" align="center" autoClearText="true" text="物品名字几个字">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n3_d4iw" name="txtOwned" xy="403,586" pivot="0.5,0" size="130,44" fontSize="32" color="#f29295" vars="true" text="已拥有:{count=0}"/>
-    <image id="n4_d4iw" name="n4" src="s2cc4h" fileName="imagesExport/zx_tsk_xian.png" xy="44,124"/>
-    <text id="n5_d4iw" name="txtDesc" xy="60,167" size="815,133" fontSize="34" color="#a99881" ubb="true" autoSize="none" autoClearText="true" text="这是一个物品。"/>
-    <loader id="n18_d4iw" name="rarity" xy="861,15" size="44,94" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
-    <image id="n7_d4iw" name="n7" src="842s6h" fileName="imagesExport/kp_sx_1.png" xy="94,400" size="50,50" group="n19_e1sm"/>
-    <image id="n8_d4iw" name="n8" src="842s6i" fileName="imagesExport/kp_sx_2.png" xy="298,400" size="50,50" group="n19_e1sm"/>
-    <image id="n9_d4iw" name="n9" src="842s6j" fileName="imagesExport/kp_sx_3.png" xy="502,400" size="50,50" group="n19_e1sm"/>
-    <image id="n10_d4iw" name="n10" src="842s6k" fileName="imagesExport/kp_sx_4.png" xy="706,400" size="50,50" group="n19_e1sm"/>
-    <text id="n12_d4iw" name="txtGong" xy="165,400" size="87,46" group="n19_e1sm" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n14_d4iw" name="txtShang" xy="369,400" size="87,46" group="n19_e1sm" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n16_d4iw" name="txtJue" xy="573,400" size="87,46" group="n19_e1sm" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n13_d4iw" name="txtZhi" xy="777,401" size="87,46" group="n19_e1sm" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
-    <group id="n19_e1sm" name="n19" xy="94,400" size="770,50"/>
+    <text id="n3_d4iw" name="txtOwned" xy="409,586" pivot="0.5,0" size="130,44" fontSize="32" color="#f29295" vars="true" text="已拥有:{count=0}"/>
+    <image id="n4_d4iw" name="n4" src="s2cc4h" fileName="imagesExport/zx_tsk_xian.png" xy="50,124"/>
+    <text id="n5_d4iw" name="txtDesc" xy="66,167" size="815,133" fontSize="34" color="#a99881" ubb="true" autoSize="none" autoClearText="true" text="这是一个物品。"/>
+    <loader id="n18_d4iw" name="rarity" xy="867,15" size="44,94" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <image id="n7_d4iw" name="n7" src="842s6h" fileName="imagesExport/kp_sx_1.png" xy="100,400" size="50,50" group="n19_e1sm"/>
+    <image id="n8_d4iw" name="n8" src="842s6i" fileName="imagesExport/kp_sx_2.png" xy="304,400" size="50,50" group="n19_e1sm"/>
+    <image id="n9_d4iw" name="n9" src="842s6j" fileName="imagesExport/kp_sx_3.png" xy="508,400" size="50,50" group="n19_e1sm"/>
+    <image id="n10_d4iw" name="n10" src="842s6k" fileName="imagesExport/kp_sx_4.png" xy="712,400" size="50,50" group="n19_e1sm"/>
+    <text id="n12_d4iw" name="txtGong" xy="171,400" size="87,46" group="n19_e1sm" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n14_d4iw" name="txtShang" xy="375,400" size="87,46" group="n19_e1sm" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n16_d4iw" name="txtJue" xy="579,400" size="87,46" group="n19_e1sm" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n13_d4iw" name="txtZhi" xy="783,401" size="87,46" group="n19_e1sm" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
+    <group id="n19_e1sm" name="n19" xy="100,400" size="770,50"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1137" opaque="false">
   <displayList>
-    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" xy="0,0" size="962,1137">
+    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" xy="0,0" size="962,1137" pkg="mgs5yrnj">
       <relation target="n17_ohbx" sidePair="height-height,middle-middle"/>
     </component>
     <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,15" group="n17_ohbx"/>

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,970">
   <displayList>
-    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" xy="0,-11" size="962,992">
+    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" xy="0,-11" size="962,992" pkg="mgs5yrnj">
       <relation target="" sidePair="height-height"/>
     </component>
     <text id="n5_si5z" name="txtName" xy="65,58" size="186,61" group="n12_si5z" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>

FGUIProject/assets/CommonGame/RewardPreviewUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="936,631">
   <displayList>
-    <image id="n1_kzte" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,631"/>
+    <component id="n1_kzte" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,631"/>
     <image id="n2_kzte" name="n2" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" xy="230,32"/>
     <text id="n3_kzte" name="txtName" xy="326,32" pivot="0.5,0" size="284,74" fontSize="56" color="#8f6e30" text="活跃度奖励"/>
     <list id="n4_kzte" name="list" xy="17,200" size="902,225" layout="row" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://eg2y0ldpj48o98" align="center">

FGUIProject/assets/CommonGame/SuitPartsDetailUI.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,783">
+<component size="962,783">
   <displayList>
-    <loader id="n0_pjip" name="bg" xy="0,0" size="936,783" url="ui://mk0fwx0xlwri5u" fill="scaleFree">
+    <component id="n0_pjip" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,783">
       <relation target="" sidePair="width-width,height-height"/>
-    </loader>
-    <image id="n4_cs8j" name="n4" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" xy="230,32"/>
-    <text id="n2_pjip" name="txtTitle" xy="104,36" size="726,72" fontSize="54" color="#8f6e30" align="center" autoSize="none" text="套装详情"/>
-    <list id="n3_pjip" name="listParts" xy="23,179" size="890,540" layout="flow_hz" overflow="scroll" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
+    </component>
+    <image id="n4_cs8j" name="n4" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" xy="243,32"/>
+    <text id="n2_pjip" name="txtTitle" xy="117,36" size="726,72" fontSize="54" color="#8f6e30" align="center" autoSize="none" text="套装详情"/>
+    <list id="n3_pjip" name="listParts" xy="36,179" size="890,540" layout="flow_hz" overflow="scroll" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/CommonGame/components/Button4.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="314,105" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_pal5" name="n0" src="pal5v" fileName="imagesExport/zx_anniutz_1.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_pal5" name="title" xy="0,-4" size="314,105" fontSize="46" color="#fff7e4" align="center" vAlign="middle" autoSize="none" strokeColor="#ac904e" strokeSize="2" singleLine="true" autoClearText="true" text="button">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/CommonGame/components/Button6.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="310,83" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_hinb" name="n0" src="hinb5p" fileName="imagesExport/fzd_anniu_1.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/CommonGame/components/ButtonBack1.xml

@@ -2,7 +2,7 @@
 <component size="90,90" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n1_si5z" name="icon" xy="46,47" pivot="0.5,0.5" anchor="true" size="90,90" url="ui://eg2y0ldpuyuxtj4" autoSize="true"/>
+    <image id="n2_dhoa" name="n2" src="uyuxtj4" fileName="imagesExport/xcpz_fhfh.png" xy="0,0"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/CommonGame/components/ButtonHome.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="96,96" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="90,90" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_qp4l" src="slb41b" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
+    <image id="n0_qp4l" name="n0" src="slb41b" fileName="imagesExport/hz_fanhuizjm.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/CommonGame/components/ButtonInValueBar.xml

@@ -3,10 +3,10 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n0_r9gf" name="n0" src="qqattj2" fileName="images/zjm_gnkuang.png" xy="-9,0" group="n4_qqat"/>
-    <image id="n3_r9gf" name="n3" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="181,-3" group="n4_qqat"/>
+    <image id="n3_r9gf" name="n3" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="181,-2" group="n4_qqat"/>
     <text id="n1_r9gf" name="title" xy="47,1" pivot="0.5,0" size="126,39" group="n4_qqat" fontSize="28" color="#fdf2df" vAlign="middle" singleLine="true" autoClearText="true" text="1000000"/>
     <loader id="n2_r9gf" name="icon" xy="2,0" pivot="0.5,0.5" size="42,42" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" autoSize="true"/>
-    <group id="n4_qqat" name="n4" xy="-9,-3" size="238,48"/>
+    <group id="n4_qqat" name="n4" xy="-9,-2" size="236,47"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -3,7 +3,6 @@
   <resources>
     <component id="s2cc4g" name="GoodsItemTips.xml" path="/" exported="true"/>
     <image id="s2cc4h" name="zx_tsk_xian.png" path="/imagesExport/" exported="true"/>
-    <image id="slb41d" name="hz_fanhui.png" path="/imagesExport/" exported="true"/>
     <image id="slb41b" name="hz_fanhuizjm.png" path="/imagesExport/" exported="true"/>
     <image id="d4iw4x" name="zx_bq_shuxing_3.png" path="/imagesExport/" exported="true"/>
     <image id="d4iw4y" name="zx_bq_shuxing_4.png" path="/imagesExport/" exported="true"/>
@@ -23,9 +22,7 @@
     <component id="ki9637" name="ButtonPlus1.xml" path="/components/" exported="true"/>
     <component id="v3541v" name="ComponentValueBar.xml" path="/components/" exported="true"/>
     <image id="d4iwj" name="sc_anniu_1.png" path="/imagesExport/" exported="true"/>
-    <component id="pal5w" name="Button4.xml" path="/components/" exported="true"/>
     <image id="pal5v" name="zx_anniutz_1.png" path="/imagesExport/" exported="true"/>
-    <image id="ga165a" name="hz_ssuo.png" path="/imagesExport/" exported="true"/>
     <image id="ga165b" name="hz_ssuodikuang.png" path="/imagesExport/" exported="true"/>
     <component id="ga165c" name="ButtonTab1.xml" path="/components/" exported="true"/>
     <image id="s2cc55" name="zd_xztup_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="21,3,8,6"/>
@@ -42,7 +39,6 @@
     <image id="fka73" name="cj_dikuang.png" path="/imagesExport/" exported="true"/>
     <image id="u67n5n" name="cj_tskuang_2.png" path="/images/"/>
     <image id="hinb5p" name="fzd_anniu_1.png" path="/imagesExport/" exported="true"/>
-    <component id="hinb5q" name="Button6.xml" path="/components/" exported="true"/>
     <component id="hinb5r" name="BuyCountUI.xml" path="/" exported="true"/>
     <image id="hinb9" name="fzd_mzkuang.png" path="/imagesExport/" exported="true"/>
     <image id="hinb6" name="fzd_gmkuang.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="54,11,108,22"/>
@@ -143,7 +139,7 @@
     <component id="n3xha1" name="ComCostCurrency.xml" path="/components/" exported="true"/>
     <font id="k1kha2" name="SIMKAI.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="ohuntac" name="zhuxian_shuoto.png" path="/imagesExport/" exported="true"/>
-    <movieclip id="lj7ea8" name="MovieClip1.jta" path="/effect/"/>
+    <movieclip id="lj7ea8" name="MovieClip1.jta" path="/effect/" atlas="alone_npot"/>
     <component id="wet2tae" name="ComRewardItem.xml" path="/components/"/>
     <movieclip id="wet2td7" name="MovieClip2.jta" path="/effect/" atlas="alone_npot"/>
     <component id="kztethp" name="ComListReward.xml" path="/"/>
@@ -171,10 +167,7 @@
     <image id="si5zti9" name="tc_fzfjk.png" path="/imgnew/"/>
     <image id="si5ztib" name="tc_qianwang.png" path="/imgnew/"/>
     <image id="si5ztic" name="tc_txbiao.png" path="/imgnew/"/>
-    <image id="si5ztie" name="tc_tydikua_3.png" path="/imgnew/"/>
-    <image id="si5ztif" name="tc_tydikua_52.png" path="/imgnew/"/>
     <image id="si5ztig" name="tc_xiant.png" path="/imgnew/" exported="true"/>
-    <component id="si5ztih" name="ComBg.xml" path="/components/" exported="true"/>
     <image id="si5ztii" name="tc_txbiao_1.png" path="/imgFunIcon/" exported="true"/>
     <image id="s5s9tij" name="js_icon_.png" path="/imgFunIcon/" exported="true"/>
     <component id="s5s9tik" name="ItemExchangeUI.xml" path="/" exported="true"/>
@@ -207,17 +200,8 @@
     <font id="wonotja" name="NANSONG.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="wonotjb" name="lyq_yunhubl.png" path="/imgItemIcon/" exported="true"/>
     <font id="wonotjc" name="FANGZHENGYANSONG.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
-    <image id="r9ritjd" name="anniuty2.png" path="/images/" exported="true"/>
-    <image id="r9ritje" name="anniuty_1.png" path="/images/" exported="true"/>
-    <image id="r9ritjf" name="anniuty.png" path="/images/" exported="true"/>
-    <component id="r9ritjg" name="Button17.xml" path="/components/" exported="true"/>
-    <component id="r9ritjh" name="Button18.xml" path="/components/" exported="true"/>
-    <image id="r9ritji" name="anniuty3.png" path="/images/" exported="true"/>
     <component id="r9ritjj" name="ButtonApproach.xml" path="/components/"/>
-    <image id="r9ritjk" name="tc_tydikua_1.png" path="/imgnew/" scale="9grid" scale9grid="240,281,480,562"/>
     <image id="r9ritjl" name="tc_kuangk.png" path="/imgnew/"/>
-    <component id="r9ritjq" name="Button19.xml" path="/components/" exported="true"/>
-    <image id="r9ritjr" name="anniuty4.png" path="/images/"/>
     <component id="kubi7h" name="CompHeadWithBg.xml" path="/components/" exported="true"/>
     <image id="kubi7e" name="self.png" path="/images/"/>
     <image id="q08xh" name="zjm_txkuang.png" path="/images/"/>
@@ -226,12 +210,8 @@
     <image id="r9ritjs" name="grxx_zytxtx.png" path="/images/"/>
     <image id="r9ri12k" name="hl_xz_ddik_1.png" path="/images/" exported="true"/>
     <image id="r9ri12o" name="hl_ddandik.png" path="/images/" exported="true"/>
-    <component id="wonody" name="Button20.xml" path="/components/" exported="true"/>
-    <component id="oqa1tjt" name="Button21.xml" path="/components/" exported="true"/>
     <component id="r9ri1h" name="ComHead.xml" path="/components/" exported="true"/>
     <image id="v95qtju" name="hc_yyy.png" path="/images/" exported="true"/>
-    <image id="v95qtjv" name="anniuty5.png" path="/images/"/>
-    <component id="v95qtjw" name="Button22.xml" path="/components/" exported="true"/>
     <component id="v95qtjx" name="ComTopTitle.xml" path="/components/" exported="true"/>
     <image id="v95qtjy" name="xgnc_dik_1.png" path="/images/"/>
     <image id="v95qtjz" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>

FGUIProject/assets/CreateRole/CreateRoleUI.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,476" bgColor="#000000">
+<component size="962,476" bgColor="#000000">
   <displayList>
-    <image id="n4_xt5s" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,476"/>
-    <image id="n11_hpgr" name="n11" src="hpgr5" fileName="images/mc_jlkuang_1.png" xy="108,112"/>
-    <component id="n5_xt5s" name="btnSure" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,304">
+    <component id="n4_xt5s" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,476"/>
+    <image id="n11_hpgr" name="n11" src="hpgr5" fileName="images/mc_jlkuang_1.png" xy="114,112"/>
+    <component id="n5_xt5s" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,304">
       <Button title="确认" titleColor="#ffffff" titleFontSize="42"/>
     </component>
-    <component id="n8_xt5s" name="btnDice" src="xt5s4" fileName="components/ButtonDice.xml" xy="713,84"/>
-    <text id="n10_xt5s" name="inputName" xy="162,125" size="560,56" fontSize="42" color="#9e8056" autoSize="none" text="" input="true" prompt="[color=#B6A688]请输入角色名称[/color]" maxLength="7"/>
+    <component id="n8_xt5s" name="btnDice" src="xt5s4" fileName="components/ButtonDice.xml" xy="719,84"/>
+    <text id="n10_xt5s" name="inputName" xy="168,125" size="560,56" fontSize="42" color="#9e8056" autoSize="none" text="" input="true" prompt="[color=#B6A688]请输入角色名称[/color]" maxLength="7"/>
   </displayList>
 </component>

FGUIProject/assets/DressUp/DressFilterUI.xml

@@ -1,42 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="940,1092">
+<component size="962,1092">
   <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n0_ih75" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="940,1092"/>
-    <image id="n17_ih75" name="n17" src="ih753l" fileName="images/sxsx_ssdi.png" xy="88,68" size="644,66"/>
-    <text id="n16_ih75" name="txtInput" xy="138,74" size="437,49" fontSize="36" color="#b6a688" autoSize="none" text="" input="true" prompt="请输入搜索关键词"/>
-    <component id="n2_ih75" name="btnSearch" src="ih753h" fileName="components/Button1.xml" xy="760,57"/>
-    <component id="n18_ih75" name="btnClose" src="ih753n" fileName="components/Button5.xml" xy="876,-36"/>
-    <component id="n13_ih75" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="499,941">
+    <component id="n0_ih75" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1092"/>
+    <image id="n17_ih75" name="n17" src="ih753l" fileName="images/sxsx_ssdi.png" xy="97,68" size="644,66"/>
+    <text id="n16_ih75" name="txtInput" xy="147,74" size="437,49" fontSize="36" color="#b6a688" autoSize="none" text="" input="true" prompt="请输入搜索关键词"/>
+    <component id="n2_ih75" name="btnSearch" src="ih753h" fileName="components/Button1.xml" xy="769,57"/>
+    <component id="n18_ih75" name="btnClose" src="ih753n" fileName="components/Button5.xml" xy="898,-36"/>
+    <component id="n13_ih75" name="btnConfirm" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,941">
       <Button title="确认"/>
     </component>
-    <component id="n14_ih75" name="btnReset" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="57,941"/>
-    <component id="n5_ih75" name="n5" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="59,204" group="n6_ih75">
+    <component id="n14_ih75" name="btnReset" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,941">
+      <Button title="重置"/>
+    </component>
+    <component id="n5_ih75" name="n5" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="68,204" group="n6_ih75">
       <property target="txtName" propertyId="0" value="品质筛选"/>
     </component>
-    <list id="n3_ih75" name="listRarity" xy="63,262" size="833,142" group="n6_ih75" layout="row" selectionMode="multipleSingleClick" colGap="84" defaultItem="ui://mbo439wbih753i">
+    <list id="n3_ih75" name="listRarity" xy="72,262" size="833,142" group="n6_ih75" layout="row" selectionMode="multipleSingleClick" colGap="84" defaultItem="ui://mbo439wbih753i">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n6_ih75" name="grpRarity" xy="59,204" size="837,200" group="n19_n0js" advanced="true"/>
-    <component id="n8_ih75" name="n8" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="59,449" group="n10_ih75">
+    <group id="n6_ih75" name="grpRarity" xy="68,204" size="837,200" group="n19_n0js" advanced="true"/>
+    <component id="n8_ih75" name="n8" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="68,449" group="n10_ih75">
       <property target="txtName" propertyId="0" value="属性筛选"/>
     </component>
-    <list id="n7_ih75" name="listScore" xy="63,507" size="842,142" group="n10_ih75" layout="row" selectionMode="multipleSingleClick" colGap="84" defaultItem="ui://mbo439wbih753j">
+    <list id="n7_ih75" name="listScore" xy="72,507" size="842,142" group="n10_ih75" layout="row" selectionMode="multipleSingleClick" colGap="84" defaultItem="ui://mbo439wbih753j">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n10_ih75" name="grpScore" xy="59,449" size="846,200" group="n19_n0js" advanced="true">
+    <group id="n10_ih75" name="grpScore" xy="68,449" size="846,200" group="n19_n0js" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
-    <component id="n9_ih75" name="n9" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="59,449" group="n12_ih75">
+    <component id="n9_ih75" name="n9" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="68,449" group="n12_ih75">
       <property target="txtName" propertyId="0" value="风格筛选"/>
     </component>
-    <list id="n11_ih75" name="listTag" xy="63,507" size="854,272" group="n12_ih75" layout="flow_hz" selectionMode="multipleSingleClick" overflow="scroll" lineGap="27" colGap="60" defaultItem="ui://mbo439wbih753k" autoClearItems="true">
+    <list id="n11_ih75" name="listTag" xy="72,507" size="854,272" group="n12_ih75" layout="flow_hz" selectionMode="multipleSingleClick" overflow="scroll" lineGap="27" colGap="60" defaultItem="ui://mbo439wbih753k" autoClearItems="true">
       <gearSize controller="c1" pages="0" values="854,124,1,1" default="854,272,1,1"/>
       <item/>
       <item/>
@@ -54,7 +56,7 @@
       <item/>
       <item/>
     </list>
-    <group id="n12_ih75" name="grpTags" xy="59,449" size="858,330" group="n19_n0js" advanced="true"/>
-    <group id="n19_n0js" name="n19" xy="59,204" size="858,575" advanced="true" layout="vt" lineGap="45" excludeInvisibles="true"/>
+    <group id="n12_ih75" name="grpTags" xy="68,449" size="858,330" group="n19_n0js" advanced="true"/>
+    <group id="n19_n0js" name="n19" xy="68,204" size="858,575" advanced="true" layout="vt" lineGap="45" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -69,7 +69,7 @@
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="下一步"/>
     </component>
-    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button20.xml" pkg="eg2y0ldp" xy="480,1728" group="n47_v95q">
+    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button20.xml" pkg="mk0fwx0x" xy="480,1728" group="n47_v95q">
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="推荐搭配"/>
     </component>

FGUIProject/assets/DressUp/DressUpUI.xml

@@ -45,11 +45,11 @@
     <component id="n32_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n30_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
-    <component id="n12_q08x" name="btnSave" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj" pkg="eg2y0ldp">
+    <component id="n12_q08x" name="btnSave" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj" pkg="mk0fwx0x">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="保存搭配" titleColor="#fdfaed" titleFontSize="54"/>
     </component>
-    <component id="n35_r9ri" name="btnNext" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj" pkg="eg2y0ldp">
+    <component id="n35_r9ri" name="btnNext" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj" pkg="mk0fwx0x">
       <gearDisplay controller="c2" pages="1"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="下一步" titleColor="#fdfaed" titleFontSize="54"/>

FGUIProject/assets/DressUp/PhotographUI.xml

@@ -23,10 +23,10 @@
     <group id="n16_9ico" name="n16" xy="940,409" size="125,415" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
-    <component id="n18_r9ri" name="btnGalleryJoin" src="r9ritjg" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="369,1728">
+    <component id="n18_r9ri" name="btnGalleryJoin" src="r9ritjg" fileName="components/Button17.xml" pkg="mk0fwx0x" xy="369,1728">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottom-bottom"/>
-      <Button title="确认上传" icon="ui://eg2y0ldpr9ritjd"/>
+      <Button title="确认上传" icon="ui://mk0fwx0xr9ritjd"/>
     </component>
     <image id="n19_r9ri" name="n19" src="r9riek" fileName="images/hl_ciskuang.png" xy="480,1834" group="n21_r9ri"/>
     <text id="n20_r9ri" name="txtCount" xy="501,1831" pivot="0.5,0" size="77,41" group="n21_r9ri" fontSize="30" color="#e3d3ae" text="3/10"/>

FGUIProject/assets/Field/FieldFightEndUI.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,700">
+<component size="962,700">
   <displayList>
-    <image id="n1_ohun" name="n1" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,700"/>
-    <list id="n2_ohun" name="list" xy="116,203" size="717,223" layout="row" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpj48o98" align="center">
+    <component id="n1_ohun" name="n1" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,700"/>
+    <list id="n2_ohun" name="list" xy="129,203" size="717,223" layout="row" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpj48o98" align="center">
       <item/>
     </list>
-    <text id="n3_ohun" name="txtTitle" xy="370,40" size="196,64" fontSize="48" color="#9b7853" text="挑战完成"/>
-    <component id="n0_s20j" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,535">
+    <text id="n3_ohun" name="txtTitle" xy="383,40" size="196,64" fontSize="48" color="#9b7853" text="挑战完成"/>
+    <component id="n0_s20j" name="btnConfirm" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,545">
       <Button title="确定"/>
     </component>
-    <text id="n4_ohun" name="txtNum" xy="380,140" pivot="0.5,0" size="175,46" fontSize="34" color="#a17d5f" ubb="true" text="第20/20轮"/>
-    <image id="n5_ohun" name="n5" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
-    <text id="n7_ohun" name="txtHas" xy="338,463" pivot="0.5,0" size="260,49" visible="false" fontSize="36" color="#a17d5f" text="已拥有：38000"/>
-    <text id="n8_ohun" name="n8" xy="326,466" size="148,49" group="n11_ohun" fontSize="36" color="#a17d5f" text="本次消耗"/>
-    <loader id="n9_ohun" name="loaCost" xy="475,465" size="50,50" group="n11_ohun" url="ui://eg2y0ldpq08x4"/>
-    <text id="n10_ohun" name="txtCostNum" xy="541,466" size="69,49" group="n11_ohun" fontSize="36" color="#a17d5f" text="x16"/>
-    <group id="n11_ohun" name="n11" xy="326,465" size="284,50"/>
-    <text id="n12_b6vj" name="n12" xy="266,291" size="40,19" fontSize="12" text=""/>
-    <text id="n13_b6vj" name="txtTips" xy="468,316" pivot="0.5,0.5" anchor="true" size="324,54" fontSize="40" color="#a17d5f" text="本周奖励已达上限"/>
+    <text id="n4_ohun" name="txtNum" xy="393,140" pivot="0.5,0" size="175,46" fontSize="34" color="#a17d5f" ubb="true" text="第20/20轮"/>
+    <image id="n5_ohun" name="n5" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
+    <text id="n7_ohun" name="txtHas" xy="351,463" pivot="0.5,0" size="260,49" visible="false" fontSize="36" color="#a17d5f" text="已拥有：38000"/>
+    <text id="n8_ohun" name="n8" xy="339,466" size="148,49" group="n11_ohun" fontSize="36" color="#a17d5f" text="本次消耗"/>
+    <loader id="n9_ohun" name="loaCost" xy="488,465" size="50,50" group="n11_ohun" url="ui://eg2y0ldpq08x4"/>
+    <text id="n10_ohun" name="txtCostNum" xy="554,466" size="69,49" group="n11_ohun" fontSize="36" color="#a17d5f" text="x16"/>
+    <group id="n11_ohun" name="n11" xy="339,465" size="284,50"/>
+    <text id="n12_b6vj" name="n12" xy="279,291" size="40,19" fontSize="12" text=""/>
+    <text id="n13_b6vj" name="txtTips" xy="481,316" pivot="0.5,0.5" anchor="true" size="324,54" fontSize="40" color="#a17d5f" text="本周奖励已达上限"/>
   </displayList>
 </component>

FGUIProject/assets/Field/FieldFightInfoUI.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,915">
+<component size="962,915">
   <displayList>
-    <image id="n1_ohun" name="n1" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,915"/>
-    <image id="n4_ohun" name="n4" src="ohunw" fileName="images/tydc_npckuang.png" xy="328,408"/>
-    <image id="n3_ohun" name="n3" src="ohunx" fileName="images/tydc_npcdik.png" xy="45,500"/>
-    <component id="n0_s20j" name="btnStop" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,726">
+    <component id="n1_ohun" name="n1" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,915"/>
+    <image id="n4_ohun" name="n4" src="ohunw" fileName="images/tydc_npckuang.png" xy="341,408"/>
+    <image id="n3_ohun" name="n3" src="ohunx" fileName="images/tydc_npcdik.png" xy="58,500"/>
+    <component id="n0_s20j" name="btnStop" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,726">
       <Button title="中止挑战"/>
     </component>
-    <loader id="n5_ohun" name="loaNpc" xy="443,400" pivot="0.5,1" size="50,50" autoSize="true"/>
-    <text id="n6_ohun" name="txtName" xy="370,407" pivot="0.5,0" size="196,64" fontSize="48" color="#887256" text="名字名字"/>
-    <text id="n8_ohun" name="txtNum" xy="716,435" size="175,46" fontSize="34" color="#a17d5f" ubb="true" text="第20/20轮"/>
-    <text id="n7_ohun" name="txtDesc" xy="73,525" size="793,100" fontSize="38" color="#9f8f73" autoSize="height" text="放马过来吧！祝福大家旗开得胜，心想事成祝福 大家旗开得胜，心想事成"/>
-    <text id="n9_ohun" name="txtTime" xy="293,838" pivot="0.5,0" size="350,49" fontSize="36" color="#bb674e" text="3秒后自动进入下一轮"/>
+    <loader id="n5_ohun" name="loaNpc" xy="456,400" pivot="0.5,1" size="50,50" autoSize="true"/>
+    <text id="n6_ohun" name="txtName" xy="383,407" pivot="0.5,0" size="196,64" fontSize="48" color="#887256" text="名字名字"/>
+    <text id="n8_ohun" name="txtNum" xy="729,435" size="175,46" fontSize="34" color="#a17d5f" ubb="true" text="第20/20轮"/>
+    <text id="n7_ohun" name="txtDesc" xy="86,525" size="793,100" fontSize="38" color="#9f8f73" autoSize="height" text="放马过来吧！祝福大家旗开得胜，心想事成祝福 大家旗开得胜，心想事成"/>
+    <text id="n9_ohun" name="txtTime" xy="306,838" pivot="0.5,0" size="350,49" fontSize="36" color="#bb674e" text="3秒后自动进入下一轮"/>
   </displayList>
 </component>

FGUIProject/assets/Field/FieldTaskUI.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="824,993">
+<component size="900,993" overflow="hidden">
   <displayList>
-    <image id="n1_ohun" name="n1" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="824,993"/>
-    <list id="n0_s20j" name="list" xy="53,218" size="717,675" overflow="scroll" lineGap="20" defaultItem="ui://5oh3t798s20ja">
+    <component id="n1_ohun" name="n1" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="-31,0" size="962,993"/>
+    <list id="n0_s20j" name="list" xy="111,218" size="740,701" overflow="scroll" lineGap="20" defaultItem="ui://5oh3t798s20ja">
       <item/>
       <item/>
       <item/>
@@ -11,8 +11,8 @@
       <item/>
       <item/>
     </list>
-    <text id="n2_ohun" name="txtTitle" xy="311,40" size="202,66" fontSize="50" color="#9b7853" text="上限提升"/>
-    <image id="n3_ohun" name="n3" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="-12,120"/>
-    <text id="n4_ohun" name="txtDecs" xy="173,137" size="478,42" fontSize="30" color="#c67764" text="完成指定目标后可提升每周奖励上限"/>
+    <text id="n2_ohun" name="txtTitle" xy="380,40" size="202,66" fontSize="50" color="#9b7853" text="上限提升"/>
+    <image id="n3_ohun" name="n3" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
+    <text id="n4_ohun" name="txtDecs" xy="242,137" size="478,42" fontSize="30" color="#c67764" text="完成指定目标后可提升每周奖励上限"/>
   </displayList>
 </component>

FGUIProject/assets/Launcher/LauncherAlertUI.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,472">
+<component size="962,472">
   <displayList>
-    <image id="n0_l55o" name="bg" src="wgy9k" fileName="images/hc_kuang_6.png" xy="0,0" size="936,472">
+    <component id="n0_l55o" name="bg" src="si5ztih" fileName="components/ComBg.xml" xy="0,0" size="962,472">
       <relation target="n5_l55o" sidePair="height-height"/>
-    </image>
+    </component>
     <text id="n5_l55o" name="txtContent" xy="111,124" size="714,142" fontSize="36" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例示例"/>
-    <component id="n3_l55o" name="btnLeft" src="k0v5i" fileName="components/Button1.xml" xy="54,322">
+    <component id="n3_l55o" name="btnLeft" src="dhoaw" fileName="components/Button18.xml" xy="88,322">
       <relation target="n0_l55o" sidePair="bottom-bottom"/>
       <Button title="取消"/>
     </component>
-    <component id="n4_l55o" name="btnRight" src="k0v5j" fileName="components/Button2.xml" xy="496,322">
+    <component id="n4_l55o" name="btnRight" src="dhoax" fileName="components/Button19.xml" xy="530,322">
       <relation target="n3_l55o" sidePair="top-top"/>
       <Button title="确认"/>
     </component>

FGUIProject/assets/Launcher/components/Button18.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="342,96" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="342,96" url="ui://mgs5yrnjdhoaz" autoSize="true"/>
+    <text id="n1_r9ri" name="title" xy="0,0" size="342,96" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#f8eae5" align="center" vAlign="middle" autoSize="none" strokeColor="#c79a89" strokeSize="2" shadowColor="#bc9e91" shadowOffset="1,1" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Launcher/components/Button19.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="344,97" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n4_wono" name="icon" xy="0,0" size="344,97" url="ui://mgs5yrnjdhoay" autoSize="true"/>
+    <text id="n5_wono" name="title" xy="0,0" pivot="0.5,0" size="344,97" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#cc8584" strokeSize="2" shadowColor="#c68686" shadowOffset="1,1" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Launcher/package.xml

@@ -28,6 +28,14 @@
     <component id="slyzt" name="ProgressBar2.xml" path="/components/"/>
     <image id="bp8xu" name="jkgg.png" path="/images/" atlas="alone_npot"/>
     <component id="bp8xv" name="HealthAdviceUI.xml" path="/" exported="true"/>
+    <component id="si5ztih" name="ComBg.xml" path="/components/" exported="true"/>
+    <image id="r9ritjk" name="tc_tydikua_1.png" path="/images/" scale="9grid" scale9grid="240,281,480,562"/>
+    <image id="si5ztie" name="tc_tydikua_3.png" path="/images/"/>
+    <image id="si5ztif" name="tc_tydikua_52.png" path="/images/"/>
+    <component id="dhoaw" name="Button18.xml" path="/components/" exported="true"/>
+    <component id="dhoax" name="Button19.xml" path="/components/" exported="true"/>
+    <image id="dhoay" name="anniuty.png" path="/images/" exported="true"/>
+    <image id="dhoaz" name="anniuty3.png" path="/images/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\Resources\UI\Launcher" packageCount="2" genCode="true" codePath="..\GameClient\Assets\Game\Launcher\FairyGUI\GenCode\" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Login/LoginInputUI.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="940,732">
+<component size="962,732">
   <displayList>
-    <image id="n1_q08x" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="940,732"/>
-    <component id="n4_q08x" name="btnRegister" src="q08xj" fileName="components/ButtonRegister.xml" xy="768,668"/>
-    <image id="n17_ozsv" name="n17" src="ozsv4u" fileName="images/dl_kuang_1.png" xy="79,124"/>
-    <image id="n18_ozsv" name="n18" src="ozsv4u" fileName="images/dl_kuang_1.png" xy="79,284"/>
-    <text id="n8_q08x" name="inputAccount" xy="125,132" size="709,49" fontSize="36" color="#b08864" autoSize="none" text="" input="true" prompt="[color=#B8A492]请输入账号[/color]"/>
-    <text id="n10_q08x" name="inputPassword" xy="125,291" size="707,49" fontSize="36" color="#b08864" autoSize="none" text="" input="true" prompt="[color=#B8A492]请输入密码[/color]" password="true"/>
-    <image id="n19_ozsv" name="n19" src="ozsv4z" fileName="images/dl_ziti_1.png" xy="1,-130"/>
-    <component id="n20_ozsv" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="55,520">
+    <component id="n1_q08x" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,732"/>
+    <component id="n4_q08x" name="btnRegister" src="q08xj" fileName="components/ButtonRegister.xml" xy="803,668"/>
+    <image id="n19_ozsv" name="n19" src="ozsv4z" fileName="images/dl_ziti_1.png" xy="0,-130"/>
+    <image id="n17_ozsv" name="n17" src="ozsv4u" fileName="images/dl_kuang_1.png" xy="90,124"/>
+    <image id="n18_ozsv" name="n18" src="ozsv4u" fileName="images/dl_kuang_1.png" xy="90,284"/>
+    <text id="n8_q08x" name="inputAccount" xy="136,132" size="709,49" fontSize="36" color="#b08864" autoSize="none" text="" input="true" prompt="[color=#B8A492]请输入账号[/color]"/>
+    <text id="n10_q08x" name="inputPassword" xy="136,291" size="707,49" fontSize="36" color="#b08864" autoSize="none" text="" input="true" prompt="[color=#B8A492]请输入密码[/color]" password="true"/>
+    <component id="n20_ozsv" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,520">
       <Button title="取消"/>
     </component>
-    <component id="n21_ozsv" name="btnSure" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="497,520">
+    <component id="n21_ozsv" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,520">
       <Button title="确认"/>
     </component>
   </displayList>

FGUIProject/assets/Login/RegisterUI.xml

@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="940,1092">
+<component size="962,1092">
   <displayList>
-    <loader id="n29_ozsv" name="bg" xy="0,0" size="940,1092" url="ui://mk0fwx0xlwri5u" fill="scaleFree"/>
-    <component id="n30_ozsv" name="btnSubmit" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="280,853">
+    <component id="n29_ozsv" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1092"/>
+    <component id="n30_ozsv" name="btnSubmit" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="292,853" size="380,105">
       <Button title="提交注册" titleColor="#ffffff" titleFontSize="42"/>
     </component>
-    <component id="n31_ozsv" name="btnAgree" src="q08x11" fileName="components/ButtonAgree.xml" xy="94,686"/>
-    <image id="n34_ozsv" name="n34" src="ozsv4w" fileName="images/dl_xiant_1.png" xy="62,170" size="800,2"/>
-    <image id="n36_ozsv" name="n36" src="ozsv4w" fileName="images/dl_xiant_1.png" xy="63,288" size="800,2"/>
-    <image id="n37_ozsv" name="n37" src="ozsv4w" fileName="images/dl_xiant_1.png" xy="63,404" size="800,2"/>
-    <image id="n38_ozsv" name="n38" src="ozsv4w" fileName="images/dl_xiant_1.png" xy="63,520" size="800,2"/>
-    <image id="n39_ozsv" name="n39" src="ozsv4w" fileName="images/dl_xiant_1.png" xy="63,636" size="800,2"/>
-    <text id="n40_ozsv" name="n40" xy="89,96" size="76,49" fontSize="36" color="#977553" text="账号"/>
-    <text id="n41_ozsv" name="inputAccount" xy="285,100" size="560,44" fontSize="30" color="#977553" autoSize="none" text="" input="true" prompt="[color=#BDA893]请输入账号[/color]">
+    <component id="n31_ozsv" name="btnAgree" src="q08x11" fileName="components/ButtonAgree.xml" xy="106,686" size="50,44"/>
+    <image id="n34_ozsv" name="n34" src="ozsv4w" fileName="images/dl_xiant_1.png" xy="74,170" size="800,2"/>
+    <image id="n36_ozsv" name="n36" src="ozsv4w" fileName="images/dl_xiant_1.png" xy="75,288" size="800,2"/>
+    <image id="n37_ozsv" name="n37" src="ozsv4w" fileName="images/dl_xiant_1.png" xy="75,404" size="800,2"/>
+    <image id="n38_ozsv" name="n38" src="ozsv4w" fileName="images/dl_xiant_1.png" xy="75,520" size="800,2"/>
+    <image id="n39_ozsv" name="n39" src="ozsv4w" fileName="images/dl_xiant_1.png" xy="75,636" size="800,2"/>
+    <text id="n40_ozsv" name="n40" xy="101,96" size="76,49" fontSize="36" color="#977553" text="账号"/>
+    <text id="n41_ozsv" name="inputAccount" xy="297,100" size="560,44" fontSize="30" color="#977553" autoSize="none" text="" input="true" prompt="[color=#BDA893]请输入账号[/color]">
       <relation target="n40_ozsv" sidePair="left-left,top-top"/>
     </text>
-    <text id="n44_ozsv" name="n44" xy="89,205" size="76,49" fontSize="36" color="#977553" text="密码"/>
-    <text id="n45_ozsv" name="inputPassword" xy="285,209" size="560,44" fontSize="30" color="#977553" autoSize="none" text="" input="true" prompt="[color=#BDA893]请设置游戏密码（6-20位）[/color]" password="true">
+    <text id="n44_ozsv" name="n44" xy="101,205" size="76,49" fontSize="36" color="#977553" text="密码"/>
+    <text id="n45_ozsv" name="inputPassword" xy="297,209" size="560,44" fontSize="30" color="#977553" autoSize="none" text="" input="true" prompt="[color=#BDA893]请设置游戏密码（6-20位）[/color]" password="true">
       <relation target="n44_ozsv" sidePair="left-left,top-top"/>
     </text>
-    <text id="n46_ozsv" name="n46" xy="89,325" size="148,49" fontSize="36" color="#977553" text="确认密码"/>
-    <text id="n47_ozsv" name="inputPassword2" xy="285,329" size="560,44" fontSize="30" color="#977553" autoSize="none" text="" input="true" prompt="[color=#BDA893]请确认游戏密码[/color]" password="true">
+    <text id="n46_ozsv" name="n46" xy="101,325" size="148,49" fontSize="36" color="#977553" text="确认密码"/>
+    <text id="n47_ozsv" name="inputPassword2" xy="297,329" size="560,44" fontSize="30" color="#977553" autoSize="none" text="" input="true" prompt="[color=#BDA893]请确认游戏密码[/color]" password="true">
       <relation target="n46_ozsv" sidePair="left-left,top-top"/>
     </text>
-    <text id="n48_ozsv" name="n48" xy="89,445" size="148,49" fontSize="36" color="#977553" text="身份证号"/>
-    <text id="n49_ozsv" name="inputIDNumber" xy="285,450" size="560,44" fontSize="30" color="#977553" autoSize="none" text="" input="true" prompt="[color=#BDA893]请输入身份证号[/color]">
+    <text id="n48_ozsv" name="n48" xy="101,445" size="148,49" fontSize="36" color="#977553" text="身份证号"/>
+    <text id="n49_ozsv" name="inputIDNumber" xy="297,450" size="560,44" fontSize="30" color="#977553" autoSize="none" text="" input="true" prompt="[color=#BDA893]请输入身份证号[/color]">
       <relation target="n48_ozsv" sidePair="left-left,top-top"/>
     </text>
-    <text id="n50_ozsv" name="n50" xy="89,561" size="148,49" fontSize="36" color="#977553" text="真实姓名"/>
-    <text id="n51_ozsv" name="inputName" xy="285,565" size="560,44" fontSize="30" color="#977553" autoSize="none" text="" input="true" prompt="[color=#BDA893]请输入真实姓名[/color]">
+    <text id="n50_ozsv" name="n50" xy="101,561" size="148,49" fontSize="36" color="#977553" text="真实姓名"/>
+    <text id="n51_ozsv" name="inputName" xy="297,565" size="560,44" fontSize="30" color="#977553" autoSize="none" text="" input="true" prompt="[color=#BDA893]请输入真实姓名[/color]">
       <relation target="n50_ozsv" sidePair="left-left,top-top"/>
     </text>
-    <image id="n52_ozsv" name="n52" src="ozsv50" fileName="images/dl_ziti_2.png" xy="0,-130"/>
-    <text id="n53_ozsv" name="n53" xy="645,446" size="208,47" fontSize="34" color="#ca7e76" text="实名认证信息"/>
-    <text id="n54_ozsv" name="n54" xy="645,561" size="208,47" fontSize="34" color="#ca7e76" text="实名认证信息"/>
-    <richtext id="n32_ozsv" name="richTextAgree" xy="205,693" size="549,91" group="n69_b6b4" fontSize="32" color="#aa9278" ubb="true" autoSize="none" text="我已详细阅读并同意"/>
-    <text id="n55_b6b4" name="n55" xy="493,693" size="260,44" group="n64_b6b4" fontSize="32" color="#aa9278" text="游戏许可服务协议"/>
-    <text id="n60_b6b4" name="n60" xy="493,696" size="260,44" group="n64_b6b4" fontSize="32" color="#c6b5a3" autoSize="none" underline="true" text="                         "/>
-    <loader id="n63_b6b4" name="loaEventa" xy="493,701" size="260,32" group="n64_b6b4"/>
-    <group id="n64_b6b4" name="n64" xy="493,693" size="260,46" group="n69_b6b4"/>
-    <text id="n58_b6b4" name="n58" xy="205,741" size="132,44" group="n66_b6b4" fontSize="32" color="#aa9278" text="隐私政策"/>
-    <text id="n61_b6b4" name="n61" xy="205,743" size="137,44" group="n66_b6b4" fontSize="32" color="#c6b5a3" underline="true" text="             "/>
-    <loader id="n65_b6b4" name="loaEventb" xy="209,751" size="124,29" group="n66_b6b4"/>
-    <group id="n66_b6b4" name="n66" xy="205,741" size="137,46" group="n69_b6b4"/>
-    <text id="n59_b6b4" name="n59" xy="333,741" size="292,44" group="n68_b6b4" fontSize="32" color="#aa9278" text="和儿童隐私保护规则"/>
-    <text id="n62_b6b4" name="n62" xy="365,743" size="260,44" group="n68_b6b4" fontSize="32" color="#c6b5a3" underline="true" text="                         "/>
-    <loader id="n67_b6b4" name="loaEventc" xy="367,751" size="255,29" group="n68_b6b4"/>
-    <group id="n68_b6b4" name="n68" xy="333,741" size="292,46" group="n69_b6b4"/>
-    <group id="n69_b6b4" name="n69" xy="205,693" size="549,94"/>
+    <image id="n52_ozsv" name="n52" src="ozsv50" fileName="images/dl_ziti_2.png" xy="0,-130" size="294,154"/>
+    <text id="n53_ozsv" name="n53" xy="657,446" size="206,46" fontSize="34" color="#ca7e76" text="实名认证信息"/>
+    <text id="n54_ozsv" name="n54" xy="657,561" size="206,46" fontSize="34" color="#ca7e76" text="实名认证信息"/>
+    <richtext id="n32_ozsv" name="richTextAgree" xy="217,693" size="549,91" group="n69_b6b4" fontSize="32" color="#aa9278" ubb="true" autoSize="none" text="我已详细阅读并同意"/>
+    <text id="n55_b6b4" name="n55" xy="505,693" size="260,44" group="n64_b6b4" fontSize="32" color="#aa9278" text="游戏许可服务协议"/>
+    <text id="n60_b6b4" name="n60" xy="505,696" size="260,44" group="n64_b6b4" fontSize="32" color="#c6b5a3" autoSize="none" underline="true" text="                         "/>
+    <loader id="n63_b6b4" name="loaEventa" xy="505,701" size="260,32" group="n64_b6b4"/>
+    <group id="n64_b6b4" name="n64" xy="505,693" size="260,46" group="n69_b6b4"/>
+    <text id="n58_b6b4" name="n58" xy="217,741" size="132,44" group="n66_b6b4" fontSize="32" color="#aa9278" text="隐私政策"/>
+    <text id="n61_b6b4" name="n61" xy="217,743" size="137,44" group="n66_b6b4" fontSize="32" color="#c6b5a3" underline="true" text="             "/>
+    <loader id="n65_b6b4" name="loaEventb" xy="221,751" size="124,29" group="n66_b6b4"/>
+    <group id="n66_b6b4" name="n66" xy="217,741" size="137,46" group="n69_b6b4"/>
+    <text id="n59_b6b4" name="n59" xy="345,741" size="292,44" group="n68_b6b4" fontSize="32" color="#aa9278" text="和儿童隐私保护规则"/>
+    <text id="n62_b6b4" name="n62" xy="377,743" size="260,44" group="n68_b6b4" fontSize="32" color="#c6b5a3" underline="true" text="                         "/>
+    <loader id="n67_b6b4" name="loaEventc" xy="379,751" size="255,29" group="n68_b6b4"/>
+    <group id="n68_b6b4" name="n68" xy="345,741" size="292,46" group="n69_b6b4"/>
+    <group id="n69_b6b4" name="n69" xy="217,693" size="549,94"/>
   </displayList>
 </component>

FGUIProject/assets/Login/RegisterUIBackup.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="940,1092">
+<component size="962,1092">
   <displayList>
-    <loader id="n1_q08x" name="bg" xy="0,0" size="940,1092" url="ui://mk0fwx0xlwri5u" fill="scaleFree"/>
-    <component id="n4_q08x" name="btnSubmit" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="280,967">
+    <component id="n1_q08x" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1092"/>
+    <component id="n4_q08x" name="btnSubmit" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="291,967">
       <Button title="提交注册" titleColor="#ffffff" titleFontSize="42"/>
     </component>
     <component id="n5_q08x" name="btnAgree" src="q08x11" fileName="components/ButtonAgree.xml" xy="94,800"/>

FGUIProject/assets/LuckyBox/LuckyBoxPreShowUI.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,1215">
+<component size="962,1158">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n0_ga16" name="bg" xy="0,0" size="936,1215" url="ui://mk0fwx0xlwri5u" fill="scaleFree"/>
-    <text id="n2_ga16" name="txtTitle" xy="105,53" size="726,69" fontSize="52" color="#9b7853" align="center" autoSize="none" text="物品展示"/>
-    <image id="n9_qr4e" name="n9" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,145"/>
-    <image id="n3_ga16" name="n3" src="qr4e27" fileName="images/wpzs_anniu_1.png" xy="177,198"/>
-    <component id="n4_ga16" name="btnItem" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="176,199">
+    <component id="n0_ga16" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1167"/>
+    <text id="n2_ga16" name="txtTitle" xy="118,53" size="726,69" fontSize="52" color="#9b7853" align="center" autoSize="none" text="物品展示"/>
+    <image id="n9_qr4e" name="n9" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,145"/>
+    <image id="n3_ga16" name="n3" src="qr4e27" fileName="images/wpzs_anniu_1.png" xy="190,181" group="n10_dhoa"/>
+    <component id="n4_ga16" name="btnItem" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="189,182" group="n10_dhoa">
       <Button checked="true" title="物品预览" controller="c1" page="0"/>
     </component>
-    <component id="n5_ga16" name="btnProb" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="469,198">
+    <component id="n5_ga16" name="btnProb" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="482,181" group="n10_dhoa">
       <Button title="概率公示" controller="c1" page="1"/>
     </component>
-    <list id="n6_ga16" name="list" xy="83,334" size="770,790" overflow="scroll" lineGap="20" defaultItem="ui://drx9d1usga16k" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
+    <group id="n10_dhoa" name="n10" xy="189,181" size="585,85"/>
+    <list id="n6_ga16" name="list" xy="96,318" size="770,790" overflow="scroll" lineGap="20" defaultItem="ui://drx9d1usga16k" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
       <item/>
@@ -20,7 +21,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n8_ga16" name="compText" src="ga16j" fileName="components/Component1.xml" xy="57,334" size="822,790">
+    <component id="n8_ga16" name="compText" src="ga16j" fileName="components/Component1.xml" xy="70,334" size="822,790">
       <gearDisplay controller="c1" pages="1"/>
     </component>
   </displayList>

FGUIProject/assets/Mail/MailContentUI.xml

@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,1225">
+<component size="962,1225">
   <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n0_ehs9" name="bg" xy="0,93" size="936,1130" url="ui://mk0fwx0xlwri5u" fill="scaleFree"/>
+    <component id="n0_ehs9" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,93" size="962,1130"/>
     <image id="n1_ehs9" name="n1" src="ehs93" fileName="images/yx_btzs.png" pkg="eg2y0ldp" xy="33,0"/>
     <image id="n2_ehs9" name="n2" src="ehs98" fileName="images/yx_btzi_2.png" xy="16,-26"/>
-    <image id="n3_ehs9" name="n3" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,231"/>
-    <text id="n5_ehs9" name="txtTitle" xy="467,147" pivot="0.5,0" anchor="true" size="331,56" fontSize="42" color="#9b7853" text="8月19号更新补偿"/>
-    <component id="n10_ehs9" name="ComContent" src="ehs9g" fileName="components/ComContent.xml" xy="60,280" size="815,418">
+    <image id="n3_ehs9" name="n3" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,231"/>
+    <text id="n5_ehs9" name="txtTitle" xy="480,147" pivot="0.5,0" anchor="true" size="331,56" fontSize="42" color="#9b7853" text="8月19号更新补偿"/>
+    <component id="n10_ehs9" name="ComContent" src="ehs9g" fileName="components/ComContent.xml" xy="73,280" size="815,418">
       <gearSize controller="c1" pages="0,1" values="815,795,1,1|815,418,1,1"/>
     </component>
-    <list id="n15_ehs9" name="listReward" xy="54,791" size="822,224" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="4" colGap="68" defaultItem="ui://eg2y0ldpj48o98" align="center">
+    <list id="n15_ehs9" name="listReward" xy="70,791" size="822,224" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="4" colGap="68" defaultItem="ui://eg2y0ldpj48o98" align="center">
       <gearDisplay controller="c1" pages="1"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n16_ehs9" name="btnGet" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="278,1097">
+    <component id="n16_ehs9" name="btnGet" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="291,1097">
       <gearDisplay controller="c1" pages="1"/>
       <Button title="领取"/>
     </component>
-    <component id="n17_kxic" name="btnDelete" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="278,1097">
+    <component id="n17_kxic" name="btnDelete" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="291,1097">
       <Button title="删除"/>
     </component>
   </displayList>

FGUIProject/assets/Mail/MailUI.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,1225">
+<component size="962,1225">
   <displayList>
-    <loader id="n0_ehs9" name="bg" xy="0,93" size="936,1130" url="ui://mk0fwx0xlwri5u" fill="scaleFree"/>
-    <image id="n1_ehs9" name="n1" src="ehs93" fileName="images/yx_btzs.png" xy="33,0" pkg="eg2y0ldp"/>
-    <image id="n2_ehs9" name="n2" src="ehs92" fileName="images/yx_btzi_1.png" xy="16,-26"/>
-    <list id="n7_ehs9" name="list" xy="31,164" size="874,859" overflow="scroll" lineGap="27" defaultItem="ui://y44a413eehs9d">
+    <component id="n0_ehs9" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,93" size="962,1130"/>
+    <image id="n1_ehs9" name="n1" src="ehs93" fileName="images/yx_btzs.png" pkg="eg2y0ldp" xy="20,0"/>
+    <image id="n2_ehs9" name="n2" src="ehs92" fileName="images/yx_btzi_1.png" xy="3,-26"/>
+    <list id="n7_ehs9" name="list" xy="46,164" size="874,859" overflow="scroll" lineGap="27" defaultItem="ui://y44a413eehs9d">
       <item/>
       <item/>
       <item/>
@@ -12,16 +12,16 @@
       <item/>
       <item/>
     </list>
-    <component id="n9_ehs9" name="btnDelete" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="54,1059">
+    <text id="n10_kxic" name="txtTips" xy="401,559" size="164,54" fontSize="40" color="#736b64" text="暂无邮件"/>
+    <text id="n11_j8b3" name="txtCount" xy="930,113" pivot="1,0" anchor="true" size="243,36" fontSize="26" color="#b19977" ubb="true" text="当前邮件：100/300">
+      <relation target="" sidePair="right-right"/>
+    </text>
+    <text id="n12_j8b3" name="txtMaxCount" xy="246,1170" pivot="0.5,0" size="473,41" fontSize="30" color="#c1aa8f" text="最高可储存300封邮箱，请及时查看"/>
+    <component id="n9_ehs9" name="btnDelete" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,1059">
       <Button title="一键删除"/>
     </component>
-    <component id="n8_ehs9" name="btnGet" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="496,1059">
+    <component id="n8_ehs9" name="btnGet" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,1059">
       <Button title="一键领取"/>
     </component>
-    <text id="n10_kxic" name="txtTips" xy="386,559" size="164,54" fontSize="40" color="#736b64" text="暂无邮件"/>
-    <text id="n11_j8b3" name="txtCount" xy="889,113" pivot="1,0" anchor="true" size="243,36" fontSize="26" color="#b19977" ubb="true" text="当前邮件：100/300">
-      <relation target="" sidePair="right-right"/>
-    </text>
-    <text id="n12_j8b3" name="txtMaxCount" xy="231,1170" pivot="0.5,0" size="473,42" fontSize="30" color="#c1aa8f" text="最高可储存300封邮箱，请及时查看"/>
   </displayList>
 </component>

FGUIProject/assets/Main/StoryCardChooseUI.xml

@@ -20,9 +20,11 @@
       <item/>
       <item/>
     </list>
-    <component id="n2_r1a9" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="79,1105">
+    <component id="n2_r1a9" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="95,1113">
       <Button title="取消"/>
     </component>
-    <component id="n3_r1a9" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="521,1105"/>
+    <component id="n3_r1a9" name="btnConfirm" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="537,1113">
+      <Button title="确认"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/Main/StoryFightQuicklyUI.xml

@@ -17,10 +17,10 @@
       <gearSize controller="c1" pages="0,1" values="895,870,1,1|895,793,1,1"/>
       <relation target="" sidePair="bottomext-bottom"/>
     </list>
-    <component id="n6_s2cc" name="btnExit" src="r9ritjh" fileName="components/Button18.xml" pkg="eg2y0ldp" xy="148,1110" size="342,96" group="n16_nzmy">
-      <Button title="结束挑战" icon="ui://eg2y0ldpr9ritji"/>
+    <component id="n6_s2cc" name="btnExit" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="148,1110" size="342,96" group="n16_nzmy">
+      <Button title="结束挑战" icon="ui://mk0fwx0xr9ritji"/>
     </component>
-    <component id="n5_s2cc" name="btnFightTimes" src="r9ritjg" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="580,1110" group="n16_nzmy">
+    <component id="n5_s2cc" name="btnFightTimes" src="r9ritjg" fileName="components/Button17.xml" pkg="mk0fwx0x" xy="580,1110" group="n16_nzmy">
       <Button title="挑战十次"/>
     </component>
     <group id="n16_nzmy" name="n16" xy="148,1110" size="774,96" group="n19_mueb" advanced="true" layout="hz" colGap="90" excludeInvisibles="true">

FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -16,7 +16,7 @@
     </component>
     <component id="n42_wono" name="comScoreStage" src="wonoh2" fileName="components/ComSingleScoreStage.xml" xy="1022,108" pivot="0.5,0.5" anchor="true"/>
     <loader id="n40_wono" name="loaGlass" xy="402,823" pivot="0.5,0.5" size="274,274" scale="0,0" url="ui://mfvz4q8kwonogt" align="center" vAlign="middle"/>
-    <component id="n4_n0js" name="comClickCircle" src="n0js9b" fileName="components/comClickCircle.xml" xy="120,1439" pivot="0.5,0.5" scale="0,0"/>
+    <component id="n4_n0js" name="comClickCircle" src="n0js9b" fileName="components/comClickCircle.xml" xy="402,823" pivot="0.5,0.5" scale="0,0"/>
     <component id="n36_jj0m" name="btnSpeedUp" src="jj0mdl" fileName="componentsDialog/ButtonSpeedUp1.xml" xy="915,1627">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
@@ -41,12 +41,12 @@
     <item time="0" type="Alpha" target="n40_wono" value="0"/>
     <item time="0" type="Rotation" target="n40_wono" value="0"/>
     <item time="0" type="Scale" target="n40_wono" value="1,1"/>
-    <item time="0" type="Scale" target="n4_n0js" tween="true" startValue="0,0" endValue="1,1" duration="18" ease="Elastic.Out"/>
-    <item time="18" type="Alpha" target="n40_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
-    <item time="48" type="Rotation" target="n40_wono" tween="true" startValue="0" endValue="360" duration="12" ease="Linear"/>
-    <item time="48" type="Scale" target="n40_wono" tween="true" startValue="1,1" endValue="0,0" duration="12" ease="Linear"/>
-    <item time="48" type="XY" target="n40_wono" label="start" tween="true" startValue="402,822" endValue="539.5,108" duration="12" label2="end" ease="Linear"/>
-    <item time="49" type="Scale" target="n4_n0js" value="0,0"/>
+    <item time="0" type="Scale" target="n4_n0js" tween="true" startValue="0,0" endValue="1,1" duration="12" ease="Elastic.Out"/>
+    <item time="12" type="Alpha" target="n40_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
+    <item time="36" type="Rotation" target="n40_wono" tween="true" startValue="0" endValue="360" duration="12" ease="Linear"/>
+    <item time="36" type="Scale" target="n40_wono" tween="true" startValue="1,1" endValue="0,0" duration="12" ease="Linear"/>
+    <item time="36" type="Scale" target="n4_n0js" value="0,0"/>
+    <item time="36" type="XY" target="n40_wono" label="start" tween="true" startValue="402,822" endValue="539.5,108" duration="12" label2="end" ease="Linear"/>
   </transition>
   <transition name="t2">
     <item time="0" type="Alpha" target="n51_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -57,10 +57,10 @@
       <item/>
       <item/>
     </list>
-    <component id="n19_t8o1" name="btnFightOnce" src="v95qtjw" fileName="components/Button22.xml" pkg="eg2y0ldp" xy="102,1046" group="n23_t8o1">
+    <component id="n19_t8o1" name="btnFightOnce" src="v95qtjw" fileName="components/Button22.xml" pkg="mk0fwx0x" xy="102,1046" group="n23_t8o1">
       <Button title="挑战一次"/>
     </component>
-    <component id="n20_t8o1" name="btnFightTimes" src="v95qtjw" fileName="components/Button22.xml" pkg="eg2y0ldp" xy="425,1046" group="n23_t8o1">
+    <component id="n20_t8o1" name="btnFightTimes" src="v95qtjw" fileName="components/Button22.xml" pkg="mk0fwx0x" xy="425,1046" group="n23_t8o1">
       <Button title="挑战十次"/>
     </component>
     <group id="n23_t8o1" name="groupPass" xy="102,1046" size="596,78" advanced="true" layout="hz" colGap="50" excludeInvisibles="true">

FGUIProject/assets/RechargeStore/GiftBagBuyUI.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,695">
+<component size="962,695">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_10not" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,695"/>
-    <image id="n18_iftf" name="n18" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" pkg="eg2y0ldp" xy="230,32"/>
-    <text id="n1_10not" name="txtName" xy="354,31" pivot="0.5,0" size="228,74" fontSize="56" color="#8f6e30" text="礼包礼包"/>
+    <component id="n0_10not" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,695"/>
+    <image id="n18_iftf" name="n18" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" pkg="eg2y0ldp" xy="243,32"/>
+    <text id="n1_10not" name="txtName" xy="367,31" pivot="0.5,0" size="228,74" fontSize="56" color="#8f6e30" text="礼包礼包"/>
     <loader id="n2_10not" name="loaIcon" xy="44,159" pivot="0.5,0.5" size="250,250" aspect="true" url="ui://vlgobc15d4iwl" fill="scaleMatchHeight"/>
     <text id="n3_10not" name="txtLimit" xy="100,420" pivot="0.5,0" size="132,46" fontSize="34" color="#a3926c" align="center" leading="-5" letterSpacing="-2" ubb="true" text="永久限购"/>
     <list id="n4_10not" name="list" xy="299,215" size="690,221" scale="0.9,0.9" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://eg2y0ldpj48o98" align="center">
@@ -16,24 +16,25 @@
     <image id="n5_10not" name="n5" src="dmsi1l" fileName="images/sc_kuangsjsj.png" xy="729,107" group="n7_10not"/>
     <text id="n6_10not" name="txtEndTime" xy="756,105" pivot="0.5,0" size="94,41" group="n7_10not" fontSize="30" color="#ffffff" align="center" leading="-5" letterSpacing="-2" strokeColor="#b98653" strokeSize="2" text="12小时"/>
     <group id="n7_10not" name="grpEndTime" xy="729,105" size="155,42" advanced="true"/>
-    <component id="n16_10not" name="btnBuy" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,566">
+    <component id="n16_10not" name="btnBuy" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,576">
       <gearDisplay controller="c1" pages="0"/>
+      <Button title="购买"/>
     </component>
     <text id="n17_oeuo" name="txtLock" xy="316,540" pivot="0.5,0" size="304,64" fontSize="48" color="#aa946b" text="通关2-10解锁">
       <gearDisplay controller="c1" pages="1"/>
     </text>
-    <loader id="n8_10not" name="loaPriceIcon" xy="322,507" size="60,60" group="n10_10not" visible="false" url="ui://vlgobc1510not1w" fill="scale"/>
-    <text id="n9_10not" name="txtIcon" xy="322,506" size="50,61" group="n10_10not" fontSize="46" color="#a17d5f" text="￥"/>
-    <group id="n10_10not" name="grpIcon" xy="322,506" size="50,61" group="n19_cs8j" advanced="true" layout="hz" excludeInvisibles="true">
+    <loader id="n8_10not" name="loaPriceIcon" xy="335,507" size="60,60" group="n10_10not" visible="false" url="ui://vlgobc1510not1w" fill="scale"/>
+    <text id="n9_10not" name="txtIcon" xy="335,506" size="50,61" group="n10_10not" fontSize="46" color="#a17d5f" text="￥"/>
+    <group id="n10_10not" name="grpIcon" xy="335,506" size="50,61" group="n19_cs8j" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="n11_10not" sidePair="right-left"/>
     </group>
-    <text id="n11_10not" name="txtOriginalPrice" xy="403,506" pivot="0.5,0" size="89,61" group="n19_cs8j" fontSize="46" color="#caa293" align="center" text="400"/>
-    <image id="n12_10not" name="n12" src="dmsi1m" fileName="images/sc_tc_xian_1.png" xy="402,539" pivot="0.5,0" size="92,2" group="n19_cs8j">
+    <text id="n11_10not" name="txtOriginalPrice" xy="416,506" pivot="0.5,0" size="89,61" group="n19_cs8j" fontSize="46" color="#caa293" align="center" text="400"/>
+    <image id="n12_10not" name="n12" src="dmsi1m" fileName="images/sc_tc_xian_1.png" xy="415,539" pivot="0.5,0" size="92,2" group="n19_cs8j">
       <relation target="n11_10not" sidePair="width-width,center-center"/>
     </image>
-    <text id="n14_10not" name="txtPrice" xy="524,506" size="89,61" group="n19_cs8j" fontSize="46" color="#a17d5f" align="center" text="500">
+    <text id="n14_10not" name="txtPrice" xy="537,506" size="89,61" group="n19_cs8j" fontSize="46" color="#a17d5f" align="center" text="500">
       <relation target="n11_10not" sidePair="left-right"/>
     </text>
-    <group id="n19_cs8j" name="grpOriginalPrice" xy="322,506" size="291,62" advanced="true"/>
+    <group id="n19_cs8j" name="grpOriginalPrice" xy="335,506" size="291,62" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/RechargeStore/ItemExchangeUI.xml

@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,695">
+<component size="962,695">
   <displayList>
-    <image id="n0_hinb" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,695"/>
-    <text id="n5_hinb" name="txtName" xy="401,28" pivot="0.5,0" size="116,74" fontSize="56" color="#8f6e30" align="center" text="名字"/>
-    <image id="n19_ai2z" name="n19" src="dmsi1o" fileName="images/sc_tc_kuang_2.png" xy="48,148" group="n21_ai2z"/>
-    <loader id="n4_hinb" name="icon" xy="57,158" size="200,200" group="n21_ai2z" aspect="true"/>
-    <loader id="n17_ugdz" name="rarity" xy="215,158" size="44,94" group="n21_ai2z" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n28_10not" name="txtNum" xy="123,313" pivot="0.5,0" size="69,49" group="n21_ai2z" fontSize="36" color="#fff7e6" align="center" strokeColor="#816531" text="x10"/>
-    <text id="n29_10not" name="txtLastCount" xy="86,358" pivot="0.5,0" size="138,44" group="n21_ai2z" fontSize="32" color="#bc8068" text="剩余:100"/>
-    <group id="n21_ai2z" name="n21" xy="48,148" size="220,254"/>
-    <text id="n30_10not" name="txtHasCount" xy="692,121" size="138,46" fontSize="34" color="#a38e66" align="center" ubb="true" text="已拥有："/>
-    <text id="n32_10not" name="n32" xy="40,422" size="180,59" group="n22_ai2z" fontSize="44" color="#a08249" align="center" text="兑换数量"/>
-    <image id="n8_hinb" name="n8" src="dmsi1p" fileName="images/sc_tc_kuang_3.png" xy="241,429" group="n22_ai2z"/>
-    <text id="n25_t1at" name="txtCount" xy="368,426" size="200,56" group="n22_ai2z" fontSize="42" color="#fdf3d7" align="center" vAlign="middle" autoSize="none" text="找钱"/>
-    <component id="n9_hinb" name="btnPlus" src="hinb5s" fileName="components/ButtonPlus2.xml" pkg="eg2y0ldp" xy="636,421" group="n22_ai2z"/>
-    <component id="n10_hinb" name="btnMinus" src="hinb5t" fileName="components/ButtonMinus1.xml" pkg="eg2y0ldp" xy="232,421" group="n22_ai2z"/>
-    <component id="n23_ai2z" name="btnAll" src="ai2z9f" fileName="components/Button12.xml" pkg="eg2y0ldp" xy="745,417" group="n22_ai2z">
+    <component id="n0_hinb" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,695"/>
+    <text id="n5_hinb" name="txtName" xy="426,28" pivot="0.5,0" size="116,74" fontSize="56" color="#8f6e30" align="center" text="名字"/>
+    <image id="n19_ai2z" name="n19" src="dmsi1o" fileName="images/sc_tc_kuang_2.png" xy="64,148" group="n21_ai2z"/>
+    <loader id="n4_hinb" name="icon" xy="73,158" size="200,200" group="n21_ai2z" aspect="true"/>
+    <loader id="n17_ugdz" name="rarity" xy="231,158" size="44,94" group="n21_ai2z" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <text id="n28_10not" name="txtNum" xy="139,313" pivot="0.5,0" size="69,49" group="n21_ai2z" fontSize="36" color="#fff7e6" align="center" strokeColor="#816531" text="x10"/>
+    <text id="n29_10not" name="txtLastCount" xy="102,358" pivot="0.5,0" size="138,44" group="n21_ai2z" fontSize="32" color="#bc8068" text="剩余:100"/>
+    <group id="n21_ai2z" name="n21" xy="64,148" size="220,254"/>
+    <text id="n30_10not" name="txtHasCount" xy="708,121" size="138,46" fontSize="34" color="#a38e66" align="center" ubb="true" text="已拥有："/>
+    <text id="n32_10not" name="n32" xy="56,422" size="180,59" group="n22_ai2z" fontSize="44" color="#a08249" align="center" text="兑换数量"/>
+    <image id="n8_hinb" name="n8" src="dmsi1p" fileName="images/sc_tc_kuang_3.png" xy="257,429" group="n22_ai2z"/>
+    <text id="n25_t1at" name="txtCount" xy="384,426" size="200,56" group="n22_ai2z" fontSize="42" color="#fdf3d7" align="center" vAlign="middle" autoSize="none" text="找钱"/>
+    <component id="n9_hinb" name="btnPlus" src="hinb5s" fileName="components/ButtonPlus2.xml" pkg="eg2y0ldp" xy="652,421" group="n22_ai2z"/>
+    <component id="n10_hinb" name="btnMinus" src="hinb5t" fileName="components/ButtonMinus1.xml" pkg="eg2y0ldp" xy="248,421" group="n22_ai2z"/>
+    <component id="n23_ai2z" name="btnAll" src="ai2z9f" fileName="components/Button12.xml" pkg="eg2y0ldp" xy="761,417" group="n22_ai2z">
       <Button icon="ui://vlgobc15dmsi1n"/>
     </component>
-    <group id="n22_ai2z" name="n22" xy="40,417" size="849,75"/>
-    <image id="n18_ai2z" name="n18" src="j48o9a" fileName="images/kp_sjsj_di_4.png" pkg="eg2y0ldp" xy="330,521" size="276,34" group="n16_ugdz"/>
-    <text id="n20_ai2z" name="n20" xy="358,510" size="76,49" group="n27_10not" fontSize="36" color="#a08249" text="花费"/>
-    <loader id="n14_ugdz" name="iconPrice" xy="443,519" size="32,32" group="n27_10not" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n15_ugdz" name="txtPrice" xy="484,510" size="93,49" group="n27_10not" fontSize="36" color="#fdf3d7" autoClearText="true" text="9999"/>
-    <group id="n27_10not" name="n27" xy="358,510" size="219,49" group="n16_ugdz"/>
-    <group id="n16_ugdz" name="n16" xy="330,510" size="276,49" advanced="true"/>
-    <component id="n6_hinb" name="btnExchange" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="278,566">
+    <group id="n22_ai2z" name="n22" xy="56,417" size="849,75"/>
+    <image id="n18_ai2z" name="n18" src="j48o9a" fileName="images/kp_sjsj_di_4.png" pkg="eg2y0ldp" xy="346,521" size="276,34" group="n16_ugdz"/>
+    <text id="n20_ai2z" name="n20" xy="374,510" size="76,49" group="n27_10not" fontSize="36" color="#a08249" text="花费"/>
+    <loader id="n14_ugdz" name="iconPrice" xy="459,519" size="32,32" group="n27_10not" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n15_ugdz" name="txtPrice" xy="500,510" size="93,49" group="n27_10not" fontSize="36" color="#fdf3d7" autoClearText="true" text="9999"/>
+    <group id="n27_10not" name="n27" xy="374,510" size="219,49" group="n16_ugdz"/>
+    <group id="n16_ugdz" name="n16" xy="346,510" size="276,49" advanced="true"/>
+    <component id="n6_hinb" name="btnExchange" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="294,566">
       <Button title="兑换"/>
     </component>
-    <text id="n31_10not" name="txtDiscribe" xy="315,176" size="546,96" fontSize="36" color="#a38b64" autoSize="none" text="描述描述描述描述描述描述描述描述"/>
+    <text id="n31_10not" name="txtDiscribe" xy="331,176" size="546,96" fontSize="36" color="#a38b64" autoSize="none" text="描述描述描述描述描述描述描述描述"/>
   </displayList>
   <relation target="n0_hinb" sidePair="height-height"/>
 </component>

FGUIProject/assets/RoleInfo/ChangeHead.xml

@@ -40,7 +40,7 @@
     <text id="n6_r9ri" name="txtDesc" xy="394,345" size="138,46" group="n12_r9ri" fontSize="34" color="#ceb599" text="头像描述"/>
     <group id="n12_r9ri" name="n12" xy="105,187" size="796,238"/>
     <image id="n13_r9ri" name="n13" src="r9rim" fileName="images/grxx_xtxtx.png" xy="88,957"/>
-    <component id="n14_r9ri" name="btnSure" src="r9ritjq" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="356,1003">
+    <component id="n14_r9ri" name="btnSure" src="r9ritjq" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="356,1003">
       <Button title="保存" titleColor="#ffffff" titleFontSize="42"/>
     </component>
   </displayList>

FGUIProject/assets/RoleInfo/ChangeNameUI.xml

@@ -6,7 +6,7 @@
     <text id="n12_r9ri" name="n12" xy="387,87" size="186,61" font="ui://eg2y0ldpwonotja" fontSize="46" color="#a98151" text="修改昵称"/>
     <image id="n13_r9ri" name="n13" src="r9rix" fileName="images/xgnc_dik_2.png" xy="200,238"/>
     <text id="n10_xt5s" name="inputName" xy="217,248" size="526,56" fontSize="38" color="#ac8450" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]请输入新角色名称[/color]" maxLength="7"/>
-    <component id="n5_xt5s" name="btnSure" src="r9ritjq" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="338,490">
+    <component id="n5_xt5s" name="btnSure" src="r9ritjq" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="338,490">
       <Button title="确定" titleColor="#ffffff" titleFontSize="42"/>
     </component>
     <text id="n15_r9ri" name="txtNeed" xy="357,422" size="191,44" group="n17_v95q" fontSize="32" color="#b99f7b" text="改名卡：0/1"/>

FGUIProject/assets/RoleInfo/PersonalSkillUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1087">
   <displayList>
-    <component id="n4_r9ri" name="n4" src="si5ztih" fileName="components/ComBg.xml" pkg="eg2y0ldp" xy="0,0" size="962,1087"/>
+    <component id="n4_r9ri" name="n4" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1087"/>
     <list id="n0_r9ri" name="list" xy="59,212" size="843,785" lineGap="90" defaultItem="ui://374k3dwvr9ri5" autoClearItems="true">
       <item/>
       <item/>
@@ -9,7 +9,7 @@
       <item/>
     </list>
     <image id="n5_r9ri" name="n5" src="r9riv" fileName="images/xgnc_btkuang.png" xy="252,55" size="458,68" group="n7_r9ri"/>
-    <text id="n6_r9ri" name="n6" xy="388,59" size="186,62" group="n7_r9ri" font="ui://eg2y0ldpwonotja" fontSize="46" color="#a98151" text="技能说明"/>
+    <text id="n6_r9ri" name="n6" xy="388,59" size="186,61" group="n7_r9ri" font="ui://eg2y0ldpwonotja" fontSize="46" color="#a98151" text="技能说明"/>
     <group id="n7_r9ri" name="n7" xy="252,55" size="458,68"/>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/SettingUI.xml

@@ -5,10 +5,10 @@
     <image id="n14_oqa1" name="n14" src="r9riv" fileName="images/xgnc_btkuang.png" xy="309,83" size="342,68" group="n16_oqa1"/>
     <text id="n15_oqa1" name="n15" xy="432,87" size="95,62" group="n16_oqa1" font="ui://eg2y0ldpwonotja" fontSize="46" color="#a98151" text="设置"/>
     <group id="n16_oqa1" name="n16" xy="309,83" size="342,68"/>
-    <component id="n9_r9ri" name="btnLogout" src="r9ritjh" fileName="components/Button18.xml" pkg="eg2y0ldp" xy="511,488" aspect="true">
+    <component id="n9_r9ri" name="btnLogout" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="511,488" aspect="true">
       <Button title="注销账户"/>
     </component>
-    <component id="n13_oqa1" name="btnExit" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="112,488" aspect="true">
+    <component id="n13_oqa1" name="btnExit" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="112,488" aspect="true">
       <Button title="返回登录"/>
     </component>
     <text id="n6_r9ri" name="n6" xy="144,273" size="87,56" group="n12_r9ri" font="ui://eg2y0ldpwonotja" fontSize="42" color="#c58c88" text="音乐"/>

FGUIProject/assets/RoleInfo/components/ButtonToggle.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="130,58" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
   <displayList>
     <image id="n0_d4iw" name="n0" src="d4iw6i" fileName="images/grxx_yx_dk.png" xy="0,0">
       <gearDisplay controller="button" pages="0,2"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_d4iw" name="n1" src="d4iw6j" fileName="images/grxx_yx_gb.png" xy="0,0" size="160,76">
+    <image id="n1_d4iw" name="n1" src="d4iw6j" fileName="images/grxx_yx_gb.png" xy="0,0">
       <gearDisplay controller="button" pages="1,3"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>

FGUIProject/assets/Studio/StudioBuyNumUI.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,574">
+<component size="962,574">
   <displayList>
-    <loader id="n26_eiwu" name="loaBg" xy="0,0" size="936,574" url="ui://mk0fwx0xlwri5u" fill="scaleFree"/>
-    <image id="n32_kqhd" name="n32" src="9cth8y" fileName="imagesExport/tctc_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
-    <component id="n6_hinb" name="btnBuy" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="496,419">
-      <Button title="购买"/>
-    </component>
-    <component id="n7_hinb" name="btnExchange" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="55,420">
+    <component id="n26_eiwu" name="loaBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,574"/>
+    <image id="n32_kqhd" name="n32" src="9cth8y" fileName="imagesExport/tctc_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
+    <component id="n27_n3xh" name="comCostItem" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="113,364"/>
+    <component id="n28_n3xh" name="comCostCurrent" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="553,364"/>
+    <text id="n30_n3xh" name="txtTitle" xy="431,30" pivot="0.5,0" size="100,64" fontSize="48" color="#9b7853" text="提示"/>
+    <text id="n29_n3xh" name="txtTips" xy="310,150" pivot="0.5,0" size="342,51" fontSize="38" color="#917961" text="请选择获取次数方式"/>
+    <text id="n31_n3xh" name="txtNum" xy="334,220" pivot="0.5,0" size="294,44" fontSize="32" color="#917961" text="(今日已兑换0/10次)"/>
+    <component id="n7_hinb" name="btnExchange" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,420">
       <Button title="兑换"/>
     </component>
-    <component id="n27_n3xh" name="comCostItem" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="100,364"/>
-    <component id="n28_n3xh" name="comCostCurrent" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="540,364"/>
-    <text id="n30_n3xh" name="txtTitle" xy="418,30" pivot="0.5,0" size="100,64" fontSize="48" color="#9b7853" text="提示"/>
-    <text id="n29_n3xh" name="txtTips" xy="297,150" pivot="0.5,0" size="342,51" fontSize="38" color="#917961" text="请选择获取次数方式"/>
-    <text id="n31_n3xh" name="txtNum" xy="321,220" pivot="0.5,0" size="294,44" fontSize="32" color="#917961" text="(今日已兑换0/10次)"/>
+    <component id="n6_hinb" name="btnBuy" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="529,420">
+      <Button title="购买"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/Travel/TravelUI.xml

@@ -41,10 +41,10 @@
       <gearDisplay controller="c1" pages="2"/>
       <Button title="游历结束"/>
     </component>
-    <component id="n5_wono" name="btnPhoto" src="r9ritjg" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="190,1496" group="n16_wono">
+    <component id="n5_wono" name="btnPhoto" src="r9ritjg" fileName="components/Button17.xml" pkg="mk0fwx0x" xy="190,1496" group="n16_wono">
       <Button title="相册"/>
     </component>
-    <component id="n19_v95q" name="btnFieldGuide" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="583,1496" group="n16_wono">
+    <component id="n19_v95q" name="btnFieldGuide" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="583,1496" group="n16_wono">
       <Button title="图鉴"/>
     </component>
     <group id="n16_wono" name="n16" xy="2,220" size="1076,1471" advanced="true">

FGUIProject/assets/poem/PoemGalleryPreviewUI.xml

@@ -35,15 +35,15 @@
     </text>
     <group id="n23_v95q" name="n23" xy="288,143" size="42,43" group="n12_r9ri"/>
     <group id="n12_r9ri" name="n12" xy="165,35" size="902,236"/>
-    <image id="n11_r9ri" name="n11" src="r9ri125" fileName="imagesGallery/hl_grxxdi.png" xy="0,1813" group="n16_r9ri"/>
-    <text id="n15_r9ri" name="txtTheme" xy="52,1845" size="417,46" group="n16_r9ri" fontSize="34" color="#ac9370" text="11/11至11/12主题名称xx"/>
-    <component id="n13_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="774,1853" group="n16_r9ri">
-      <Button title="50000" icon="ui://iyz778gkr9ri128" selectedIcon="ui://iyz778gkr9ri127"/>
+    <image id="n11_r9ri" name="n11" src="r9ri125" fileName="imagesGallery/hl_grxxdi.png" xy="0,1743" group="n16_r9ri"/>
+    <text id="n15_r9ri" name="txtTheme" xy="52,1812" size="495,54" group="n16_r9ri" fontSize="40" color="#ac9370" text="11/11至11/12主题名称xx"/>
+    <component id="n13_r9ri" name="btnCollect" src="dhoatjt" fileName="componentsGallery/Button14.xml" xy="710,1815" group="n16_r9ri">
+      <Button title="50000" icon="ui://iyz778gkdhoatjp" selectedIcon="ui://iyz778gkdhoatjs"/>
     </component>
-    <component id="n14_r9ri" name="btnVote" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="933,1853" group="n16_r9ri">
-      <Button title="50000" icon="ui://iyz778gkr9ri124" selectedIcon="ui://iyz778gkr9ri123"/>
+    <component id="n14_r9ri" name="btnVote" src="dhoatjt" fileName="componentsGallery/Button14.xml" xy="903,1815" group="n16_r9ri">
+      <Button title="50000" icon="ui://iyz778gkdhoatjr" selectedIcon="ui://iyz778gkdhoatjq"/>
     </component>
-    <group id="n16_r9ri" name="n16" xy="0,1813" size="1080,107" advanced="true">
+    <group id="n16_r9ri" name="n16" xy="0,1743" size="1080,177" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
   </displayList>

FGUIProject/assets/poem/componentsGallery/Button14.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="50,47" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n4_r9ri" name="icon" xy="0,0" size="50,50" url="ui://iyz778gkdhoatjq" autoSize="true"/>
+    <text id="n3_r9ri" name="title" xy="51,0" size="10,46" fontSize="34" color="#ac9370" align="center" vAlign="middle" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+  <relation target="n4_r9ri" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/poem/componentsGallery/ComGetReward.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,703">
   <displayList>
-    <component id="n7_r9ri" name="n7" src="si5ztih" fileName="components/ComBg.xml" pkg="eg2y0ldp" xy="0,0" size="962,703"/>
+    <component id="n7_r9ri" name="n7" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,703"/>
     <text id="n3_r9ri" name="n3" xy="329,60" size="232,61" group="n4_r9ri" font="ui://eg2y0ldpwonotja" fontSize="46" color="#8a7253" text="上期排名："/>
     <text id="n8_r9ri" name="txtRank" xy="569,60" size="64,61" group="n4_r9ri" font="ui://eg2y0ldpwonotja" fontSize="46" color="#cf7e78" text="666"/>
     <group id="n4_r9ri" name="n4" xy="329,60" size="304,61" advanced="true">

FGUIProject/assets/poem/componentsGallery/ComboBox_popup.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="410,155" opaque="false">
+<component size="410,172" opaque="false">
   <displayList>
-    <image id="n0_q08x" name="n0" src="r9ri11q" fileName="imagesGallery/hl_tzkuang_1.png" xy="89,9" size="232,146" group="n2_r9ri">
+    <image id="n0_q08x" name="n0" src="r9ri11q" fileName="imagesGallery/hl_tzkuang_1.png" xy="99,9" size="212,156" group="n2_r9ri">
       <relation target="" sidePair=""/>
     </image>
-    <list id="n1_q08x" name="list" xy="44,24" size="322,132" group="n2_r9ri" overflow="scroll" lineGap="12" defaultItem="ui://iyz778gkr9ri13d" align="center">
+    <list id="n1_q08x" name="list" xy="44,29" size="322,110" group="n2_r9ri" overflow="hidden" lineGap="12" defaultItem="ui://iyz778gkr9ri13d" align="center">
       <relation target="" sidePair=""/>
       <item/>
       <item/>
     </list>
-    <group id="n2_r9ri" name="n2" xy="44,9" size="322,147"/>
+    <group id="n2_r9ri" name="n2" xy="44,9" size="322,156"/>
   </displayList>
 </component>

FGUIProject/assets/poem/package.xml

@@ -75,7 +75,7 @@
     <image id="r9ri11n" name="hl_wxzzi_3.png" path="/imagesGallery/"/>
     <image id="r9ri11o" name="hl_wxzzi_2.png" path="/imagesGallery/"/>
     <image id="r9ri11p" name="hl_wxzzi_1.png" path="/imagesGallery/"/>
-    <image id="r9ri11q" name="hl_tzkuang_1.png" path="/imagesGallery/"/>
+    <image id="r9ri11q" name="hl_tzkuang_1.png" path="/imagesGallery/" scale="9grid" scale9grid="58,36,116,72"/>
     <image id="r9ri11r" name="hl_tzkuang.png" path="/imagesGallery/"/>
     <image id="r9ri11s" name="hl_pxpx.png" path="/imagesGallery/" exported="true"/>
     <image id="r9ri11t" name="hl_dhsc.png" path="/imagesGallery/"/>
@@ -133,6 +133,11 @@
     <image id="r9ri13h" name="xc_hl.png" path="/images/"/>
     <component id="r9ri13i" name="ComGetReward.xml" path="/componentsGallery/"/>
     <image id="v95qtjo" name="zjm_dj_1.png" path="/images/"/>
+    <image id="dhoatjp" name="hl_sc_22.png" path="/imagesGallery/"/>
+    <image id="dhoatjq" name="hl_dz_11.png" path="/imagesGallery/"/>
+    <image id="dhoatjr" name="hl_dz_22.png" path="/imagesGallery/"/>
+    <image id="dhoatjs" name="hl_sc_11.png" path="/imagesGallery/"/>
+    <component id="dhoatjt" name="Button14.xml" path="/componentsGallery/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -26,7 +26,7 @@ namespace GFGGame
         //小圈收缩时间
         public const float SMALL_CIRCLE_TIME = 1;
         //刷新下一个圈的等待时间
-        public const float REFRESH_CIRCLE_WITE_TIME = 0.5f;
+        public const float REFRESH_CIRCLE_WITE_TIME = 0.3f;
         //完成一个圈的总时间
         public const float COMPLETION_CIRCLE_TIME = BIG_CIRCLE_TIME + SMALL_CIRCLE_TIME + REFRESH_CIRCLE_WITE_TIME;
         //登峰造极长按时间

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

@@ -14,7 +14,7 @@ namespace GFGGame
 
         public Dictionary<string, List<string>> msgDic = new Dictionary<string, List<string>>();
 
-        private UI_BtnLog _btnLog;
+        // private UI_BtnLog _btnLog;
 
         public void Init()
         {
@@ -64,11 +64,11 @@ namespace GFGGame
                     msgDic[_all].Add(msg);
                     msgDic[_error].Add(msg);
 
-                    if (_btnLog != null)
-                    {
-                        _btnLog.m_c1.selectedIndex = 1;
-                        _btnLog.target.alpha = 1;
-                    }
+                    // if (_btnLog != null)
+                    // {
+                    //     _btnLog.m_c1.selectedIndex = 1;
+                    //     _btnLog.target.alpha = 1;
+                    // }
                     if (LauncherConfig.onDebug >= 0)
                     {
 #if !UNITY_EDITOR
@@ -99,26 +99,26 @@ namespace GFGGame
 
         private void CreatBtnLog()
         {
-            if (_btnLog == null)
-            {
-                _btnLog = UI_BtnLog.Create();
-                ViewManager.AddChildToDebugLayer(_btnLog.target);
-                this.SetBtnLogVisable(false);
-                _btnLog.target.x = 50;
-                _btnLog.target.y = 1880;
-                _btnLog.target.onClick.Add(this.OnBtnLogClick);
-            }
+            // if (_btnLog == null)
+            // {
+            //     _btnLog = UI_BtnLog.Create();
+            //     ViewManager.AddChildToDebugLayer(_btnLog.target);
+            //     this.SetBtnLogVisable(false);
+            //     _btnLog.target.x = 50;
+            //     _btnLog.target.y = 1880;
+            //     _btnLog.target.onClick.Add(this.OnBtnLogClick);
+            // }
         }
         private void OnBtnLogClick()
         {
             ViewManager.Show(ViewName.LOG_VIEW);
-            _btnLog.m_c1.selectedIndex = 0;
-            _btnLog.target.alpha = 0;
+            // _btnLog.m_c1.selectedIndex = 0;
+            // _btnLog.target.alpha = 0;
         }
 
         public void SetBtnLogVisable(bool visable)
         {
-            _btnLog.target.visible = visable;
+            // _btnLog.target.visible = visable;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingDecompose/UI_ClothingDecomposeRuleUI.cs

@@ -7,7 +7,7 @@ namespace UI.ClothingDecompose
     public partial class UI_ClothingDecomposeRuleUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
+        public GComponent m_loaBg;
         public GTextField m_txtTitle;
         public GTextField m_txtRule;
         public GList m_listReward;
@@ -58,7 +58,7 @@ namespace UI.ClothingDecompose
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaBg = (GComponent)comp.GetChild("loaBg");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtRule = (GTextField)comp.GetChild("txtRule");
             m_listReward = (GList)comp.GetChild("listReward");