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

# Conflicts:
#	FGUIProject/assets/CommonGame/components/BtnStyle005.xml
#	FGUIProject/assets/CommonGame/components/BtnStyle006.xml
#	FGUIProject/assets/CommonGame/components/ComIcon003.xml
#	FGUIProject/assets/CommonGame/package.xml
#	FGUIProject/assets/LuckyBox/LuckyBoxPreShowUI.xml
#	FGUIProject/assets/LuckyBox/combox/ComBox.xml
#	FGUIProject/assets/LuckyBox/components/ButtonTab1.xml
#	FGUIProject/assets/LuckyBox/components/CompLuckyBoxBonusListItem.xml
#	FGUIProject/assets/LuckyBox/components/Component1.xml
#	FGUIProject/assets/LuckyBox/package.xml
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs.meta
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs.meta
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs.meta
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs.meta
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIcon.cs.meta
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs.meta
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox.cs
#	GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardPreView.cs
#	GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/FirstChargeBonusView.cs
#	GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs
#	GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs
#	GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
#	GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRewardGetView.cs
#	GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRewardView.cs
#	GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRuleView.cs
#	GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingRewardView.cs
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
#	GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
#	GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
#	GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png
#	GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png
#	GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png.meta
#	GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png.meta
#	GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes

FGUIProject/assets/ActivityDay7/ActivityDay7UI.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://kupdwln7nyhm0">
   <displayList>
-    <loader id="n24_jttb" 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 id="n24_jttb" name="loaBg" xy="540,1200" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://kupdwln7vnbyj" fill="scaleMatchWidth" clearOnPublish="true">
+      <relation target="" sidePair="width-width,height-height,top-top"/>
     </loader>
+    <image id="n25_vnby" name="n25" src="nyhm8" fileName="imagesNew/qrhd_db.png" pkg="eg2y0ldp" xy="0,790">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
     <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" 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"/>
+    <image id="n1_nyhm" name="n1" src="nyhm5" fileName="imagesNew/sj_db.png" pkg="eg2y0ldp" xy="367,108"/>
+    <text id="n2_nyhm" name="TimeStr" xy="401,107" size="231,44" fontSize="32" color="#fffaec" align="center" vAlign="middle" autoSize="none" text=""/>
+    <component id="n4_nyhm" name="tip" 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">
       <ProgressBar value="50" max="100"/>
     </component>
@@ -26,6 +29,7 @@
       <item/>
     </list>
     <list id="n12_jttb" name="TaskList" xy="12,983" size="1064,937" overflow="scroll" defaultItem="ui://eg2y0ldplh8v5">
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>

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" src="nyhm7" fileName="images/qrhd_jdt.png" xy="12,13"/>
+    <image id="n1_nyhm" name="bar_v" src="nyhm7" fileName="images/qrhd_jdt.png" xy="12,13"/>
   </displayList>
-  <ProgressBar reverse="true"/>
+  <ProgressBar/>
 </component>

FGUIProject/assets/ActivityDay7/components/ExpProcessItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="c1" pages="0,非最大,1,最大" selected="0"/>
   <controller name="c2" pages="0,未获得,1,已获得" selected="0"/>
   <displayList>
     <image id="n11_bhmm" name="n11" src="nyhm4" fileName="images/qrhd_wp_db_1.png" xy="-17,-15" group="n9_bhmm">
@@ -13,11 +13,9 @@
     <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"/>
+    <image id="n12_p8yf" name="n12" src="nyhme" fileName="images/qrhd_jdt_sz_db.png" xy="-42,52" 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>

FGUIProject/assets/ActivityDay7/package.xml

@@ -16,6 +16,7 @@
     <component id="nyhmf" name="ExpProcess.xml" path="/components/"/>
     <component id="rle1h" name="ButtonDay.xml" path="/components/"/>
     <component id="bhmmi" name="ExpProcessItem.xml" path="/components/" exported="true"/>
+    <image id="vnbyj" name="qrhd_banner_yxzy.png" path="/Designs/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/ActivityDay7" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxUI.xml

@@ -5,13 +5,13 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n1_mbf1" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n3_mbf1" name="btnTask" src="mbf1l" fileName="compoents/Button1.xml" xy="953,127" size="94,95" group="n8_mbf1">
-      <Button icon="ui://ubfk2kobmbf12"/>
+    <component id="n3_mbf1" name="btnTask" src="mbf1l" fileName="compoents/Button1.xml" xy="896,147" group="n8_mbf1">
+      <Button icon="ui://ubfk2kobt6j1m"/>
     </component>
-    <component id="n7_mbf1" name="btnShop" src="mbf1l" fileName="compoents/Button1.xml" xy="1055,127" size="94,95" group="n8_mbf1" visible="false">
+    <component id="n7_mbf1" name="btnShop" src="mbf1l" fileName="compoents/Button1.xml" xy="998,127" size="94,95" group="n8_mbf1" visible="false">
       <Button icon="ui://ubfk2kobmbf11"/>
     </component>
-    <group id="n8_mbf1" name="n8" xy="953,127" size="94,95" advanced="true" layout="hz" colGap="8" excludeInvisibles="true">
+    <group id="n8_mbf1" name="n8" xy="896,147" size="151,118" advanced="true" layout="hz" colGap="8" excludeInvisibles="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     <image id="n6_mbf1" name="n6" src="mbf14" fileName="imagesNew/sj_dk.png" pkg="eg2y0ldp" xy="416,105" group="n9_mbf1"/>

FGUIProject/assets/ActivityThemeLuckyBox/compoents/Button1.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,100" extention="Button">
+<component size="151,118" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n3_mbf1" name="icon" xy="0,0" size="100,100" autoSize="true"/>
-    <text id="n4_mbf1" name="title" xy="30,29" pivot="0.5,0.5" size="40,42" fontSize="30" align="center" vAlign="middle" text="">
+    <loader id="n3_mbf1" name="icon" xy="0,0" size="151,118" url="ui://ubfk2kobt6j1m" vAlign="bottom"/>
+    <text id="n4_mbf1" name="title" xy="55,38" pivot="0.5,0.5" size="40,42" fontSize="30" align="center" vAlign="middle" text="">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>
   <Button/>
-  <relation target="n3_mbf1" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/ActivityThemeLuckyBox/package.xml

@@ -14,6 +14,7 @@
     <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"/>
+    <image id="t6j1m" name="cj_xsrw_db.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/Arena/ArenaLoadingUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920">
   <displayList>
     <loader id="n0_rv09" name="loaBg" xy="0,-240" size="1080,2400" fill="scale">
-      <relation target="" sidePair="width-width,height-height"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <component id="n1_rv09" name="progressBar1" src="rv0955" fileName="components/ProgressBar2.xml" xy="95,1676" group="n4_rv09">
       <relation target="" sidePair="center-center,bottom-bottom"/>

FGUIProject/assets/Arena/ArenaUI.xml

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

FGUIProject/assets/Bag/BagUI.xml

@@ -4,14 +4,14 @@
     <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,95" group="n17_si5z">
+    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" group="n17_si5z">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n6_wet2" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,196" group="n17_si5z">
+    <component id="n6_wet2" name="btnback" src="uyuxtj5" fileName="components/BtnBack0.xml" pkg="eg2y0ldp" xy="35,196" group="n17_si5z">
       <Button icon="ui://2bsz6nelsi5zti3"/>
     </component>
     <image id="n14_si5z" name="n14" src="si5zti6" fileName="images/wpbb_xtxt.png" xy="54,312" group="n17_si5z"/>
-    <group id="n17_si5z" name="grpTop" xy="0,95" size="1080,229"/>
+    <group id="n17_si5z" name="grpTop" xy="0,85" size="1080,239"/>
     <list id="n0_lh8v" name="list" xy="33,390" size="1013,1530" layout="flow_hz" overflow="scroll" lineGap="82" colGap="43" defaultItem="ui://2bsz6nelsi5zti7" autoClearItems="true">
       <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
       <item/>

FGUIProject/assets/Bag/GiftBoxSelectorUI.xml

@@ -4,8 +4,8 @@
     <image id="n0_v5no" name="n0" src="v5notm5" fileName="images/tanchuang_2.png" xy="-61,-37" size="1023,1026"/>
     <component id="n31_cu9w" name="btnCancel" src="cu9wtmj" fileName="components/BtnCancel.xml" xy="849,-29" group="n11_v5no"/>
     <image id="n14_v5no" name="n14" src="v5notm0" fileName="images/lm_db_3.png" xy="331,135" size="575,274" group="n11_v5no"/>
-    <image id="n1_v5no" name="n1" src="v5notm1" fileName="images/lm_dt_zsx1.png" xy="243,72" group="n11_v5no"/>
-    <image id="n2_v5no" name="n2" src="v5notm2" fileName="images/lm_dt_zsx2.png" xy="587,71" group="n11_v5no"/>
+    <image id="n1_v5no" name="n1" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="243,72" group="n11_v5no"/>
+    <image id="n2_v5no" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="587,71" pivot="0.5,0" group="n11_v5no" scale="-1,1"/>
     <image id="n6_v5no" name="n6" src="v5notm9" fileName="images/wplb_db.png" xy="-9,76" group="n11_v5no"/>
     <text id="n15_v5no" name="txtItemDes" xy="390,165" size="462,217" group="n11_v5no" fontSize="32" color="#b08d5c" leading="1" autoSize="ellipsis" text="摘星道具摘星道具摘星道具摘星道 具摘星道具摘星道具摘星道具"/>
     <text id="n3_v5no" name="txtName" xy="376,53" size="210,54" group="n11_v5no" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoSize="shrink" text="稀有升星材料(自选)"/>

FGUIProject/assets/Bag/components/BtnSub.xml

@@ -5,7 +5,7 @@
     <image id="n0_cu9w" name="n0" src="v5notlz" fileName="images/lm_an__xuanzhong_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_cu9w" name="title" xy="0,0" size="265,82" font="SourceHanSerifCN-Regular" fontSize="32" color="#683c28" align="center" vAlign="middle" autoSize="none" singleLine="true" text="使用">
+    <text id="n1_cu9w" name="title" xy="0,0" size="265,82" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#683c28" align="center" vAlign="middle" autoSize="none" singleLine="true" text="使用">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Bag/components/ListSelectorItem.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="172,241" overflow="hidden">
   <displayList>
-    <image id="n0_v5no" name="n0" src="v5notm7" fileName="images/wpk_db_1_da.png" xy="0,1"/>
     <image id="n2_v5no" name="n2" src="v5notmc" fileName="images/db_jiajian_1.png" xy="23,189"/>
     <text id="n17_cu9w" name="txtSelNum" xy="56,184" size="60,53" fontSize="39" color="#915e15" align="center" autoSize="none" text="0"/>
-    <loader id="n11_v5no" name="loaIcon" xy="87,84" pivot="0.5,0.5" anchor="true" size="100,88" fill="scale"/>
-    <image id="n18_qqhz" name="n18" src="v5notm8" fileName="images/wpk_sz_db_1.png" xy="8,120" size="155,45"/>
-    <text id="n19_qqhz" name="txtNum" xy="58,122" size="54,42" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="120"/>
     <component id="n15_cu9w" name="btnReduce" src="cu9wtmf" fileName="components/BtnReduce.xml" xy="-1,188"/>
     <component id="n16_cu9w" name="btnAdd" src="cu9wtmg" fileName="components/BtnAdd.xml" xy="121,189"/>
+    <image id="n0_v5no" name="n0" src="v5notm7" fileName="images/wpk_db_1_da.png" xy="0,1" group="n20_yjmk"/>
+    <loader id="n11_v5no" name="loaIcon" xy="87,84" pivot="0.5,0.5" anchor="true" size="100,88" group="n20_yjmk" fill="scale"/>
+    <image id="n18_qqhz" name="n18" src="v5notm8" fileName="images/wpk_sz_db_1.png" xy="8,120" size="155,45" group="n20_yjmk"/>
+    <text id="n19_qqhz" name="txtNum" xy="58,122" size="54,42" group="n20_yjmk" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="120"/>
+    <group id="n20_yjmk" name="n20" xy="0,1" size="172,172"/>
   </displayList>
 </component>

FGUIProject/assets/Bag/package.xml

@@ -12,8 +12,6 @@
     <image id="v5notly" name="back.png" path="/images/"/>
     <image id="v5notlz" name="lm_an__xuanzhong_1.png" path="/images/"/>
     <image id="v5notm0" name="lm_db_3.png" path="/images/"/>
-    <image id="v5notm1" name="lm_dt_zsx1.png" path="/images/"/>
-    <image id="v5notm2" name="lm_dt_zsx2.png" path="/images/"/>
     <image id="v5notm3" name="lm_zhuangshixian_duan.png" path="/images/"/>
     <image id="v5notm4" name="lm_zsx0.png" path="/images/"/>
     <image id="v5notm5" name="tanchuang_2.png" path="/images/"/>

FGUIProject/assets/Card/components/ComFosterTop.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n71_lc71" name="n71" src="qkjsb6" fileName="imagesNew/back_jiguang.png" xy="0,0"/>
     <component id="n69_lc71" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n68_lc71" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,6"/>
+    <component id="n68_lc71" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,6"/>
     <component id="n74_qkjs" name="btnStory" src="xtmoa1" fileName="components/Button1.xml" xy="40,245" group="n75_o9gh" aspect="true">
       <Button icon="ui://7l6lvkayqkjsba"/>
     </component>

FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml

@@ -9,8 +9,8 @@
       <relation target="" sidePair="top-top"/>
     </image>
     <image id="n22_qyr6" name="n22" src="qyr6n" fileName="images/fzfj_erdituditu.png" xy="72,406"/>
-    <component id="n28_cb92" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,7"/>
-    <component id="n0_wlc2" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n28_cb92" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,7"/>
+    <component id="n0_wlc2" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n1_wlc2" name="btnRule" src="wlc21" fileName="components/Button1.xml" xy="975,194"/>
     <list id="n29_ez2u" name="listTab" xy="100,343" size="880,63" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="2" colGap="12">
       <item url="ui://h9mv1l71wlc22" icon="ui://h9mv1l71qyr6j" selectedIcon="ui://h9mv1l71qyr6e"/>
@@ -35,7 +35,7 @@
     <component id="n16_wlc2" name="btnDecompose" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="368,1553">
       <Button title="分解"/>
     </component>
-    <text id="n17_wlc2" name="txtConsume" xy="440,1506" pivot="0.5,0" size="199,41" fontSize="30" color="#da826e" align="center" text="消耗金币X200">
+    <text id="n17_wlc2" name="txtConsume" xy="445,1506" pivot="0.5,0" size="188,41" fontSize="30" color="#da826e" align="center" text="消耗金币X200">
       <relation target="" sidePair="center-center"/>
     </text>
     <text id="n18_wlc2" name="txtTips" xy="254,1660" size="571,44" fontSize="26" color="#bbafa3" align="center" autoSize="none" text="服装会自动保留一件不显示在列表中"/>

FGUIProject/assets/ClothingFoster/ClothingUI.xml

@@ -10,7 +10,7 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
     <component id="n9_pjip" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n42_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,6"/>
+    <component id="n42_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,6"/>
     <loader id="n18_py5g" name="loaRarity" xy="940,140" size="54,224" url="ui://eg2y0ldpqdrt15" autoSize="true"/>
     <image id="n37_l4ui" name="n37" src="l4ui26" fileName="images/fzyc_yhditu_2.png" xy="0,1336">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/ClothingShop/ArenaShopUI.xml

@@ -11,10 +11,10 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     <loader id="n45_ugdz" name="n45" xy="0,0" size="1080,199" url="ui://e5hnfx8augdz1i" fill="scaleFree"/>
-    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,6"/>
-    <component id="n47_ugdz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,6"/>
+    <component id="n47_ugdz" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n49_f5bl" name="n49" src="lwri5x" fileName="images/hc_btkuang_1.png" pkg="eg2y0ldp" xy="282,103" group="n51_f5bl"/>
-    <text id="n50_f5bl" name="txtTitle" xy="540,103" pivot="0.5,0" anchor="true" size="152,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="活动商店"/>
+    <text id="n50_f5bl" name="txtTitle" xy="540,103" pivot="0.5,0" anchor="true" size="154,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="活动商店"/>
     <group id="n51_f5bl" name="grpTop" xy="282,103" size="516,55" visible="false" advanced="true"/>
     <image id="n9_hinb" name="bgList" src="hinbx" fileName="images/fzd_diban_2.png" xy="0,1176" group="n65_v95q">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/ClothingShop/ClothingShopUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="2,,3,,4,,5,,6," selected="4">
+  <controller name="c1" pages="2,,3,,4,,5,,6," selected="0">
     <remark page="1" value="服装店"/>
     <remark page="2" value="落星商店"/>
     <remark page="3" value="活动商店"/>
@@ -10,31 +10,31 @@
     <loader id="n63_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="n3_hinb" name="compHolder" src="ugdz1g" fileName="components/Component1.xml" xy="0,250">
+    <component id="n3_hinb" name="compHolder" src="ugdz1g" fileName="components/ComClothingRole.xml" xy="0,250">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n7_hinb" name="compItemInfo" src="hinb1d" fileName="components/CompItemInfo.xml" xy="618,217">
+    <component id="n7_hinb" name="compItemInfo" src="hinb1d" fileName="components/ComClothingShopItemInfo.xml" xy="618,217">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     <loader id="n45_ugdz" name="n45" xy="0,0" size="1080,199" url="ui://e5hnfx8augdz1i" fill="scaleFree"/>
-    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,105" controller="c1,6">
-      <gearXY controller="c1" pages="2,3,4,5,6" values="0,95|0,105|0,105|0,105|0,105"/>
+    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,6">
+      <gearXY controller="c1" pages="2,3,4,5,6" values="0,85|0,105|0,105|0,105|0,105"/>
     </component>
-    <component id="n47_ugdz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n47_ugdz" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n49_f5bl" name="n49" src="lwri5x" fileName="images/hc_btkuang_1.png" pkg="eg2y0ldp" xy="282,103" group="n51_f5bl"/>
-    <text id="n50_f5bl" name="txtTitle" xy="540,103" pivot="0.5,0" anchor="true" size="152,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="画廊商店">
+    <text id="n50_f5bl" name="txtTitle" xy="540,103" pivot="0.5,0" anchor="true" size="154,51" group="n51_f5bl" fontSize="38" color="#fdf4e3" text="活动商店">
       <gearText controller="c1" pages="4,6" values="落星商店|画廊商店" default="活动商店"/>
     </text>
     <group id="n51_f5bl" name="grpTop" xy="282,103" size="516,55" visible="false" advanced="true">
       <gearDisplay controller="c1" pages="4,5,6"/>
     </group>
     <image id="n52_iakb" name="n52" src="iakb5z" fileName="images/fzd_lxsdt.png" xy="308,1073" group="n53_iakb"/>
-    <text id="n54_iakb" name="txtTips" xy="436,1081" size="300,39" group="n59_iakb" fontSize="28" color="#fffbf0" text="50星屑自动合成1落星石"/>
+    <text id="n54_iakb" name="txtTips" xy="436,1081" size="297,39" group="n59_iakb" fontSize="28" color="#fffbf0" text="50星屑自动合成1落星石"/>
     <loader id="n57_iakb" name="loaIcon1" xy="774,1080" size="42,42" group="n61_iakb" url="ui://eg2y0ldply9g8n" autoSize="true"/>
-    <text id="n58_iakb" name="txtCount1" xy="819,1081" size="84,39" group="n61_iakb" fontSize="28" color="#fffbf0" text="10000"/>
+    <text id="n58_iakb" name="txtCount1" xy="819,1081" size="72,39" group="n61_iakb" fontSize="28" color="#fffbf0" text="10000"/>
     <group id="n61_iakb" name="n61" xy="774,1080" size="136,42" group="n59_iakb"/>
     <loader id="n55_iakb" name="loaIcon0" xy="940,1081" size="42,42" group="n60_iakb" url="ui://eg2y0ldply9g8m" autoSize="true"/>
-    <text id="n56_iakb" name="txtCount0" xy="984,1081" size="68,39" group="n60_iakb" fontSize="28" color="#fffbf0" autoClearText="true" text="1000"/>
+    <text id="n56_iakb" name="txtCount0" xy="984,1081" size="58,39" group="n60_iakb" fontSize="28" color="#fffbf0" autoClearText="true" text="1000"/>
     <group id="n60_iakb" name="n60" xy="940,1081" size="117,42" group="n59_iakb"/>
     <group id="n59_iakb" name="n59" xy="436,1080" size="621,43" group="n53_iakb" advanced="true">
       <relation target="" sidePair="right-right"/>

FGUIProject/assets/ClothingShop/GalleryShopUI.xml

@@ -4,10 +4,10 @@
     <loader id="n27_r9ri" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_yd72" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n1_yd72" name="btnBack" src="uyuxtj5" fileName="components/BtnBack0.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="ui://e5hnfx8ar9rieg"/>
     </component>
-    <component id="n26_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="17,95" controller="c1,9"/>
+    <component id="n26_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="17,85" controller="c1,9"/>
     <image id="n19_r9ri" name="n19" src="r9rieh" fileName="images/jfsc_dik.png" xy="625,0"/>
     <image id="n22_r9ri" name="n22" src="r9ri6r" fileName="images/jfsc_xiantiao_1.png" xy="665,371" group="n21_r9ri"/>
     <component id="n20_r9ri" name="btnBuy" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="706,636" group="n21_r9ri">

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

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

FGUIProject/assets/CommonGame/components/BtnStyle005.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="94,94" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="316,102" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n0_idkd" src="idkdtnd" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
-    </image>
-    <text id="n1_idkd" name="title" xy="0,0" size="94,94" fontSize="30" autoSize="none" align="center" vAlign="middle" singleLine="true">
-      <relation target="" sidePair="width,height"/>
+    <loader id="n2_idkd" name="icon" xy="0,0" pivot="0.5,0.5" size="316,102" url="ui://eg2y0ldpvolstnf" autoSize="true"/>
+    <text id="n1_9qpb" name="title" xy="0,-4" size="316,102" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="前往">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </text>
   </displayList>
+  <Button/>
+  <relation target="n2_idkd" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/CommonGame/components/BtnStyle006.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="316,102" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+<component size="94,94" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n2_idkd" name="icon" xy="0,3" size="316,102" url="ui://eg2y0ldpidkdtne" autoSize="true"/>
-    <text id="n1_idkd" name="title" xy="0,0" size="316,102" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="摘星十次">
-      <relation target="" sidePair="width-width,height-height"/>
+    <loader id="n2_idkd" name="icon" xy="0,0" pivot="0.5,0.5" size="94,94" url="ui://eg2y0ldpvolstni" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <text id="n1_9qpb" name="title" xy="0,0" size="94,94" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </text>
   </displayList>
   <Button/>

FGUIProject/assets/CommonGame/components/ComHead.xml

@@ -4,7 +4,7 @@
     <remark page="0" value="可见"/>
     <remark page="1" value="不可见"/>
   </controller>
-  <controller name="c2" exported="true" pages="0,,1,,2,,3,,4," selected="4">
+  <controller name="c2" exported="true" pages="0,,1,,2,,3,,4,,5," selected="0">
     <remark page="0" value="默认边框"/>
   </controller>
   <displayList>
@@ -29,6 +29,9 @@
     <image id="n49_qik1" name="n49" src="qik1tm5" fileName="images/phbphb_txkk.png" xy="30,38" size="166,166" group="n41_r9ri">
       <gearDisplay controller="c2" pages="4"/>
     </image>
+    <image id="n50_t6j1" name="n50" src="kubi7f" fileName="images/zjm_txkuang_1.png" xy="23,32" size="178,179" group="n41_r9ri">
+      <gearDisplay controller="c2" pages="5"/>
+    </image>
     <loader id="n37_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>

FGUIProject/assets/CommonGame/components/ComIcon003.xml

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

FGUIProject/assets/CommonGame/components/ComItem003.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="210,210" pivot="0.5,0.5" overflow="hidden" opaque="false">
+  <displayList>
+    <component id="n25_pu55" name="comItemIcon" src="volstnd" fileName="components/ComIcon003.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
+    <text id="n26_r9ri" name="txtName" xy="105,224" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
+      <relation target="n25_pu55" sidePair="bottom-bottom"/>
+    </text>
+    <image id="n27_qik1" name="n27" src="qik1tm0" fileName="imagesNew/dikuang_SkillLevel.png" xy="162,192" pivot="0.5,0.5" anchor="true" size="90,33" group="n28_qik1">
+      <relation target="n15_ehs9" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n15_ehs9" name="txtCount" xy="161,169" pivot="0.5,0" anchor="true" size="50,44" group="n28_qik1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" align="center" vars="true" text="x00">
+      <relation target="n25_pu55" sidePair="center-center"/>
+    </text>
+    <group id="n28_qik1" name="n28" xy="117,169" size="90,44"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/components/ComTipsBase.xml

@@ -10,8 +10,8 @@
     <text id="n9_si5z" name="txtDesc" xy="375,181" size="506,166" group="n24_u2u3" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
     <group id="n24_u2u3" name="n24" xy="56,50" size="850,320" group="n25_u2u3" advanced="true"/>
     <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="75,400" size="50,50" group="n19_si5z"/>
-    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesNew/kp_sx_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="n12_si5z" name="n12" src="842s6i" fileName="imagesNew/kp_sx_3.png" xy="300,400" size="50,50" group="n19_si5z"/>
+    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesNew/kp_sx_2.png" xy="525,400" size="50,50" group="n19_si5z"/>
     <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="750,400" size="50,50" group="n19_si5z"/>
     <text id="n15_si5z" name="txtGong" xy="135,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
     <text id="n16_si5z" name="txtShang" xy="360,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
@@ -22,12 +22,19 @@
       <item/>
       <item/>
     </list>
-    <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">
+    <list id="n26_l500" name="listItem" xy="58,551" pivot="0.5,0" size="851,131" group="n25_u2u3" layout="row" overflow="scroll" scroll="horizontal" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n25_u2u3" name="n25" xy="56,50" size="850,632" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
+    <group id="n25_u2u3" name="n25" xy="56,50" size="853,632" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
   </displayList>
   <relation target="n25_u2u3" sidePair="height-height"/>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -187,7 +187,7 @@
     <image id="r9ritjl" name="tc_kuangk.png" path="/imgnew/"/>
     <image id="kubi7e" name="self.png" path="/images/"/>
     <image id="q08xh" name="zjm_txkuang.png" path="/images/"/>
-    <image id="kubi7f" name="zjm_txkuang_1.png" path="/images/" scale="9grid" scale9grid="31,31,62,62"/>
+    <image id="kubi7f" name="zjm_txkuang_1.png" path="/images/" scale9grid="31,31,62,62"/>
     <image id="r9ritjs" name="grxx_zytxtx.png" path="/images/"/>
     <image id="r9ri12k" name="hl_xz_ddik_1.png" path="/images/" exported="true"/>
     <image id="r9ri12o" name="hl_ddandik.png" path="/images/" exported="true"/>
@@ -300,7 +300,7 @@
     <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
     <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/" exported="true"/>
     <component id="qik1tly" name="ComItem002.xml" path="/components/" exported="true"/>
-    <component id="qik1tlz" name="ComIcon002.xml" path="/components/" exported="true"/>
+    <component id="qik1tlz" name="ComIcon002.xml" path="/components/"/>
     <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
     <component id="qik1tm1" name="BtnStyle000.xml" path="/components/" exported="true"/>
@@ -339,13 +339,16 @@
     <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"/>
-    <image id="idkdtnd" name="an_bt_cut.png" path="/imagesNew/" exported="true"/>
-    <image id="idkdtne" name="an_bt_jin.png" path="/imagesNew/" exported="true"/>
-    <image id="idkdtnf" name="an_bt_bai.png" path="/imagesNew/" exported="true"/>
-    <component id="idkdtng" name="BtnStyle005.xml" path="/components/" exported="true"/>
-    <component id="idkdtnh" name="BtnStyle006.xml" path="/components/" exported="true"/>
-    <component id="imyrtni" name="ComIcon003.xml" path="/components/" exported="true"/>
-    <image id="idkdtcb" name="wp_bg_yuan.png" path="/imagesNew/"/>
+    <component id="volstnd" name="ComIcon003.xml" path="/components/"/>
+    <image id="volstne" name="lm_fl_db.png" path="/bgimg/" exported="true"/>
+    <component id="volstnf" name="BtnStyle005.xml" path="/components/"/>
+    <component id="volstng" name="BtnStyle006.xml" path="/components/"/>
+    <component id="volstnh" name="ComItem003.xml" path="/components/" exported="true"/>
+    <image id="volstni" name="an_bt_bai.png" path="/imagesNew/"/>
+    <image id="volstnj" name="an_bt_cut.png" path="/imagesNew/"/>
+    <image id="volstnk" name="an_bt_jin.png" path="/imagesNew/"/>
+    <image id="volstnl" name="wp_bg_yuan.png" path="/imagesNew/"/>
+    <image id="volstnm" name="wp_own.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/ComList.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="987,1514" overflow="scroll">
+  <displayList>
+    <component id="n4_fqor" name="btnLimitChargeAddUp" src="qik1u" fileName="components/Button1.xml" xy="0,0" group="n30_idkd" controller="c1,1,c2,0">
+      <Button title="限时累充" icon="ui://t8nwuj7ivols1q"/>
+    </component>
+    <component id="n5_fqor" name="btnSevenDayLogin" src="qik1u" fileName="components/Button1.xml" xy="0,351" group="n30_idkd" controller="c2,1">
+      <Button title="一周黄历"/>
+      <property target="loaIcon" propertyId="1" value="ui://t8nwuj7ivols20"/>
+      <property target="loaTitle" propertyId="1" value="ui://t8nwuj7ivols1z"/>
+    </component>
+    <component id="n28_idkd" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,702" group="n30_idkd" controller="c2,2">
+      <Button title="每日签到" icon="ui://t8nwuj7ivols1y"/>
+      <property target="loaIcon" propertyId="1" value="ui://t8nwuj7ivols1y"/>
+      <property target="loaTitle" propertyId="1" value="ui://t8nwuj7ivols1m"/>
+    </component>
+    <component id="n29_idkd" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,1053" group="n30_idkd" controller="c2,3">
+      <Button title="每日补给" icon="ui://t8nwuj7ivols1x"/>
+      <property target="loaIcon" propertyId="1" value="ui://t8nwuj7ivols1x"/>
+      <property target="loaTitle" propertyId="1" value="ui://t8nwuj7ivols21"/>
+    </component>
+    <group id="n30_idkd" name="n30" xy="0,0" size="987,1393" advanced="true" layout="vt" lineGap="11" excludeInvisibles="true"/>
+  </displayList>
+</component>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -4,25 +4,22 @@
     <loader id="n27_fqor" 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="n0_fqor" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n3_fqor">
+    <image id="n31_vols" name="n31" src="volstne" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-77,0" size="1235,2071" aspect="true">
+      <relation target="" sidePair="width-width,height-height,top-top"/>
+    </image>
+    <image id="n32_vols" name="n32" src="vols1s" fileName="images/hdrk_biaotz.png" xy="232,67"/>
+    <component id="n0_fqor" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" group="n3_fqor" visible="false">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n1_fqor" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,196" group="n3_fqor">
+    <component id="n1_fqor" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n3_fqor">
       <Button icon="ui://t8nwuj7ifqor1"/>
     </component>
-    <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,191"/>
-    <component id="n4_fqor" name="btnLimitChargeAddUp" src="qik1u" fileName="components/Button1.xml" xy="0,360" group="n30_idkd">
-      <Button title="限时累充"/>
+    <group id="n3_fqor" name="grpTop" xy="0,80" size="1080,96"/>
+    <component id="n4_fqor" name="comList" src="vols22" fileName="ComList.xml" xy="46,210" size="987,1709">
+      <relation target="" sidePair="height-height"/>
     </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="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"/>
+    <image id="n34_vols" name="n34" src="vols1t" fileName="images/hdrk_zz.png" xy="43,1667">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </image>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/LimitChargeUI.xml

@@ -6,12 +6,16 @@
     </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">
+    <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" autoClearText="true" text="00天00时00分"/>
+    <group id="n6_idkd" name="grpTime" 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">
+    <image id="n8_idkd" name="n8" src="nyhm8" fileName="imagesNew/qrhd_db.png" pkg="eg2y0ldp" xy="0,791" group="n12_idkd">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <text id="n13_vols" name="n13" xy="186,912" size="708,44" group="n12_idkd" fontSize="32" color="#bc8d49" text="活动期间累充达到指定会员积分即可领取绝版套装"/>
+    <list id="n1_fqor" name="list" xy="15,979" size="1040,941" group="n12_idkd" layout="flow_hz" overflow="scroll" lineGap="20" defaultItem="ui://t8nwuj7iidkd15">
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
@@ -27,7 +31,7 @@
       <Button title="前往充值"/>
     </component>
     <group id="n12_idkd" name="n12" xy="0,768" size="1080,1152" advanced="true">
-      <relation target="" sidePair="bottom-bottom"/>
+      <relation target="" sidePair="top-top"/>
     </group>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/Button1.xml

@@ -1,13 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,328" overflow="hidden" extention="Button">
+<component size="987,340" overflow="hidden" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="c1" exported="true" pages="0,,1," selected="0">
+    <remark page="0" value="不显示时间"/>
+    <remark page="1" value="显示时间"/>
+  </controller>
+  <controller name="c2" exported="true" pages="0,,1,,2,,3," selected="0">
+    <remark page="0" value="限时累充标题位置"/>
+    <remark page="1" value="七天登录标题位置"/>
+    <remark page="2" value="每日签到标题位置"/>
+    <remark page="3" value="每日补给标题位置"/>
+  </controller>
   <displayList>
-    <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,41" fontSize="30" align="center" vAlign="middle" singleLine="true" text="每日签到">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
+    <image id="n2_vols" name="n2" src="vols1w" fileName="images/hdbn_db.png" xy="38,10"/>
+    <loader id="n3_vols" name="loaIcon" xy="31,20" pivot="0.5,0.5" size="924,297" url="ui://t8nwuj7ivols1y" autoSize="true"/>
+    <loader id="n5_vols" name="loaTitle" xy="407,52" pivot="0.5,0.5" size="530,155" url="ui://t8nwuj7ivols1n" autoSize="true">
+      <gearXY controller="c2" pages="1,2,3" values="466,82|407,63|466,65" default="407,52"/>
+    </loader>
+    <image id="n4_vols" name="n4" src="vols1r" fileName="images/hdbn_zsx.png" xy="0,27"/>
+    <image id="n7_vols" name="n7" src="vols1v" fileName="images/hd_sj_dkuang.png" xy="425,263" group="n8_vols"/>
+    <text id="n6_vols" name="txtTime" xy="604,268" pivot="0.5,0" size="244,42" group="n8_vols" font="ui://eg2y0ldpa0cftkx" fontSize="30" color="#fffcf7" autoClearText="true" text="剩余时间：0天0分"/>
+    <group id="n8_vols" name="grpTime" xy="425,263" size="493,54" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
   </displayList>
   <Button/>
+  <customProperty target="loaIcon" propertyId="1"/>
+  <customProperty target="loaTitle" propertyId="1"/>
 </component>

FGUIProject/assets/DailyWelfare/components/ListChargeItem.xml

@@ -8,7 +8,13 @@
   <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,65" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+    <list id="n3_mbf1" name="listRewards" xy="93,65" size="662,131" layout="row" overflow="scroll" scroll="horizontal" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
     </list>

FGUIProject/assets/DailyWelfare/components/ListItem.xml

@@ -3,8 +3,8 @@
   <displayList>
     <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="n6_ox5b" name="txtNum" xy="171,220" size="59,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="名字"/>
-    <image id="n4_ox5b" name="imgGot" src="ox5b8" fileName="images/yzhl_yqd.png" xy="0,0"/>
+    <image id="n4_ox5b" name="imgGot" src="ox5b8" fileName="images/yzhl_yqd.png" xy="0,0" pivot="0.5,0.5"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/package.xml

@@ -60,6 +60,22 @@
     <image id="idkd1j" name="top_line.png" path="/images/"/>
     <component id="idkd1k" name="ComSignBg.xml" path="/components/"/>
     <component id="idkd1l" name="ComSignTop.xml" path="/components/"/>
+    <image id="vols1m" name="hdbn_wz_mrqd.png" path="/images/"/>
+    <image id="vols1n" name="hdbn_wz_xslc_wylh.png" path="/images/" exported="true"/>
+    <image id="vols1o" name="hdbn_wz_xslc_xslgt.png" path="/images/" exported="true"/>
+    <image id="vols1p" name="hdbn_xslc_wylh.png" path="/images/" exported="true"/>
+    <image id="vols1q" name="hdbn_xslc_xslgt.png" path="/images/" exported="true"/>
+    <image id="vols1r" name="hdbn_zsx.png" path="/images/"/>
+    <image id="vols1s" name="hdrk_biaotz.png" path="/images/"/>
+    <image id="vols1t" name="hdrk_zz.png" path="/images/"/>
+    <image id="vols1v" name="hd_sj_dkuang.png" path="/images/"/>
+    <image id="vols1w" name="hdbn_db.png" path="/images/"/>
+    <image id="vols1x" name="hdbn_mrbj.png" path="/images/"/>
+    <image id="vols1y" name="hdbn_mrqd.png" path="/images/"/>
+    <image id="vols1z" name="hdbn_qtdl.png" path="/images/"/>
+    <image id="vols20" name="hdbn_qtdl_kqdnf.png" path="/images/"/>
+    <image id="vols21" name="hdbn_wz_mrbj.png" path="/images/"/>
+    <component id="vols22" name="ComList.xml" path="/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/components/Button15.xml

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="119,119" extention="Button">
+<component size="105,105" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ygap" name="n0" src="ygapeo" fileName="images/hz_qhdzfz.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <loader id="n1_ygap" name="icon" xy="12,12" size="95,95" aspect="true" url="ui://mbo439wbygaper" fill="scaleFree">
-      <relation target="" sidePair="width-width,height-height"/>
-    </loader>
+    <image id="n0_ygap" name="n0" src="ygapeo" fileName="images/hz_qhdzfz.png" xy="-7,-7" group="n2_vols"/>
+    <loader id="n1_ygap" name="icon" xy="12,12" size="81,81" group="n2_vols" aspect="true" url="ui://mbo439wbygaper" fill="scaleFree"/>
+    <group id="n2_vols" name="n2" xy="-7,-7" size="119,119"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/DressUp/components/ComActionSelect.xml

@@ -2,8 +2,8 @@
 <component size="228,192">
   <displayList>
     <image id="n12_ygap" name="n12" src="ygapen" fileName="images/hz_hzhzmbmb.png" xy="18,0"/>
-    <component id="n13_ygap" name="btnNormal" src="ygapep" fileName="components/Button15.xml" xy="0,53" group="n18_ygap" aspect="true"/>
-    <component id="n14_ygap" name="btnAction" src="ygapep" fileName="components/Button15.xml" xy="109,53" group="n18_ygap" aspect="true"/>
-    <group id="n18_ygap" name="n18" xy="0,53" size="228,119" advanced="true"/>
+    <component id="n13_ygap" name="btnNormal" src="ygapep" fileName="components/Button15.xml" xy="1,53" group="n18_ygap" aspect="true"/>
+    <component id="n14_ygap" name="btnAction" src="ygapep" fileName="components/Button15.xml" xy="122,53" size="141,105" group="n18_ygap"/>
+    <group id="n18_ygap" name="n18" xy="1,53" size="262,105" advanced="true" layout="hz" colGap="16"/>
   </displayList>
 </component>

FGUIProject/assets/DressUp/components/PartsListItem.xml

@@ -8,12 +8,12 @@
     </loader>
     <loader id="n7_d4iw" name="rarity" xy="173,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n5_8xpg" name="ScoreType" xy="24,142" size="50,50" touchable="false" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n6_8xpg" name="txtScore" xy="147,160" pivot="0.5,0" size="61,36" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
+    <text id="n6_8xpg" name="txtScore" xy="150,160" pivot="0.5,0" size="54,36" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
     <image id="n8_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="13,0" size="67,68"/>
     <image id="n10_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,70" size="70,70"/>
     <image id="n2_k6he" name="n2" src="k6he1y" fileName="images/hz_minzikuang.png" xy="13,198" size="208,42" group="n11_wono"/>
-    <text id="n3_k6he" name="txtTitle" xy="42,199" pivot="0.5,0" size="152,42" group="n11_wono" fontSize="30" color="#b58f54" align="center" leading="0" text="繁星点点啊"/>
+    <text id="n3_k6he" name="txtTitle" xy="42,199" pivot="0.5,0" size="152,41" group="n11_wono" fontSize="30" color="#b58f54" align="center" leading="0" text="繁星点点啊"/>
     <group id="n11_wono" name="n11" xy="13,198" size="208,43"/>
-    <component id="n12_ygap" name="comAxtionSelect" src="ygapet" fileName="components/ComActionSelect.xml" xy="4,0" visible="false"/>
+    <component id="n12_ygap" name="comAxtionSelect" src="ygapet" fileName="components/ComActionSelect.xml" xy="2,0" visible="false"/>
   </displayList>
 </component>

FGUIProject/assets/EnduringGiftBox/EnduringGiftBoxUI.xml

@@ -27,47 +27,46 @@
     <component id="n36_qqhz" name="btnBack" src="qqhz26" fileName="components/BnBack.xml" xy="497,1064"/>
   </displayList>
   <transition name="t1">
-    <item time="0" type="Alpha" target="n0_qqhz" tween="true" startValue="0" endValue="1" duration="15"/>
+    <item time="0" type="Alpha" target="n0_qqhz" tween="true" startValue="0" endValue="1" duration="15" ease="Linear"/>
     <item time="0" type="Alpha" target="n12_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n14_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n15_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n1_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n27_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n29_qqhz" value="0"/>
-    <item time="0" type="Alpha" target="n2_qqhz" tween="true" startValue="0" endValue="1" duration="15"/>
+    <item time="0" type="Alpha" target="n2_qqhz" tween="true" startValue="0" endValue="1" duration="15" ease="Linear"/>
     <item time="0" type="Alpha" target="n33_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n34_qqhz" value="0"/>
+    <item time="0" type="Alpha" target="n35_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n3_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n5_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n6_qqhz" value="0"/>
     <item time="0" type="Alpha" target="n9_qqhz" value="0"/>
-    <item time="0" type="Rotation" target="n0_qqhz" tween="true" startValue="-2" endValue="0" duration="15"/>
+    <item time="0" type="Rotation" target="n0_qqhz" tween="true" startValue="-2" endValue="0" duration="15" ease="Linear"/>
     <item time="0" type="Visible" target="n29_qqhz" value="false"/>
-    <item time="0" type="Visible" target="n35_qqhz" value="false"/>
-    <item time="0" type="XY" target="n1_qqhz" tween="true" startValue="6,96" endValue="37,61" duration="12"/>
-    <item time="0" type="XY" target="n2_qqhz" tween="true" startValue="-25,400" endValue="30,365" duration="15"/>
+    <item time="0" type="XY" target="n1_qqhz" tween="true" startValue="6,96" endValue="37,61" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n2_qqhz" tween="true" startValue="-25,400" endValue="30,365" duration="15" ease="Linear"/>
     <item time="5" type="Alpha" target="n29_qqhz" value="0"/>
-    <item time="5" type="Alpha" target="n3_qqhz" tween="true" startValue="0.2" endValue="1" duration="10"/>
-    <item time="8" type="Alpha" target="n35_qqhz" tween="true" startValue="0.4" endValue="1" duration="11"/>
-    <item time="9" type="Alpha" target="n33_qqhz" tween="true" startValue="0.7" endValue="1" duration="9"/>
-    <item time="12" type="Alpha" target="n1_qqhz" tween="true" startValue="0.2" endValue="1" duration="11"/>
-    <item time="12" type="Alpha" target="n29_qqhz" tween="true" startValue="0.4" endValue="1" duration="13"/>
-    <item time="12" type="Alpha" target="n6_qqhz" tween="true" startValue="0.6" endValue="1" duration="9"/>
-    <item time="12" type="Scale" target="n29_qqhz" tween="true" startValue="0.85,0.85" endValue="1,1" duration="10"/>
+    <item time="5" type="Alpha" target="n3_qqhz" tween="true" startValue="0.2" endValue="1" duration="10" ease="Linear"/>
+    <item time="9" type="Alpha" target="n33_qqhz" tween="true" startValue="0.7" endValue="1" duration="9" ease="Linear"/>
+    <item time="12" type="Alpha" target="n1_qqhz" tween="true" startValue="0.2" endValue="1" duration="11" ease="Linear"/>
+    <item time="12" type="Alpha" target="n29_qqhz" tween="true" startValue="0.4" endValue="1" duration="13" ease="Linear"/>
+    <item time="12" type="Alpha" target="n6_qqhz" tween="true" startValue="0.6" endValue="1" duration="9" ease="Linear"/>
+    <item time="12" type="Scale" target="n29_qqhz" tween="true" startValue="0.85,0.85" endValue="1,1" duration="10" ease="Linear"/>
     <item time="12" type="Visible" target="n29_qqhz" value="true"/>
-    <item time="13" type="Alpha" target="n5_qqhz" tween="true" startValue="0.5" endValue="1" duration="8"/>
-    <item time="14" type="Alpha" target="n34_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="14" type="Alpha" target="n9_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="14" type="Visible" target="n35_qqhz" value="true"/>
-    <item time="15" type="Alpha" target="n12_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="15" type="Alpha" target="n14_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="18" type="Alpha" target="n15_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="18" type="Alpha" target="n27_qqhz" tween="true" startValue="0.7" endValue="1" duration="8"/>
-    <item time="18" type="Alpha" target="n33_qqhz" tween="true" startValue="1" endValue="0.028" duration="15"/>
+    <item time="13" type="Alpha" target="n5_qqhz" tween="true" startValue="0.5" endValue="1" duration="8" ease="Linear"/>
+    <item time="14" type="Alpha" target="n34_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="14" type="Alpha" target="n9_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="15" type="Alpha" target="n12_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="15" type="Alpha" target="n14_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="15" type="Alpha" target="n35_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="18" type="Alpha" target="n15_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="18" type="Alpha" target="n27_qqhz" tween="true" startValue="0.7" endValue="1" duration="8" ease="Linear"/>
+    <item time="18" type="Alpha" target="n33_qqhz" tween="true" startValue="1" endValue="0.028" duration="15" ease="Linear"/>
     <item time="24" type="Visible" target="n30_qqhz" value="true"/>
-    <item time="25" type="Alpha" target="n30_qqhz" tween="true" startValue="0.5" endValue="1" duration="18"/>
-    <item time="33" type="Alpha" target="n33_qqhz" tween="true" startValue="0.028" endValue="0" duration="3"/>
-    <item time="43" type="Alpha" target="n30_qqhz" tween="true" startValue="1" endValue="0" duration="24"/>
+    <item time="25" type="Alpha" target="n30_qqhz" tween="true" startValue="0.5" endValue="1" duration="18" ease="Linear"/>
+    <item time="33" type="Alpha" target="n33_qqhz" tween="true" startValue="0.028" endValue="0" duration="3" ease="Linear"/>
+    <item time="43" type="Alpha" target="n30_qqhz" tween="true" startValue="1" endValue="0" duration="24" ease="Linear"/>
     <item time="68" type="Visible" target="n30_qqhz" value="false"/>
   </transition>
   <transition name="t2" autoPlay="true" autoPlayRepeat="-1" autoPlayDelay=".5">

FGUIProject/assets/EnduringGiftBox/RushSaleGiftBoxUI.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,958">
+  <displayList>
+    <image id="n1_yjmk" name="n1" src="yjmk2j" fileName="images/xsqg_db.png" xy="1,-72" group="n22_droi"/>
+    <image id="n2_yjmk" name="n2" src="yjmk2i" fileName="images/wz_xsqg.png" xy="335,26" group="n22_droi"/>
+    <component id="n19_droi" name="btnUp" src="droi3c" fileName="components/BtnUp.xml" xy="63,380" group="n22_droi"/>
+    <component id="n20_droi" name="btnNext" src="droi3d" fileName="components/BtnNext.xml" xy="877,386" group="n22_droi"/>
+    <component id="n21_droi" name="btnBack" src="qqhz26" fileName="components/BnBack.xml" xy="498,940" group="n22_droi"/>
+    <group id="n22_droi" name="n22" xy="1,-72" size="1077,1231"/>
+    <image id="n5_yjmk" name="n5" src="yjmk2m" fileName="images/xsqg_nr_db.png" xy="193,215" group="n23_droi"/>
+    <text id="n4_yjmk" name="txtBoxItemName" xy="363,207" size="283,65" group="n23_droi" fontSize="40" color="#fffbf5" align="center" autoSize="none" strokeColor="#d69546" text="体力限时礼包"/>
+    <image id="n6_yjmk" name="n6" src="yjmk2n" fileName="images/xsqg_sj_db.png" xy="639,216" group="n23_droi"/>
+    <text id="n8_yjmk" name="txtBoxResidueTime" xy="683,214" size="207,48" group="n23_droi" fontSize="35" color="#fffbf5" align="center" autoSize="none" text="6天23分23秒"/>
+    <list id="n11_yjmk" name="list" xy="344,377" size="425,203" group="n23_droi" alpha="0" layout="flow_vt" overflow="scroll" scroll="horizontal" scrollBarFlags="32" colGap="50" defaultItem="ui://bdi1qe15yjmk2p" align="center">
+      <item/>
+      <item/>
+    </list>
+    <image id="n12_yjmk" name="n12" src="yjmk2b" fileName="images/xsqg_zsx.png" xy="302,602" group="n23_droi"/>
+    <text id="n13_yjmk" name="txtUrc" xy="453,623" size="224,68" group="n23_droi" fontSize="34" color="#b8857b" align="center" vAlign="middle" autoSize="shrink" text="今日限购0/1"/>
+    <component id="n15_yjmk" name="btnBuyPink" src="yjmk2q" fileName="components/BtnBuyPink.xml" xy="408,693" group="n23_droi"/>
+    <graph id="n25_droi" name="holderBtnBy" xy="570,744" size="46,29" group="n23_droi"/>
+    <graph id="n27_droi" name="holderZheKouChiXu" xy="394,692" size="33,33" group="n23_droi" visible="false"/>
+    <component id="n14_yjmk" name="comDiscount" src="yjmk2r" fileName="components/ComDiscount2.xml" xy="333,642" group="n23_droi"/>
+    <graph id="n26_droi" name="holderZheKou" xy="417,710" size="65,64" group="n23_droi"/>
+    <text id="n16_yjmk" name="txtLrc" xy="379,787" size="380,46" group="n23_droi" fontSize="34" color="#b8857b" align="center" autoSize="shrink" text="可获得60充值经验"/>
+    <graph id="n28_droi" name="holderStar" xy="554,470" size="43,38" group="n23_droi"/>
+    <group id="n23_droi" name="n23" xy="193,207" size="746,626"/>
+    <graph id="n24_droi" name="holderPaoBaby" xy="263,282" size="86,77"/>
+  </displayList>
+  <transition name="t3">
+    <item time="0" type="Alpha" target="n11_yjmk" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n12_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n13_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n14_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n15_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n16_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n19_droi" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
+    <item time="0" type="Alpha" target="n1_yjmk" tween="true" startValue="0" endValue="1" duration="13" ease="Linear"/>
+    <item time="0" type="Alpha" target="n20_droi" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
+    <item time="0" type="Alpha" target="n21_droi" tween="true" startValue="0" endValue="1" duration="27"/>
+    <item time="0" type="Alpha" target="n2_yjmk" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
+    <item time="0" type="Alpha" target="n4_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n5_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n6_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n6_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n8_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n8_yjmk" value="0"/>
+    <item time="0" type="Scale" target="n15_yjmk" tween="true" startValue="0.95,1" endValue="1,1" duration="17" ease="Quad.In"/>
+    <item time="0" type="Scale" target="n24_droi" tween="true" startValue="0.95,0.95" endValue="1,1" duration="12" ease="Linear"/>
+    <item time="0" type="Visible" target="n11_yjmk" value="false"/>
+    <item time="0" type="Visible" target="n24_droi" value="false"/>
+    <item time="0" type="Visible" target="n27_droi" value="false"/>
+    <item time="0" type="XY" target="n15_yjmk" tween="true" startValue="422,693" endValue="408,693" duration="17" ease="Linear"/>
+    <item time="0" type="XY" target="n19_droi" tween="true" startValue="70,380" endValue="63,380" duration="10" ease="Linear"/>
+    <item time="0" type="XY" target="n20_droi" tween="true" startValue="863,386" endValue="877,386" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n24_droi" tween="true" startValue="274,290" endValue="263,282" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n2_yjmk" tween="true" startValue="335,20" endValue="335,26" duration="11" ease="Linear"/>
+    <item time="6" type="Visible" target="n11_yjmk" value="true"/>
+    <item time="6" type="Visible" target="n24_droi" value="true"/>
+    <item time="10" type="Alpha" target="n15_yjmk" tween="true" startValue="0.2" endValue="1" duration="16" ease="Linear"/>
+    <item time="12" type="Visible" target="n27_droi" value="true"/>
+    <item time="15" type="Alpha" target="n12_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n13_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n14_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n16_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n24_droi" tween="true" startValue="0" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n4_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
+    <item time="15" type="Alpha" target="n5_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Quart.Out"/>
+    <item time="15" type="Alpha" target="n6_yjmk" tween="true" startValue="0" endValue="1" duration="14" ease="Quint.Out"/>
+    <item time="15" type="Alpha" target="n8_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Quint.Out"/>
+  </transition>
+</component>

FGUIProject/assets/EnduringGiftBox/SpecialOfferGiftBoxUI.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1116">
+  <displayList>
+    <image id="n0_yjmk" name="n0" src="yjmk2v" fileName="images/bg02.png" xy="-9,142"/>
+    <image id="n28_fter" name="n28" src="qqhz4" fileName="images/tape.png" xy="-3,626"/>
+    <image id="n1_yjmk" name="n1" src="yjmk2u" fileName="images/bg01.png" xy="29,15"/>
+    <graph id="n25_fter" name="holderBaby" xy="261,161" size="97,73"/>
+    <image id="n2_yjmk" name="n2" src="yjmk2g" fileName="images/wz_thlb.png" xy="76,39"/>
+    <graph id="n26_fter" name="holderChiXuTx" xy="366,110" size="100,100"/>
+    <image id="n5_yjmk" name="n5" src="yjmk2f" fileName="images/thlb_sj_db.png" xy="699,233"/>
+    <text id="n6_yjmk" name="txtBoxResidueTime" xy="701,229" size="251,42" fontSize="28" color="#fffcf9" align="center" autoSize="none" text="剩余6天23时13分"/>
+    <list id="n18_yjmk" name="list" xy="68,270" size="957,690" layout="flow_vt" scroll="both" lineGap="15" defaultItem="ui://bdi1qe15yjmk37">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n22_droi" name="btnUp" src="droi3c" fileName="components/BtnUp.xml" xy="-22,488"/>
+    <component id="n23_droi" name="btnNext" src="droi3d" fileName="components/BtnNext.xml" xy="933,488"/>
+    <component id="n24_droi" name="back" src="qqhz26" fileName="components/BnBack.xml" xy="494,1098"/>
+    <graph id="n27_fter" name="holderOneTx" xy="661,156" size="100,100"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n0_yjmk" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
+    <item time="0" type="Alpha" target="n18_yjmk" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
+    <item time="0" type="Alpha" target="n1_yjmk" tween="true" startValue="0" endValue="1" duration="15"/>
+    <item time="0" type="Alpha" target="n22_droi" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
+    <item time="0" type="Alpha" target="n23_droi" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.InOut"/>
+    <item time="0" type="Alpha" target="n24_droi" value="0"/>
+    <item time="0" type="Alpha" target="n25_fter" tween="true" startValue="0" endValue="1" duration="15"/>
+    <item time="0" type="Alpha" target="n28_fter" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
+    <item time="0" type="Alpha" target="n2_yjmk" tween="true" startValue="0" endValue="1" duration="15"/>
+    <item time="0" type="Alpha" target="n5_yjmk" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
+    <item time="0" type="Alpha" target="n6_yjmk" tween="true" startValue="0" endValue="1" duration="15" ease="Quad.In"/>
+    <item time="0" type="Rotation" target="n0_yjmk" tween="true" startValue="0" endValue="0" duration="15" ease="Quad.In"/>
+    <item time="0" type="Rotation" target="n1_yjmk" tween="true" startValue="0.18" endValue="0" duration="15" ease="Quad.In"/>
+    <item time="0" type="XY" target="n0_yjmk" tween="true" startValue="6,142" endValue="-9,142" duration="8" ease="Quint.In"/>
+    <item time="0" type="XY" target="n1_yjmk" tween="true" startValue="18,15" endValue="29,15" duration="8" ease="Quad.In"/>
+    <item time="0" type="XY" target="n25_fter" tween="true" startValue="249,161" endValue="261,161" duration="8" ease="Quad.In"/>
+    <item time="0" type="XY" target="n2_yjmk" tween="true" startValue="53,39" endValue="82,39" duration="8"/>
+    <item time="8" type="Alpha" target="n24_droi" tween="true" startValue="0" endValue="1" duration="7" ease="Quad.InOut"/>
+    <item time="8" type="XY" target="n2_yjmk" value="82,39"/>
+    <item time="15" type="Rotation" target="n1_yjmk" value="0"/>
+  </transition>
+</component>

FGUIProject/assets/EnduringGiftBox/components/BtnBuy.xml

@@ -3,11 +3,9 @@
   <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" pkg="eg2y0ldp">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_qqhz" name="txtNewPrice" xy="146,2" size="104,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" text="12元"/>
-    <text id="n2_qqhz" name="txtOldPrice" xy="21,2" size="84,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="shrink" strike="true" text="86"/>
+    <image id="n6_yjmk" name="bagYellow" src="yjmk2y" fileName="images/button.png" xy="0,0"/>
+    <text id="n1_qqhz" name="txtNewPrice" xy="134,2" size="104,69" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" text="12元"/>
+    <text id="n2_qqhz" name="txtOldPrice" xy="21,2" size="84,69" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="shrink" strike="true" text="86"/>
     <loader id="n5_yjmk" name="loaIcon" xy="104,22" size="38,34" fill="scale" shrinkOnly="true"/>
   </displayList>
   <Button/>

FGUIProject/assets/EnduringGiftBox/components/BtnBuyPink.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="316,95" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n7_yjmk" name="bagGrey" src="qqhzm" fileName="images/cz_an_grey.png" xy="0,7" size="316,92"/>
+    <image id="n6_yjmk" name="bagPink" src="yjmk3b" fileName="images/an_pink.png" xy="0,7" size="316,92"/>
+    <text id="n1_qqhz" name="txtNewPrice" xy="166,13" size="104,69" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" text="300元"/>
+    <text id="n2_qqhz" name="txtOldPrice" xy="47,13" size="84,69" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffdf4" align="right" vAlign="middle" autoSize="shrink" strike="true" text="2000"/>
+    <loader id="n5_yjmk" name="loaIcon" xy="122,30" size="33,31" fill="scale" shrinkOnly="true"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/EnduringGiftBox/components/BtnBuyWeek.xml

@@ -2,9 +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" pkg="eg2y0ldp">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    <image id="n4_yjmk" name="n4" src="yjmk2y" fileName="images/button.png" xy="0,0"/>
     <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"/>
     <text id="n2_qqhz" name="txtOldPrice" xy="21,1" size="84,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" strike="true" text="2000"/>
     <image id="n3_qqhz" name="n3" src="qqhz10" fileName="images/lm_tb.png" xy="103,21"/>

FGUIProject/assets/EnduringGiftBox/components/BtnCancel.xml

@@ -5,7 +5,7 @@
     <image id="n0_qqhz" name="n0" src="qqhzn" fileName="images/cz_an_blue.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_qqhz" name="n1" xy="0,0" size="260,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="取消"/>
+    <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="取消"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/EnduringGiftBox/components/BtnIcoWeekPromptTag.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="37,37">
+  <displayList>
+    <image id="n0_droi" name="n0" src="qqhz1p" fileName="images/lm_tb_tishi.png" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/components/BtnNext.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="166,182">
+  <displayList>
+    <image id="n0_droi" name="n0" src="yjmk2k" fileName="images/xsqg_fy_an.png" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/components/BtnReceive.xml

@@ -3,9 +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" pkg="eg2y0ldp">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    <image id="n3_yjmk" name="receive" src="yjmk2y" fileName="images/button.png" xy="0,0"/>
     <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="领取"/>
   </displayList>
   <Button/>

FGUIProject/assets/EnduringGiftBox/components/BtnSub.xml

@@ -2,10 +2,8 @@
 <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" pkg="eg2y0ldp">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_qqhz" name="n1" xy="0,0" size="260,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="确定"/>
+    <image id="n2_yjmk" name="n2" src="yjmk3b" fileName="images/an_pink.png" xy="0,0"/>
+    <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="确定"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/EnduringGiftBox/components/BtnUp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="166,182">
+  <displayList>
+    <image id="n0_droi" name="n0" src="yjmk2o" fileName="images/xsqg_fy_an_2.png" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/components/ComCurSupplyItem.xml

@@ -8,11 +8,11 @@
     <component id="n4_qqhz" name="btnBuy" src="qqhzy" fileName="components/BtnBuy.xml" xy="656,90"/>
     <component id="n5_qqhz" name="btnCurReceive" src="qqhzv" fileName="components/BtnReceive.xml" xy="656,90"/>
     <component id="n28_qqhz" name="comLeftGiftBox" src="qqhz1q" fileName="components/ComLeftGiftBox.xml" xy="25,22"/>
-    <text id="n15_qqhz" name="txtTitle" xy="290,15" size="275,47" font="SourceHanSerifCN-SemiBold" fontSize="28" color="#cc9974" align="center" autoSize="none" text="体力超值返利包"/>
-    <text id="n22_qqhz" name="txtWeekPrompt" xy="294,46" size="266,39" font="FZKTJW--GB1-0" fontSize="26" color="#bda5a8" align="center" autoSize="none" text="连续七天每日获得"/>
-    <image id="n23_qqhz" name="icoWeekPromptTag" src="qqhz1p" fileName="images/lm_tb_tishi.png" xy="530,48"/>
-    <list id="n18_qqhz" name="list" xy="231,83" size="402,132" layout="flow_vt" overflow="scroll" scroll="horizontal" scrollBarFlags="32" colGap="35" defaultItem="ui://bdi1qe15qqhz1g" align="center">
+    <text id="n15_qqhz" name="txtTitle" xy="290,15" size="275,47" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#cc9974" align="center" autoSize="none" text="体力超值返利包"/>
+    <text id="n22_qqhz" name="txtWeekPrompt" xy="294,46" size="266,39" font="ui://eg2y0ldpa0cftks" fontSize="26" color="#bda5a8" align="center" autoSize="none" text="连续七天每日获得"/>
+    <list id="n18_qqhz" name="list" xy="231,83" size="402,132" layout="flow_vt" overflow="scroll" scroll="horizontal" scrollBarFlags="32" colGap="35" defaultItem="ui://bdi1qe15qqhz1g" align="center" autoClearItems="true">
       <item/>
     </list>
+    <component id="n30_fwtw" name="btnIcoWeekPromptTag" src="droi3g" fileName="components/BtnIcoWeekPromptTag.xml" xy="541,49"/>
   </displayList>
 </component>

FGUIProject/assets/EnduringGiftBox/components/ComDiscount.xml

@@ -2,7 +2,7 @@
 <component size="78,77">
   <displayList>
     <image id="n3_yjmk" name="n3" src="yjmk27" fileName="images/tb_zk_red.png" xy="-3,-2"/>
-    <text id="n1_qqhz" name="txtDiscountNum" xy="8,6" size="57,44" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffceb" align="center" autoSize="none" text="1.5"/>
-    <text id="n2_qqhz" name="n2" xy="18,36" size="38,34" font="SourceHanSerifCN-SemiBold" fontSize="24" color="#fffceb" align="center" autoSize="none" text="折"/>
+    <text id="n1_qqhz" name="txtDiscountNum" xy="8,6" size="57,44" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fffceb" align="center" autoSize="none" text="1.5"/>
+    <text id="n2_qqhz" name="n2" xy="18,36" size="38,34" font="ui://eg2y0ldpa0cftkz" fontSize="24" color="#fffceb" align="center" autoSize="none" text="折"/>
   </displayList>
 </component>

FGUIProject/assets/EnduringGiftBox/components/ComDiscount2.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="120,109">
+  <displayList>
+    <image id="n4_yjmk" name="n4" src="yjmk2a" fileName="images/xsqg_zk_db.png" xy="0,0" size="120,109" aspect="true"/>
+    <text id="n1_qqhz" name="txtDiscountNum" xy="17,14" size="78,59" fontSize="44" color="#fffbf3" leading="0" letterSpacing="-2" autoSize="none" bold="true" text="1.3"/>
+    <text id="n2_qqhz" name="n2" xy="65,32" size="35,56" font="ui://eg2y0ldpa0cftks" fontSize="37" color="#fffceb" align="center" autoSize="none" shadowColor="#ffffff" shadowOffset="1,1" text="折"/>
+  </displayList>
+</component>

FGUIProject/assets/EnduringGiftBox/components/ComRewardIconItem.xml

@@ -8,5 +8,11 @@
     <image id="n6_qqhz" name="bagYellowEx" src="qqhz1f" fileName="images/wpk_sz_db.png" xy="7,95" size="118,31"/>
     <image id="n1_nd17" name="bagBlueEx" src="qqhz1b" fileName="images/wpk_sz_db2.png" xy="7,95" size="118,31"/>
     <text id="n2_nd17" name="num" xy="9,85" size="116,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" autoSize="none" text="120"/>
+    <graph id="n7_fter" name="holderItem" xy="68,69" size="71,63"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n7_fter" tween="true" startValue="0" endValue="1" duration="9" ease="Linear"/>
+    <item time="0" type="Visible" target="n7_fter" value="false"/>
+    <item time="6" type="Visible" target="n7_fter" value="true"/>
+  </transition>
 </component>

FGUIProject/assets/EnduringGiftBox/components/ComRsGifBoxIconItem.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="150,203">
+  <displayList>
+    <component id="n3_yjmk" name="comRewardIconItem" src="qqhz1g" fileName="components/ComRewardIconItem.xml" xy="3,2" size="132,132" aspect="true" scale="1.09,1.09"/>
+    <text id="n1_yjmk" name="txtItemName" xy="6,138" size="143,56" fontSize="39" color="#a47e49" align="center" autoSize="none" text="体力"/>
+    <graph id="n4_droi" name="holderItem" xy="77,71" size="46,42" visible="false"/>
+  </displayList>
+  <transition name="t1">
+    <item time="0" type="Visible" target="n4_droi" value="false"/>
+    <item time="18" type="Visible" target="n4_droi" value="true"/>
+  </transition>
+</component>

FGUIProject/assets/EnduringGiftBox/components/ComSpecialOfferGiftBoxItem.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="940,213">
+  <displayList>
+    <image id="n0_yjmk" name="nczlb" src="qqhzg" fileName="images/cz_lb_db.png" xy="0,0" size="940,220" group="n8_yjmk"/>
+    <text id="n2_yjmk" name="txtBoxItemName" xy="55,7" size="459,44" group="n8_yjmk" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#cc9974" autoSize="none" text="体力补给礼包"/>
+    <component id="n3_yjmk" name="btnBuy" src="qqhzy" fileName="components/BtnBuy.xml" xy="660,85" size="261,73" group="n8_yjmk"/>
+    <graph id="n11_fter" name="holderBtn" xy="788,116" size="80,56" group="n8_yjmk"/>
+    <image id="n4_yjmk" name="n4" src="qqhz8" fileName="images/lm_dt_tsdb_2.png" xy="679,8" group="n8_yjmk"/>
+    <text id="n5_yjmk" name="txtUrc" xy="714,13" size="216,42" group="n8_yjmk" rotation="-0.6" fontSize="28" color="#cc6960" align="center" leading="0" autoSize="none" text="今日限购1/1"/>
+    <text id="n6_yjmk" name="txtGetJf" xy="660,165" size="269,33" group="n8_yjmk" fontSize="28" color="#c69652" align="center" autoSize="none" text="可获得120会员积分"/>
+    <component id="n7_yjmk" name="comDiscount" src="qqhz1o" fileName="components/ComDiscount.xml" xy="629,59" size="78,66" group="n8_yjmk"/>
+    <list id="n9_yjmk" name="list" xy="57,58" size="439,133" group="n8_yjmk" scale="1.05,1.05" layout="flow_vt" overflow="scroll" scroll="horizontal" scrollBarFlags="32" colGap="16" defaultItem="ui://bdi1qe15qqhz1g" autoClearItems="true">
+      <item/>
+      <item/>
+    </list>
+    <group id="n8_yjmk" name="n8" xy="0,0" size="940,220"/>
+    <image id="n1_yjmk" name="n1" src="yjmk2b" fileName="images/xsqg_zsx.png" xy="46,48"/>
+    <graph id="n10_fter" name="holderZheKou" xy="667,97" size="49,47"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="XY" target="n2_yjmk" tween="true" startValue="38,7" endValue="55,7" duration="8" ease="Quad.In"/>
+  </transition>
+</component>