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

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

FGUIProject/assets/Activity/package.xml

@@ -16,5 +16,5 @@
     <component id="rkrwj" name="Component1.xml" path="/SevenDayLoginComponents/"/>
     <component id="fqor0" name="FirstChargeBonusUI.xml" path="/" exported="true"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Activity" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Activity" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Arena/package.xml

@@ -172,5 +172,5 @@
     <image id="rv0959" name="dljm_jdq_4.png" path="/images/"/>
     <image id="rv095a" name="dljm_jdq_3.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Arena" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Bag/package.xml

@@ -29,5 +29,5 @@
     <component id="cu9wtmg" name="BtnAdd.xml" path="/components/" exported="true"/>
     <component id="cu9wtmj" name="BtnCancel.xml" path="/components/" exported="true"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Bag" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Bag" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Card/package.xml

@@ -143,5 +143,5 @@
     <image id="fqortln" name="cp_yeqian_bg_shang.png" path="/images/"/>
     <image id="fqortlo" name="cp_yeqian_bg_xia.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Card" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Card" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/ClothingDecompose/package.xml

@@ -31,5 +31,5 @@
     <image id="qyr6u" name="fzfj_yijanniu_4.png" path="/images/"/>
     <component id="qyr6v" name="ComBtnTab.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingDecompose" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/ClothingDecompose" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/ClothingFoster/package.xml

@@ -84,5 +84,5 @@
     <image id="ysx92p" name="tujian_ditup.png" path="/images/"/>
     <image id="weok2q" name="fzyh_fzyh.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingFoster" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/ClothingFoster" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/ClothingShop/package.xml

@@ -72,5 +72,5 @@
     <image id="v95qel" name="fzd_xiant_2.png" path="/images/"/>
     <component id="psphem" name="ArenaShopUI.xml" path="/" exported="true"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingShop" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/ClothingShop" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/ClothingSynthetic/package.xml

@@ -61,5 +61,5 @@
     <image id="weok2j" name="jbhc_btbandi.png" path="/images/"/>
     <image id="weok2k" name="jbhc_btban_3.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingSynthetic" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/ClothingSynthetic" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Common/components/ComBg.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1157" overflow="hidden">
   <displayList>
-    <image id="n23_r9ri" name="n23" src="r9ritjk" fileName="imgnew/tc_tydikua_1.png" xy="0,6"/>
-    <image id="n21_si5z" name="n21" src="si5ztie" fileName="imgnew/tc_tydikua_3.png" xy="0,0">
+    <image id="n23_r9ri" name="n23" src="r9ritjk" fileName="components/tc_tydikua_1.png" xy="0,6">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n21_si5z" name="n21" src="si5ztie" fileName="components/tc_tydikua_3.png" xy="0,0">
       <relation target="" sidePair="top-top"/>
     </image>
-    <image id="n22_si5z" name="n22" src="si5ztif" fileName="imgnew/tc_tydikua_52.png" xy="0,1143">
+    <image id="n22_si5z" name="n22" src="si5ztif" fileName="components/tc_tydikua_52.png" xy="0,1143">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
   </displayList>

FGUIProject/assets/Common/package.xml

@@ -59,5 +59,5 @@
     <image id="a0cf2d" name="lm_an.png" path="/imagesExport/"/>
     <image id="a0cf2w" name="lm_an_2.png" path="/imagesExport/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Common" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Common" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1137" opaque="false">
+<component size="962,1310" opaque="false">
   <displayList>
-    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,15" size="962,1106">
+    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,1" size="962,1307">
       <relation target="n17_ohbx" sidePair="height-height,middle-middle"/>
     </component>
-    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,30" group="n17_ohbx"/>
-    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="0,489" size="962,596" group="n17_ohbx"/>
-    <group id="n17_ohbx" name="grpTips" xy="0,30" size="962,1055" advanced="true" layout="vt" excludeInvisibles="true">
+    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,1" group="n17_ohbx"/>
+    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="0,715" size="962,596" group="n17_ohbx"/>
+    <group id="n17_ohbx" name="grpTips" xy="0,1" size="962,1310" advanced="true" layout="vt" excludeInvisibles="true">
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,40 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,970">
+<component size="962,1025">
   <displayList>
-    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,-11" size="962,992">
-      <relation target="" sidePair="height-height"/>
+    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1025">
+      <relation target="n33_l500" 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="物品名字"/>
-    <text id="n6_si5z" name="txtOwned" xy="747,80" pivot="1,0" size="134,41" group="n12_si5z" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
+    <text id="n6_si5z" name="txtOwned" xy="752,80" pivot="1,0" size="129,41" group="n12_si5z" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
     <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,130" group="n12_si5z"/>
     <loader id="n8_si5z" name="loaRarity" xy="40,164" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
     <loader id="n9_si5z" name="loaIcon" xy="165,253" pivot="0.5,0.5" anchor="true" size="200,200" group="n12_si5z" aspect="true" autoSize="true"/>
     <image id="n10_si5z" name="n10" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="357,167" group="n12_si5z"/>
     <text id="n11_si5z" name="txtDesc" xy="375,189" size="506,166" group="n12_si5z" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-    <text id="n28_s5s9" name="txtExchangeCount" xy="237,314" pivot="1,0" size="62,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
-    <group id="n12_si5z" name="n12" xy="40,58" size="866,313"/>
-    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,445" size="897,15" group="n4_si5z"/>
-    <text id="n3_si5z" name="txtShow" xy="359,423" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
-    <group id="n4_si5z" name="n4" xy="32,423" size="897,54"/>
-    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,530" group="n19_si5z"/>
-    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,528" group="n19_si5z">
+    <text id="n28_s5s9" name="txtExchangeCount" xy="243,314" pivot="1,0" size="56,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
+    <group id="n12_si5z" name="n12" xy="40,58" size="866,313" group="n33_l500" advanced="true"/>
+    <list id="n32_l500" name="listItem" xy="205,391" pivot="0.5,0" size="569,131" group="n33_l500" layout="row" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,564" size="897,15" group="n4_si5z"/>
+    <text id="n3_si5z" name="txtShow" xy="359,542" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
+    <group id="n4_si5z" name="n4" xy="32,542" size="897,54" group="n34_l500"/>
+    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,619" group="n19_si5z"/>
+    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,617" group="n19_si5z">
       <Button icon="ui://eg2y0ldps5s9tip"/>
     </component>
-    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,529" group="n19_si5z"/>
-    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,527" group="n19_si5z">
+    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,618" group="n19_si5z"/>
+    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,616" group="n19_si5z">
       <Button icon="ui://eg2y0ldpsi5ztil"/>
     </component>
-    <text id="n22_si5z" name="txtCostCount" xy="341,535" pivot="0.5,0" size="48,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
-    <group id="n19_si5z" name="n19" xy="175,527" size="612,70"/>
-    <text id="n24_si5z" name="txtTips" xy="318,648" pivot="0.5,0" size="326,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
-    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="416,739" pivot="0.5,0" group="n26_si5z" controller="c1,0"/>
-    <group id="n26_si5z" name="n26" xy="318,648" size="326,137" advanced="true" layout="vt" lineGap="40" excludeInvisibles="true"/>
-    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,827" group="n20_si5z">
+    <text id="n22_si5z" name="txtCostCount" xy="343,624" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
+    <group id="n19_si5z" name="n19" xy="175,616" size="612,70" group="n34_l500"/>
+    <text id="n24_si5z" name="txtTips" xy="319,706" pivot="0.5,0" size="323,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="416,797" pivot="0.5,0" group="n26_si5z" controller="c1,0"/>
+    <group id="n26_si5z" name="n26" xy="318,706" size="326,137" group="n34_l500" advanced="true" layout="vt" lineGap="40" excludeInvisibles="true"/>
+    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,863" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>
-    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,827" size="294,89" group="n20_si5z">
+    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,863" size="294,89" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9til"/>
     </component>
-    <group id="n20_si5z" name="n20" xy="124,827" size="714,89"/>
+    <group id="n20_si5z" name="n20" xy="124,863" size="714,89" group="n34_l500"/>
+    <group id="n34_l500" name="n34" xy="32,542" size="897,410" group="n33_l500" advanced="true"/>
+    <group id="n33_l500" name="n33" xy="32,58" size="897,894" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/BtnTab.xml

@@ -2,7 +2,7 @@
 <component size="290,70" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n1_ojlz" name="n1" src="qkjsbl" fileName="imagesNew/choose_tab.png" xy="0,0">
+    <image id="n1_ojlz" name="n1" src="qkjsbl" fileName="imagesNew/choose_tab.png" xy="0,0" size="290,70">
       <gearDisplay controller="button" pages="1,6"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>

FGUIProject/assets/League/components/Button11.xml → FGUIProject/assets/CommonGame/components/Button11.xml

@@ -2,10 +2,10 @@
 <component size="219,61" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n5_9jv6" name="n5" src="a0cf2o" fileName="images/lm_an_yellow.png" xy="0,0">
+    <image id="n5_9jv6" name="n5" src="a0cf2o" fileName="imagesNew/lm_an_yellow.png" xy="0,0">
       <relation target="" sidePair="width-width"/>
     </image>
-    <text id="n3_u2u3" name="title" xy="87,11" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
+    <text id="n3_u2u3" name="title" xy="87,11" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vAlign="middle" vars="true" text="{value=0}/{maxValue=0}">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/components/ComItemIconNew.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="260,260">
+<component size="124,124">
   <displayList>
-    <image id="n25_pu55" name="n25" src="9jv6tlu" fileName="images/lm_daoju_db.png" xy="0,0"/>
-    <loader id="n12_ehs9" name="loaIcon" xy="130,130" pivot="0.5,0.5" anchor="true" size="200,200" group="n30_9jv6" url="ui://xz8kxrecng0i27" fill="scaleFree" autoSize="true"/>
-    <text id="n17_j48o" name="txtHasCount" xy="131,261" pivot="0.5,0" anchor="true" size="102,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
-    <loader id="n18_j48o" name="loaRarity" xy="183,18" size="44,94" group="n30_9jv6" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="40,109" size="178,40" group="n29_pu55"/>
-    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="40,109" size="178,40" group="n29_pu55"/>
-    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="49,109" size="160,40" group="n29_pu55"/>
-    <group id="n29_pu55" name="n29" xy="40,109" size="178,40" group="n30_9jv6" advanced="true"/>
-    <image id="n24_pu55" name="n24" src="pu55tiw" fileName="images/pfjl_and.png" xy="19,19" size="221,220" group="n27_pu55"/>
-    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="87,104" size="85,49" group="n27_pu55"/>
-    <group id="n27_pu55" name="grpGot" xy="19,19" size="221,220" group="n30_9jv6" visible="false" advanced="true"/>
-    <group id="n30_9jv6" name="n30" xy="19,18" size="221,279"/>
+    <image id="n25_pu55" name="n25" src="l500tlv" fileName="imagesNew/wpk_db_1.png" xy="1,1" group="n30_9jv6"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="63,63" pivot="0.5,0.5" anchor="true" size="102,102" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
+    <text id="n17_j48o" name="txtHasCount" xy="64,194" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <loader id="n18_j48o" name="loaRarity" xy="89,7" size="27,58" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale"/>
+    <image id="n31_l500" name="n31" src="l500tlw" fileName="imagesNew/wpk_sz_db.png" xy="7,86" group="n30_9jv6"/>
+    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="-27,42" size="178,40" group="n29_pu55"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="-27,42" size="178,40" group="n29_pu55"/>
+    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="-18,42" size="160,40" group="n29_pu55"/>
+    <group id="n29_pu55" name="n29" xy="-27,42" size="178,40" group="n30_9jv6" advanced="true"/>
+    <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="6,6" group="n27_pu55"/>
+    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="20,37" size="85,49" group="n27_pu55"/>
+    <group id="n27_pu55" name="grpGot" xy="6,6" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
+    <group id="n30_9jv6" name="n30" xy="-27,1" size="178,229"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/ComItemNew.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="260,260" overflow="hidden" opaque="false">
+<component size="124,124" pivot="0.5,0.5" overflow="hidden" opaque="false">
   <displayList>
     <component id="n25_pu55" name="comItemIcon" src="9jv6tlt" fileName="components/ComItemIconNew.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
-    <text id="n15_ehs9" name="txtCount" xy="243,203" pivot="1,0" anchor="true" size="69,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#5b4b35" align="right" vars="true" text="x200">
-      <relation target="n25_pu55" sidePair="right-right,top-top"/>
+    <text id="n15_ehs9" name="txtCount" xy="61,78" pivot="0.5,0" anchor="true" size="97,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" vars="true" text="x00200">
+      <relation target="n25_pu55" sidePair="center-center"/>
     </text>
-    <text id="n26_r9ri" name="txtName" xy="131,260" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
+    <text id="n26_r9ri" name="txtName" xy="62,124" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
       <relation target="n25_pu55" sidePair="bottom-bottom"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/components/ComTipsBase.xml

@@ -1,28 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,520">
+<component size="962,714">
   <displayList>
-    <text id="n1_s2cc" name="txtName" xy="65,50" size="184,61" group="n24_u2u3" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
-    <text id="n3_s2cc" name="txtOwned" xy="744,72" pivot="1,0" size="137,41" group="n24_u2u3" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
+    <text id="n1_s2cc" name="txtName" xy="65,50" size="186,61" group="n24_u2u3" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
+    <text id="n3_s2cc" name="txtOwned" xy="752,72" pivot="1,0" size="129,41" group="n24_u2u3" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
     <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,122" group="n24_u2u3"/>
     <loader id="n8_si5z" name="loaIcon" xy="187,270" pivot="0.5,0.5" anchor="true" size="200,200" group="n24_u2u3" aspect="true" autoSize="true"/>
     <loader id="n6_ohbx" name="loaRarity" xy="249,156" size="44,94" group="n24_u2u3" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
     <image id="n20_r9ri" name="n20" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="354,162" group="n24_u2u3"/>
     <text id="n9_si5z" name="txtDesc" xy="375,181" size="506,166" group="n24_u2u3" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
     <group id="n24_u2u3" name="n24" xy="56,50" size="850,320" group="n25_u2u3" advanced="true"/>
-    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesExport/kp_sx_1.png" xy="75,390" size="50,50" group="n19_si5z"/>
-    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesExport/kp_sx_2.png" xy="300,390" size="50,50" group="n19_si5z"/>
-    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesExport/kp_sx_3.png" xy="525,390" size="50,50" group="n19_si5z"/>
-    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesExport/kp_sx_4.png" xy="750,390" size="50,50" group="n19_si5z"/>
-    <text id="n15_si5z" name="txtGong" xy="135,394" size="72,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n16_si5z" name="txtShang" xy="360,394" size="72,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n17_si5z" name="txtJue" xy="585,394" size="72,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n18_si5z" name="txtZhi" xy="810,394" size="72,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <group id="n19_si5z" name="grpScore" xy="75,390" size="807,50" group="n25_u2u3" advanced="true"/>
-    <list id="n21_u2u3" name="listTag" xy="71,460" size="377,41" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
+    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="75,400" size="50,50" group="n19_si5z"/>
+    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesNew/kp_sx_2.png" xy="300,400" size="50,50" group="n19_si5z"/>
+    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesNew/kp_sx_3.png" xy="525,400" size="50,50" group="n19_si5z"/>
+    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="750,400" size="50,50" group="n19_si5z"/>
+    <text id="n15_si5z" name="txtGong" xy="135,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n16_si5z" name="txtShang" xy="360,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n17_si5z" name="txtJue" xy="585,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n18_si5z" name="txtZhi" xy="810,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <group id="n19_si5z" name="grpScore" xy="75,400" size="807,50" group="n25_u2u3" advanced="true"/>
+    <list id="n21_u2u3" name="listTag" xy="71,480" size="377,41" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
       <item/>
       <item/>
     </list>
-    <group id="n25_u2u3" name="n25" xy="56,50" size="850,451" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
+    <list id="n26_l500" name="listItem" xy="196,551" pivot="0.5,0" size="569,131" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n25_u2u3" name="n25" xy="56,50" size="850,632" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
   </displayList>
   <relation target="n25_u2u3" sidePair="height-height"/>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -60,8 +60,8 @@
     <component id="pq5x6e" name="Button7.xml" path="/components/" exported="true"/>
     <component id="pq5x6f" name="Button8.xml" path="/components/" exported="true"/>
     <image id="842s6h" name="kp_sx_1.png" path="/imagesNew/" exported="true"/>
-    <image id="842s6i" name="kp_sx_2.png" path="/imagesNew/" exported="true"/>
-    <image id="842s6j" name="kp_sx_3.png" path="/imagesNew/" exported="true"/>
+    <image id="842s6i" name="kp_sx_3.png" path="/imagesNew/" exported="true"/>
+    <image id="842s6j" name="kp_sx_2.png" path="/imagesNew/" exported="true"/>
     <image id="842s6k" name="kp_sx_4.png" path="/imagesNew/" exported="true"/>
     <component id="842s6q" name="BtnNormal1.xml" path="/components/" exported="true"/>
     <image id="j539t" name="hc_kuang_3.png" path="/images/" exported="true" scale="9grid" scale9grid="42,12,84,24"/>
@@ -285,6 +285,22 @@
     <image id="wm603g" name="lm_an__3weixuan.png" path="/imagesNew/" exported="true"/>
     <image id="wm603f" name="lm_an__3xuanzhong.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4m" name="lm_an__tongyi.png" path="/imagesNew/" exported="true"/>
+    <image id="9jv66c" name="lm_an__3xuanzhong2.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/imagesExport/" exported="true"/>
+    <image id="o9gh4b" name="lm_tb_tishi.png" path="/imagesNew/" exported="true"/>
+    <image id="a0cf2h" name="lm_tb.png" path="/imagesNew/" exported="true"/>
+    <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4o" name="lm_an_jujue.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true"/>
+    <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
+    <image id="a0cf2o" name="lm_an_yellow.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="54,15,108,30"/>
+    <image id="o9gh4g" name="lm_kuang_icon.png" path="/imagesNew/" exported="true"/>
+    <image id="9jv66j" name="lm_zsx0.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh40" name="tanchuang.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="255,165,510,239"/>
+    <image id="wm603t" name="lm_zhuangshixian_duan.png" path="/imagesNew/" exported="true"/>
+    <image id="l500tlv" name="wpk_db_1.png" path="/imagesNew/"/>
+    <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
+    <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CreateRole/package.xml

@@ -6,5 +6,5 @@
     <component id="xt5s4" name="ButtonDice.xml" path="/components/"/>
     <image id="hpgr5" name="mc_jlkuang_1.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\CreateRole" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/CreateRole" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/package.xml

@@ -13,5 +13,5 @@
     <image id="fqorb" name="lm_bq_dcm.png" path="/imagesTest/" exported="true"/>
     <image id="fqorc" name="lm_bq_xcm.png" path="/imagesTest/" exported="true"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\DailyWelfare" packageCount="2" genCode="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/package.xml

@@ -198,5 +198,5 @@
     <image id="v461f5" name="jjcdi_jjxian.png" path="/images/"/>
     <image id="rv09f6" name="jjsy_xx_1(1).png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Field/package.xml

@@ -44,5 +44,5 @@
     <image id="mzf819" name="tydc_zizi_4.png" path="/images/" exported="true"/>
     <image id="nasr1a" name="tydc_djdj_4.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Field" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Field" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/FieldGuide/package.xml

@@ -106,5 +106,5 @@
     <image id="mzf842" name="tujian_sjdu.png" path="/imagesExport/"/>
     <image id="mzf843" name="tujian_taoz_3.png" path="/imagesExport/" exported="true"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Friend/package.xml

@@ -48,5 +48,5 @@
     <image id="z73e1c" name="dz_hz_rwdh_1.png" path="/images/"/>
     <image id="gmjo1d" name="hy_dikuang_4.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Friend" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Friend" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Guide/package.xml

@@ -15,7 +15,7 @@
     <image id="v95qj" name="yd_tyafu.png" path="/images/"/>
     <image id="v95qk" name="yd_tykuang_4.png" path="/images/"/>
   </resources>
-  <publish name="Guide" path="..\GameClient\Assets\ResIn\UI\Guide" packageCount="2" genCode="true" extractAlpha="true">
+  <publish name="Guide" path="../GameClient/Assets/ResIn/UI/Guide" packageCount="2" genCode="true" extractAlpha="true">
     <atlas name="默认" index="0"/>
   </publish>
 </packageDescription>

FGUIProject/assets/Launcher/package.xml

@@ -36,5 +36,5 @@
     <image id="pac9tjo" name="dljm_jdq_4.png" path="/images/"/>
     <image id="pac9tjp" name="dljm_jdq_5.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\Resources\UI\Launcher" packageCount="2" genCode="true" codePath="..\GameClient\Assets\Game\Launcher\FairyGUI\GenCode\" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Launcher" packageCount="2" genCode="true" codePath="..\GameClient\Assets\Game\Launcher\FairyGUI\GenCode\" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/LeagueAnswerRewardUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,647">
   <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n0_pvb4" name="n0" src="o9gh40" fileName="images/tanchuang.png" xy="0,0"/>
+    <image id="n0_pvb4" name="n0" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" pkg="eg2y0ldp"/>
     <component id="n1_pvb4" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="895,25" size="111,96"/>
     <image id="n6_pvb4" name="n6" src="9jv66i" fileName="images/lm_biaotizi_13.png" xy="260,96"/>
     <image id="n2_pvb4" name="n2" src="wm603d" fileName="images/lm_yeqian_db.png" xy="143,153" size="293,56" group="n5_pvb4"/>

FGUIProject/assets/League/LeagueAnswerUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,647">
   <displayList>
-    <image id="n8_9jv6" name="n8" src="o9gh40" fileName="images/tanchuang.png" xy="0,0"/>
+    <image id="n8_9jv6" name="n8" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" pkg="eg2y0ldp"/>
     <image id="n17_9jv6" name="n17" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="74,491"/>
     <component id="n9_9jv6" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="899,26"/>
     <component id="n3_pvb4" name="btnRank" src="9jv67a" fileName="components/Button122.xml" xy="922,415">

FGUIProject/assets/League/LeagueAnsweringUI.xml

@@ -30,13 +30,13 @@
     <image id="n45_9jv6" name="n45" src="9jv66q" fileName="images/lm_dt_cy_db.png" xy="25,724">
       <relation target="" sidePair="height-height"/>
     </image>
-    <image id="n39_9jv6" name="n39" src="9jv66j" fileName="images/lm_zsx0.png" xy="170,128"/>
+    <image id="n39_9jv6" name="n39" src="9jv66j" fileName="images/lm_zsx0.png" xy="170,128" pkg="eg2y0ldp"/>
     <component id="n5_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <text id="n7_pvb4" name="txtTime" xy="706,713" size="275,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ceb188" text="活动剩余时间 00:00"/>
     <component id="n8_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="663,718" size="36,37">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <text id="n10_pvb4" name="txtRightCount" xy="435,128" size="196,41" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" ubb="true" vars="true" text="全员已答对[color=#AF5638]{value=0}[/color]题">
       <gearDisplay controller="ctrlQuestionState" pages="1"/>
@@ -122,7 +122,7 @@
     <image id="n47_9jv6" name="n47" src="9jv667" fileName="images/lm_dt_srdb.png" xy="0,1665" group="n56_miy3"/>
     <image id="n48_9jv6" name="n48" src="a0cf2g" fileName="images/lm_sousuok.png" xy="84,1779" group="n56_miy3"/>
     <text id="n35_pvb4" name="txtChat" xy="110,1784" size="653,44" group="n56_miy3" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b4905d" letterSpacing="-2" vars="true" autoSize="none" text="" input="true" prompt="[color=#A7957E]最多输入50个字[/color]" maxLength="50"/>
-    <component id="n36_pvb4" name="btnSend" src="rv091o" fileName="components/Button11.xml" xy="799,1775" size="198,61" group="n56_miy3">
+    <component id="n36_pvb4" name="btnSend" src="rv091o" fileName="components/Button11.xml" xy="799,1775" size="198,61" group="n56_miy3" pkg="eg2y0ldp">
       <Button title="发送"/>
     </component>
     <group id="n56_miy3" name="n56" xy="0,1665" size="1080,255" advanced="true">

FGUIProject/assets/League/LeagueApplyUI.xml

@@ -7,7 +7,7 @@
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <component id="n0_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="642,86" size="36,37">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <list id="n4_rv09" name="list" xy="140,165" size="820,531" overflow="scroll" defaultItem="ui://tw70qm9drv091z" autoClearItems="true">
       <item/>

FGUIProject/assets/League/LeagueChangeNameUI.xml

@@ -35,7 +35,7 @@
       <Button title="修改"/>
     </component>
     <component id="n0_rv09" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="442,915" size="237,46"/>
-    <image id="n12_wm60" name="n12" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,290"/>
+    <image id="n12_wm60" name="n12" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,290" pkg="eg2y0ldp"/>
     <image id="n14_wm60" name="n14" src="wm603l" fileName="images/biaotizi_5.png" xy="202,130"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueChangeNoticeUI.xml

@@ -10,6 +10,6 @@
       <Button title="保存"/>
     </component>
     <image id="n4_wm60" name="n4" src="wm603n" fileName="images/biaotizi_3.png" xy="203,75"/>
-    <image id="n7_wm60" name="n7" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="140,691"/>
+    <image id="n7_wm60" name="n7" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="140,691" pkg="eg2y0ldp"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueConstructUI.xml

@@ -5,7 +5,7 @@
     <image id="n46_o9gh" name="n46" src="o9gh4q" fileName="images/biaotizi_8.png" xy="207,102"/>
     <component id="n73_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="913,51"/>
     <image id="n43_o9gh" name="n43" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="118,187" group="n7_rv09"/>
-    <image id="n39_o9gh" name="n39" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="150,223" group="n7_rv09"/>
+    <image id="n39_o9gh" name="n39" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="150,223" group="n7_rv09" pkg="eg2y0ldp"/>
     <loader id="n0_rv09" name="loaIcon" xy="197,267" size="127,127" group="n7_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <image id="n42_o9gh" name="n42" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="135,435" group="n7_rv09"/>
     <text id="n2_rv09" name="txtName" xy="201,429" pivot="0.5,0" size="107,48" group="n7_rv09" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="宴客厅"/>
@@ -23,7 +23,7 @@
     <component id="n35_a0cf" name="btnUpLv0" src="a0cf31" fileName="components/Button20.xml" xy="160,792" group="n10_rv09"/>
     <group id="n10_rv09" name="n10" xy="118,187" size="274,736" group="n67_o9gh"/>
     <image id="n47_o9gh" name="n47" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="412,187" group="n55_o9gh"/>
-    <image id="n48_o9gh" name="n48" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="444,223" group="n55_o9gh"/>
+    <image id="n48_o9gh" name="n48" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="444,223" group="n55_o9gh" pkg="eg2y0ldp"/>
     <loader id="n49_o9gh" name="loaIcon1" xy="491,267" size="127,127" group="n55_o9gh" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <image id="n50_o9gh" name="n50" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="429,435" group="n55_o9gh"/>
     <text id="n51_o9gh" name="txtName1" xy="495,429" pivot="0.5,0" size="107,48" group="n55_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小酒馆"/>
@@ -46,11 +46,11 @@
     <group id="n56_o9gh" name="n56" xy="424,487" size="259,140" group="n17_rv09" advanced="true" layout="vt" excludeInvisibles="true"/>
     <component id="n36_a0cf" name="btnUpLv1" src="a0cf31" fileName="components/Button20.xml" xy="454,792" group="n17_rv09"/>
     <component id="n68_o9gh" name="btnTips" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="631,235" size="36,37" group="n17_rv09">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <group id="n17_rv09" name="n17" xy="412,187" size="274,736" group="n67_o9gh"/>
     <image id="n57_o9gh" name="n57" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="717,187" group="n65_o9gh"/>
-    <image id="n58_o9gh" name="n58" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="749,223" group="n65_o9gh"/>
+    <image id="n58_o9gh" name="n58" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="749,223" group="n65_o9gh" pkg="eg2y0ldp"/>
     <loader id="n59_o9gh" name="loaIcon2" xy="796,267" size="127,127" group="n65_o9gh" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <image id="n60_o9gh" name="n60" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="734,435" group="n65_o9gh"/>
     <text id="n61_o9gh" name="txtName2" xy="800,429" pivot="0.5,0" size="107,48" group="n65_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小金库"/>
@@ -65,7 +65,7 @@
     <group id="n28_rv09" name="n28" xy="706,187" size="295,736" group="n67_o9gh"/>
     <group id="n67_o9gh" name="n67" xy="118,187" size="883,736" advanced="true"/>
     <component id="n69_o9gh" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="344,968" size="36,37" group="n72_o9gh">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <text id="n70_o9gh" name="n70" xy="389,966" size="202,35" group="n72_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#8d817a" text="雅集每日维护资金"/>
     <component id="n71_o9gh" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="607,960" group="n72_o9gh" controller="c1,1"/>

FGUIProject/assets/League/LeagueGiftUI.xml

@@ -10,7 +10,7 @@
     </image>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" size="111,96"/>
     <image id="n2_pvb4" name="n2" src="9jv669" fileName="images/biaotizi_11.png" xy="203,222" size="673,62"/>
-    <image id="n18_9jv6" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,1649">
+    <image id="n18_9jv6" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,1649" pkg="eg2y0ldp">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
     </image>
@@ -23,9 +23,9 @@
     </component>
     <group id="n6_pvb4" name="n6" xy="613,88" size="304,63"/>
     <component id="n7_pvb4" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="920,101" size="36,37">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
-    <component id="n8_pvb4" name="btnGet" src="rv091o" fileName="components/Button11.xml" xy="430,1697">
+    <component id="n8_pvb4" name="btnGet" src="rv091o" fileName="components/Button11.xml" xy="430,1697" pkg="eg2y0ldp">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="一键领取"/>

FGUIProject/assets/League/LeagueMemberAppointUI.xml

@@ -6,7 +6,7 @@
   </controller>
   <controller name="c2" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
-    <image id="n7_wm60" name="n7" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" size="1021,647"/>
+    <image id="n7_wm60" name="n7" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" size="1021,647" pkg="eg2y0ldp"/>
     <image id="n10_o9gh" name="n10" src="o9gh4j" fileName="images/lm_biaotizi_6.png" xy="260,88"/>
     <component id="n17_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="911,26"/>
     <component id="n6_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="612,88" size="36,37">
@@ -36,6 +36,6 @@
     <component id="n5_rv09" name="btnKick" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="410,520">
       <Button title="请离雅集"/>
     </component>
-    <image id="n18_o9gh" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,480"/>
+    <image id="n18_o9gh" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,480" pkg="eg2y0ldp"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueUI.xml

@@ -8,7 +8,7 @@
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <component id="n22_a0cf" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="296,88" size="36,37" visible="false">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <component id="n18_u2u3" name="btnMember" src="u2u31b" fileName="components/Button3.xml" xy="770,81" size="168,61" controller="c1,1">
       <Button title="雅集成员"/>

FGUIProject/assets/League/components/Button20.xml

@@ -2,10 +2,10 @@
 <component size="189,58" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver,4,disabled" selected="3"/>
   <displayList>
-    <image id="n7_o9gh" name="n7" src="o9gh4l" fileName="images/lm_an__weixuan_qifu.png" xy="0,0">
+    <image id="n7_o9gh" name="n7" src="o9gh4l" fileName="images/lm_an__weixuan_qifu.png" xy="0,0" pkg="eg2y0ldp">
       <gearDisplay controller="button" pages="4"/>
     </image>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="189,58" aspect="true" url="ui://tw70qm9do9gh4k" fill="scale" autoSize="true">
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="189,58" aspect="true" url="ui://eg2y0ldpo9gh4k" fill="scale" autoSize="true">
       <gearDisplay controller="button" pages="0,1,2,3"/>
     </loader>
     <text id="n3_u2u3" name="title" xy="64,9" pivot="0.5,0" size="60,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#683c28" align="center" vars="true" text="升级">

FGUIProject/assets/League/components/Button3.xml

@@ -7,7 +7,7 @@
       <gearSize controller="c1" pages="1" values="146,47,1,1" default="280,47,1,1"/>
     </image>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="168,61" aspect="true" url="ui://tw70qm9da0cf2v" fill="scale" autoSize="true">
-      <gearIcon controller="c1" pages="0,1" values="ui://tw70qm9da0cf2o|ui://tw70qm9da0cf2v"/>
+      <gearIcon controller="c1" pages="0,1" values="ui://eg2y0ldpa0cf2o|ui://tw70qm9da0cf2v"/>
     </loader>
     <text id="n7_a0cf" name="txtCount" xy="173,10" pivot="0.5,0" size="78,39" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#fffcf7" align="center" vars="true" text="{value=30}/{maxValue=30}">
       <gearXY controller="c1" pages="0,1" values="264,10|173,10"/>

FGUIProject/assets/League/components/Button4.xml

@@ -2,7 +2,7 @@
 <component size="219,61" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="219,61" aspect="true" url="ui://tw70qm9da0cf2o" fill="scale" autoSize="true"/>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="219,61" aspect="true" url="ui://eg2y0ldpa0cf2o" fill="scale" autoSize="true"/>
     <text id="n3_u2u3" name="title" xy="67,11" pivot="0.5,0" size="116,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="搜索雅集">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>

FGUIProject/assets/League/components/ComPary.xml

@@ -6,7 +6,7 @@
   </controller>
   <displayList>
     <image id="n14_o9gh" name="n14" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="0,0"/>
-    <image id="n13_o9gh" name="n13" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="32,66"/>
+    <image id="n13_o9gh" name="n13" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="32,66" pkg="eg2y0ldp"/>
     <image id="n16_o9gh" name="n16" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="17,276"/>
     <loader id="n2_rv09" name="LoaIcon" xy="74,109" pivot="0.5,0" size="128,128" aspect="true" url="ui://eg2y0ldpu2u3tkq" align="center" fill="scale"/>
     <text id="n3_rv09" name="txtName" xy="83,270" pivot="0.5,0" size="107,48" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" text="白檀香"/>

FGUIProject/assets/League/components/ListApplyItem.xml

@@ -7,7 +7,7 @@
       <Button title="同意"/>
     </component>
     <component id="n3_rv09" name="btnRefuse" src="rv091x" fileName="components/Button17.xml" xy="655,39" pkg="eg2y0ldp">
-      <Button title="拒绝" icon="ui://tw70qm9do9gh4o"/>
+      <Button title="拒绝" icon="ui://eg2y0ldpo9gh4o"/>
     </component>
     <image id="n5_o9gh" name="n5" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="0,108" size="816,12"/>
   </displayList>

FGUIProject/assets/League/components/ListGiftButItem.xml

@@ -4,17 +4,18 @@
     <image id="n19_9jv6" name="n19" src="9jv65t" fileName="images/lm_kp_db_chang.png" xy="0,0" group="n22_9jv6"/>
     <loader id="n12_pvb4" name="loaIcon" xy="134,265" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
     <text id="n15_pvb4" name="txtCount" xy="210,437" pivot="0.5,0" size="144,34" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="24" color="#b08548" letterSpacing="-2" text="今日剩余：1/1"/>
-    <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/Button17.xml" xy="126,588" group="n22_9jv6" pkg="eg2y0ldp">
-      <Button title="采购" icon="ui://tw70qm9d9jv66c"/>
+     <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/Button17.xml" xy="126,588" group="n22_9jv6" pkg="eg2y0ldp">
+      <Button title="采购" icon="ui://eg2y0ldp9jv66c"/> 
     </component>
     <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="124,636" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>
-    <list id="n13_pvb4" name="listGift" xy="-438,485" pivot="0.5,0" size="1255,267" group="n22_9jv6" scale="0.305,0.305" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+    <list id="n13_pvb4" name="listGift" xy="-113,485" pivot="0.5,0" size="601,132" group="n22_9jv6" scale="0.65,0.65" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+      <item/>
       <item/>
       <item/>
       <item/>
     </list>
     <text id="n18_pvb4" name="txtTime" xy="258,117" pivot="0.5,0" size="102,39" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#be8f4d" align="center" ubb="true" text="剩余1天"/>
     <loader id="n21_9jv6" name="loaType" xy="19,99" size="62,203" group="n22_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
-    <group id="n22_9jv6" name="n22" xy="-438,0" size="1255,801"/>
+    <group id="n22_9jv6" name="n22" xy="-113,0" size="601,801"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListGiftGetItem.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="386,759">
-  <controller name="c1" pages="0,,1," selected="1">
+  <controller name="c1" pages="0,,1," selected="0">
     <remark page="0" value="可领取"/>
     <remark page="1" value="已领取"/>
   </controller>
   <displayList>
-    <loader id="n29_9jv6" name="n29" xy="5,0" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65p" align="center" vAlign="middle" autoSize="true">
+    <loader id="n29_9jv6" name="n29" xy="5,0" size="377,754" group="n28_9jv6" url="ui://tw70qm9d9jv65s" align="center" vAlign="middle" autoSize="true">
       <gearIcon controller="c1" pages="0" values="ui://tw70qm9d9jv65s" default="ui://tw70qm9d9jv65p"/>
     </loader>
     <loader id="n21_9jv6" name="loaType" xy="22,101" size="62,203" group="n28_9jv6" url="ui://tw70qm9d9jv66x" autoSize="true"/>
     <loader id="n15_pvb4" name="loaIcon" xy="137,260" pivot="0.5,0.5" size="112,112" group="n28_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
-    <list id="n13_pvb4" name="listGift" xy="-363,493" pivot="0.5,0" size="1113,266" group="n28_9jv6" scale="0.305,0.305" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+    <list id="n13_pvb4" name="listGift" xy="-113,493" pivot="0.5,0" size="612,129" group="n28_9jv6" scale="0.65,0.65" layout="row" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
       <item/>
       <item/>
       <item/>
@@ -19,6 +19,6 @@
     <image id="n26_9jv6" name="n26" src="9jv66g" fileName="images/lm_biaoqian_ylq.png" xy="28,300" group="n28_9jv6">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <group id="n28_9jv6" name="n28" xy="-363,0" size="1113,759"/>
+    <group id="n28_9jv6" name="n28" xy="-113,0" size="612,754"/>
   </displayList>
 </component>

FGUIProject/assets/League/components/ListRankItem.xml

@@ -9,7 +9,7 @@
     <image id="n28_9jv6" name="n28" src="9jv65u" fileName="images/lm_phb_dk.png" xy="0,1">
       <gearDisplay controller="c2" pages="1"/>
     </image>
-    <image id="n26_9jv6" name="n26" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="64,121" group="n25_9jv6">
+    <image id="n26_9jv6" name="n26" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="64,121" group="n25_9jv6" pkg="eg2y0ldp">
       <gearDisplay controller="c2" pages="0"/>
     </image>
     <loader id="n19_pvb4" name="loaRank" xy="37,14" size="83,83" group="n25_9jv6" url="ui://tw70qm9d9jv65x" autoSize="true">

FGUIProject/assets/League/package.xml

@@ -32,7 +32,6 @@
     <component id="rv091l" name="Button10.xml" path="/components/"/>
     <component id="rv091m" name="ComLeader.xml" path="/components/"/>
     <component id="rv091n" name="ListMemberItem.xml" path="/components/"/>
-    <component id="rv091o" name="Button11.xml" path="/components/"/>
     <component id="rv091r" name="Button14.xml" path="/components/"/>
     <component id="rv091s" name="Button15.xml" path="/components/"/>
     <component id="rv091z" name="ListApplyItem.xml" path="/components/"/>
@@ -46,10 +45,8 @@
     <image id="a0cf2e" name="lm_db.png" path="/images/"/>
     <image id="a0cf2f" name="lm_db2.png" path="/images/"/>
     <image id="a0cf2g" name="lm_sousuok.png" path="/images/"/>
-    <image id="a0cf2h" name="lm_tb.png" path="/images/"/>
     <image id="a0cf2j" name="lm_yz.png" path="/images/"/>
     <image id="a0cf2n" name="lm_sousuok2.png" path="/images/"/>
-    <image id="a0cf2o" name="lm_an_yellow.png" path="/images/" scale="9grid" scale9grid="54,15,108,30"/>
     <image id="a0cf2p" name="lm_tb_huanyp.png" path="/images/"/>
     <image id="a0cf2q" name="lm_db_chang.png" path="/images/" scale="9grid" scale9grid="0,486,1080,275"/>
     <image id="a0cf2r" name="lm_kuang_1.png" path="/images/"/>
@@ -79,14 +76,12 @@
     <image id="wm603n" name="biaotizi_3.png" path="/images/"/>
     <image id="wm603q" name="lm_yeqian_xuanzhong.png" path="/images/"/>
     <component id="wm603r" name="ComHeadIcon.xml" path="/components/"/>
-    <image id="wm603t" name="lm_zhuangshixian_duan.png" path="/images/"/>
     <image id="wm603u" name="lm_chenghao_1.png" path="/images/" exported="true"/>
     <image id="wm603v" name="lm_chenghao_2.png" path="/images/" exported="true"/>
     <image id="wm603w" name="lm_chenghao_3.png" path="/images/" exported="true"/>
     <component id="wm603x" name="Button111.xml" path="/components/"/>
     <component id="wm603y" name="ListIconSmallItem.xml" path="/components/"/>
     <image id="o9gh3z" name="an_close.png" path="/images/"/>
-    <image id="o9gh40" name="tanchuang.png" path="/images/" scale="9grid" scale9grid="255,165,510,239"/>
     <image id="o9gh41" name="lm_zjm_zykuang_2.png" path="/images/" scale="9grid" scale9grid="57,11,114,22"/>
     <image id="o9gh42" name="lm_zjm_zykuang.png" path="/images/"/>
     <image id="o9gh44" name="lm_zjm_mzkuang.png" path="/images/"/>
@@ -96,18 +91,13 @@
     <image id="o9gh48" name="lm_zjm_gnkuang.png" path="/images/"/>
     <image id="o9gh49" name="lm_zjm_djs.png" path="/images/"/>
     <image id="o9gh4a" name="lm_zjm_chkuang.png" path="/images/"/>
-    <image id="o9gh4b" name="lm_tb_tishi.png" path="/images/"/>
     <image id="o9gh4c" name="lm_tb_db_weixuan.png" path="/images/"/>
     <image id="o9gh4d" name="lm_tb_db.png" path="/images/"/>
     <image id="o9gh4e" name="tb_gou.png" path="/images/"/>
     <image id="o9gh4f" name="lm_kuang_qifu_name.png" path="/images/"/>
-    <image id="o9gh4g" name="lm_kuang_icon.png" path="/images/"/>
     <image id="o9gh4h" name="lm_kuang_3.png" path="/images/"/>
     <image id="o9gh4i" name="lm_db_2.png" path="/images/"/>
     <image id="o9gh4j" name="lm_biaotizi_6.png" path="/images/"/>
-    <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/images/"/>
-    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/images/"/>
-    <image id="o9gh4o" name="lm_an_jujue.png" path="/images/"/>
     <image id="o9gh4p" name="biaotizi_9.png" path="/images/"/>
     <image id="o9gh4q" name="biaotizi_8.png" path="/images/"/>
     <image id="o9gh4r" name="biaotizi_7.png" path="/images/"/>
@@ -136,7 +126,6 @@
     <image id="9jv65j" name="biaotizi12.png" path="/images/"/>
     <image id="9jv65k" name="lm_dt_tsdb.png" path="/images/"/>
     <image id="9jv65l" name="lm_dt_tsdk.png" path="/images/"/>
-    <image id="9jv65m" name="lm_dt_zsx1.png" path="/images/"/>
     <image id="9jv65n" name="lm_fgx.png" path="/images/"/>
     <image id="9jv65o" name="lm_fl_db.png" path="/images/" scale="9grid" scale9grid="269,993,538,25"/>
     <image id="9jv65p" name="lm_kp_db.png" path="/images/"/>
@@ -160,10 +149,8 @@
     <image id="9jv669" name="biaotizi_11.png" path="/images/"/>
     <image id="9jv66a" name="fannao.png" path="/images/"/>
     <image id="9jv66b" name="liuhan.png" path="/images/"/>
-    <image id="9jv66c" name="lm_an__3xuanzhong2.png" path="/images/"/>
     <image id="9jv66g" name="lm_biaoqian_ylq.png" path="/images/"/>
     <image id="9jv66i" name="lm_biaotizi_13.png" path="/images/"/>
-    <image id="9jv66j" name="lm_zsx0.png" path="/images/"/>
     <image id="9jv66k" name="lm_bq_dcm.png" path="/images/"/>
     <image id="9jv66l" name="lm_bq_xxcm.png" path="/images/"/>
     <image id="9jv66m" name="lm_ch_dcm.png" path="/images/"/>
@@ -212,5 +199,5 @@
     <component id="miy37v" name="ListSkillScore.xml" path="/"/>
     <component id="miy37w" name="Button124.xml" path="/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Loading/package.xml

@@ -11,5 +11,5 @@
     <image id="pac99" name="dljm_jdq_4.png" path="/images/"/>
     <image id="pac9a" name="dljm_jdq_3.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Loading" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Loading" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Login/package.xml

@@ -50,5 +50,5 @@
     <component id="nasr5m" name="Button13.xml" path="/components/"/>
     <image id="nasr5n" name="cj_xhua.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Login" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Login" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/LuckyBox/package.xml

@@ -63,5 +63,5 @@
     <image id="dhoatab" name="cj_bj_2.png" path="/images/"/>
     <image id="mzf8tac" name="cj_zizi_3.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Mail/package.xml

@@ -22,5 +22,5 @@
     <image id="oq7ro" name="yx_btzs.png" path="/images/"/>
     <image id="oq7rp" name="yx_xiant_1.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Mail" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Mail" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/package.xml

@@ -617,5 +617,5 @@
     <image id="9jv6o2" name="3Second.png" path="/imagesNew/"/>
     <component id="fqoro3" name="ComResultProMask.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Notice/package.xml

@@ -30,5 +30,5 @@
     <component id="kjq3t" name="NoticeSystemShowUI.xml" path="/" exported="true"/>
     <component id="kjq3u" name="ComContent.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Notice" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Notice" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RoleInfo/GMPanelUI.xml

@@ -1,21 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="600,600">
   <displayList>
-    <loader id="n0_d4iw" name="bg" xy="0,0" size="600,600" url="ui://mk0fwx0xq08x4" fill="scaleFree"/>
+    <loader id="n0_d4iw" name="bg" xy="0,0" size="600,730" url="ui://mk0fwx0xq08x4" fill="scaleFree"/>
     <component id="n11_c5sc" name="ComBtn" src="lqp0dm" fileName="components/ComBtn.xml" xy="45,51"/>
-    <richtext id="n3_c5sc" name="n3" xy="70,472" size="130,36" group="n14_g926" fontSize="26" color="#999999" text="添加物品："/>
+    <richtext id="n3_c5sc" name="n3" xy="70,472" size="134,36" group="n14_g926" fontSize="26" color="#999999" text="添加物品："/>
     <graph id="n5_c5sc" name="n5" xy="249,467" size="219,42" group="n14_g926" type="rect" lineSize="0" fillColor="#ffd0cfdb">
       <relation target="n4_c5sc" sidePair="width-width,height-height,center-center,middle-middle"/>
     </graph>
     <text id="n4_c5sc" name="inputItem" xy="249,467" size="219,42" group="n14_g926" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]请输入 物品id 空格 个数[/size][/color]"/>
     <component id="n6_c5sc" name="btnAddItem" src="ki9637" fileName="components/ButtonPlus1.xml" pkg="eg2y0ldp" xy="489,466" group="n14_g926"/>
     <group id="n14_g926" name="n14" xy="70,466" size="459,43"/>
-    <richtext id="n15_g926" name="n15" xy="70,535" size="130,36" group="n19_g926" fontSize="26" color="#999999" text="输入指令："/>
+    <richtext id="n15_g926" name="n15" xy="70,535" size="134,36" group="n19_g926" fontSize="26" color="#999999" text="输入指令："/>
     <graph id="n16_g926" name="n16" xy="249,530" size="219,42" group="n19_g926" type="rect" lineSize="0" fillColor="#ffd0cfdb">
       <relation target="n17_g926" sidePair="width-width,height-height,center-center,middle-middle"/>
     </graph>
     <text id="n17_g926" name="inputGM" xy="249,530" size="219,42" group="n19_g926" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]请输入 指令 空格 状态[/size][/color]"/>
     <component id="n18_g926" name="btnGM" src="ki9637" fileName="components/ButtonPlus1.xml" pkg="eg2y0ldp" xy="489,529" group="n19_g926"/>
     <group id="n19_g926" name="n19" xy="70,529" size="459,43"/>
+    <richtext id="n20_9qpb" name="n20" xy="34,591" size="134,36" group="n23_9qpb" fontSize="26" color="#999999" text="设置计数："/>
+    <text id="n22_9qpb" name="RoleNumType" xy="208,588" size="139,42" group="n23_9qpb" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数类型[/size][/color]" keyboardType="4"/>
+    <text id="n21_9qpb" name="Num" xy="392,588" size="141,42" group="n23_9qpb" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数值[/size][/color]" keyboardType="4"/>
+    <component id="n28_9qpb" name="btnSetNum" src="ki9637" fileName="components/ButtonPlus1.xml" pkg="eg2y0ldp" xy="548,588" group="n23_9qpb"/>
+    <group id="n23_9qpb" name="n23" xy="34,588" size="554,42"/>
+    <richtext id="n24_9qpb" name="n24" xy="37,652" size="134,36" group="n27_9qpb" fontSize="26" color="#999999" text="添加计数："/>
+    <text id="n25_9qpb" name="AddRoleNumType" xy="208,649" size="139,42" group="n27_9qpb" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数类型[/size][/color]" keyboardType="4"/>
+    <text id="n26_9qpb" name="AddNum" xy="392,649" size="141,42" group="n27_9qpb" fontSize="30" vAlign="middle" autoSize="none" text="" input="true" prompt="[color=#999999][size=18]计数值[/size][/color]" keyboardType="4"/>
+    <component id="n29_9qpb" name="btnAddNum" src="ki9637" fileName="components/ButtonPlus1.xml" pkg="eg2y0ldp" xy="548,649" group="n27_9qpb"/>
+    <group id="n27_9qpb" name="n27" xy="37,649" size="551,42"/>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/package.xml

@@ -76,5 +76,5 @@
     <component id="v95qg3" name="ListHeadBorderItem.xml" path="/components/"/>
     <image id="ysx9gg" name="zjm_dj_1.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleInfo" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/RoleInfo" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RoleLvUp/package.xml

@@ -8,5 +8,5 @@
     <component id="mueb4" name="Component1.xml" path="/components/"/>
     <component id="mueb5" name="Component2.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleLvUp" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/RoleLvUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Store/ItemExchangeUI.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="962,695">
-  <displayList>
-    <component id="n0_hinb" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" 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://p9mtgheodmsi1n"/>
-    </component>
-    <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="331,176" size="546,96" fontSize="36" color="#a38b64" autoSize="none" text="描述描述描述描述描述描述描述描述"/>
-  </displayList>
-  <relation target="n0_hinb" sidePair="height-height"/>
-</component>

FGUIProject/assets/Store/RechargeStoreUI.xml → FGUIProject/assets/Store/StoreChargeAddUpUI.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
   <displayList>
-    <component id="n32_hhx9" name="n32" src="fqor7x" fileName="StoreUI.xml" xy="0,0"/>
     <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
-    <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="ComVipLv.xml" xy="62,493"/>
+    <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
     <list id="n10_d4iw" name="list" xy="0,793" size="1080,1033" layout="flow_hz" overflow="hidden" colGap="20" defaultItem="ui://p9mtgheohhx91i" align="center" scrollItemToViewOnClick="false">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>

FGUIProject/assets/Store/StoreChargeUI.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <displayList>
+    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
+    <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
+    <list id="n10_d4iw" name="list" xy="0,793" size="1080,1033" layout="flow_hz" overflow="hidden" colGap="20" defaultItem="ui://p9mtgheohhx91i" align="center" scrollItemToViewOnClick="false">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n29_hhx9" name="n29" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Store/StoreExchangeUI.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <displayList>
+    <list id="n0_l500" name="list" xy="74,513" size="932,1316" layout="flow_hz" overflow="scroll" lineGap="30" colGap="10" defaultItem="ui://p9mtgheo10not1t" autoClearItems="true">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n2_l500" name="n2" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Store/StoreGiftBagUI.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <displayList>
+    <list id="n0_l500" name="list" xy="74,495" size="932,1333" layout="flow_hz" overflow="scroll" lineGap="10" colGap="30" defaultItem="ui://p9mtgheol500tbe" autoClearItems="true">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n2_l500" name="n2" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Store/components/Button3.xml

@@ -15,8 +15,12 @@
     <text id="n4_fqor" name="txt1" xy="31,89" pivot="0.5,0" size="36,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#be8c52" align="center" text="值">
       <gearColor controller="button" pages="0" values="#be8c52,#000000" default="#985e2a,#000000"/>
     </text>
+    <text id="n5_l500" name="txt2" xy="9,22" pivot="0.5,0" size="10,49" font="ui://eg2y0ldpa0cftks" fontSize="36" color="#be8c52" align="center" text="">
+      <gearColor controller="button" pages="0" values="#be8c52,#000000" default="#985e2a,#000000"/>
+    </text>
   </displayList>
   <Button mode="Radio"/>
   <customProperty target="txt0" propertyId="0"/>
   <customProperty target="txt1" propertyId="0"/>
+  <customProperty target="txt2" propertyId="0"/>
 </component>

FGUIProject/assets/Store/components/Button5.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="148,35" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <text id="n9_l500" name="txtIcon" xy="3,-4" size="36,44" group="n8_l500" fontSize="32" color="#5a3e16" align="center" text="￥"/>
+    <loader id="n3_l500" name="loaIcon" xy="41,-2" size="40,40" group="n8_l500" aspect="true" visible="false" url="ui://eg2y0ldpkztethq" fill="scale"/>
+    <text id="n5_l500" name="txtOriginalPrice" xy="46,-3" pivot="0.5,0" size="50,44" group="n7_l500" fontSize="32" color="#725e41" align="center" text="999"/>
+    <image id="n6_l500" name="n6" src="fqortas" fileName="imagesNew/sc_jinxiexian.png" xy="41,16" pivot="0.5,0" group="n7_l500">
+      <relation target="n5_l500" sidePair="width-width"/>
+    </image>
+    <group id="n7_l500" name="grpOriginalPrice" xy="41,-3" size="60,44" group="n8_l500" advanced="true"/>
+    <text id="n4_l500" name="txtPrice" xy="103,-9" size="43,54" group="n8_l500" fontSize="40" color="#5a3e16" text="99"/>
+    <group id="n8_l500" name="n8" xy="3,-9" size="143,54" advanced="true" layout="hz" colGap="2" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Store/components/ComTab.xml

@@ -3,7 +3,7 @@
   <controller name="c1" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <displayList>
     <component id="n9_fqor" name="n9" src="fqortb1" fileName="components/Button3.xml" xy="0,0" group="n14_fqor">
-      <Button checked="true" icon="ui://p9mtgheofqortao" selectedIcon="ui://p9mtgheofqortan" controller="c1" page="1"/>
+      <Button icon="ui://p9mtgheofqortao" selectedIcon="ui://p9mtgheofqortan" controller="c1" page="1"/>
     </component>
     <component id="n10_fqor" name="n10" src="fqortb1" fileName="components/Button3.xml" xy="193,0" group="n14_fqor">
       <Button icon="ui://p9mtgheofqortak" selectedIcon="ui://p9mtgheofqortaj" controller="c1" page="2"/>
@@ -22,8 +22,9 @@
     </component>
     <component id="n13_fqor" name="n13" src="fqortb1" fileName="components/Button3.xml" xy="772,0" group="n14_fqor">
       <Button icon="ui://p9mtgheofqortam" selectedIcon="ui://p9mtgheofqortal" controller="c1" page="5"/>
-      <property target="txt0" propertyId="0" value="竞"/>
-      <property target="txt1" propertyId="0" value="技"/>
+      <property target="txt0" propertyId="0" value="花"/>
+      <property target="txt1" propertyId="0" value="令"/>
+      <property target="txt2" propertyId="0" value="飞"/>
     </component>
     <group id="n14_fqor" name="n14" xy="0,0" size="900,128" advanced="true" layout="hz" colGap="65" excludeInvisibles="true"/>
   </displayList>

FGUIProject/assets/Store/ComVipLv.xml → FGUIProject/assets/Store/components/ComVipLv.xml

@@ -2,20 +2,20 @@
 <component size="956,220">
   <displayList>
     <image id="n33_hhx9" name="n33" src="hhx91" fileName="imagesNew/VipLevel_baseboard.png" xy="0,0"/>
-    <text id="n34_hhx9" name="txtLv" xy="60,65" pivot="0.5,0" size="128,94" group="n38_hhx9" font="ui://p9mtgheohhx91g" fontSize="28" color="#8c8580" text="45"/>
-    <text id="n35_hhx9" name="n35" xy="38,114" size="31,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="lv."/>
-    <image id="n36_hhx9" name="n36" src="fqortau" fileName="imagesNew/sc_xian.png" xy="31,152" size="168,4" group="n38_hhx9"/>
-    <text id="n37_hhx9" name="n37" xy="57,154" size="116,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="累计充值"/>
-    <group id="n38_hhx9" name="n38" xy="31,65" size="168,128"/>
+    <text id="n34_hhx9" name="txtLv" xy="55,65" pivot="0.5,0" size="116,94" group="n38_hhx9" font="ui://p9mtgheohhx91g" fontSize="28" color="#8c8580" letterSpacing="-12" text="88"/>
+    <text id="n35_hhx9" name="n35" xy="40,114" size="31,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="lv."/>
+    <text id="n37_hhx9" name="n37" xy="57,154" size="116,39" group="n38_hhx9" fontSize="28" color="#5a3e16" text="会员等级"/>
+    <group id="n38_hhx9" name="n38" xy="40,65" size="133,128"/>
     <component id="n39_hhx9" name="proExp" src="hhx91p" fileName="components/ProgressBar1.xml" xy="250,139">
       <ProgressBar value="50" max="100"/>
     </component>
     <text id="n40_hhx9" name="n40" xy="265,86" size="100,44" group="n43_hhx9" fontSize="32" color="#8c8580" text="再获得"/>
     <loader id="n41_hhx9" name="loaIcon" xy="365,86" size="45,45" group="n43_hhx9" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n42_hhx9" name="txtTips" xy="410,87" size="323,44" group="n43_hhx9" fontSize="32" color="#8c8580" ubb="true" vars="true" text="{exp=0}经验可升级为[color=#5A3E16]{lv=0}[/color]级会员"/>
-    <group id="n43_hhx9" name="n43" xy="265,86" size="468,45" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <text id="n42_hhx9" name="txtTips" xy="410,87" size="323,44" group="n43_hhx9" fontSize="32" color="#8c8580" ubb="true" vars="true" text="{exp=0}积分可升级为[color=#5A3E16]{vipLv=0}[/color]级会员"/>
+    <group id="n43_hhx9" name="grpTips" xy="265,86" size="468,45" advanced="true" layout="hz" excludeInvisibles="true"/>
     <component id="n44_hhx9" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="862,63" size="52,52">
       <Button icon="ui://p9mtgheofqortar"/>
     </component>
+    <text id="n45_l500" name="txtTipsFull" xy="505,107" size="100,44" fontSize="32" color="#8c8580" ubb="true" vars="true" text="已满级"/>
   </displayList>
 </component>

FGUIProject/assets/Store/components/ListGiftItem.xml

@@ -1,45 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="478,401">
-  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="0"/>
-  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0"/>
+<component size="460,270" overflow="hidden">
+  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="1">
+    <remark page="0" value="可购买"/>
+    <remark page="1" value="已售罄"/>
+  </controller>
+  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0">
+    <remark page="0" value="未解锁"/>
+    <remark page="1" value="已解锁"/>
+  </controller>
   <displayList>
-    <image id="n22_10not" name="n22" src="dmsi1k" fileName="images/sc_kuangdikjia_2.png" xy="0,0"/>
-    <image id="n24_10not" name="n24" src="dmsi1j" fileName="images/sc_kuangczcz.png" xy="2,98" group="n26_10not"/>
-    <text id="n25_10not" name="txtDesc" xy="23,121" size="80,78" group="n26_10not" fontSize="32" color="#ffe5cf" align="center" leading="-5" letterSpacing="-2" vars="true" text="超值&#xA;{count=250}%"/>
-    <group id="n26_10not" name="grpDiscount" xy="2,98" size="128,132" advanced="true"/>
-    <loader id="n23_10not" name="icon" xy="56,186" size="140,140" aspect="true" url="ui://vlgobc15d4iwl" fill="scaleMatchHeight"/>
-    <text id="n27_10not" name="txtName" xy="346,135" pivot="0.5,0" anchor="true" size="85,56" fontSize="42" color="#906d4b" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
-    <image id="n28_10not" name="n28" src="dmsi1l" fileName="images/sc_kuangsjsj.png" xy="269,232" group="n30_10not"/>
-    <text id="n29_10not" name="txtEndTime" xy="300,230" pivot="0.5,0" size="90,41" group="n30_10not" fontSize="30" color="#ffffff" align="center" leading="-5" letterSpacing="-2" strokeColor="#b98653" strokeSize="2" text="12小时"/>
-    <group id="n30_10not" name="grpEndTime" xy="269,230" size="155,42" advanced="true">
-      <gearDisplay controller="c1" pages="0"/>
-    </group>
-    <text id="n32_10not" name="txtLimit" xy="41,332" pivot="0.5,0" size="177,36" fontSize="26" color="#ab9a87" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（0/1）">
-      <gearDisplay controller="c1" pages="0"/>
-    </text>
-    <text id="n31_10not" name="txtLock" xy="347,300" pivot="0.5,0" anchor="true" size="215,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
-      <gearDisplay controller="c2" pages="1"/>
-    </text>
-    <loader id="n36_iftf" name="loaIcon" xy="246,294" size="60,60" group="n38_iftf" visible="false" url="ui://vlgobc15iftftad" fill="scaleFree"/>
-    <text id="n37_iftf" name="txtIcon" xy="245,299" pivot="0.5,0" size="44,54" group="n38_iftf" fontSize="40" color="#896e5f" text="￥"/>
-    <group id="n38_iftf" name="grpIcon" xy="246,299" size="44,54" group="n43_iftf" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <text id="n39_iftf" name="txtOriginalPrice" xy="303,299" pivot="0.5,0" size="71,54" group="n41_iftf" fontSize="40" color="#bca89d" align="center" text="100"/>
-    <image id="n40_iftf" name="n40" src="iftftae" fileName="images/sc_xtxtxt(1).png" xy="306,326" pivot="0.5,0" size="72,2" group="n41_iftf">
-      <relation target="n39_iftf" sidePair="width-width"/>
-    </image>
-    <group id="n41_iftf" name="grpOriginalPrice" xy="300,299" size="78,54" group="n43_iftf" advanced="true"/>
-    <text id="n42_iftf" name="txtPrice" xy="391,299" pivot="0.5,0" size="48,54" group="n43_iftf" fontSize="40" color="#896e5f" align="right" text="10"/>
-    <group id="n43_iftf" name="grpPrice" xy="246,299" size="196,54" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
-      <gearDisplay controller="c1" pages="0"/>
-      <gearDisplay2 controller="c2" pages="0" condition="0"/>
+    <image id="n22_10not" name="n22" src="hhx91f" fileName="imagesNew/GiftBag_baseboard1.png" xy="26,0"/>
+    <image id="n47_l500" name="imgDouble" src="hhx9v" fileName="imagesNew/font_save_baseboard.png" xy="0,-1" group="n26_10not"/>
+    <text id="n48_l500" name="n48" xy="17,7" size="69,46" group="n26_10not" fontSize="34" color="#ffffff" letterSpacing="-2" text="超值"/>
+    <text id="n49_l500" name="txtDesc" xy="13,32" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#cc3300" text="800"/>
+    <text id="n50_l500" name="n50" xy="68,42" size="22,36" group="n51_l500" fontSize="26" color="#ffffff" letterSpacing="-2" text="%"/>
+    <group id="n51_l500" name="n51" xy="13,32" size="77,51" group="n26_10not" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <text id="n44_iftf" name="n44" xy="291,296" size="124,54" fontSize="40" color="#a59f8f" align="center" text="已售罄">
+    <group id="n26_10not" name="grpDiscount" xy="0,-1" size="100,96" advanced="true"/>
+    <loader id="n23_10not" name="icon" xy="61,55" size="162,162" aspect="true" url="ui://p9mtgheohhx91n" fill="scaleMatchHeight"/>
+    <text id="n27_10not" name="txtName" xy="328,26" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
+    <text id="n29_10not" name="txtEndTime" xy="81,220" pivot="0.5,0" size="111,36" fontSize="26" color="#ac4100" align="center" leading="-5" letterSpacing="-2" text="1天后下架"/>
+    <text id="n32_10not" name="txtLimit" xy="229,76" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）"/>
+    <text id="n31_10not" name="txtLock" xy="330,111" pivot="0.5,0" anchor="true" size="239,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" text="飞花令达到段位07解锁">
+      <gearDisplay controller="c2" pages="0"/>
+    </text>
+    <text id="n44_iftf" name="n44" xy="299,120" size="81,36" fontSize="26" color="#a59f8f" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
-      <gearDisplay2 controller="c2" pages="0" condition="0"/>
+      <gearDisplay2 controller="c2" pages="1" condition="0"/>
     </text>
-    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="3,96">
+    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="-7,-61" size="474,379">
       <gearDisplay controller="c1" pages="1"/>
+      <gearDisplay2 controller="c2" pages="0" condition="1"/>
     </image>
+    <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="257,184"/>
   </displayList>
 </component>

FGUIProject/assets/Store/components/ListShopItem.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="290,455" overflow="hidden">
+  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="0">
+    <remark page="0" value="可购买"/>
+    <remark page="1" value="已售罄"/>
+  </controller>
+  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0">
+    <remark page="0" value="未解锁"/>
+    <remark page="1" value="已解锁"/>
+  </controller>
+  <displayList>
+    <image id="n22_10not" name="n22" src="hhx9w" fileName="imagesNew/GiftBag_baseboard.png" xy="0,0"/>
+    <image id="n47_l500" name="imgDouble" src="hhx9v" fileName="imagesNew/font_save_baseboard.png" xy="191,263" group="n26_10not"/>
+    <text id="n48_l500" name="n48" xy="208,271" size="69,46" group="n26_10not" fontSize="34" color="#ffffff" letterSpacing="-2" text="超值"/>
+    <text id="n49_l500" name="txtDesc" xy="207,301" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#cc3300" text="800"/>
+    <text id="n50_l500" name="n50" xy="262,310" size="22,36" group="n51_l500" fontSize="26" color="#ffffff" letterSpacing="-2" text="%"/>
+    <group id="n51_l500" name="n51" xy="207,301" size="77,51" group="n26_10not" advanced="true" layout="hz" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <group id="n26_10not" name="grpDiscount" xy="191,263" size="100,96" advanced="true"/>
+    <loader id="n23_10not" name="icon" xy="61,169" size="162,162" aspect="true" url="ui://p9mtgheohhx91n" fill="scaleMatchHeight"/>
+    <text id="n27_10not" name="txtName" xy="145,72" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
+    <text id="n29_10not" name="txtEndTime" xy="89,340" pivot="0.5,0" size="111,36" fontSize="26" color="#ac4100" align="center" leading="-5" letterSpacing="-2" vars="true" text="{value=1天}后下架"/>
+    <text id="n56_l500" name="txtLimit" xy="45,121" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）"/>
+    <text id="n31_10not" name="txtLock" xy="145,150" pivot="0.5,0" anchor="true" size="229,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" text="飞花令达到段位7解锁">
+      <gearDisplay controller="c2" pages="0"/>
+    </text>
+    <text id="n57_l500" name="n57" xy="104,157" size="81,36" fontSize="26" color="#a59f8f" align="center" text="已售罄">
+      <gearDisplay controller="c1" pages="1"/>
+      <gearDisplay2 controller="c2" pages="1" condition="0"/>
+    </text>
+    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="0,-72" size="291,600">
+      <gearDisplay controller="c1" pages="1"/>
+      <gearDisplay2 controller="c2" pages="0" condition="1"/>
+    </image>
+    <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="71,390"/>
+    <image id="n55_l500" name="n55" src="fqortau" fileName="imagesNew/sc_xian.png" xy="27,119" size="236,4"/>
+  </displayList>
+</component>

FGUIProject/assets/Store/components/ProgressBar1.xml

@@ -5,7 +5,7 @@
     <image id="n0_hhx9" name="n0" src="hhx9e" fileName="imagesNew/VipLevel_Progress_frame1.png" xy="4,3" size="655,18">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_hhx9" name="bar" src="hhx9f" fileName="imagesNew/VipLevel_Progress_fill.png" xy="4,3" size="656,18"/>
+    <image id="n1_hhx9" name="bar" src="hhx9f" fileName="imagesNew/VipLevel_Progress_fill.png" xy="4,3" size="656,18" fillMethod="hz"/>
     <image id="n2_hhx9" name="n2" src="hhx9d" fileName="imagesNew/VipLevel_Progress_frame2.png" xy="0,0" fillMethod="hz"/>
     <text id="n4_hhx9" name="txttitle" xy="576,21" pivot="1,0" size="71,39" fontSize="28" color="#8c8580" align="right" ubb="true" vars="true" text="[color=#5A3E16]{value=0}[/color]/{max=100}"/>
   </displayList>

FGUIProject/assets/Store/package.xml

@@ -50,7 +50,7 @@
     <image id="fqortap" name="sc_zhuangshihua.png" path="/imagesNew/"/>
     <image id="fqortaq" name="sc_tab_xuanzhong.png" path="/imagesNew/"/>
     <image id="fqortar" name="sc_xiangqing.png" path="/imagesNew/"/>
-    <image id="fqortas" name="sc_jinxiexian.png" path="/imagesNew/"/>
+    <image id="fqortas" name="sc_jinxiexian.png" path="/imagesNew/" scale="9grid" scale9grid="15,2,30,4"/>
     <image id="fqortau" name="sc_xian.png" path="/imagesNew/" scale="9grid" scale9grid="11,1,22,2"/>
     <image id="fqortav" name="sc_subTab_xz.png" path="/imagesNew/"/>
     <image id="fqortaw" name="sc_subtab.png" path="/imagesNew/"/>
@@ -64,8 +64,6 @@
     <image id="fqortb7" name="sc_beijing_shang.png" path="/imagesNew/"/>
     <image id="fqortb8" name="sc_yeqian_zhedang.png" path="/imagesNew/"/>
     <component id="10not1v" name="GiftBagBuyUI.xml" path="/" exported="true"/>
-    <component id="10nota8" name="ItemExchangeUI.xml" path="/" exported="true"/>
-    <component id="d4iw0" name="RechargeStoreUI.xml" path="/" exported="true"/>
     <component id="fqor7x" name="StoreUI.xml" path="/" exported="true"/>
     <component id="hhx90" name="ComZhuangShi.xml" path="/components/"/>
     <image id="hhx91" name="VipLevel_baseboard.png" path="/imagesNew/"/>
@@ -129,8 +127,14 @@
     <image id="hhx91n" name="sc_zizhuan_5.png" path="/imagesExport/" exported="true"/>
     <image id="hhx91o" name="sc_zizhuan_6.png" path="/imagesExport/" exported="true"/>
     <component id="hhx91p" name="ProgressBar1.xml" path="/components/"/>
-    <image id="hhx91q" name="sc_beijing.png" path="/imagesNew/"/>
-    <component id="hhx91r" name="ComVipLv.xml" path="/"/>
+    <image id="hhx91q" name="sc_beijing.png" path="/imagesNew/" atlas="alone_npot"/>
+    <component id="hhx91r" name="ComVipLv.xml" path="/components/"/>
+    <component id="l500tb9" name="StoreChargeUI.xml" path="/" exported="true"/>
+    <component id="l500tbb" name="Button5.xml" path="/components/"/>
+    <component id="l500tbc" name="StoreGiftBagUI.xml" path="/" exported="true"/>
+    <component id="l500tbe" name="ListShopItem.xml" path="/components/"/>
+    <component id="l500tbf" name="StoreChargeAddUpUI.xml" path="/" exported="true"/>
+    <component id="l500tbh" name="StoreExchangeUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/Studio/package.xml

@@ -92,5 +92,5 @@
     <image id="psph3c" name="cwxf_zidi_3.png" path="/imgExpot/" exported="true"/>
     <image id="psph3d" name="ejzjm_5.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Studio" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="1"/>
+  <displayList>
+    <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,240">
+      <relation target="" sidePair="left-right"/>
+    </image>
+    <text id="n19_nd17" name="LeftTime" xy="59,241" size="172,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="9天1时5分"/>
+    <image id="n16_nd17" name="n16" src="o9gh4b" fileName="imagesNew/lm_tb_tishi.png" pkg="eg2y0ldp" xy="246,233" size="61,61"/>
+    <component id="n18_nd17" name="LevelProcess" src="nd173t" fileName="components/ExpProcess.xml" xy="107,601">
+      <relation target="" sidePair="left-left"/>
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <component id="n56_itts" name="btnBuyLevel" src="ittstnj" fileName="components/ButtonBuyBattlePassLevel.xml" xy="778,570">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="right-right"/>
+      <property target="text" propertyId="0" value="购买等级"/>
+    </component>
+    <component id="n49_nd17" name="btnOpen" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="778,570">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="right-right"/>
+    </component>
+    <image id="n33_nd17" name="n33" src="uxxstme" fileName="images/txz_nr_db.png" xy="0,683" size="1080,1263"/>
+    <image id="n20_nd17" name="n20" src="uxxstn1" fileName="images/bt_db_dj.png" xy="14,691"/>
+    <text id="n21_nd17" name="n21" xy="35,701" size="68,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b18235" autoSize="none" text="等级"/>
+    <image id="n35_nd17" name="n35" src="uxxstmh" fileName="images/jdt_bg.png" xy="49,737"/>
+    <image id="n22_nd17" name="n22" src="uxxstmx" fileName="images/jdt_pink_2.png" xy="61,750"/>
+    <image id="n32_nd17" name="n32" src="uxxstm3" fileName="images/bt_db_ptzz.png" xy="143,691"/>
+    <image id="n31_nd17" name="n31" src="uxxstmp" fileName="images/txz_jlzz_db_pt.png" xy="136,739" size="254,961"/>
+    <text id="n37_nd17" name="n37" xy="198,698" size="132,50" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#bd697a" align="center" autoSize="none" text="普通织造"/>
+    <image id="n27_nd17" name="n27" src="uxxstml" fileName="images/bt_db_jlzz.png" xy="405,692"/>
+    <image id="n25_nd17" name="n25" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="388,725" size="691,974"/>
+    <text id="n30_nd17" name="n30" xy="667,701" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ae7034" align="center" autoSize="none" text="锦罗织造"/>
+    <image id="n29_nd17" name="n29" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="517,714"/>
+    <image id="n28_nd17" name="n28" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="822,714" flip="hz"/>
+    <list id="n48_nd17" name="RewardList" xy="2,748" size="1080,790" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n36_nd17" name="n36" src="uxxstmu" fileName="images/zsx_flower.png" xy="755,736" size="14,869"/>
+    <image id="n26_nd17" name="n26" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="1,1538" size="1080,217"/>
+    <component id="n51_nd17" name="btnGetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="408,1781" size="266,70">
+      <Button title="一键领取"/>
+    </component>
+    <component id="n52_or80" name="n52" src="or80tlw" fileName="components/BattlePassReward.xml" xy="5,1577"/>
+    <image id="n53_or80" name="n53" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="139,1548"/>
+    <text id="n54_or80" name="n54" xy="412,1549" size="196,44" fontSize="32" color="#915e15" text="下个特别大奖"/>
+  </displayList>
+</component>

FGUIProject/assets/Task/BuyBattlePassLevelUI.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1021,647" designImageOffsetY="-523">
+  <displayList>
+    <image id="n0_or80" name="n0" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0"/>
+    <component id="n1_or80" name="CloseBtn" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="903,25">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
+    <image id="n3_or80" name="n3" src="uxxstms" fileName="images/lm_biaotizi_13.png" xy="248,83"/>
+    <text id="n4_or80" name="n4" xy="186,130" size="228,39" fontSize="28" color="#b79f7d" text="立即获得以下奖励"/>
+    <image id="n5_or80" name="n5" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="148,488"/>
+    <list id="n6_or80" name="n6" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://5mpsibzznd1743">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n9_or80" name="n9" xy="447,558" size="171,39" fontSize="28" color="#b79f7d" vars="true" text="{startLeve=0}级提升至{endLevel=1}级"/>
+    <component id="n10_itts" name="n10" src="uxxstm2" fileName="components/AddReduceButton.xml" xy="367,498"/>
+  </displayList>
+</component>

FGUIProject/assets/Task/ComBattle.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="947,1575">
-  <controller name="c1" pages="0,,1," selected="0">
-    <remark page="0" value="普通织造"/>
-    <remark page="1" value="特别织造"/>
-  </controller>
-  <displayList>
-    <component id="n12_fqor" name="n12" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="4,0" group="n14_fqor">
-      <Button checked="true" title="普通织造" controller="c1" page="0"/>
-    </component>
-    <component id="n13_fqor" name="n13" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="339,0" group="n14_fqor">
-      <Button title="特别织造" controller="c1" page="1"/>
-    </component>
-    <group id="n14_fqor" name="n14" xy="4,0" size="625,70" advanced="true" layout="hz" colGap="45" excludeInvisibles="true"/>
-    <image id="n3_wet2" name="n3" src="wet22h" fileName="images/mrqd_kdi.png" xy="126,-383" group="n10_wet2"/>
-    <text id="n7_wet2" name="txtDesc0" xy="142,-376" size="208,44" group="n11_slkg" fontSize="32" color="#d5c9a5" text="今日活跃度40 "/>
-    <loader id="n9_wet2" name="loaIcon" xy="345,-376" size="46,44" group="n11_slkg" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n8_wet2" name="txtDesc1" xy="386,-376" size="300,44" group="n11_slkg" fontSize="32" color="#d5c9a5" autoSize="none" text="，满40活跃度可领奖"/>
-    <group id="n11_slkg" name="n11" xy="142,-376" size="544,44" group="n10_wet2" advanced="true" layout="hz" colGap="-5" excludeInvisibles="true"/>
-    <group id="n10_wet2" name="n10" xy="126,-383" size="588,58" visible="false" advanced="true">
-      <relation target="" sidePair="center-center,top-top"/>
-    </group>
-    <component id="n4_wet2" name="btnGetAll" src="wet22k" fileName="components/Button3.xml" xy="313,1475">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/Task/ComTask.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="947,1575">
-  <controller name="c1" pages="0,,1," selected="0">
-    <remark page="0" value="每日任务"/>
-    <remark page="1" value="织造任务"/>
-  </controller>
-  <displayList>
-    <list id="n1_lh8v" name="listReward" xy="16,333" size="914,194" layout="row" colGap="40" defaultItem="ui://5mpsibzzlh8v6" autoClearItems="true">
-      <relation target="" sidePair="center-center,top-top"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n12_fqor" name="n12" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="4,0" group="n14_fqor">
-      <Button checked="true" title="今日任务" controller="c1" page="0"/>
-    </component>
-    <component id="n13_fqor" name="n13" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="339,0" group="n14_fqor">
-      <Button title="织造任务" controller="c1" page="1"/>
-    </component>
-    <group id="n14_fqor" name="n14" xy="4,0" size="625,70" advanced="true" layout="hz" colGap="45" excludeInvisibles="true"/>
-    <image id="n3_wet2" name="n3" src="wet22h" fileName="images/mrqd_kdi.png" xy="126,-383" group="n10_wet2"/>
-    <text id="n7_wet2" name="txtDesc0" xy="142,-376" size="208,44" group="n11_slkg" fontSize="32" color="#d5c9a5" text="今日活跃度40 "/>
-    <loader id="n9_wet2" name="loaIcon" xy="345,-376" size="46,44" group="n11_slkg" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n8_wet2" name="txtDesc1" xy="386,-376" size="300,44" group="n11_slkg" fontSize="32" color="#d5c9a5" autoSize="none" text="，满40活跃度可领奖"/>
-    <group id="n11_slkg" name="n11" xy="142,-376" size="544,44" group="n10_wet2" advanced="true" layout="hz" colGap="-5" excludeInvisibles="true"/>
-    <group id="n10_wet2" name="n10" xy="126,-383" size="588,58" visible="false" advanced="true">
-      <relation target="" sidePair="center-center,top-top"/>
-    </group>
-    <list id="n0_lh8v" name="list" xy="0,542" size="940,884" overflow="scroll" lineGap="40" defaultItem="ui://5mpsibzzlh8v5" align="center" autoClearItems="true">
-      <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n4_wet2" name="btnGetAll" src="wet22k" fileName="components/Button3.xml" xy="313,1475">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/Task/CombTaskUI.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <controller name="c1" pages="0,,1," selected="0">
+    <remark page="0" value="每日任务"/>
+    <remark page="1" value="织造任务"/>
+  </controller>
+  <displayList>
+    <component id="n15_ids4" name="LivenessProcess" src="ids449" fileName="components/LivenessRewardProcess.xml" xy="70,717" size="949,53">
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <list id="n0_lh8v" name="TaskList" xy="0,937" size="1080,778" overflow="scroll" defaultItem="ui://5mpsibzzlh8v5" align="center" autoClearItems="true">
+      <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n21_ids4" name="n21" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="176,883"/>
+    <text id="n22_ids4" name="n22" xy="438,880" size="215,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" letterSpacing="4" autoSize="none" text="每日5:00刷新"/>
+    <image id="n17_ids4" name="n17" src="uxxstm8" fileName="images/yeqian_db.png" xy="302,804" size="491,72"/>
+    <component id="n25_ids4" name="n25" src="ids44e" fileName="components/TabButton.xml" xy="294,805" group="n27_ids4">
+      <Button checked="true" controller="c1" page="0"/>
+    </component>
+    <component id="n26_ids4" name="n26" src="ids44e" fileName="components/TabButton.xml" xy="555,805" group="n27_ids4">
+      <Button title="织造任务" controller="c1" page="1"/>
+    </component>
+    <group id="n27_ids4" name="n27" xy="294,805" size="522,72" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <component id="n18_ids4" name="GetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="405,1779" size="273,59">
+      <relation target="" sidePair="bottom-bottom"/>
+      <Button title="一键领取" titleColor="#915e15"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Task/DailyTaskUI.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
-  <displayList>
-    <loader id="n13_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </loader>
-    <list id="n1_lh8v" name="listReward" xy="82,273" size="914,194" layout="row" colGap="40" defaultItem="ui://5mpsibzzlh8v6" autoClearItems="true">
-      <relation target="" sidePair="center-center,top-top"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <image id="n3_wet2" name="n3" src="wet22h" fileName="images/mrqd_kdi.png" xy="246,494" group="n10_wet2"/>
-    <text id="n7_wet2" name="txtDesc0" xy="262,501" size="208,44" group="n11_slkg" fontSize="32" color="#d5c9a5" text="今日活跃度40 "/>
-    <loader id="n9_wet2" name="loaIcon" xy="471,501" size="46,44" group="n11_slkg" url="ui://eg2y0ldpkztethq" fill="scale"/>
-    <text id="n8_wet2" name="txtDesc1" xy="512,501" size="300,44" group="n11_slkg" fontSize="32" color="#d5c9a5" autoSize="none" text="，满40活跃度可领奖"/>
-    <group id="n11_slkg" name="n11" xy="262,501" size="550,44" group="n10_wet2" advanced="true" layout="hz" colGap="-5" excludeInvisibles="true"/>
-    <group id="n10_wet2" name="n10" xy="246,494" size="588,58" visible="false" advanced="true">
-      <relation target="" sidePair="center-center,top-top"/>
-    </group>
-    <list id="n0_lh8v" name="list" xy="70,659" size="940,1040" overflow="scroll" lineGap="40" defaultItem="ui://5mpsibzzlh8v5" align="center" autoClearItems="true">
-      <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n4_wet2" name="btnGetAll" src="wet22k" fileName="components/Button3.xml" xy="697,1748">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </component>
-    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,0">
-      <relation target="" sidePair="right-right,top-top"/>
-    </component>
-    <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,152">
-      <relation target="" sidePair="left-left,top-top"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/Task/OpenBattlePassUI.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1021,647" designImageOffsetY="-523">
+  <displayList>
+    <image id="n0_or80" name="n0" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0"/>
+    <component id="n1_or80" name="CloseBtn" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="903,25">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
+    <image id="n3_or80" name="n3" src="uxxstmv" fileName="images/lm_biaotizi_12.png" xy="248,83"/>
+    <text id="n4_or80" name="n4" xy="186,130" size="228,39" fontSize="28" color="#b79f7d" text="解锁特别制造奖励"/>
+    <image id="n5_or80" name="n5" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="148,488"/>
+    <list id="n6_or80" name="n6" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://5mpsibzznd1743">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n8_or80" name="OpenBtn" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="411,510">
+      <Button title="68元"/>
+    </component>
+    <text id="n9_or80" name="n9" xy="419,572" size="241,39" fontSize="28" color="#b79f7d" text="可获得680会员积分"/>
+  </displayList>
+</component>

FGUIProject/assets/Task/TaskUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="2,,0,,1," selected="2">
+  <controller name="c1" pages="2,,0,,1," selected="1">
     <remark page="1" value="任务"/>
     <remark page="2" value="锦罗织造"/>
   </controller>
@@ -8,24 +8,18 @@
     <loader id="n13_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,0">
+    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="2,36" controller="c1,0">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,170">
+    <component id="n6_wet2" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="48,105">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <component id="n15_fqor" name="n15" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="167,187" group="n17_fqor">
-      <Button title="今日任务" controller="c1" page="0"/>
+    <component id="n15_fqor" name="n15" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="246,118" group="n17_fqor">
+      <Button checked="true" title="今日任务" controller="c1" page="0"/>
     </component>
-    <component id="n16_fqor" name="n16" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="457,187" group="n17_fqor">
-      <Button checked="true" title="锦罗织造" controller="c1" page="1"/>
-    </component>
-    <group id="n17_fqor" name="n17" xy="167,187" size="580,70" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <component id="n1_lh8v" name="comTask" src="fqor2p" fileName="ComTask.xml" xy="66,290" size="947,1558">
-      <gearDisplay controller="c1" pages="0"/>
-    </component>
-    <component id="n18_fqor" name="comBattle" src="fqor2q" fileName="ComBattle.xml" xy="66,290">
-      <gearDisplay controller="c1" pages="1"/>
+    <component id="n16_fqor" name="n16" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="536,118" group="n17_fqor">
+      <Button title="锦罗织造" controller="c1" page="1"/>
     </component>
+    <group id="n17_fqor" name="n17" xy="246,118" size="580,70" advanced="true" layout="hz" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/Task/components/AddReduceButton.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="348,63" designImageOffsetX="-366" designImageOffsetY="-1020">
+  <displayList>
+    <image id="n1_uxxs" name="n1" src="uxxstm9" fileName="images/db_jiajian.png" xy="24,2"/>
+    <text id="n0_uxxs" name="n0" xy="145,8" size="123,48" fontSize="35" autoSize="none" text="" input="true"/>
+    <image id="n2_uxxs" name="n2" src="uxxstm6" fileName="images/an_jia.png" xy="287,2"/>
+    <image id="n3_uxxs" name="n3" src="uxxstmz" fileName="images/an_jian.png" xy="-4,3"/>
+    <image id="n4_uxxs" name="n4" src="a0cf2h" fileName="imagesNew/lm_tb.png" pkg="eg2y0ldp" xy="106,17"/>
+  </displayList>
+</component>