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

FGUIProject/assets/Arena/ArenaUI.xml

@@ -10,7 +10,7 @@
       <relation target="" sidePair="bottom-bottom"/>
     </image>
     <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="-12,95" group="n28_psph" controller="c1,12"/>
+    <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,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"/>
@@ -25,7 +25,7 @@
       <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">

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/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,7 +9,7 @@
       <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="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">

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

@@ -6,7 +6,7 @@
     </loader>
     <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>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -8,7 +8,7 @@
       <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,95" group="n3_fqor" visible="false">
+    <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="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n3_fqor">

FGUIProject/assets/DailyWelfare/LimitChargeUI.xml

@@ -10,9 +10,12 @@
     <group id="n6_idkd" name="n6" xy="736,58" size="366,45" advanced="true">
       <relation target="" sidePair="top-top"/>
     </group>
-    <image id="n8_idkd" name="n8" src="nyhm8" fileName="imagesNew/qrhd_db.png" pkg="eg2y0ldp" xy="0,791" group="n12_idkd"/>
+    <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/>
@@ -28,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/Field/FieldUI.xml

@@ -5,10 +5,10 @@
     <loader id="n34_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="n11_ohun" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,1">
+    <component id="n11_ohun" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,1">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n1_8jo9" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n1_8jo9" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
     <image id="n14_ohun" name="n14" src="ohunf" fileName="images/tydc_ztkuang.png" xy="316,215" size="465,93" group="n18_ohun"/>
@@ -29,7 +29,7 @@
     <component id="n9_s20j" name="btnTask" src="ohuny" fileName="components/Button6.xml" xy="458,1736" group="n29_ohun">
       <Button title="上限提升"/>
     </component>
-    <text id="n37_mzf8" name="n37" xy="214,1740" size="186,62" group="n29_ohun" fontSize="46" color="#a48550" text="每周奖励"/>
+    <text id="n37_mzf8" name="n37" xy="214,1740" size="186,61" group="n29_ohun" fontSize="46" color="#a48550" text="每周奖励"/>
     <component id="n26_ohun" name="proTaskReward" src="ohunz" fileName="components/ProgressBar1.xml" xy="214,1812" group="n29_ohun">
       <ProgressBar value="50" max="100"/>
     </component>

FGUIProject/assets/League/LeagueSkillUI.xml

@@ -8,7 +8,7 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n16_miy3" name="n16" src="miy37f" fileName="images/lm_ch_zsx.png" xy="67,243"/>
-    <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,13"/>
+    <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,13"/>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>

FGUIProject/assets/League/LeagueSkillUpUI.xml

@@ -4,7 +4,7 @@
     <loader id="n0_pvb4" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,13"/>
+    <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,13"/>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
@@ -20,7 +20,6 @@
     <item time="0" type="Alpha" target="n4_pvb4" value="0"/>
     <item time="0" type="Visible" target="n20_idkd" value="true"/>
     <item time="6" type="Alpha" target="n4_pvb4" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
-    <item time="18" type="Alpha" target="n4_pvb4" value="1"/>
   </transition>
   <transition name="t1">
     <item time="0" type="Visible" target="n22_idkd" value="true"/>

FGUIProject/assets/League/LeagueUI.xml

@@ -39,8 +39,8 @@
     <component id="n3_u2u3" name="btnSkill" src="u2u3u" fileName="components/ButtonModle2.xml" xy="343,669" group="n9_u2u3"/>
     <component id="n4_u2u3" name="btnGift" src="u2u3y" fileName="components/ButtonModle3.xml" xy="755,894" group="n9_u2u3"/>
     <component id="n5_u2u3" name="btnAnswer" src="u2u310" fileName="components/ButtonModle4.xml" xy="663,1582" group="n9_u2u3"/>
-    <component id="n6_u2u3" name="n6" src="u2u312" fileName="components/ButtonModle5.xml" xy="118,1486" group="n9_u2u3"/>
-    <component id="n8_u2u3" name="n8" src="u2u316" fileName="components/ButtonModle7.xml" xy="615,1263" group="n9_u2u3"/>
+    <component id="n6_u2u3" name="btnParty" src="u2u312" fileName="components/ButtonModle5.xml" xy="118,1486" group="n9_u2u3"/>
+    <component id="n8_u2u3" name="btnShop" src="u2u316" fileName="components/ButtonModle7.xml" xy="615,1263" group="n9_u2u3"/>
     <group id="n9_u2u3" name="n9" xy="70,446" size="1012,1496" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>

FGUIProject/assets/LuckyBox/LuckyBoxActivityUI.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <component id="n41_mbf1" name="comBox" src="mbf1tae" fileName="combox/ComBox_4.xml" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
+    <component id="n41_mbf1" name="comBox" src="njmn2p" fileName="combox/ComBox.xml" xy="0,0">
+      <relation target="" sidePair="width-width,height-height,middle-middle"/>
     </component>
     <component id="n6_fka7" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n3_fka7" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,14">
+    <component id="n3_fka7" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,14">
       <relation target="" sidePair="right-right"/>
     </component>
     <image id="n48_mbf1" name="n48" src="mbf14" fileName="imagesNew/sj_dk.png" pkg="eg2y0ldp" xy="416,105" group="n55_mbf1"/>
@@ -27,7 +27,7 @@
     <group id="n52_mbf1" name="n52" xy="18,213" size="130,342" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
     <image id="n56_mbf1" name="n56" src="mbf1tam" fileName="images/cj_tswz_db.png" xy="136,1497" group="n54_mbf1"/>
     <image id="n53_mbf1" name="n53" src="mbf1tam" fileName="images/cj_tswz_db.png" xy="136,1497" group="n54_mbf1"/>
-    <text id="n44_mbf1" name="txtCount" xy="236,1496" pivot="0.5,0" size="608,42" group="n54_mbf1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fff7d4" align="center" vars="true" text="{value=15}次摘星内必得{name=沧海月明}限定部件或对应词牌"/>
+    <text id="n44_mbf1" name="txtCount" xy="240,1496" pivot="0.5,0" size="600,41" group="n54_mbf1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fff7d4" align="center" vars="true" text="{value=15}次摘星内必得{name=沧海月明}限定部件或对应词牌"/>
     <group id="n54_mbf1" name="n54" xy="136,1496" size="808,43" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>

FGUIProject/assets/LuckyBox/LuckyBoxUI.xml

@@ -7,12 +7,12 @@
     <list id="n23_vek8" name="listBg" xy="0,0" size="1080,1920" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="154" defaultItem="ui://drx9d1usnjmn2p">
       <relation target="" sidePair="height-height,center-center,middle-middle"/>
     </list>
-    <component id="n3_fka7" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n32_vek8">
+    <component id="n3_fka7" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" group="n32_vek8">
       <relation target="" sidePair="right-right"/>
     </component>
     <component id="n6_fka7" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n32_vek8"/>
     <component id="n7_fka7" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220" group="n32_vek8"/>
-    <group id="n32_vek8" name="grpTop" xy="0,80" size="1080,236" advanced="true"/>
+    <group id="n32_vek8" name="grpTop" xy="0,80" size="1080,230" advanced="true"/>
     <component id="n33_ly9g" name="btnLeft" src="ly9g1e" fileName="components/Button13.xml" pkg="eg2y0ldp" xy="74,960" pivot="0.5,0.5" anchor="true" rotation="180"/>
     <component id="n39_ly9g" name="btnRight" src="ly9g1e" fileName="components/Button13.xml" pkg="eg2y0ldp" xy="1000,960" pivot="0.5,0.5" anchor="true"/>
   </displayList>

FGUIProject/assets/LuckyBox/combox/ComBox.xml

@@ -14,13 +14,13 @@
     <group id="n66_vols" name="n66" xy="861,241" size="226,148" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
-    <image id="n72_vols" name="n72" src="volstcj" fileName="imageNews/cj_wz_jhsy.png" xy="101,376">
+    <image id="n72_vols" name="imgActLuckyBox" src="volstcj" fileName="imageNews/cj_wz_jhsy.png" xy="101,376" visible="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     <image id="n68_vols" name="n68" src="qi041j" fileName="images/cj_zizi_2.png" xy="392,545" group="n71_vols"/>
     <image id="n69_vols" name="n69" src="mzf8tac" fileName="images/cj_zizi_3.png" xy="676,700" group="n71_vols"/>
     <text id="n70_vols" name="txtTime" xy="643,949" size="62,237" group="n71_vols" font="ui://eg2y0ldpwonotj9" fontSize="46" color="#fffbdd" align="center" vAlign="middle" autoSize="height" strokeColor="#a98538" strokeSize="2" text="剩余80天"/>
-    <group id="n71_vols" name="n71" xy="392,545" size="387,700" visible="false" advanced="true">
+    <group id="n71_vols" name="grpLuckyBox" xy="392,545" size="387,700" visible="false" advanced="true">
       <relation target="" sidePair="middle-middle"/>
     </group>
     <component id="n55_vols" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="256,1635" pivot="0.5,0" anchor="true" group="n61_vols">

FGUIProject/assets/LuckyBox/combox/ComBox_3.xml

@@ -17,7 +17,7 @@
     <text id="n36_njmn" name="txtOwned" xy="891,289" size="143,36" group="n37_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有：{v1=0}/{v2=0}">
       <relation target="n35_njmn" sidePair="center-center,middle-middle"/>
     </text>
-    <group id="n37_njmn" name="n37" xy="854,177" size="226,148" visible="false" advanced="true">
+    <group id="n37_njmn" name="n37" xy="854,177" size="226,148" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     <component id="n26_njmn" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="301,1635" pivot="0.5,0" anchor="true" group="n31_njmn">

FGUIProject/assets/LuckyBox/combox/ComBox_4.xml

@@ -20,7 +20,7 @@
     <image id="n41_dhoa" name="n41" src="qi041j" fileName="images/cj_zizi_2.png" xy="390,548" group="n42_dhoa"/>
     <image id="n43_mzf8" name="n43" src="mzf8tac" fileName="images/cj_zizi_3.png" xy="674,703" group="n42_dhoa"/>
     <text id="n38_dhoa" name="txtTime" xy="641,952" size="62,237" group="n42_dhoa" font="ui://eg2y0ldpwonotj9" fontSize="46" color="#fffbdd" align="center" vAlign="middle" autoSize="height" strokeColor="#a98538" strokeSize="2" text="剩余80天"/>
-    <group id="n42_dhoa" name="n42" xy="390,548" size="387,700" visible="false" advanced="true">
+    <group id="n42_dhoa" name="n42" xy="390,548" size="387,700" advanced="true">
       <relation target="" sidePair="middle-middle"/>
     </group>
     <component id="n26_njmn" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="302,1667" pivot="0.5,0" anchor="true" group="n31_njmn">

FGUIProject/assets/LuckyBox/combox/ComModel.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920">
   <displayList>
     <loader id="n40_mbf1" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1useshh1f" align="center" vAlign="middle" fill="scale">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <graph id="n39_dhoa" name="holder" xy="540,900" pivot="0.5,0.5" anchor="true" size="10,10">
       <relation target="" sidePair="center-center,middle-middle"/>

FGUIProject/assets/Main/MainUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://mfvz4q8kv482fw" designImageOffsetY="-240">
   <displayList>
-    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" group="n59_oju1"/>
+    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" group="n59_oju1"/>
     <image id="n68_v95q" name="n68" src="v95qi0" fileName="images/zjm_mbmbmb.png" xy="0,1448" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
@@ -66,17 +66,17 @@
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     <component id="n90_vols" name="comListAd" src="volsos" fileName="components/ComAd.xml" xy="0,314" size="411,145" group="n89_vols"/>
-    <component id="n74_fqor" name="btnDailyWelfare" src="volsoq" fileName="components/BtnModle1.xml" xy="22,469" group="n89_vols">
+    <component id="n74_fqor" name="btnDailyWelfare" src="volsoq" fileName="components/BtnModle1.xml" xy="22,469" size="141,130" group="n89_vols">
       <relation target="" sidePair="left-left,top-top"/>
       <Button title="活动" icon="ui://mfvz4q8kvolsof"/>
     </component>
-    <component id="n78_bhmm" name="btnActivityDay7" src="volsoq" fileName="components/BtnModle1.xml" xy="22,608" group="n89_vols" controller="c1,1">
+    <component id="n78_bhmm" name="btnActivityDay7" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,609" size="141,159" group="n89_vols" controller="c1,1">
       <Button title="七日活动" icon="ui://mfvz4q8kvolsoh"/>
     </component>
-    <component id="n75_mbf1" name="btnActivityLuckyBox" src="volsoq" fileName="components/BtnModle1.xml" xy="22,775" group="n89_vols" controller="c1,1">
+    <component id="n75_mbf1" name="btnActivityLuckyBox" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,778" size="141,159" group="n89_vols" controller="c1,1">
       <Button title="镜花水月" icon="ui://mfvz4q8kvolsog"/>
     </component>
-    <group id="n89_vols" name="n89" xy="0,314" size="411,618" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true">
+    <group id="n89_vols" name="n89" xy="0,314" size="411,623" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true">
       <relation target="" sidePair="left-left,top-top"/>
     </group>
     <group id="n52_qqat" name="grpLeft" xy="0,160" size="1130,1760" group="n59_oju1" advanced="true"/>
@@ -114,7 +114,7 @@
     <group id="n58_oju1" name="grpRight" xy="71,447" size="1010,1497" group="n59_oju1" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <group id="n59_oju1" name="grpMove" xy="0,90" size="1130,1854" advanced="true"/>
+    <group id="n59_oju1" name="grpMove" xy="0,85" size="1130,1859" advanced="true"/>
     <loader id="n66_v95q" name="loaGuidestudio" xy="0,0" size="1080,1920" visible="false"/>
     <graph id="n71_mzf8" name="n71" xy="0,0" size="1080,1920" alpha="0" touchable="false" type="rect" lineSize="0">
       <relation target="" sidePair="width-width,height-height"/>

FGUIProject/assets/Main/StoryChapterUI.xml

@@ -4,11 +4,11 @@
     <component id="n13_xuzk" name="chapter" src="xuzk2e" fileName="componentsLevel/CompChapter.xml" xy="0,0" size="1080,1920">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n2_v354" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,1"/>
-    <component id="n3_v354" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n2_v354" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,1"/>
+    <component id="n3_v354" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n4_v354" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
     <image id="n5_v354" name="n5" src="v3541y" fileName="imagesStory/zx_gka_di_1.png" xy="34,375" aspect="true"/>
-    <text id="n6_v354" name="txtStarCount" xy="35,404" pivot="0.5,0" size="95,41" fontSize="30" color="#fff6e6" align="center" text="15/18">
+    <text id="n6_v354" name="txtStarCount" xy="45,404" pivot="0.5,0" size="75,41" fontSize="30" color="#fff6e6" align="center" text="15/18">
       <relation target="n5_v354" sidePair="center-center,middle-middle"/>
     </text>
     <component id="n7_v354" name="bonusBox3" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="20,493"/>

FGUIProject/assets/Main/components/BtnModle1.xml

@@ -1,26 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="141,158" extention="Button">
+<component size="141,130" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="c1" exported="true" pages="0,,1," selected="1">
     <remark page="0" value="不显示时间"/>
     <remark page="1" value="显示时间"/>
   </controller>
   <displayList>
-    <loader id="n4_wg7t" name="icon" xy="70,51" pivot="0.5,0.5" anchor="true" size="127,102" group="n13_vols" url="ui://mfvz4q8kvolsof" align="center"/>
-    <image id="n5_vols" name="n5" src="volsoe" fileName="imagesNew/zjm_tb_db_hd.png" xy="30,99" pivot="0.5,0" size="81,29" group="n12_vols">
+    <loader id="n4_wg7t" name="icon" xy="70,51" pivot="0.5,0.5" anchor="true" size="127,102" group="n14_t6j1" url="ui://mfvz4q8kvolsog" align="center"/>
+    <image id="n5_vols" name="n5" src="volsoe" fileName="imagesNew/zjm_tb_db_hd.png" xy="30,100" pivot="0.5,0" size="81,29" group="n14_t6j1">
       <relation target="n7_vols" sidePair="width-width,height-height"/>
     </image>
-    <text id="n7_vols" name="title" xy="39,91" pivot="0.5,0" size="63,42" group="n12_vols" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#ffffff" align="center" strokeColor="#936f37" text="首充"/>
-    <group id="n12_vols" name="grpName" xy="30,91" size="81,42" group="n13_vols" advanced="true"/>
-    <image id="n10_vols" name="n10" src="volsoa" fileName="imagesNew/zjm_hd_sj_db.png" xy="14,131" pivot="0.5,0" group="n11_vols">
-      <relation target="n9_vols" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n9_vols" name="txtTime" xy="20,122" pivot="0.5,0" size="100,39" group="n11_vols" fontSize="28" color="#775839" text="03:58:28"/>
-    <group id="n11_vols" name="grpTime" xy="14,122" size="112,39" group="n13_vols" advanced="true">
-      <gearDisplay controller="c1" pages="1"/>
-    </group>
-    <group id="n13_vols" name="n13" xy="7,0" size="127,161" advanced="true" layout="vt" lineGap="-11" excludeInvisibles="true"/>
+    <text id="n7_vols" name="title" xy="39,92" pivot="0.5,0" size="63,41" group="n14_t6j1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#ffffff" align="center" strokeColor="#936f37" text="首充"/>
+    <group id="n14_t6j1" name="n14" xy="6,0" size="127,133" advanced="true"/>
   </displayList>
   <Button/>
-  <relation target="n13_vols" sidePair="height-height"/>
 </component>

FGUIProject/assets/Main/components/BtnModle2.xml

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

FGUIProject/assets/Main/package.xml

@@ -644,6 +644,7 @@
     <component id="volsot" name="ListAdItem.xml" path="/components/"/>
     <component id="volsou" name="ComAdSelectItem.xml" path="/components/"/>
     <component id="volsov" name="ComTargetSkillShow.xml" path="/components/"/>
+    <component id="t6j1ow" name="BtnModle2.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Store/StoreChargeAddUpUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920" opaque="false">
   <displayList>
     <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员积分"/>
-    <component id="n34_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
+    <component id="n34_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,10"/>
     <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
     <list id="n58_qik1" name="list" xy="0,790" size="1080,1082" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="8" colGap="60" defaultItem="ui://p9mtgheoqik1tby" align="center">
       <item/>

FGUIProject/assets/Store/StoreChargeUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920" opaque="false">
   <displayList>
     <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员积分"/>
-    <component id="n34_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
+    <component id="n34_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,10"/>
     <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
     <list id="n10_d4iw" name="list" xy="0,793" size="1080,1033" layout="flow_hz" overflow="hidden" colGap="20" defaultItem="ui://p9mtgheohhx91i" align="center" scrollItemToViewOnClick="false">
       <relation target="" sidePair="bottomext-bottom"/>

FGUIProject/assets/Store/StoreExchangeUI.xml

@@ -17,6 +17,6 @@
     <component id="n2_l500" name="n2" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <component id="n4_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,14"/>
+    <component id="n4_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,14"/>
   </displayList>
 </component>

FGUIProject/assets/Store/StoreGiftBagUI.xml

@@ -17,6 +17,6 @@
     <component id="n2_l500" name="n2" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <component id="n3_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,14"/>
+    <component id="n3_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,14"/>
   </displayList>
 </component>

FGUIProject/assets/Store/StoreMonthUI.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="height-height"/>
     </image>
     <image id="n2_qik1" name="n2" src="hhx918" fileName="imagesNew/MonthCard_bg.png" xy="90,552"/>
-    <component id="n41_qik1" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
+    <component id="n41_qik1" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,10"/>
     <component id="n3_qik1" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="908,564" size="52,52">
       <Button icon="ui://p9mtgheofqortar"/>
     </component>

FGUIProject/assets/Studio/StudioEctypeUI.xml

@@ -4,7 +4,7 @@
     <loader id="n28_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="n18_n3xh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n19_n3xh" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,1"/>
+    <component id="n18_n3xh" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n19_n3xh" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,1"/>
   </displayList>
 </component>

FGUIProject/assets/Studio/StudioFilingUI.xml

@@ -4,15 +4,15 @@
     <loader id="n0_rqo4" 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="n25_v482" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,1">
+    <component id="n25_v482" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,1">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n21_rqo4" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n21_rqo4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n2_rqo4" name="btnChange" src="rqo41l" fileName="components/Button1.xml" xy="0,210">
       <Button title="邢慈静"/>
     </component>
     <image id="n23_v482" name="n23" src="v4822m" fileName="images/cyjd_di_7.png" xy="690,230" group="n24_v482"/>
-    <text id="n5_rqo4" name="txtNum" xy="715,234" size="258,46" group="n24_v482" fontSize="34" color="#9b7f59" vars="true" text="今日挑战次数:{count=10}"/>
+    <text id="n5_rqo4" name="txtNum" xy="715,234" size="247,46" group="n24_v482" fontSize="34" color="#9b7f59" vars="true" text="今日挑战次数:{count=10}"/>
     <component id="n6_rqo4" name="btnAdd" src="rqo41o" fileName="components/Button4.xml" xy="992,235" group="n24_v482"/>
     <group id="n24_v482" name="grpAdd" xy="690,230" size="364,58"/>
     <list id="n14_rqo4" name="list" xy="540,998" pivot="0.5,0.5" anchor="true" size="960,1358" lineGap="20" defaultItem="ui://xz8kxrecv4822p" align="center" vAlign="middle" autoClearItems="true">
@@ -26,7 +26,7 @@
     <component id="n4_rqo4" name="btnSuit" src="rqo41n" fileName="components/Button3.xml" xy="0,1722" group="n28_weok"/>
     <image id="n26_v482" name="n26" src="v4822l" fileName="images/cyjd_di_6.png" xy="300,1833" pivot="0.5,0" anchor="true" size="146,43" group="n20_rqo4"/>
     <text id="n15_rqo4" name="txtSuitName" xy="300,1765" pivot="0.5,0" anchor="true" size="170,56" group="n20_rqo4" fontSize="42" color="#c7a26d" text="熔金漫纪"/>
-    <text id="n19_rqo4" name="txtSuitProgress" xy="300,1832" pivot="0.5,0" anchor="true" size="83,44" group="n20_rqo4" fontSize="32" color="#d28a79" text="1/10"/>
+    <text id="n19_rqo4" name="txtSuitProgress" xy="300,1832" pivot="0.5,0" anchor="true" size="65,44" group="n20_rqo4" fontSize="32" color="#d28a79" text="1/10"/>
     <group id="n20_rqo4" name="n20" xy="215,1765" size="170,111" group="n28_weok" advanced="true"/>
     <loader id="n27_weok" name="suitIcon" xy="30,1744" size="170,170" group="n28_weok" touchable="false" url="ui://xz8kxrecng0i27" align="center" vAlign="middle" fill="scaleMatchWidth" clearOnPublish="true"/>
     <component id="n3_rqo4" name="btnReward" src="rqo41m" fileName="components/Button2.xml" xy="896,1756" group="n28_weok"/>

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -2,47 +2,62 @@
 <component size="1080,1920" opaque="false">
   <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="0"/>
   <displayList>
-    <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,240">
+    <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,264">
       <relation target="" sidePair="left-right"/>
     </image>
-    <text id="n19_nd17" name="LeftTime" xy="37,240" size="200,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="15天24时60分"/>
-    <component id="n16_nd17" name="tip" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="246,233" size="61,61"/>
-    <component id="n18_nd17" name="LevelProcess" src="e3m1tnl" fileName="components/ExpProcess.xml" xy="107,601">
+    <text id="n19_nd17" name="LeftTime" xy="37,264" size="200,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="15天24时60分"/>
+    <component id="n16_nd17" name="tip" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="246,257" size="61,61"/>
+    <component id="n18_nd17" name="LevelProcess" src="e3m1tnl" fileName="components/ExpProcess.xml" xy="107,604">
       <relation target="" sidePair="left-left"/>
       <ProgressBar value="50" max="100"/>
     </component>
-    <component id="n56_itts" name="btnBuyLevel" src="ittstnj" fileName="components/ButtonBuyBattlePassLevel.xml" xy="778,570">
+    <component id="n56_itts" name="btnBuyLevel" src="ittstnj" fileName="components/ButtonBuyBattlePassLevel.xml" xy="778,573">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="right-right"/>
       <property target="text" propertyId="0" value="购买等级"/>
     </component>
-    <component id="n49_nd17" name="btnOpen" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="778,570">
+    <component id="n49_nd17" name="btnOpen" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="778,573">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="right-right"/>
     </component>
-    <image id="n33_nd17" name="n33" src="uxxstme" fileName="images/txz_nr_db.png" xy="0,683" size="1080,1263"/>
-    <image id="n20_nd17" name="n20" src="uxxstn1" fileName="images/bt_db_dj.png" xy="14,691"/>
-    <text id="n21_nd17" name="n21" xy="35,701" size="68,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b18235" autoSize="none" text="等级"/>
-    <image id="n35_nd17" name="n35" src="uxxstmh" fileName="images/jdt_bg.png" xy="49,737"/>
-    <image id="n32_nd17" name="n32" src="uxxstm3" fileName="images/bt_db_ptzz.png" xy="143,691"/>
-    <image id="n31_nd17" name="n31" src="uxxstmp" fileName="images/txz_jlzz_db_pt.png" xy="136,739" size="254,961"/>
-    <text id="n37_nd17" name="n37" xy="198,698" size="132,50" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#bd697a" align="center" autoSize="none" text="普通织造"/>
-    <image id="n27_nd17" name="n27" src="uxxstml" fileName="images/bt_db_jlzz.png" xy="405,692"/>
-    <image id="n25_nd17" name="n25" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="388,725" size="691,974"/>
-    <text id="n30_nd17" name="n30" xy="667,701" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ae7034" align="center" autoSize="none" text="特别织造"/>
-    <image id="n29_nd17" name="n29" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="517,714"/>
-    <image id="n28_nd17" name="n28" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="822,714" flip="hz"/>
-    <list id="n48_nd17" name="RewardList" xy="2,747" size="1080,790" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u" autoClearItems="true">
+    <image id="n33_nd17" name="n33" src="uxxstme" fileName="images/txz_nr_db.png" xy="0,670" group="n59_emat">
+      <relation target="" sidePair="bottomext-bottom"/>
+    </image>
+    <image id="n20_nd17" name="n20" src="uxxstn1" fileName="images/bt_db_dj.png" xy="14,690" group="n59_emat"/>
+    <text id="n21_nd17" name="n21" xy="35,700" size="68,44" group="n59_emat" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b18235" autoSize="none" text="等级"/>
+    <image id="n35_nd17" name="n35" src="uxxstmh" fileName="images/jdt_bg.png" xy="49,736" group="n59_emat">
+      <relation target="" sidePair="bottomext-bottom"/>
+    </image>
+    <image id="n32_nd17" name="n32" src="uxxstm3" fileName="images/bt_db_ptzz.png" xy="143,690" group="n59_emat"/>
+    <image id="n31_nd17" name="n31" src="uxxstmp" fileName="images/txz_jlzz_db_pt.png" xy="136,738" size="254,961" group="n59_emat">
+      <relation target="" sidePair="bottomext-bottom"/>
+    </image>
+    <text id="n37_nd17" name="n37" xy="198,697" size="132,50" group="n59_emat" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#bd697a" align="center" autoSize="none" text="普通织造"/>
+    <image id="n27_nd17" name="n27" src="uxxstml" fileName="images/bt_db_jlzz.png" xy="405,691" group="n59_emat"/>
+    <image id="n25_nd17" name="n25" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="388,724" size="691,974" group="n59_emat">
+      <relation target="" sidePair="bottomext-bottom"/>
+    </image>
+    <text id="n30_nd17" name="n30" xy="667,700" size="132,44" group="n59_emat" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ae7034" align="center" autoSize="none" text="特别织造"/>
+    <image id="n29_nd17" name="n29" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="517,713" group="n59_emat"/>
+    <image id="n28_nd17" name="n28" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="822,713" group="n59_emat" flip="hz"/>
+    <list id="n48_nd17" name="RewardList" xy="2,746" size="1080,790" group="n59_emat" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u" autoClearItems="true">
+      <relation target="" sidePair="height-height"/>
       <item/>
       <item/>
     </list>
-    <image id="n36_nd17" name="n36" src="uxxstmu" fileName="images/zsx_flower.png" xy="755,736" size="14,869"/>
-    <image id="n26_nd17" name="n26" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="1,1538" size="1080,217"/>
-    <component id="n51_nd17" name="btnGetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="408,1781" size="266,70">
+    <image id="n36_nd17" name="n36" src="uxxstmu" fileName="images/zsx_flower.png" xy="755,735" size="14,869" group="n59_emat">
+      <relation target="" sidePair="bottomext-bottom"/>
+    </image>
+    <group id="n59_emat" name="n59" xy="0,670" size="1082,1312"/>
+    <image id="n26_nd17" name="n26" src="uxxstmn" fileName="images/txz_jlzz_tbdj_db.png" xy="1,1538" group="n57_emat"/>
+    <component id="n51_nd17" name="btnGetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="408,1781" size="266,70" group="n57_emat">
       <Button title="一键领取"/>
     </component>
-    <component id="n52_or80" name="SpecialReward" src="or80tlw" fileName="components/BattlePassReward.xml" xy="5,1577"/>
-    <image id="n53_or80" name="n53" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="139,1548"/>
-    <text id="n54_or80" name="n54" xy="412,1549" size="196,44" fontSize="32" color="#915e15" text="下个特别大奖"/>
+    <component id="n52_or80" name="SpecialReward" src="or80tlw" fileName="components/BattlePassReward.xml" xy="5,1577" group="n57_emat"/>
+    <image id="n53_or80" name="n53" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="139,1548" group="n57_emat"/>
+    <text id="n54_or80" name="n54" xy="412,1549" size="196,44" group="n57_emat" fontSize="32" color="#915e15" text="下个特别大奖"/>
+    <group id="n57_emat" name="n57" xy="1,1538" size="1084,313" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/Task/CombTaskUI.xml

@@ -5,6 +5,9 @@
     <remark page="1" value="织造任务"/>
   </controller>
   <displayList>
+    <image id="n28_emat" name="n28" src="uxxstme" fileName="images/txz_nr_db.png" xy="0,608">
+      <relation target="" sidePair="bottomext-bottom"/>
+    </image>
     <component id="n15_ids4" name="LivenessProcess" src="ids449" fileName="components/LivenessRewardProcess.xml" xy="70,717" size="949,53">
       <ProgressBar value="50" max="100"/>
     </component>

FGUIProject/assets/Task/TaskUI.xml

@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="2,,0,,1," selected="1">
+  <controller name="c1" pages="2,,0,,1," selected="0">
     <remark page="1" value="任务"/>
     <remark page="2" value="锦罗织造"/>
   </controller>
   <displayList>
-    <loader id="n13_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    <loader id="n13_gbqo" name="loaBg" xy="540,600" pivot="0.5,0.5" anchor="true" size="1080,1200" fill="scaleMatchWidth">
+      <relation target="" sidePair=""/>
     </loader>
-    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="2,36" controller="c1,0">
+    <image id="n18_emat" name="n18" src="emattnp" fileName="images/txz_bn_cscs.png" xy="0,205"/>
+    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" size="1080,70" controller="c1,0">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n6_wet2" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="48,105">
+    <component id="n6_wet2" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="48,153">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <component id="n15_fqor" name="n15" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="246,118" group="n17_fqor">
-      <Button checked="true" title="今日任务" controller="c1" page="0"/>
+    <component id="n15_fqor" name="n15" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="246,165" group="n17_fqor">
+      <Button title="今日任务" controller="c1" page="0"/>
     </component>
-    <component id="n16_fqor" name="n16" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="536,118" group="n17_fqor">
+    <component id="n16_fqor" name="n16" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="536,165" group="n17_fqor">
       <Button title="锦罗织造" controller="c1" page="1"/>
     </component>
-    <group id="n17_fqor" name="n17" xy="246,118" size="580,70" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <group id="n17_fqor" name="n17" xy="246,165" size="580,70" advanced="true" layout="hz" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/Task/components/ExpProcess.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="346,22" extention="ProgressBar">
-  <controller name="c1" pages="0,未满,1,已满" selected="1"/>
+  <controller name="c1" pages="0,未满,1,已满" selected="0"/>
   <displayList>
-    <image id="n0_e3m1" name="n0" src="uxxstn2" fileName="images/jyt_dk.png" xy="0,0" size="346,22">
+    <image id="n0_e3m1" name="n0" src="uxxstmw" fileName="images/jyt_dk_2.png" xy="-7,0" size="346,22">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_e3m1" name="bar" src="uxxstmi" fileName="images/jyt_yellow.png" xy="0,0" size="346,19"/>
+    <image id="n1_e3m1" name="bar" src="uxxstmi" fileName="images/jyt_yellow.png" xy="-7,1" size="346,19"/>
     <image id="n3_e3m1" name="n3" src="uxxstm7" fileName="imagesNew/txz_lvl_db.png" pkg="eg2y0ldp" xy="-103,-54"/>
     <text id="n4_e3m1" name="n4" xy="-56,-27" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
     <text id="n5_e3m1" name="Level" xy="-80,-18" size="73,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="000"/>

FGUIProject/assets/Task/package.xml

@@ -60,6 +60,7 @@
     <component id="e3m1tnm" name="ButtonAdd.xml" path="/components/"/>
     <component id="e3m1tnn" name="ButtonReduce.xml" path="/components/"/>
     <image id="8paktno" name="jdt_pink_2.jpg" path="/images/"/>
+    <image id="emattnp" name="txz_bn_cscs.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Task" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Travel/TravelUI.xml

@@ -10,8 +10,8 @@
     <loader id="n18_v95q" 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="n15_wono" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,8"/>
-    <component id="n7_wono" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n15_wono" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,8"/>
+    <component id="n7_wono" name="btnback" src="uyuxtj5" fileName="components/BtnBack0.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://jitclg1gwono1a"/>
     </component>
@@ -28,7 +28,7 @@
       <gearDisplay controller="c2" pages="1"/>
     </group>
     <image id="n13_wono" name="n13" src="wonos" fileName="xqfs_ylglsj.png" xy="93,1309" group="n14_wono"/>
-    <text id="n4_wono" name="txtTime" xy="365,1299" pivot="0.5,0" size="370,64" group="n14_wono" fontSize="48" color="#ad8a4e" autoClearText="true" text="大约5小时后归来"/>
+    <text id="n4_wono" name="txtTime" xy="369,1299" pivot="0.5,0" size="363,64" group="n14_wono" fontSize="48" color="#ad8a4e" autoClearText="true" text="大约5小时后归来"/>
     <group id="n14_wono" name="grpTime" xy="93,1299" size="894,64" group="n16_wono" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
     </group>
@@ -46,7 +46,7 @@
     <component id="n19_v95q" name="btnFieldGuide" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="583,1496" group="n16_wono">
       <Button title="图鉴"/>
     </component>
-    <group id="n16_wono" name="n16" xy="2,220" size="1076,1471" advanced="true">
+    <group id="n16_wono" name="n16" xy="2,220" size="1075,1471" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
   </displayList>

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

@@ -68,6 +68,8 @@ namespace GFGGame
             List<string> listCfg = new List<string>();
             for (int i = 0; i < cfgs.Length; i++)
             {
+                if (cfgs[i].id == typeof(ArenaView).Name) ArenaDataManager.Instance.ReqArenaInfo();
+
                 if (cfgs[i].show == 0) continue;
                 if (cfgs[i].special > 0) continue;
                 if (cfgs[i].lv > 0) continue;
@@ -75,7 +77,6 @@ namespace GFGGame
                 // if (CheckIsLvFunOpen(cfgs[i], false)) continue;
                 listCfg.Add(cfgs[i].id);
 
-                if (cfgs[i].id == typeof(ArenaView).Name) ArenaDataManager.Instance.ReqArenaInfo();
             }
             if (listCfg.Count > 0)
             {
@@ -95,6 +96,8 @@ namespace GFGGame
             List<string> listCfg = new List<string>();
             for (int i = 0; i < cfgs.Length; i++)
             {
+                if (cfgs[i].id == typeof(ArenaView).Name) ArenaDataManager.Instance.ReqArenaInfo();
+
                 if ((cfgs[i].special > 0)) continue;
                 if (cfgs[i].show == 0) continue;
                 if (lv <= 0) continue;
@@ -103,7 +106,6 @@ namespace GFGGame
                 // if (CheckIsChapterFunOpen(cfgs[i], false)) continue;
                 listCfg.Add(cfgs[i].id);
 
-                if (cfgs[i].id == typeof(ArenaView).Name) ArenaDataManager.Instance.ReqArenaInfo();
 
             }
             if (listCfg.Count > 0)
@@ -121,6 +123,8 @@ namespace GFGGame
             List<string> listCfg = new List<string>();
             for (int i = 0; i < cfgs.Length; i++)
             {
+                if (cfgs[i].id == typeof(ArenaView).Name) ArenaDataManager.Instance.ReqArenaInfo();
+
                 if (cfgs[i].show == 0) continue;
                 if (cfgs[i].storyLevelId > 0) continue;
                 if (cfgs[i].lv > 0) continue;
@@ -129,8 +133,6 @@ namespace GFGGame
                 if (CheckIsSpecialFunOpen(cfgs[i], false))
                 {
                     listCfg.Add(cfgs[i].id);
-
-                    if (cfgs[i].id == typeof(ArenaView).Name) ArenaDataManager.Instance.ReqArenaInfo();
                 }
             }
             if (listCfg.Count > 0)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueUI.cs

@@ -23,6 +23,8 @@ namespace UI.League
         public UI_ButtonModle2 m_btnSkill;
         public UI_ButtonModle3 m_btnGift;
         public UI_ButtonModle4 m_btnAnswer;
+        public UI_ButtonModle5 m_btnParty;
+        public UI_ButtonModle7 m_btnShop;
         public const string URL = "ui://tw70qm9du2u32";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueUI";
@@ -86,6 +88,8 @@ namespace UI.League
             m_btnSkill = (UI_ButtonModle2)UI_ButtonModle2.Create(comp.GetChild("btnSkill"));
             m_btnGift = (UI_ButtonModle3)UI_ButtonModle3.Create(comp.GetChild("btnGift"));
             m_btnAnswer = (UI_ButtonModle4)UI_ButtonModle4.Create(comp.GetChild("btnAnswer"));
+            m_btnParty = (UI_ButtonModle5)UI_ButtonModle5.Create(comp.GetChild("btnParty"));
+            m_btnShop = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btnShop"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -112,6 +116,10 @@ namespace UI.League
             m_btnGift = null;
             m_btnAnswer.Dispose();
             m_btnAnswer = null;
+            m_btnParty.Dispose();
+            m_btnParty = null;
+            m_btnShop.Dispose();
+            m_btnShop = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,7 +10,9 @@ namespace UI.LuckyBox
         public UI_ComModel m_comModel;
         public UI_Button3 m_btnPreview;
         public GTextField m_txtOwned;
+        public GImage m_imgActLuckyBox;
         public GTextField m_txtTime;
+        public GGroup m_grpLuckyBox;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
         public UI_Button1 m_btnBuyOne;
@@ -67,7 +69,9 @@ namespace UI.LuckyBox
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_imgActLuckyBox = (GImage)comp.GetChild("imgActLuckyBox");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpLuckyBox = (GGroup)comp.GetChild("grpLuckyBox");
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
             m_btnBuyOne = (UI_Button1)UI_Button1.Create(comp.GetChild("btnBuyOne"));
@@ -82,7 +86,9 @@ namespace UI.LuckyBox
             m_btnPreview.Dispose();
             m_btnPreview = null;
             m_txtOwned = null;
+            m_imgActLuckyBox = null;
             m_txtTime = null;
+            m_grpLuckyBox = null;
             m_comCostOne.Dispose();
             m_comCostOne = null;
             m_comCostTen.Dispose();

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

@@ -7,7 +7,7 @@ namespace UI.LuckyBox
     public partial class UI_LuckyBoxActivityUI
     {
         public GComponent target;
-        public UI_ComBox_4 m_comBox;
+        public UI_ComBox m_comBox;
         public GButton m_btnBack;
         public GComponent m_valueBar;
         public GTextField m_txtTime;
@@ -63,7 +63,7 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
-            m_comBox = (UI_ComBox_4)UI_ComBox_4.Create(comp.GetChild("comBox"));
+            m_comBox = (UI_ComBox)UI_ComBox.Create(comp.GetChild("comBox"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_txtTime = (GTextField)comp.GetChild("txtTime");

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle1.cs

@@ -8,9 +8,6 @@ namespace UI.Main
     {
         public GButton target;
         public Controller m_c1;
-        public GGroup m_grpName;
-        public GTextField m_txtTime;
-        public GGroup m_grpTime;
         public const string URL = "ui://mfvz4q8kvolsoq";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "BtnModle1";
@@ -59,16 +56,10 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_grpName = (GGroup)comp.GetChild("grpName");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_grpTime = (GGroup)comp.GetChild("grpTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_grpName = null;
-            m_txtTime = null;
-            m_grpTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle2.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_BtnModle2
+    {
+        public GButton target;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public const string URL = "ui://mfvz4q8kt6j1ow";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "BtnModle2";
+        private static UI_BtnModle2 _proxy;
+
+        public static UI_BtnModle2 Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnModle2();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BtnModle2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnModle2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtTime = null;
+            m_grpTime = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle2.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -23,8 +23,8 @@ namespace UI.Main
         public GGroup m_grpList;
         public UI_ComAd m_comListAd;
         public UI_BtnModle1 m_btnDailyWelfare;
-        public UI_BtnModle1 m_btnActivityDay7;
-        public UI_BtnModle1 m_btnActivityLuckyBox;
+        public UI_BtnModle2 m_btnActivityDay7;
+        public UI_BtnModle2 m_btnActivityLuckyBox;
         public GGroup m_grpLeft;
         public UI_ButtonModle6 m_btnArena;
         public UI_ButtonModle7 m_btn1;
@@ -103,8 +103,8 @@ namespace UI.Main
             m_grpList = (GGroup)comp.GetChild("grpList");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
-            m_btnActivityDay7 = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityDay7"));
-            m_btnActivityLuckyBox = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
+            m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
             m_grpLeft = (GGroup)comp.GetChild("grpLeft");
             m_btnArena = (UI_ButtonModle6)UI_ButtonModle6.Create(comp.GetChild("btnArena"));
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -3,6 +3,7 @@ using FairyGUI;
 using ET;
 using System.Collections.Generic;
 using System;
+using UnityEngine;
 
 namespace GFGGame
 {
@@ -31,9 +32,18 @@ namespace GFGGame
             _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_bgIndex]);
             if (_luckyBoxCfg.suitShowArr.Length > 0)
             {
-                _dressUpObjUI.ResetSceneObj(100, false, false, null, false);
+                int scale = 100;
+                int direction = 1;
+                if (_luckyBoxCfg.scaleArr.Length > 0)
+                {
+                    scale = Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]);
+                    direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
+                }
+                _dressUpObjUI.ResetSceneObj(scale, false, false, null, false);
                 _dressUpObjUI.dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitShowArr[_modelIndex][0], true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
                 _dressUpObjUI.UpdateWrapper(_comModel.m_holder);
+                _dressUpObjUI.sceneObject.transform.localPosition = new Vector3(_luckyBoxCfg.suitShowArr[_modelIndex][1], _luckyBoxCfg.suitShowArr[_modelIndex][2], 0);
+                _dressUpObjUI.sceneObject.transform.localScale = new Vector3(direction * scale, scale, scale);
             }
             if (_luckyBoxCfg.resArr.Length > 1 || _luckyBoxCfg.suitShowArr.Length > 1)
             {
@@ -57,9 +67,18 @@ namespace GFGGame
                 }
                 if (_luckyBoxCfg.suitShowArr.Length > 0)
                 {
-                    _dressUpObjUI.ResetSceneObj(100, false, false, null, false);
+                    int scale = 100;
+                    int direction = 1;
+                    if (_luckyBoxCfg.scaleArr.Length > 0)
+                    {
+                        scale = Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]);
+                        direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
+                    }
+                    _dressUpObjUI.ResetSceneObj(scale, false, false, null, false);
                     _dressUpObjUI.dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitShowArr[_modelIndex][0], true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
                     _dressUpObjUI.UpdateWrapper(_comModel.m_holder);
+                    _dressUpObjUI.sceneObject.transform.localPosition = new Vector3(_luckyBoxCfg.suitShowArr[_modelIndex][1], _luckyBoxCfg.suitShowArr[_modelIndex][2], 0);
+                    _dressUpObjUI.sceneObject.transform.localScale = new Vector3(direction * scale, scale, scale);
                 }
             }
         }

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs

@@ -89,6 +89,8 @@ namespace GFGGame
             _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
             _rechargeCfgs = SoreCfg(_rechargeCfgs);
             _ui.m_list.numItems = _rechargeCfgs.Count;
+            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xslc_banner_" + openCfg.res);
         }
         private void RenderListItem(int index, GObject obj)
         {

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -38,6 +38,8 @@ namespace GFGGame
             _ui.m_btnSkill.target.onClick.Add(OnBtnSkillClick);
             _ui.m_btnAnswer.target.onClick.Add(OnBtnAnswerClick);
             _ui.m_btnGift.target.onClick.Add(OnBtnGiftClick);
+            _ui.m_btnShop.target.onClick.Add(OnBtnShopClick);
+            _ui.m_btnParty.target.onClick.Add(OnBtnPartyClick);
         }
         protected override void AddEventListener()
         {
@@ -93,10 +95,13 @@ namespace GFGGame
         {
             ViewManager.Show<LeaguePrayView>(null, new object[] { typeof(LeagueView).FullName, null });
         }
+        private void OnBtnPartyClick()
+        {
+            PromptController.Instance.ShowFloatTextPrompt("活动未开启");
+        }
         private void OnBtnShopClick()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_LEAGUE }, new object[] { typeof(LeaguePrayView).FullName, true }, true);
-            ViewManager.Show<LeaguePrayView>(null, new object[] { typeof(LeagueView).FullName, null });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_LEAGUE });//new object[] { typeof(LeaguePrayView).FullName, true }
         }
         private void OnBtnSkillClick()
         {

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -97,12 +97,12 @@ namespace GFGGame
             }
             //=====限时礼包倒计时END
         }
-        
+
         private void UpdateView()
         {
             _ui.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastDrawCount.ToString()).FlushVars();
             _ui.m_txtCount.SetVar("name", _activityCfg.themeName).FlushVars();
-            UI_ComBox_4 comBox = UI_ComBox_4.Proxy(_ui.m_comBox.target);
+            UI_ComBox comBox = UI_ComBox.Proxy(_ui.m_comBox.target);
 
             LuckyBoxDataManager.Instance.InitData(_luckyBoxCfg.id);
             comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
@@ -129,7 +129,8 @@ namespace GFGGame
                 comBox.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
             }
             comBox.m_btnBuyTen.target.data = _luckyBoxCfg.id;
-
+            comBox.m_imgActLuckyBox.visible = true;
+            comBox.m_grpLuckyBox.visible = false;
             if (comBox.m_btnPreview.target.data == null)
             {
                 comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);
@@ -138,9 +139,9 @@ namespace GFGGame
 
             comBox.target.data = _luckyBoxCfg.id;
 
-            UI_ComBox_4.ProxyEnd();
+            UI_ComBox.ProxyEnd();
         }
-        
+
         private void UpGiftBox()
         {
             var activityInfoByTypeList =
@@ -216,7 +217,7 @@ namespace GFGGame
         {
             ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
         }
-        
+
         //限时礼包按钮点击执行方法
         private void OnClikcBtnGiftBag()
         {

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -211,13 +211,17 @@ namespace GFGGame
             comBox.m_btnPreview.target.data = boxId;
 
             obj.data = boxId;
-
+            // if (comBox.m_grpLuckyBox != null)
+            // {
+            //     comBox.m_grpLuckyBox.visible = boxId == _activeBoxId;
+            // }
             if (boxId == _activeBoxId)
             {
                 long endTime = LuckyBoxDataManager.Instance.endTime;
                 long curTime = TimeHelper.ServerNow();
                 TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
                 comBox.m_txtTime.text = string.Format("剩余{0}{1}", num, str);
+                comBox.m_grpLuckyBox.visible = boxId == _activeBoxId;
             }
 
             UI_ComBox.ProxyEnd();

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -338,11 +338,11 @@ namespace GFGGame
             if (!MainDataManager.Instance.CanSwipe) return;
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.MAIN_SECOND_VIEW, false)) return;
 
-            if (_ui.m_comListAd.m_listAd.numItems > 0//滚动广告区域不可切换页面
+            if (MainDataManager.Instance.ViewType == 0 && _ui.m_comListAd.m_listAd.numItems > 0//滚动广告区域不可切换页面
             && _startPos.x > _ui.m_comListAd.target.x && _startPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
-            && _startPos.y > _ui.m_comListAd.target.y && _startPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)
-            && _endPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
-            && _endPos.y > _ui.m_comListAd.target.y && _endPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)) return;
+            && _startPos.y > _ui.m_comListAd.target.y && _startPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)) return;
+            // || _endPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
+            // && _endPos.y > _ui.m_comListAd.target.y && _endPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)) 
 
             SwipeGesture swipeture = (SwipeGesture)context.sender;
             if (MainDataManager.Instance.ViewType == 0 && swipeture.position.x < 0 &&

GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs

@@ -34,7 +34,7 @@ namespace GFGGame
             bringToFontOnClick = false;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_txz");
             _ui.m_c1.onChanged.Add(OnCtrlChange);
         }