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

# Conflicts:
#	GameClient/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0!a.png
#	GameClient/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_atlas0.png
#	GameClient/Assets/ResIn/UI/EnduringGiftBox/EnduringGiftBox_fui.bytes

FGUIProject/assets/Activity/FirstChargeBonusUI.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="994,1393">
-  <controller name="c1" pages="0,,1,,2," selected="1">
-    <remark page="0" value="充值"/>
-    <remark page="1" value="领取"/>
-    <remark page="2" value="已领取"/>
-  </controller>
-  <displayList>
-    <image id="n0_fqor" name="n0" src="ox5b9" fileName="SevenDayLoginImages/yzhd_ditu.png" xy="0,0"/>
-    <list id="n1_fqor" name="list" xy="84,201" size="681,830" layout="flow_hz" overflow="scroll" defaultItem="ui://eg2y0ldpj48o98">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n2_fqor" name="btnCharge" src="rv091p" fileName="components/BtnYellowBig.xml" pkg="eg2y0ldp" xy="538,1073">
-      <gearDisplay controller="c1" pages="0"/>
-      <Button title="充值"/>
-    </component>
-    <component id="n3_fqor" name="btnGet" src="rv091p" fileName="components/BtnYellowBig.xml" pkg="eg2y0ldp" xy="540,1074">
-      <gearDisplay controller="c1" pages="1,2"/>
-      <gearLook controller="c1" pages="2" values="1,0,0,1" default="1,0,0,1"/>
-      <gearText controller="c1" pages="1" values="领取" default="已领取"/>
-      <Button title="领取"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/Activity/package.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packageDescription id="5uawdql9">
-  <resources>
-    <component id="lh8v6" name="SevenDayLoginUI.xml" path="/" exported="true"/>
-    <component id="jyml7" name="ListItem.xml" path="/SevenDayLoginComponents/"/>
-    <image id="ox5b8" name="yzhl_yqd.png" path="/SevenDayLoginImages/"/>
-    <image id="ox5b9" name="yzhd_ditu.png" path="/SevenDayLoginImages/"/>
-    <image id="ox5ba" name="yzhd_dyt_1.png" path="/SevenDayLoginImages/" exported="true"/>
-    <image id="ox5bb" name="yzhd_dyt_2.png" path="/SevenDayLoginImages/" exported="true"/>
-    <image id="ox5bc" name="yzhd_dyt_3.png" path="/SevenDayLoginImages/" exported="true"/>
-    <image id="ox5bd" name="yzhd_dyt_4.png" path="/SevenDayLoginImages/" exported="true"/>
-    <image id="ox5be" name="yzhd_dyt_6.png" path="/SevenDayLoginImages/" exported="true"/>
-    <image id="ox5bf" name="yzhd_dyt_7.png" path="/SevenDayLoginImages/" exported="true"/>
-    <image id="ox5bg" name="yzhd_dyt_5.png" path="/SevenDayLoginImages/" exported="true"/>
-    <image id="ox5bi" name="yzhd_zszs.png" path="/SevenDayLoginImages/"/>
-    <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"/>
-</packageDescription>

FGUIProject/assets/ActivityDay7/ActivityDay7UI.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n0_nyhm" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="48,78"/>
-    <image id="n1_nyhm" name="n1" src="nyhm5" fileName="images/sj_db.png" xy="367,108"/>
+    <image id="n1_nyhm" name="n1" src="nyhm5" fileName="images/sj_db.png" xy="367,108" pkg="eg2y0ldp"/>
     <text id="n2_nyhm" name="TimeStr" xy="461,107" size="156,44" fontSize="32" color="#fffaec" autoSize="none" text=""/>
     <component id="n4_nyhm" name="n4" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="640,100"/>
     <component id="n6_rle1" name="ExpProcess" src="nyhmf" fileName="components/ExpProcess.xml" xy="74,190">
@@ -34,7 +34,7 @@
       <item/>
       <item/>
     </list>
-    <loader id="n14_jttb" name="StartIndex" xy="96,810" size="166,93" url="ui://kupdwln7nyhmc"/>
-    <loader id="n22_jttb" name="EndIndex" xy="79,152" size="159,98" url="ui://kupdwln7nyhmc"/>
+    <loader id="n14_jttb" name="EndIndex" xy="134,808" size="159,98"/>
+    <loader id="n22_jttb" name="StartIndex" xy="134,155" size="159,98"/>
   </displayList>
 </component>

FGUIProject/assets/ActivityDay7/components/ButtonDay.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="174,60" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="c1" pages="0,选中,1,未选中" selected="0"/>
   <displayList>
     <image id="n0_rle1" name="n0" src="nyhma" fileName="images/choose_cardtab_1.png" xy="0,0">
+      <gearDisplay2 controller="c1" pages="0" condition="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <text id="n1_rle1" name="text" xy="39,8" size="108,44" fontSize="32" color="#954848" autoSize="none" text="第一天"/>

FGUIProject/assets/ActivityDay7/components/ExpProcess.xml

@@ -4,7 +4,7 @@
     <image id="n0_nyhm" name="n0" src="nyhmb" fileName="images/qrhd_jdt_db.png" xy="0,0" size="38,676">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_nyhm" name="bar_v" src="nyhm7" fileName="images/qrhd_jdt.png" xy="12,13"/>
+    <image id="n1_nyhm" name="bar" src="nyhm7" fileName="images/qrhd_jdt.png" xy="12,13"/>
   </displayList>
   <ProgressBar reverse="true"/>
 </component>

FGUIProject/assets/ActivityDay7/components/ExpProcessItem.xml

@@ -1,11 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="159,98">
+<component size="94,95" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="c1" pages="0,非最大,1,最大" selected="1"/>
+  <controller name="c2" pages="0,未获得,1,已获得" selected="0"/>
   <displayList>
-    <image id="n5_jttb" name="n5" src="nyhmc" fileName="images/qrhd_wp_db.png" xy="53,0"/>
-    <loader id="n6_jttb" name="loaIcon" xy="74,19" size="58,61" url="ui://eg2y0ldply9g8n"/>
-    <image id="n9_jttb" name="n9" src="nyhm2" fileName="images/qrhd_jd_fgx.png" xy="0,42"/>
-    <image id="n7_jttb" name="n7" src="nyhm9" fileName="images/qrhd_sz_db.png" xy="112,64"/>
-    <text id="n8_jttb" name="Num" xy="112,56" size="47,42" fontSize="28" color="#fffbeb" align="center" vAlign="middle" autoSize="none" text="99"/>
-    <text id="n10_jttb" name="Score" xy="6,41" size="55,42" fontSize="30" color="#fffbeb" autoSize="none" text="100"/>
+    <image id="n11_bhmm" name="n11" src="nyhm4" fileName="images/qrhd_wp_db_1.png" xy="-17,-15" group="n9_bhmm">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n3_bhmm" name="bg" src="nyhmc" fileName="images/qrhd_wp_db.png" xy="-1,-2" group="n9_bhmm">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <loader id="n4_bhmm" name="loaIcon" xy="21,17" size="58,61" group="n9_bhmm" aspect="true" url="ui://eg2y0ldply9g8n" fill="scale"/>
+    <image id="n5_bhmm" name="n5" src="nyhm2" fileName="images/qrhd_jd_fgx.png" xy="-54,40" group="n9_bhmm"/>
+    <image id="n6_bhmm" name="n6" src="nyhm9" fileName="images/qrhd_sz_db.png" xy="58,62" group="n9_bhmm"/>
+    <text id="n7_bhmm" name="Num" xy="58,54" size="47,42" group="n9_bhmm" fontSize="28" color="#fffbeb" align="center" vAlign="middle" autoSize="none" text="99"/>
+    <text id="n8_bhmm" name="Score" xy="-48,39" size="66,42" group="n9_bhmm" fontSize="30" color="#fffbeb" autoSize="none" text="1000"/>
+    <image id="n12_bhmm" name="n12" src="l500tlx" fileName="imagesNew/wpk_zz.png" pkg="eg2y0ldp" xy="-7,-6" group="n9_bhmm">
+      <gearDisplay controller="c2" pages="1"/>
+    </image>
+    <image id="n10_bhmm" name="Get" src="orsttis" fileName="images/pfjl_ywc.png" pkg="eg2y0ldp" xy="10,27" group="n9_bhmm">
+      <gearDisplay controller="c2" pages="1"/>
+    </image>
+    <group id="n9_bhmm" name="n9" xy="-54,-15" size="171,131"/>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/ActivityDay7/package.xml

@@ -6,9 +6,7 @@
     <image id="nyhm2" name="qrhd_jd_fgx.png" path="/images/"/>
     <image id="nyhm3" name="qrhd_zd.png" path="/images/"/>
     <image id="nyhm4" name="qrhd_wp_db_1.png" path="/images/"/>
-    <image id="nyhm5" name="sj_db.png" path="/images/"/>
     <image id="nyhm7" name="qrhd_jdt.png" path="/images/"/>
-    <image id="nyhm8" name="qrhd_db.png" path="/images/"/>
     <image id="nyhm9" name="qrhd_sz_db.png" path="/images/"/>
     <image id="nyhma" name="choose_cardtab_1.png" path="/images/"/>
     <image id="nyhmb" name="qrhd_jdt_db.png" path="/images/"/>
@@ -16,8 +14,8 @@
     <image id="nyhmd" name="qrhd_jf_db.png" path="/images/"/>
     <image id="nyhme" name="qrhd_jdt_sz_db.png" path="/images/"/>
     <component id="nyhmf" name="ExpProcess.xml" path="/components/"/>
-    <component id="nyhmg" name="ExpProcessItem.xml" path="/components/" exported="true"/>
     <component id="rle1h" name="ButtonDay.xml" path="/components/"/>
+    <component id="bhmmi" name="ExpProcessItem.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/ActivityDay7" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1344">
   <displayList>
     <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
-      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1b"/>
+      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1c"/>
     </component>
     <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
       <item/>

FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListTaskItem.xml → FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="882,208">
-  <controller name="c1" pages="0,,1,,2,,3," selected="3">
+  <controller name="c1" pages="0,,1,,2,,3," selected="0">
     <remark page="0" value="不可领取"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
@@ -8,11 +8,11 @@
   </controller>
   <displayList>
     <image id="n2_mbf1" name="n2" src="mbf13" fileName="images/tc_xuanxiangkuang.png" xy="0,0"/>
-    <list id="n3_mbf1" name="lsitRewards" xy="30,69" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+    <list id="n3_mbf1" name="listRewards" xy="30,69" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
       <item/>
       <item/>
     </list>
-    <text id="n4_mbf1" name="txtTitle" xy="30,8" size="448,44" fontSize="32" color="#a07c49" vars="true" text="{title=巴拉巴拉限定摘星99次}（{curValue=0}/{allValue=}99）"/>
+    <text id="n4_mbf1" name="txtTitle" xy="30,8" size="448,44" fontSize="32" color="#a07c49" text="巴拉巴拉限定摘星99次（0/99）"/>
     <component id="n7_mbf1" name="btnGetNone" src="mbf1tn7" fileName="components/BtnStyle003.xml" pkg="eg2y0ldp" xy="648,80">
       <gearDisplay controller="c1" pages="0"/>
       <Button title="领取"/>

FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListRewardItem.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="882,208">
-  <controller name="c1" pages="0,,1,,2," selected="0">
-    <remark page="0" value="不可领取"/>
-    <remark page="1" value="可领取"/>
-    <remark page="2" value="已领取"/>
-  </controller>
-  <displayList>
-    <image id="n2_mbf1" name="n2" src="mbf13" fileName="images/tc_xuanxiangkuang.png" xy="0,0"/>
-    <list id="n3_mbf1" name="lsitRewards" xy="30,69" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
-      <item/>
-      <item/>
-    </list>
-    <text id="n4_mbf1" name="txtTitle" xy="30,8" size="448,44" fontSize="32" color="#a07c49" vars="true" text="{title=巴拉巴拉限定摘星99次}（{curValue=0}/{allValue=}99）"/>
-    <component id="n5_mbf1" name="btnGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="648,80" size="189,58">
-      <gearDisplay controller="c1" pages="1"/>
-      <Button title="领取" icon="ui://eg2y0ldpmbf1tn8"/>
-    </component>
-    <component id="n7_mbf1" name="btnGot" src="mbf1tn7" fileName="components/BtnStyle003.xml" pkg="eg2y0ldp" xy="648,80">
-      <gearDisplay controller="c1" pages="0,2"/>
-      <Button title="领取"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/ActivityThemeLuckyBox/package.xml

@@ -10,8 +10,7 @@
     <image id="mbf15" name="cj_xiafang_db.png" path="/images/"/>
     <component id="mbf16" name="ActivityThemeLuckyBoxBonusUI.xml" path="/" exported="true"/>
     <image id="mbf17" name="tx_xuanxiang_zz.png" path="/images/"/>
-    <component id="mbf19" name="ListTaskItem.xml" path="/compoents/"/>
-    <component id="mbf1a" name="ListRewardItem.xml" path="/compoents/"/>
+    <component id="mbf19" name="ListItem.xml" path="/compoents/"/>
     <image id="mbf1b" name="lm_biaotizi_15.png" path="/images/"/>
     <image id="mbf1c" name="lm_biaotizi_14.png" path="/images/"/>
     <component id="mbf1d" name="ActivityThemeLuckyBoxTaskUI.xml" path="/" exported="true"/>

FGUIProject/assets/BornLimit/FirstChargeBonusUI.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1230">
+  <controller name="c1" pages="0,,1,,2," selected="0">
+    <remark page="0" value="充值"/>
+    <remark page="1" value="领取"/>
+    <remark page="2" value="已领取"/>
+  </controller>
+  <displayList>
+    <image id="n0_fqor" name="n0" src="sjiz3" fileName="images/sc_db.png" xy="0,-43"/>
+    <image id="n8_sjiz" name="n8" src="sjiz4" fileName="images/sc_lihui_lnlx.png" xy="10,29"/>
+    <image id="n6_sjiz" name="n6" src="sjiz0" fileName="images/sc_mc_db.png" xy="140,202"/>
+    <image id="n9_sjiz" name="n9" src="sjiz2" fileName="images/wz_sc.png" xy="437,139"/>
+    <image id="n13_idkd" name="n13" src="idkdtnc" fileName="imagesNew/xsqg_zsx.png" pkg="eg2y0ldp" xy="461,400"/>
+    <text id="n7_sjiz" name="txtName" xy="151,297" size="40,135" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fffdfc" leading="-6" autoSize="height" strokeColor="#d88f4e" text="岭南荔夏"/>
+    <list id="n1_fqor" name="list" xy="493,414" size="402,476" layout="flow_hz" overflow="scroll" lineGap="14" colGap="14" defaultItem="ui://eg2y0ldp9jv6tls">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n10_idkd" name="btnCharge" src="idkdtna" fileName="components/BtnStyle004.xml" pkg="eg2y0ldp" xy="560,928" size="260,74">
+      <gearDisplay controller="c1" pages="0"/>
+      <Button title="前往充值" icon="ui://eg2y0ldpqqhzk"/>
+    </component>
+    <component id="n3_fqor" name="btnGet" src="idkdtna" fileName="components/BtnStyle004.xml" pkg="eg2y0ldp" xy="560,928">
+      <gearDisplay controller="c1" pages="1,2"/>
+      <gearLook controller="c1" pages="2" values="1,0,1,0" default="1,0,0,1"/>
+      <Button title="领取奖励"/>
+    </component>
+    <component id="n5_sjiz" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="496,1137"/>
+    <image id="n11_idkd" name="n11" src="sjiz1" fileName="images/sc_wp_zz.png" xy="467,832"/>
+    <text id="n12_idkd" name="txtTips" xy="485,358" pivot="0.5,0" size="432,39" fontSize="28" color="#d28f88" letterSpacing="-3" text="商城充值、月卡、锦罗织造可激活首充"/>
+  </displayList>
+</component>

FGUIProject/assets/BornLimit/package.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="cfkvka81">
+  <resources>
+    <component id="idkd13" name="FirstChargeBonusUI.xml" path="/" exported="true"/>
+    <image id="sjiz0" name="sc_mc_db.png" path="/images/"/>
+    <image id="sjiz1" name="sc_wp_zz.png" path="/images/"/>
+    <image id="sjiz2" name="wz_sc.png" path="/images/"/>
+    <image id="sjiz3" name="sc_db.png" path="/images/"/>
+    <image id="sjiz4" name="sc_lihui_lnlx.png" path="/images/"/>
+  </resources>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/BornLimit" packageCount="2" genCode="true" extractAlpha="true"/>
+</packageDescription>

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticListUI.xml

@@ -7,12 +7,12 @@
     <component id="n0_j539" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="ui://4f294tdkweok2i"/>
     </component>
-    <image id="n18_weok" name="n18" src="weok2j" fileName="images/jbhc_btbandi.png" xy="246,201"/>
+    <image id="n18_weok" name="n18" src="weok2j" fileName="images/jbhc_btbandi.png" xy="93,201" size="891,81"/>
     <list id="n4_j539" name="listMenu" xy="31,201" size="1017,80" layout="row" align="center" foldInvisibleItems="true">
       <relation target="" sidePair="center-center"/>
       <item url="ui://4f294tdkj539f"/>
-      <item url="ui://4f294tdkj539h"/>
       <item url="ui://4f294tdkkqeb25"/>
+      <item url="ui://4f294tdkj539h"/>
     </list>
     <list id="n14_j539" name="listSuit" xy="25,363" size="1030,1557" layout="flow_hz" overflow="scroll" lineGap="47" colGap="2" defaultItem="ui://4f294tdkj539k" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>

FGUIProject/assets/CommonGame/components/BtnBack0.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="90,90" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n4_uyux" name="loaBg" xy="-35,0" size="578,116" touchable="false" url="ui://eg2y0ldpuyuxtj8" autoSize="true"/>
+    <loader id="n3_uyux" name="n3" xy="0,-11" size="111,96" url="ui://eg2y0ldpa0cftl1" autoSize="true"/>
+    <loader id="n5_uyux" name="icon" xy="112,16" pivot="0.5,0.5" size="157,45" align="center" vAlign="middle" fill="scale"/>
+    <text id="n6_idkd" name="title" xy="187,10" pivot="0.5,0.5" size="10,54" font="ui://eg2y0ldpa0cftkv" fontSize="40" color="#ffebc7" strokeColor="#c99954" strokeSize="2" text=""/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/BtnStyle004.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="260,75" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <loader id="n2_idkd" name="icon" xy="0,0" pivot="0.5,0.5" size="260,75" url="ui://eg2y0ldpqqhzl" autoSize="true"/>
+    <text id="n1_9qpb" name="title" xy="0,-4" size="260,75" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#fffaf7" align="center" vAlign="middle" autoSize="none" singleLine="true" text="前往">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </text>
+  </displayList>
+  <Button/>
+  <relation target="n2_idkd" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/CommonGame/components/ButtonBack.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="90,90" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <loader id="n4_uyux" name="loaBg" xy="50,10" size="429,76" touchable="false" url="ui://eg2y0ldpysx9tk6" autoSize="true"/>
-    <loader id="n3_uyux" name="n3" xy="0,0" size="92,94" url="ui://eg2y0ldpuyuxtj4" autoSize="true"/>
-    <loader id="n5_uyux" name="icon" xy="125,19" pivot="0.5,0" size="161,54" autoSize="true"/>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/CommonGame/components/ComItemNew.xml

@@ -2,7 +2,7 @@
 <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="61,78" pivot="0.5,0" anchor="true" size="97,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" vars="true" text="x00200">
+    <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" text="x00200">
       <relation target="n25_pu55" sidePair="center-center"/>
     </text>
     <text id="n26_r9ri" name="txtName" xy="62,124" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">

FGUIProject/assets/CommonGame/package.xml

@@ -173,7 +173,7 @@
     <component id="si5ztin" name="Button2.xml" path="/components/"/>
     <component id="si5ztio" name="Button3.xml" path="/components/"/>
     <component id="si5ztip" name="Button16.xml" path="/components/" exported="true"/>
-    <image id="orsttis" name="pfjl_ywc.png" path="/images/"/>
+    <image id="orsttis" name="pfjl_ywc.png" path="/images/" exported="true"/>
     <image id="orsttit" name="wpbb_di.png" path="/images/" exported="true"/>
     <image id="pu55tiw" name="pfjl_and.png" path="/images/"/>
     <component id="ng0itiz" name="ComItemIcon.xml" path="/components/"/>
@@ -181,7 +181,7 @@
     <image id="qqattj2" name="zjm_gnkuang.png" path="/images/"/>
     <image id="uyuxtj3" name="tujian_zkanniu.png" path="/images/" exported="true"/>
     <image id="uyuxtj4" name="xcpz_fhfh.png" path="/imagesExport/" exported="true"/>
-    <component id="uyuxtj5" name="ButtonBack.xml" path="/components/" exported="true"/>
+    <component id="uyuxtj5" name="BtnBack0.xml" path="/components/" exported="true"/>
     <image id="uyuxtj7" name="xc_bto_1.png" path="/images/"/>
     <image id="uyuxtj8" name="xc_bto.png" path="/images/"/>
     <component id="r9ritjj" name="ButtonApproach.xml" path="/components/"/>
@@ -282,24 +282,24 @@
     <image id="miy37t" name="tb_suo.png" path="/imagesNew/" exported="true"/>
     <component id="rv091p" name="BtnStyle1Big.xml" path="/components/" exported="true"/>
     <component id="rv091x" name="BtnStyle1Small.xml" path="/components/" exported="true"/>
-    <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="/imagesNew/" exported="true"/>
+    <image id="wm603g" name="an__3weixuan.png" path="/imagesNew/" exported="true"/>
+    <image id="wm603f" name="an__3xuanzhong.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4m" name="an__tongyi.png" path="/imagesNew/" exported="true"/>
+    <image id="9jv66c" name="an__3xuanzhong2.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4k" name="an__xuanzhong_qifu.png" path="/imagesNew/" 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="o9gh4o" name="lm_an_jujue.png" path="/imagesNew/" exported="true"/>
-    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="47,14,94,28"/>
+    <image id="o9gh4o" name="an_jujue.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4l" name="an__weixuan_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="47,14,94,28"/>
     <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="a0cf2o" name="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/"/>
+    <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/" exported="true"/>
     <component id="qik1tly" name="ComItemNew1.xml" path="/components/" exported="true"/>
     <component id="qik1tlz" name="ComItemIconNew1.xml" path="/components/" exported="true"/>
     <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
@@ -313,8 +313,8 @@
     <image id="uxxstmq" name="mrrw_bq_qb.png" path="/imagesNew/" exported="true"/>
     <image id="uxxstmj" name="mrrw_db.png" path="/imagesNew/" exported="true"/>
     <image id="uxxstn3" name="txz_tb_ylq.png" path="/imagesNew/" exported="true"/>
-    <image id="ittstn4" name="lm_an_jujue_1.png" path="/imagesNew/" exported="true"/>
-    <image id="nyhm6" name="lm_an_qrhd_ylq_db.png" path="/imagesNew/" exported="true"/>
+    <image id="ittstn4" name="an_jujue_1.png" path="/imagesNew/" exported="true"/>
+    <image id="nyhm6" name="an_qrhd_ylq_db.png" path="/imagesNew/" exported="true"/>
     <image id="qik1tm2" name="jzsjzs_txktx.png" path="/images/" scale9grid="30,30,60,60"/>
     <image id="qik1tm3" name="jjsjs_txk_2.png" path="/images/"/>
     <image id="qik1tm4" name="pmts_xtk_1.png" path="/images/"/>
@@ -331,7 +331,15 @@
     <component id="mbf1tn5" name="ComBg001.xml" path="/componentsBg/" exported="true"/>
     <image id="mbf1tn6" name="lm_biaotizi_14.png" path="/componentsBg/"/>
     <component id="mbf1tn7" name="BtnStyle003.xml" path="/components/" exported="true"/>
-    <image id="mbf1tn8" name="lm_an__xuanzhong.png" path="/imagesNew/" exported="true"/>
+    <image id="mbf1tn8" name="an__xuanzhong.png" path="/imagesNew/" exported="true"/>
+    <image id="idkdtn9" name="bq_whd.png" path="/imagesNew/" exported="true"/>
+    <image id="nyhm5" name="sj_db.png" path="/imagesNew/" exported="true"/>
+    <image id="qqhzl" name="an_pink.png" path="/imagesNew/" exported="true"/>
+    <component id="idkdtna" name="BtnStyle004.xml" path="/components/" exported="true"/>
+    <image id="nyhm8" name="qrhd_db.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="269,618,540,239"/>
+    <image id="idkdtnb" name="hl_jfscibt.png" path="/imagesNew/"/>
+    <image id="qqhzk" name="an_yellow_1.png" path="/imagesNew/" exported="true"/>
+    <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/DailySignUI.xml

@@ -2,9 +2,9 @@
 <component size="1080,1865">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_qik1" name="n0" src="qik1l" fileName="images/mrqd_db.png" xy="0,0"/>
+    <image id="n0_qik1" name="n0" src="idkd1f" fileName="images/bg.png" xy="0,38"/>
     <image id="n1_qik1" name="n1" src="qik1i" fileName="images/wz_yqd.png" xy="48,223"/>
-    <component id="n3_qik1" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="376,324" pivot="0,0.5" anchor="true">
+    <component id="n3_qik1" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="686,254" pivot="0.5,0" anchor="true">
       <ProgressBar value="50" max="100"/>
     </component>
     <image id="n8_qik1" name="n8" src="qik1r" fileName="images/txz_lvl_db.png" xy="305,290"/>
@@ -47,4 +47,5 @@
     </list>
     <component id="n9_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="495,1769"/>
   </displayList>
+  <transition name="t0"/>
 </component>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -11,11 +11,18 @@
       <Button icon="ui://t8nwuj7ifqor1"/>
     </component>
     <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,191"/>
-    <component id="n4_fqor" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,408">
+    <component id="n4_fqor" name="btnLimitChargeAddUp" src="qik1u" fileName="components/Button1.xml" xy="0,360" group="n30_idkd">
+      <Button title="限时累充"/>
+    </component>
+    <component id="n5_fqor" name="btnSevenDayLogin" src="qik1u" fileName="components/Button1.xml" xy="0,742" group="n30_idkd">
+      <Button title="一周黄历"/>
+    </component>
+    <component id="n28_idkd" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,1124" group="n30_idkd">
       <Button title="每日签到"/>
     </component>
-    <component id="n5_fqor" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,911">
+    <component id="n29_idkd" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,1506" group="n30_idkd">
       <Button title="每日补给"/>
     </component>
+    <group id="n30_idkd" name="n30" xy="0,360" size="1080,1474" advanced="true" layout="vt" lineGap="54" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/LimitChargeUI.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" overflow="hidden">
+  <displayList>
+    <loader id="n11_idkd" 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="n10_idkd" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <image id="n7_idkd" name="n7" src="nyhm5" fileName="imagesNew/sj_db.png" pkg="eg2y0ldp" xy="736,59" group="n6_idkd"/>
+    <text id="n5_idkd" name="txtTime" xy="820,58" pivot="0.5,0" size="193,44" group="n6_idkd" fontSize="32" color="#fffbf9" align="center" text="00天00时00分"/>
+    <group id="n6_idkd" name="n6" xy="736,58" size="366,45" advanced="true">
+      <relation target="" sidePair="top-top"/>
+    </group>
+    <image id="n8_idkd" name="n8" src="nyhm8" fileName="imagesNew/qrhd_db.png" pkg="eg2y0ldp" xy="0,791" group="n12_idkd"/>
+    <list id="n1_fqor" name="list" xy="15,974" size="1040,946" group="n12_idkd" layout="flow_hz" overflow="scroll" lineGap="20" defaultItem="ui://t8nwuj7iidkd15">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n2_fqor" name="btnCharge" src="idkdtna" fileName="components/BtnStyle004.xml" pkg="eg2y0ldp" xy="747,768" group="n12_idkd">
+      <Button title="前往充值"/>
+    </component>
+    <group id="n12_idkd" name="n12" xy="0,768" size="1080,1152" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
+  </displayList>
+</component>

FGUIProject/assets/Activity/SevenDayLoginUI.xml → FGUIProject/assets/DailyWelfare/SevenDayLoginUI.xml

@@ -2,7 +2,7 @@
 <component size="994,1393">
   <displayList>
     <image id="n4_ox5b" name="n4" src="ox5b9" fileName="images/yzhd_ditu.png" xy="0,0"/>
-    <list id="n0_lh8v" name="list" xy="77,66" size="839,693" layout="flow_hz" overflow="hidden" lineGap="15" colGap="10" defaultItem="ui://5uawdql9jyml7">
+    <list id="n0_lh8v" name="list" xy="77,66" size="839,693" layout="flow_hz" overflow="hidden" lineGap="15" colGap="10" defaultItem="ui://t8nwuj7ijyml7">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/DailyWelfare/components/Button1.xml

@@ -2,10 +2,10 @@
 <component size="1080,328" overflow="hidden" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_qik1" name="n0" src="qik1l" fileName="images/mrqd_db.png" xy="0,-112" size="1080,1697">
+    <image id="n0_qik1" name="n0" src="ox5bg" fileName="images/yzhd_dyt_5.png" xy="0,-107" size="1080,961" aspect="true">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_qik1" name="title" xy="479,207" size="122,0" fontSize="30" align="center" vAlign="middle" singleLine="true" text="每日签到">
+    <text id="n1_qik1" name="title" xy="479,207" size="122,41" fontSize="30" align="center" vAlign="middle" singleLine="true" text="每日签到">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Activity/SevenDayLoginComponents/Component1.xml → FGUIProject/assets/DailyWelfare/components/Component1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="553,492">
   <displayList>
-    <loader id="n5_ox5b" name="loaIcon" xy="0,0" size="553,492" url="ui://5uawdql9ox5bg" autoSize="true"/>
+    <loader id="n5_ox5b" name="loaIcon" xy="0,0" size="553,492" url="ui://t8nwuj7iox5bg" autoSize="true"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/ListChargeItem.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1041,216">
+  <controller name="c1" pages="0,,1,,2," selected="0">
+    <remark page="0" value="不可领取"/>
+    <remark page="1" value="可领取"/>
+    <remark page="2" value="已领取"/>
+  </controller>
+  <displayList>
+    <image id="n2_mbf1" name="n2" src="uxxstmj" fileName="imagesNew/mrrw_db.png" pkg="eg2y0ldp" xy="0,0"/>
+    <image id="n9_idkd" name="n9" src="uxxstmq" fileName="imagesNew/mrrw_bq_qb.png" pkg="eg2y0ldp" xy="37,5"/>
+    <list id="n3_mbf1" name="listRewards" xy="99,64" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+      <item/>
+      <item/>
+    </list>
+    <text id="n4_mbf1" name="txtTitle" xy="59,11" size="448,44" fontSize="32" color="#a07c49" text="巴拉巴拉限定摘星99次（0/99）"/>
+    <component id="n7_mbf1" name="btnGetNone" src="mbf1tn7" fileName="components/BtnStyle003.xml" pkg="eg2y0ldp" xy="799,70">
+      <gearDisplay controller="c1" pages="0"/>
+      <Button title="领取"/>
+    </component>
+    <component id="n5_mbf1" name="btnGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="799,70" size="189,58">
+      <gearDisplay controller="c1" pages="1"/>
+      <Button title="领取" icon="ui://eg2y0ldpmbf1tn8"/>
+    </component>
+    <component id="n8_mbf1" name="btnGot" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="775,74" size="233,51">
+      <gearDisplay controller="c1" pages="2"/>
+      <Button title="领取" icon="ui://eg2y0ldpnyhm6"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Activity/SevenDayLoginComponents/ListItem.xml → FGUIProject/assets/DailyWelfare/components/ListItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="270,334">
   <displayList>
-    <loader id="n2_ox5b" name="loaBg" xy="0,0" size="270,334" url="ui://5uawdql9ox5ba" autoSize="true"/>
+    <loader id="n2_ox5b" name="loaBg" xy="0,0" size="270,334" url="ui://t8nwuj7iox5ba" autoSize="true"/>
     <loader id="n3_ox5b" name="loaIcon" xy="60,98" size="150,150" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scaleMatchHeight"/>
     <text id="n6_ox5b" name="txtNum" xy="171,220" size="67,44" fontSize="32" color="#be675e" text="X88"/>
     <text id="n5_ox5b" name="txtName" xy="99,281" pivot="0.5,0" size="71,46" fontSize="34" color="#91a08b" text="名字"/>

FGUIProject/assets/DailyWelfare/components/ProgressBar1.xml

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="620,140" extention="ProgressBar">
+<component size="620,140" overflow="hidden" extention="ProgressBar">
   <displayList>
-    <image id="n0_fqor" name="n0" src="qik1m" fileName="images/mrqd_jdt_db.png" xy="0,95" size="620,23">
+    <image id="n8_idkd" name="n8" src="qik1m" fileName="images/mrqd_jdt_db.png" xy="0,95" size="620,23">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_fqor" name="bar" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,100" fillMethod="hz"/>
+    <component id="n0_fqor" name="n0" src="idkd1g" fileName="components/comPro.xml" xy="0,95"/>
     <component id="n2_fqor" name="comProBonus0" src="fqor8" fileName="components/ComProBonus.xml" xy="95,70" group="n7_fqor"/>
     <component id="n3_fqor" name="comProBonus1" src="fqor8" fileName="components/ComProBonus.xml" xy="205,70" group="n7_fqor"/>
     <component id="n4_fqor" name="comProBonus2" src="fqor8" fileName="components/ComProBonus.xml" xy="315,70" group="n7_fqor"/>
     <component id="n5_fqor" name="comProBonus3" src="fqor8" fileName="components/ComProBonus.xml" xy="425,70" group="n7_fqor"/>
     <component id="n6_fqor" name="comProBonus4" src="fqor8" fileName="components/ComProBonus.xml" xy="535,70" group="n7_fqor"/>
     <group id="n7_fqor" name="n7" xy="55,0" size="520,140" advanced="true"/>
+    <graph id="n9_idkd" name="ani" xy="608,56" pivot="0.5,0.5" anchor="true" size="10,10" type="rect" lineSize="0"/>
   </displayList>
   <ProgressBar/>
 </component>

FGUIProject/assets/DailyWelfare/components/comPro.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="620,23" mask="n3_idkd">
+  <displayList>
+    <image id="n1_fqor" name="bar" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,5" fillMethod="hz"/>
+    <image id="n3_idkd" name="n3" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,5" fillMethod="hz"/>
+    <graph id="n2_idkd" name="ani" xy="614,12" pivot="0.5,0.5" anchor="true" size="10,10" type="rect" lineSize="0"/>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/package.xml

@@ -14,7 +14,6 @@
     <image id="qik1i" name="wz_yqd.png" path="/images/"/>
     <image id="qik1j" name="yqd_mr_db.png" path="/images/"/>
     <image id="qik1k" name="yz_yhd.png" path="/images/"/>
-    <image id="qik1l" name="mrqd_db.png" path="/images/" scale="9grid" scale9grid="270,453,540,1372"/>
     <image id="qik1m" name="mrqd_jdt_db.png" path="/images/"/>
     <image id="qik1n" name="mrqd_jdt_yellow.png" path="/images/"/>
     <image id="qik1o" name="mrqd_kbq.png" path="/images/"/>
@@ -30,7 +29,32 @@
     <image id="qik1z" name="mrbj_tb1.png" path="/images/"/>
     <image id="qik110" name="mrbj_wz2.png" path="/images/"/>
     <image id="qik111" name="wz_mrbj.png" path="/images/"/>
-    <image id="qik112" name="ornamental_title.png" path="/imagesNew/"/>
+    <component id="lh8v6" name="SevenDayLoginUI.xml" path="/" exported="true"/>
+    <image id="ox5b9" name="yzhd_ditu.png" path="/images/"/>
+    <image id="ox5ba" name="yzhd_dyt_1.png" path="/images/" exported="true"/>
+    <image id="ox5bb" name="yzhd_dyt_2.png" path="/images/" exported="true"/>
+    <image id="ox5bc" name="yzhd_dyt_3.png" path="/images/" exported="true"/>
+    <image id="ox5bd" name="yzhd_dyt_4.png" path="/images/" exported="true"/>
+    <image id="ox5bg" name="yzhd_dyt_5.png" path="/images/" exported="true"/>
+    <image id="ox5be" name="yzhd_dyt_6.png" path="/images/" exported="true"/>
+    <image id="ox5bf" name="yzhd_dyt_7.png" path="/images/" exported="true"/>
+    <image id="ox5bi" name="yzhd_zszs.png" path="/images/"/>
+    <image id="ox5b8" name="yzhl_yqd.png" path="/images/"/>
+    <component id="rkrwj" name="Component1.xml" path="/components/"/>
+    <component id="jyml7" name="ListItem.xml" path="/components/"/>
+    <component id="idkd14" name="LimitChargeUI.xml" path="/" exported="true"/>
+    <component id="idkd15" name="ListChargeItem.xml" path="/components/"/>
+    <image id="idkd16" name="tc_xuanxiangkuang.png" path="/images/"/>
+    <image id="idkd17" name="t4.png" path="/images/"/>
+    <image id="idkd18" name="t_k1.png" path="/images/"/>
+    <image id="idkd19" name="t_k2.png" path="/images/"/>
+    <image id="idkd1a" name="t_kuai.png" path="/images/"/>
+    <image id="idkd1b" name="t_moon.png" path="/images/"/>
+    <image id="idkd1c" name="t1.png" path="/images/"/>
+    <image id="idkd1d" name="t2.png" path="/images/"/>
+    <image id="idkd1e" name="t3.png" path="/images/"/>
+    <image id="idkd1f" name="bg.png" path="/images/"/>
+    <component id="idkd1g" name="comPro.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/EnduringGiftBox/components/BtnBuy.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n3_qqhz" name="bagGrey" src="qqhzm" fileName="images/cz_an_grey.png" xy="0,0"/>
-    <image id="n0_qqhz" name="bagYellow" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0">
+    <image id="n0_qqhz" name="bagYellow" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <text id="n1_qqhz" name="txtNewPrice" xy="146,2" size="104,69" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" text="12元"/>

FGUIProject/assets/EnduringGiftBox/components/BtnBuyWeek.xml

@@ -2,7 +2,7 @@
 <component size="260,74" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_qqhz" name="n0" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0">
+    <image id="n0_qqhz" name="n0" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <text id="n1_qqhz" name="txtNewPrice" xy="135,0" size="106,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" text="300"/>

FGUIProject/assets/EnduringGiftBox/components/BtnReceive.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n2_qqhz" name="received" src="qqhzm" fileName="images/cz_an_grey.png" xy="0,0"/>
-    <image id="n0_qqhz" name="receive" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0">
+    <image id="n0_qqhz" name="receive" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <text id="n1_qqhz" name="txtRec" xy="0,0" size="260,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="领取"/>

FGUIProject/assets/EnduringGiftBox/components/BtnSub.xml

@@ -2,7 +2,7 @@
 <component size="260,75" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_qqhz" name="n0" src="qqhzl" fileName="images/cz_an_pink.png" xy="0,0">
+    <image id="n0_qqhz" name="n0" src="qqhzl" fileName="images/cz_an_pink.png" xy="0,0" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <text id="n1_qqhz" name="n1" xy="0,0" size="260,69" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="确定"/>

FGUIProject/assets/EnduringGiftBox/package.xml

@@ -20,8 +20,6 @@
     <image id="qqhzh" name="cz_jb_juese.png" path="/images/"/>
     <image id="qqhzi" name="cz_gmjd_db.png" path="/images/"/>
     <image id="qqhzj" name="cz_db.png" path="/images/"/>
-    <image id="qqhzk" name="cz_an_yellow.png" path="/images/"/>
-    <image id="qqhzl" name="cz_an_pink.png" path="/images/"/>
     <image id="qqhzm" name="cz_an_grey.png" path="/images/"/>
     <image id="qqhzn" name="cz_an_blue.png" path="/images/"/>
     <image id="qqhzo" name="ch_db_gy.png" path="/images/"/>

FGUIProject/assets/League/ComSkillUp.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1035,1085">
+  <displayList>
+    <list id="n4_pvb4" name="listScore" xy="84,981" size="868,104" group="n21_idkd" layout="row" overflow="scroll" colGap="20" defaultItem="ui://tw70qm9dmiy37v" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n13_pvb4" name="list" xy="148,0" size="740,676" group="n21_idkd" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="136" lineItemCount2="4" defaultItem="ui://tw70qm9dpvb45f" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n18_miy3" name="btnLeft" src="miy37w" fileName="Button124.xml" xy="0,338" pivot="0.5,0.5" group="n21_idkd" scale="-1,1"/>
+    <component id="n19_miy3" name="btnRight" src="miy37w" fileName="Button124.xml" xy="902,335" pivot="0.5,0.5" group="n21_idkd"/>
+    <group id="n21_idkd" name="n21" xy="0,0" size="1035,1085" advanced="true"/>
+  </displayList>
+</component>

FGUIProject/assets/League/LeagueAnsweringUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="ctrlHasIcon" pages="0,,1," selected="1">
+  <controller name="ctrlHasIcon" pages="0,,1," selected="0">
     <remark page="0" value="有图标"/>
     <remark page="1" value="无图标"/>
   </controller>
@@ -8,7 +8,7 @@
     <remark page="0" value="答题中"/>
     <remark page="1" value="cd中"/>
   </controller>
-  <controller name="ctrlQuestionType" pages="0,,1,,2," selected="2">
+  <controller name="ctrlQuestionType" pages="0,,1,,2," selected="0">
     <remark page="1" value="选择题"/>
     <remark page="2" value="填空题"/>
   </controller>
@@ -30,7 +30,8 @@
     <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" pkg="eg2y0ldp"/>
+    <image id="n39_9jv6" name="n39" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="170,128"/>
+    <graph id="n58_idkd" name="holder" xy="535,373" size="10,10"/>
     <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>
@@ -44,11 +45,11 @@
     <image id="n38_9jv6" name="n38" src="9jv66o" fileName="images/lm_djs_db.png" xy="935,0" group="n15_pvb4"/>
     <text id="n9_pvb4" name="txtAnswerTime" xy="959,165" pivot="0.5,0" size="74,44" group="n15_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffdf8" align="center" text="00:55"/>
     <text id="n11_pvb4" name="txtAnswerNum" xy="478,124" pivot="0.5,0" size="124,41" group="n15_pvb4" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#8b3510" align="center" text="第1/15题"/>
-    <text id="n13_pvb4" name="txtContent" xy="230,274" size="620,142" group="n15_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" letterSpacing="-2" autoSize="none" text="题目描述题目描述题目描述题目描述题目 描述题目描述题目描述题目描述题目题目 描述述?">
+    <text id="n13_pvb4" name="txtContent" xy="358,274" size="620,173" group="n15_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" letterSpacing="-2" autoSize="none" text="题目描述题目描述题目描述题目描述题目 描述题目描述题目描述题目描述题目题目 描述述?">
       <gearXY controller="ctrlHasIcon" pages="0,1" values="358,274|230,274"/>
       <gearSize controller="ctrlHasIcon" pages="0,1" values="620,173,1,1|620,142,1,1"/>
     </text>
-    <list id="n14_pvb4" name="listResult" xy="227,515" pivot="0.5,0" size="625,148" group="n15_pvb4" layout="flow_hz" lineGap="20" lineItemCount="2" defaultItem="ui://tw70qm9d9jv67c" autoItemSize="true" align="center" vAlign="middle" autoClearItems="true">
+    <list id="n14_pvb4" name="listResult" xy="359,515" pivot="0.5,0" size="625,148" group="n15_pvb4" layout="flow_hz" lineGap="20" lineItemCount="2" defaultItem="ui://tw70qm9d9jv67c" autoItemSize="true" align="center" vAlign="middle" autoClearItems="true">
       <gearDisplay controller="ctrlQuestionType" pages="1"/>
       <gearXY controller="ctrlHasIcon" pages="0,1" values="359,515|227,515"/>
       <gearSize controller="ctrlHasIcon" pages="0,1" values="625,148,1,1|625,148,1,1"/>
@@ -57,16 +58,16 @@
       <item/>
       <item/>
     </list>
-    <text id="n16_pvb4" name="n16" xy="229,472" size="241,41" group="n19_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#b68f52" align="center" text="请输入您的答案：">
+    <text id="n16_pvb4" name="n16" xy="360,472" size="241,41" group="n19_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#b68f52" align="center" text="请填入您的答案：">
       <gearText controller="ctrlQuestionType" pages="1,2" values="请选择您的答案：|请输入您的答案：" default="请填入您的答案："/>
     </text>
-    <text id="n17_pvb4" name="txtResult" xy="471,470" size="123,42" group="n19_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#b68f52" align="center" autoSize="none" text="亚索" input="true">
+    <text id="n17_pvb4" name="txtResult" xy="602,470" size="123,42" group="n19_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#b68f52" align="center" autoSize="none" text="亚索" input="true">
       <gearDisplay controller="ctrlQuestionType" pages="2"/>
     </text>
-    <text id="n18_pvb4" name="n18" xy="472,470" size="124,42" group="n19_pvb4" fontSize="30" color="#b68f52" align="center" autoSize="none" underline="true" text="                       ">
+    <text id="n18_pvb4" name="n18" xy="603,470" size="124,42" group="n19_pvb4" fontSize="30" color="#b68f52" align="center" autoSize="none" underline="true" text="                       ">
       <gearDisplay controller="ctrlQuestionType" pages="2"/>
     </text>
-    <group id="n19_pvb4" name="n19" xy="229,470" size="367,43" group="n15_pvb4" advanced="true">
+    <group id="n19_pvb4" name="n19" xy="360,470" size="367,43" group="n15_pvb4" advanced="true">
       <gearDisplay controller="ctrlQuestionType" pages=""/>
       <gearXY controller="ctrlHasIcon" pages="0,1" values="360,470|229,470"/>
     </group>
@@ -81,9 +82,10 @@
     <group id="n15_pvb4" name="n15" xy="15,0" size="1065,751" advanced="true">
       <gearDisplay controller="ctrlQuestionState" pages="0"/>
     </group>
-    <component id="n50_miy3" name="comRightHead" src="wm603r" fileName="components/ComHeadIcon.xml" xy="539,369" pivot="0.5,0.5" anchor="true" size="167,166" group="n52_miy3" aspect="true" scale="1.125,1.125"/>
-    <image id="n51_miy3" name="n51" src="wm6037" fileName="images/lm_db_touxiang.png" xy="382,185" group="n52_miy3"/>
-    <group id="n52_miy3" name="n52" xy="382,185" size="316,355" group="n24_pvb4" advanced="true">
+    <component id="n50_miy3" name="comRightHead" src="wm603r" fileName="components/ComHeadIcon.xml" xy="536,370" pivot="0.5,0.5" anchor="true" size="167,166" group="n52_miy3" aspect="true" scale="1.355,1.355"/>
+    <image id="n61_idkd" name="n61" src="9jv660" fileName="images/lm_tx_db.png" xy="537,382" pivot="0.5,0.5" anchor="true" group="n52_miy3" visible="false"/>
+    <graph id="n59_idkd" name="holderHead" xy="535,372" pivot="0.5,0.5" anchor="true" size="10,10" group="n52_miy3" visible="false"/>
+    <group id="n52_miy3" name="n52" xy="346,187" size="382,391" group="n24_pvb4" advanced="true">
       <gearDisplay controller="ctrlResult" pages="1"/>
     </group>
     <image id="n21_pvb4" name="imgFail" src="9jv66a" fileName="images/fannao.png" xy="394,169" group="n24_pvb4">
@@ -92,15 +94,15 @@
     <image id="n55_miy3" name="n55" src="9jv65l" fileName="images/lm_dt_tsdk.png" xy="110,424" group="n24_pvb4">
       <gearDisplay controller="ctrlResult" pages="3"/>
     </image>
-    <text id="n22_pvb4" name="txtInfo" xy="539,514" pivot="0.5,0" anchor="true" size="245,44" group="n24_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" text="全部题目答完啦~">
-      <gearXY controller="ctrlResult" pages="0,1,2,3" values="539,514|539,514|539,514|539,417"/>
+    <text id="n22_pvb4" name="txtInfo" xy="539,560" pivot="0.5,0" anchor="true" size="245,44" group="n24_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" text="全部题目答完啦~">
+      <gearXY controller="ctrlResult" pages="0,1,2,3" values="539,514|539,560|539,560|539,417"/>
     </text>
-    <image id="n53_miy3" name="n53" src="9jv65l" fileName="images/lm_dt_tsdk.png" xy="110,568" group="n54_miy3"/>
-    <text id="n23_pvb4" name="txtCdTime" xy="410,562" pivot="0.5,0" size="259,44" group="n54_miy3" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" ubb="true" vars="true" text="[color=#5EAE49]{value=10}[/color]秒后开始下一题"/>
-    <group id="n54_miy3" name="n54" xy="110,562" size="756,44" group="n24_pvb4" advanced="true">
+    <image id="n53_miy3" name="n53" src="9jv65l" fileName="images/lm_dt_tsdk.png" xy="110,614" group="n54_miy3"/>
+    <text id="n23_pvb4" name="txtCdTime" xy="410,608" pivot="0.5,0" size="259,44" group="n54_miy3" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" ubb="true" vars="true" text="[color=#5EAE49]{value=10}[/color]秒后开始下一题"/>
+    <group id="n54_miy3" name="n54" xy="110,608" size="756,44" group="n24_pvb4" advanced="true">
       <gearDisplay controller="ctrlResult" pages="1,2"/>
     </group>
-    <group id="n24_pvb4" name="n24" xy="110,169" size="756,437" advanced="true">
+    <group id="n24_pvb4" name="n24" xy="110,169" size="756,483" advanced="true">
       <gearDisplay controller="ctrlQuestionState" pages="1"/>
     </group>
     <text id="n25_pvb4" name="txtJoinNum" xy="73,738" pivot="0.5,0" size="233,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#927346" align="center" letterSpacing="-2" text="当前参与成员：0/30"/>
@@ -122,7 +124,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" pkg="eg2y0ldp">
+    <component id="n36_pvb4" name="btnSend" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="799,1775" size="198,61" group="n56_miy3">
       <Button title="发送"/>
     </component>
     <group id="n56_miy3" name="n56" xy="0,1665" size="1080,255" advanced="true">

FGUIProject/assets/League/LeagueSkillUI.xml

@@ -4,7 +4,9 @@
     <loader id="n0_pvb4" 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>
-    <image id="n15_miy3" name="n15" src="9jv65o" fileName="images/lm_fl_db.png" xy="-31,21" size="1144,1898"/>
+    <image id="n15_miy3" name="n15" src="9jv65o" fileName="images/lm_fl_db.png" xy="-31,21" size="1144,1898">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
     <image id="n16_miy3" name="n16" src="miy37f" fileName="images/lm_ch_zsx.png" xy="67,243"/>
     <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,13"/>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">

FGUIProject/assets/League/LeagueSkillUpUI.xml

@@ -4,35 +4,28 @@
     <loader id="n0_pvb4" 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>
-    <image id="n16_miy3" name="n16" src="miy37p" fileName="images/lm_ch_btk.png" xy="143,246"/>
-    <image id="n17_miy3" name="n17" src="miy37q" fileName="images/ch_jn_db.png" xy="0,314"/>
     <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,13"/>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <list id="n4_pvb4" name="listScore" xy="106,1498" size="868,104" layout="row" overflow="scroll" colGap="20" defaultItem="ui://tw70qm9dmiy37v" align="center" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <list id="n13_pvb4" name="list" xy="170,517" size="740,676" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="136" lineItemCount2="4" defaultItem="ui://tw70qm9dpvb45f" align="center">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
+    <image id="n16_miy3" name="n16" src="miy37p" fileName="images/lm_ch_btk.png" xy="143,246"/>
     <text id="n14_miy3" name="txtTitle" xy="448,251" pivot="0.5,0.5" size="184,56" font="ui://eg2y0ldpa0cftky" fontSize="42" color="#fffefa" align="center" vAlign="middle" leading="-5" autoClearText="true" text="茶艺-选茶"/>
     <text id="n15_miy3" name="txtProgress" xy="469,324" pivot="0.5,0" size="142,54" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c3c8d8" align="center" ubb="true" vars="true" text="进度:[color=#FFE59D]{value=0}%[/color]"/>
-    <component id="n18_miy3" name="btnLeft" src="miy37w" fileName="Button124.xml" xy="22,855" pivot="0.5,0.5" scale="-1,1"/>
-    <component id="n19_miy3" name="btnRight" src="miy37w" fileName="Button124.xml" xy="924,852" pivot="0.5,0.5"/>
+    <graph id="n20_idkd" name="holder" xy="540,963" size="10,10" visible="false"/>
+    <component id="n4_pvb4" name="comSkill" src="idkd80" fileName="ComSkillUp.xml" xy="22,517"/>
+    <graph id="n22_idkd" name="holderSkill" xy="486,874" size="10,10" visible="false"/>
+    <graph id="n23_idkd" name="holderScore" xy="486,874" size="10,10" visible="false"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n4_pvb4" value="0"/>
+    <item time="0" type="Visible" target="n20_idkd" value="true"/>
+    <item time="6" type="Alpha" target="n4_pvb4" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
+    <item time="18" type="Alpha" target="n4_pvb4" value="1"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Visible" target="n22_idkd" value="true"/>
+    <item time="0" type="Visible" target="n23_idkd" value="true"/>
+    <item time="36" type="Visible" target="n22_idkd" value="false"/>
+    <item time="36" type="Visible" target="n23_idkd" value="false"/>
+  </transition>
 </component>

FGUIProject/assets/League/ListSkillScore.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="120,108">
+<component size="120,108" pivot="0.5,0.5">
   <displayList>
     <image id="n13_miy3" name="n13" src="miy37d" fileName="images/card_jn_db.png" xy="0,0"/>
     <loader id="n12_miy3" name="loaIcon" xy="10,10" size="88,88" aspect="true" url="ui://eg2y0ldp842s6h" fill="scale"/>

FGUIProject/assets/League/components/ListSkillItem.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="162,162" overflow="hidden">
+<component size="162,162" pivot="0.5,0.5" overflow="hidden">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n16_gfx4" name="n16" src="miy37n" fileName="images/lm_ch_dldb.png" xy="0,0" pivot="0.5,0"/>

FGUIProject/assets/League/components/ListSkillLayerItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="740,165" overflow="hidden">
   <displayList>
-    <list id="n14_pvb4" name="listSkill" xy="0,0" size="740,165" layout="row" colGap="100" defaultItem="ui://tw70qm9dpvb45d" align="center">
+    <list id="n14_pvb4" name="listSkill" xy="0,0" size="740,165" layout="row" colGap="100" defaultItem="ui://tw70qm9dpvb45d" align="center" vAlign="middle">
       <relation target="" sidePair="center-center"/>
       <item/>
       <item/>

FGUIProject/assets/League/package.xml

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

FGUIProject/assets/Main/MainUI.xml

@@ -19,6 +19,9 @@
       <Button icon="ui://mfvz4q8kv482fm"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhs"/>
     </component>
+    <component id="n78_bhmm" name="btnActivityDay7" src="wg7t8y" fileName="components/ButtonModle.xml" xy="41,770" group="n52_qqat">
+      <Button icon="ui://mfvz4q8kq08xe"/>
+    </component>
     <component id="n5_q08x" name="btnHuanZhuang" src="q08xu" fileName="components/ButtonModle1.xml" xy="25,1675" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fn"/>
@@ -100,6 +103,9 @@
     <graph id="n71_mzf8" name="n71" xy="0,0" size="1080,1920" alpha="0" touchable="false" type="rect" lineSize="0">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
+    <component id="n79_g1yr" name="btnFirstRecharge" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="423,223">
+      <Button title="首充"/>
+    </component>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n71_mzf8" tween="true" startValue="0" endValue="1" duration="10" ease="Linear"/>

FGUIProject/assets/Main/StorySkillUI.xml

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <graph id="n4_py00" name="n4" xy="0,0" size="1080,1920" alpha="0.2" type="rect" lineSize="0" fillColor="#ff000000">
+    <graph id="n4_py00" name="n4" xy="0,0" size="1080,1920" alpha="0.4" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n7_psph" name="comSkillShow" src="psphiy" fileName="ComSkillShow.xml" xy="540,960" pivot="0.5,0.5" anchor="true"/>
+    <image id="n8_idkd" name="n8" src="qkjsk9" fileName="imagesNew/back_card_zhzhao.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </image>
+    <component id="n7_psph" name="comSkillShow" src="psphiy" fileName="components/ComSkillShow.xml" xy="540,960" pivot="0.5,0.5" anchor="true"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Scale" target="n7_psph" tween="true" startValue="1,1" endValue="0,0" duration="12" ease="Linear"/>

FGUIProject/assets/Main/components/ComAllPerfect.xml

@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="345,367">
+<component size="1080,1920" opaque="false">
   <controller name="c1" pages="0,,1," selected="0">
     <remark page="0" value="非自动战斗"/>
     <remark page="1" value="自动战斗"/>
   </controller>
   <displayList>
-    <graph id="n42_gfx4" name="holderLoop" xy="190,183" size="1,1" visible="false"/>
-    <graph id="n43_gfx4" name="holder" xy="190,183" size="1,1" visible="false"/>
-    <graph id="n44_gfx4" name="holderSmokeIn" xy="190,183" size="1,1" visible="false"/>
-    <graph id="n45_gfx4" name="holderSmokeOut" xy="190,183" size="1,1" visible="false"/>
-    <text id="n38_qgxy" name="txtCount" xy="-25,96" pivot="0.5,0.5" size="419,121" visible="false" font="ui://mfvz4q8kqkjsnw" fontSize="50" text="66666"/>
-    <image id="n47_fqor" name="img3Second" src="9jv6o2" fileName="imagesNew/3Second.png" xy="-202,545">
+    <graph id="n49_idkd" name="n49" xy="0,0" size="1080,1920" alpha="0.6" touchable="false" type="rect" lineSize="0" fillColor="#ff000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <graph id="n42_gfx4" name="holderLoop" xy="557,744" size="1,1" group="n48_idkd" visible="false"/>
+    <graph id="n43_gfx4" name="holder" xy="557,744" size="1,1" group="n48_idkd" visible="false"/>
+    <graph id="n44_gfx4" name="holderSmokeIn" xy="557,744" size="1,1" group="n48_idkd" visible="false"/>
+    <graph id="n45_gfx4" name="holderSmokeOut" xy="557,744" size="1,1" group="n48_idkd" visible="false"/>
+    <text id="n38_qgxy" name="txtCount" xy="342,657" pivot="0.5,0.5" size="419,121" group="n48_idkd" visible="false" font="ui://mfvz4q8kqkjsnw" fontSize="50" text="66666"/>
+    <image id="n47_fqor" name="img3Second" src="9jv6o2" fileName="imagesNew/3Second.png" xy="165,1106" group="n48_idkd">
       <gearDisplay controller="c1" pages="0"/>
     </image>
+    <group id="n48_idkd" name="n48" xy="165,657" size="749,497" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
   </displayList>
   <transition name="t0">
     <item time="0" type="Visible" target="n38_qgxy" value="false"/>
@@ -27,7 +33,7 @@
   <transition name="t1">
     <item time="0" type="Visible" target="n43_gfx4" value="false"/>
     <item time="0" type="Visible" target="n44_gfx4" value="true"/>
-    <item time="72" type="Visible" target="n44_gfx4" value="true"/>
+    <item time="72" type="Visible" target="n43_gfx4" value="false"/>
   </transition>
   <transition name="t2">
     <item time="0" type="Visible" target="n44_gfx4" value="false"/>
@@ -37,7 +43,7 @@
     <item time="18" type="Visible" target="n38_qgxy" value="true"/>
     <item time="23" type="Scale" target="n38_qgxy" tween="true" startValue="1.3,1.3" endValue="1,1" duration="5" ease="Linear"/>
     <item time="28" type="Scale" target="n38_qgxy" tween="true" startValue="1,1" endValue="1,1" duration="26" ease="Linear"/>
-    <item time="30" type="Visible" target="n45_gfx4" value="false"/>
+    <item time="36" type="Visible" target="n45_gfx4" value="false"/>
     <item time="54" type="Visible" target="n38_qgxy" value="false"/>
     <item time="54" type="Visible" target="n42_gfx4" value="false"/>
     <item time="54" type="Visible" target="n47_fqor" value="false"/>

FGUIProject/assets/Main/components/ComClick.xml

@@ -11,6 +11,8 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <component id="n51_f2bf" name="comResult" src="vuz5bi" fileName="components/ComScoreResult.xml" xy="143,489" visible="false"/>
-    <component id="n53_fqor" name="comAllPerfect" src="psphj4" fileName="components/ComAllPerfect.xml" xy="367,776"/>
+    <component id="n53_fqor" name="comAllPerfect" src="psphj4" fileName="components/ComAllPerfect.xml" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComSkillCard.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="524,897">
   <displayList>
-    <image id="n4_qkjs" name="n4" src="qkjsjv" fileName="imagesNew/dikuang_card_light2.png" xy="-278,-129"/>
-    <image id="n3_qkjs" name="n3" src="qkjskb" fileName="imagesNew/dikuang_card.png" xy="-11,1"/>
     <component id="n0_py00" name="comCard" src="o9gho0" fileName="components/ComSkillCardMask.xml" xy="19,15"/>
     <image id="n2_qkjs" name="n2" src="qkjskc" fileName="imagesNew/dikuang_card_light1.png" xy="0,-2"/>
   </displayList>

FGUIProject/assets/Main/components/ComSkillName.xml

@@ -2,7 +2,6 @@
 <component size="548,106" overflow="hidden">
   <displayList>
     <image id="n1_py00" name="n1" src="qkjsky" fileName="imagesNew/skill_card_light1.png" xy="0,31"/>
-    <text id="n2_py00" name="txtName" xy="27,13" size="454,79" font="ui://eg2y0ldpa0cftks" fontSize="60" color="#fefef6" align="center" ubb="true" autoSize="none" text="月中天"/>
     <image id="n3_qkjs" name="n3" src="qkjsky" fileName="imagesNew/skill_card_light1.png" xy="406,31" flip="hz"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComSkillShow.xml

@@ -1,21 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="524,897">
+<component size="546,897">
   <displayList>
-    <component id="n0_py00" name="comSkillCard" src="py009o" fileName="components/ComSkillCard.xml" xy="0,0" pivot="0.5,0.5"/>
-    <component id="n1_py00" name="ComSkillName" src="sx2v9p" fileName="components/ComSkillName.xml" xy="-12,-106" size="548,106"/>
-    <component id="n6_om9f" name="ComSkillScore" src="om9f9w" fileName="components/ComSkillScore.xml" xy="322,34" pivot="0.5,0.5"/>
+    <graph id="n15_idkd" name="holderBottom" xy="268,443" size="10,10" group="n14_idkd" type="rect"/>
+    <image id="n13_idkd" name="n13" src="qkjskb" fileName="imagesNew/dikuang_card.png" xy="802,1" group="n14_idkd"/>
+    <component id="n0_py00" name="comSkillCard" src="py009o" fileName="components/ComSkillCard.xml" xy="-802,0" pivot="0.5,0.5" group="n14_idkd"/>
+    <component id="n6_om9f" name="ComSkillScore" src="om9f9w" fileName="components/ComSkillScore.xml" xy="322,34" pivot="0.5,0.5" group="n14_idkd" visible="false"/>
+    <text id="n17_idkd" name="txtName" xy="46,-95" size="454,79" group="n14_idkd" visible="false" font="ui://eg2y0ldpa0cftks" fontSize="60" color="#fefef6" align="center" ubb="true" autoSize="none" text="月中天"/>
+    <graph id="n16_idkd" name="holderTop" xy="275,417" size="10,10" group="n14_idkd" type="rect"/>
+    <group id="n14_idkd" name="n14" xy="-802,-95" size="2150,992"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Alpha" target="n0_py00" tween="true" startValue="0.3" endValue="1" duration="4" ease="Linear"/>
-    <item time="0" type="Scale" target="n0_py00" tween="true" startValue="0,0" endValue="1.4,1.4" duration="5" ease="Linear"/>
-    <item time="0" type="Scale" target="n6_om9f" value="1.4,1.4"/>
-    <item time="0" type="Skew" target="n0_py00" tween="true" startValue="0,120" endValue="0,360" duration="5" ease="Linear"/>
-    <item time="0" type="Visible" target="n1_py00" value="false"/>
+    <item time="0" type="Alpha" target="n0_py00" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n13_idkd" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Visible" target="n15_idkd" value="true"/>
+    <item time="0" type="Visible" target="n16_idkd" value="true"/>
+    <item time="0" type="Visible" target="n17_idkd" value="false"/>
     <item time="0" type="Visible" target="n6_om9f" value="false"/>
-    <item time="5" type="Scale" target="n0_py00" tween="true" startValue="1.4,1.4" endValue="1.4,1.4" duration="3" ease="Quad.In"/>
-    <item time="8" type="Scale" target="n0_py00" tween="true" startValue="1.4,1.4" endValue="1,1" duration="3" ease="Linear"/>
-    <item time="12" type="Visible" target="n1_py00" value="true"/>
-    <item time="16" type="Scale" target="n6_om9f" tween="true" startValue="1.4,1.4" endValue="1,1" duration="4" ease="Quad.In"/>
-    <item time="16" type="Visible" target="n6_om9f" value="true"/>
+    <item time="0" type="XY" target="n0_py00" tween="true" startValue="-802,0" endValue="11,0" duration="18" ease="Expo.Out"/>
+    <item time="0" type="XY" target="n13_idkd" tween="true" startValue="802,1" endValue="0,1" duration="18" ease="Expo.Out"/>
+    <item time="18" type="Scale" target="n6_om9f" tween="true" startValue="0,0" endValue="1.4,1.4" duration="6" ease="Linear"/>
+    <item time="18" type="Visible" target="n17_idkd" value="true"/>
+    <item time="18" type="Visible" target="n6_om9f" value="true"/>
+    <item time="24" type="Scale" target="n6_om9f" tween="true" startValue="1.4,1.4" endValue="1,1" duration="6" ease="Linear"/>
+    <item time="60" type="Visible" target="n17_idkd" value="true"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n0_py00" tween="true" startValue="1" endValue="0" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n13_idkd" tween="true" startValue="1" endValue="0" duration="18" ease="Linear"/>
+    <item time="0" type="Visible" target="n15_idkd" value="false"/>
+    <item time="0" type="Visible" target="n16_idkd" value="false"/>
+    <item time="0" type="Visible" target="n17_idkd" value="false"/>
+    <item time="0" type="Visible" target="n6_om9f" value="false"/>
+    <item time="0" type="XY" target="n0_py00" tween="true" startValue="11,0" endValue="-802,0" duration="18" ease="Expo.In"/>
+    <item time="0" type="XY" target="n13_idkd" tween="true" startValue="0,1" endValue="802,1" duration="18" ease="Expo.In"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -3,13 +3,9 @@
   <displayList>
     <image id="n11_fqor" name="n11" src="qkjsla" fileName="imagesNew/pro_bk_in.png" xy="-36,0"/>
     <component id="n1_uj53" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,4"/>
-    <image id="n8_v95q" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="833,16" pivot="0.518,0.438" anchor="true" alpha="0.76">
+    <image id="n8_v95q" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="849,16" pivot="0.518,0.438" anchor="true" alpha="0.76">
       <relation target="n1_uj53" sidePair="right-right"/>
     </image>
-    <graph id="n9_weok" name="holder" xy="770,15" pivot="0.5,0.5" anchor="true" size="100,100">
-      <relation target="n1_uj53" sidePair="right-right"/>
-    </graph>
-    <graph id="n10_weok" name="holder1" xy="417,14" pivot="0.5,0.5" size="1,1"/>
     <image id="n12_fqor" name="n12" src="qkjskk" fileName="imagesNew/zdqp_dikuang.png" xy="-8,34" group="n16_fqor"/>
     <image id="n13_fqor" name="n13" src="qkjsl1" fileName="imagesNew/font_zdsz_picture.png" xy="-2,39" group="n16_fqor"/>
     <image id="n14_fqor" name="n14" src="qkjsk8" fileName="imagesNew/score.png" xy="43,40" group="n16_fqor"/>
@@ -20,6 +16,10 @@
     <image id="n19_fqor" name="n19" src="qkjsk8" fileName="imagesNew/score.png" xy="739,40" group="n21_fqor"/>
     <text id="n20_fqor" name="txtNpcScore" xy="700,41" pivot="1,0" size="38,32" group="n21_fqor" font="ui://mfvz4q8kqkjsny" fontSize="36" color="#fff6e3" align="right" vAlign="middle" letterSpacing="-6" bold="true" text="01"/>
     <group id="n21_fqor" name="n21" xy="526,34" size="324,44"/>
+    <graph id="n9_weok" name="holder" xy="770,15" pivot="0.5,0.5" anchor="true" size="100,100">
+      <relation target="n1_uj53" sidePair="right-right"/>
+    </graph>
+    <graph id="n10_weok" name="holder1" xy="417,14" pivot="0.5,0.5" size="1,1"/>
   </displayList>
   <ProgressBar/>
 </component>

FGUIProject/assets/Main/package.xml

@@ -486,7 +486,7 @@
     <image id="qkjsk6" name="font_zdsz_9.png" path="/FontNew/"/>
     <image id="qkjsk7" name="result.png" path="/imagesNew/"/>
     <image id="qkjsk8" name="score.png" path="/imagesNew/"/>
-    <image id="qkjsk9" name="back_card_zhzhao.png" path="/imagesNew/"/>
+    <image id="qkjsk9" name="back_card_zhzhao.png" path="/imagesNew/" scale="9grid" scale9grid="270,480,540,960"/>
     <image id="qkjska" name="btn_card_speed2.png" path="/imagesNew/"/>
     <image id="qkjskb" name="dikuang_card.png" path="/imagesNew/"/>
     <image id="qkjskc" name="dikuang_card_light1.png" path="/imagesNew/"/>

FGUIProject/assets/RoleInfo/ChangeHead.xml

@@ -35,10 +35,10 @@
     </component>
     <group id="n10_r9ri" name="n10" xy="205,93" size="585,84"/>
     <image id="n11_r9ri" name="n11" src="r9rim" fileName="images/grxx_xtxtx.png" xy="381,330" size="520,6" group="n12_r9ri"/>
-    <component id="n4_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="105,187" size="236,238" group="n12_r9ri" scale="1.2,1.2"/>
+    <component id="n4_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="105,187" group="n12_r9ri" scale="1.2,1.2"/>
     <text id="n5_r9ri" name="txtName" xy="394,263" size="129,56" group="n12_r9ri" fontSize="42" color="#ab8759" text="头像名"/>
     <text id="n6_r9ri" name="txtDesc" xy="394,345" size="138,46" group="n12_r9ri" fontSize="34" color="#ceb599" text="头像描述"/>
-    <group id="n12_r9ri" name="n12" xy="105,187" size="796,238"/>
+    <group id="n12_r9ri" name="n12" xy="105,187" size="796,230"/>
     <image id="n13_r9ri" name="n13" src="r9rim" fileName="images/grxx_xtxtx.png" xy="88,957"/>
     <component id="n14_r9ri" name="btnSure" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="356,1003">
       <Button title="保存" titleColor="#ffffff" titleFontSize="42"/>

FGUIProject/assets/RoleInfo/components/ListHeadBorderItem.xml

@@ -8,7 +8,9 @@
     </image>
     <loader id="n6_v95q" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" aspect="true" touchable="false" url="ui://374k3dwvr9ri23" autoSize="true"/>
     <image id="n7_v95q" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="154,45"/>
-    <image id="n8_mbf1" name="imgUnGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="26,100"/>
+    <image id="n9_idkd" name="imgUnGet" src="idkdtn9" fileName="imagesNew/bq_whd.png" pkg="eg2y0ldp" xy="20,95" group="n11_idkd"/>
+    <text id="n10_idkd" name="n10" xy="62,104" size="88,39" group="n11_idkd" fontSize="28" color="#fff9f6" text="未获得"/>
+    <group id="n11_idkd" name="grpUnGet" xy="20,95" size="172,56" advanced="true"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/RoleInfo/components/ListHeadItem.xml

@@ -8,7 +8,9 @@
       <gearDisplay controller="button" pages="1"/>
     </image>
     <image id="n7_r9ri" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="140,18"/>
-    <image id="n8_mbf1" name="imgUnGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="11,89"/>
+    <image id="n8_mbf1" name="imgUnGet" src="idkdtn9" fileName="imagesNew/bq_whd.png" pkg="eg2y0ldp" xy="6,80" group="n11_idkd"/>
+    <text id="n10_idkd" name="n10" xy="48,89" size="88,39" group="n11_idkd" fontSize="28" color="#fff9f6" text="未获得"/>
+    <group id="n11_idkd" name="grpUnGet" xy="6,80" size="172,56" advanced="true"/>
   </displayList>
   <Button mode="Radio"/>
 </component>