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

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/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/CommonGame/components/BtnStyle005.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="316,102" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <loader id="n2_idkd" name="icon" xy="0,0" pivot="0.5,0.5" size="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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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,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/>
+  <relation target="n2_idkd" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/CommonGame/components/ButtonTab1.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="292,84" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
-  <displayList>
-    <image id="n0_ga16" name="n0" src="qr4etht" fileName="imagesExport/wpzs_anniu_2.png" xy="0,0">
-      <gearDisplay controller="button" pages="1,2,3"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n2_ga16" name="title" xy="0,0" size="292,84" fontSize="38" color="#998b7d" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
-      <gearColor controller="button" pages="0" values="#998b7d,#000000" default="#fff7e4,#000000"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button mode="Radio"/>
-</component>

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="volstc1" 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="volstc2" fileName="imagesNew/wp_own.png" xy="16,91" size="178,40" 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="178,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="volstnj" 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/DailyWelfare/ComList.xml

@@ -0,0 +1,22 @@
+<?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"/>
+      <property target="title" propertyId="1" value="ui://t8nwuj7ivols1o"/>
+    </component>
+    <component id="n5_fqor" name="btnSevenDayLogin" src="qik1u" fileName="components/Button1.xml" xy="0,351" group="n30_idkd" controller="c2,1">
+      <Button title="一周黄历" icon="ui://t8nwuj7ivols20"/>
+      <property target="title" 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="title" 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="title" 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,20 @@
     <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="9jv65o" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-77,0" size="1235,2071" aspect="true"/>
+    <component id="n0_fqor" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" 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,195" size="987,1724">
+      <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="n32_vols" name="n32" src="vols1s" fileName="images/hdrk_biaotz.png" xy="232,54"/>
+    <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/components/Button1.xml

@@ -1,13 +1,29 @@
 <?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="596,268" pivot="0.5,0" size="260,42" group="n8_vols" font="ui://eg2y0ldpa0cftkx" fontSize="30" color="#fffcf7" text="剩余时间：5天30分"/>
+    <group id="n8_vols" name="grpTime" xy="425,263" size="493,54" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
   </displayList>
   <Button/>
+  <customProperty target="title" propertyId="1"/>
 </component>

FGUIProject/assets/DailyWelfare/package.xml

@@ -60,6 +60,23 @@
     <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="vols1u" name="zjm_guanggao_kuang.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/League/LeagueGiftUI.xml

@@ -5,7 +5,7 @@
     <loader id="n14_9jv6" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n0_pvb4" name="n0" src="9jv65o" fileName="images/lm_fl_db.png" xy="0,110">
+    <image id="n0_pvb4" name="n0" src="9jv65o" fileName="images/lm_fl_db.png" xy="0,110" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" size="111,96"/>

FGUIProject/assets/League/LeagueSkillUI.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>
-    <image id="n15_miy3" name="n15" src="9jv65o" fileName="images/lm_fl_db.png" xy="-31,21" size="1144,1898">
+    <image id="n15_miy3" name="n15" src="9jv65o" fileName="images/lm_fl_db.png" xy="-31,21" size="1144,1898" pkg="eg2y0ldp">
       <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"/>

FGUIProject/assets/League/package.xml

@@ -127,7 +127,6 @@
     <image id="9jv65k" name="lm_dt_tsdb.png" path="/images/"/>
     <image id="9jv65l" name="lm_dt_tsdk.png" path="/images/"/>
     <image id="9jv65n" name="lm_fgx.png" path="/images/"/>
-    <image id="9jv65o" name="lm_fl_db.png" path="/images/" scale="9grid" scale9grid="269,993,538,25"/>
     <image id="9jv65p" name="lm_kp_db.png" path="/images/"/>
     <image id="9jv65s" name="lm_kp_db2_dlq.png" path="/images/"/>
     <image id="9jv65t" name="lm_kp_db_chang.png" path="/images/"/>

FGUIProject/assets/LuckyBox/LuckyBoxPreShowUI.xml

@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1158">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <component id="n0_ga16" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1167"/>
-    <text id="n2_ga16" name="txtTitle" xy="118,53" size="726,69" fontSize="52" color="#9b7853" align="center" autoSize="none" text="物品展示"/>
-    <image id="n9_qr4e" name="n9" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,145"/>
-    <image id="n3_ga16" name="n3" src="qr4e27" fileName="images/wpzs_anniu_1.png" xy="190,181" group="n10_dhoa"/>
-    <component id="n4_ga16" name="btnItem" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="189,182" group="n10_dhoa">
-      <Button checked="true" title="物品预览" controller="c1" page="0"/>
+    <image id="n13_vols" name="n13" src="volstc4" fileName="imageNews/zx_tc_piaodai_shang.png" xy="-47,-130" group="n15_vols"/>
+    <image id="n14_vols" name="n14" src="volstc5" fileName="imageNews/zx_tc_piaodai_xia.png" xy="545,841" group="n15_vols"/>
+    <image id="n11_vols" name="n11" src="volstc3" fileName="imageNews/zx_tc_bg.png" xy="5,11" group="n15_vols"/>
+    <group id="n15_vols" name="n15" xy="-47,-130" size="1046,1353"/>
+    <image id="n16_vols" name="n16" src="volstbz" fileName="imageNews/zx_tc_title_zhuangshi.png" xy="28,62" group="n20_vols"/>
+    <text id="n2_ga16" name="n2" xy="68,71" size="64,79" group="n20_vols" fontSize="60" color="#5a3e16" text="物"/>
+    <text id="n17_vols" name="n17" xy="123,84" size="54,66" group="n20_vols" fontSize="50" color="#5a3e16" text="品"/>
+    <text id="n18_vols" name="n18" xy="168,71" size="64,79" group="n20_vols" fontSize="60" color="#5a3e16" text="展"/>
+    <text id="n19_vols" name="n19" xy="223,84" size="54,66" group="n20_vols" fontSize="50" color="#5a3e16" text="示"/>
+    <group id="n20_vols" name="n20" xy="28,62" size="249,110" advanced="true"/>
+    <image id="n3_ga16" name="n3" src="volstc6" fileName="imageNews/zx_tc_tab_bg.png" xy="247,182" size="468,74" group="n10_dhoa"/>
+    <component id="n4_ga16" name="btnItem" src="ga165c" fileName="components/ButtonTab1.xml" xy="244,181" group="n10_dhoa">
+      <Button title="物品预览" controller="c1" page="0"/>
     </component>
-    <component id="n5_ga16" name="btnProb" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="482,181" group="n10_dhoa">
-      <Button title="概率公示" controller="c1" page="1"/>
+    <component id="n5_ga16" name="btnProb" src="ga165c" fileName="components/ButtonTab1.xml" xy="479,181" group="n10_dhoa" controller="c1,1">
+      <Button checked="true" title="概率公示" controller="c1" page="1"/>
     </component>
-    <group id="n10_dhoa" name="n10" xy="189,181" size="585,85"/>
-    <list id="n6_ga16" name="list" xy="96,318" size="770,790" overflow="scroll" lineGap="20" defaultItem="ui://drx9d1usga16k" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
+    <image id="n12_vols" name="n12" src="volstc7" fileName="imageNews/zx_tc_tab_biankuang.png" xy="33,181" group="n10_dhoa"/>
+    <group id="n10_dhoa" name="n10" xy="33,181" size="896,75"/>
+    <list id="n6_ga16" name="list" xy="96,318" size="770,735" overflow="scroll" lineGap="20" defaultItem="ui://drx9d1usga16k" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
     </list>
-    <component id="n8_ga16" name="compText" src="ga16j" fileName="components/Component1.xml" xy="70,334" size="822,790">
+    <component id="n8_ga16" name="compText" src="ga16j" fileName="components/Component1.xml" xy="96,318" size="770,732">
       <gearDisplay controller="c1" pages="1"/>
     </component>
   </displayList>

FGUIProject/assets/LuckyBox/combox/ComBox.xml

@@ -4,34 +4,37 @@
     <component id="n44_mbf1" name="comModel" src="mbf1tah" fileName="combox/ComModel.xml" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n32_njmn" name="btnPreview" src="ga16d" fileName="components/Button3.xml" xy="925,240" group="n36_njmn">
+    <component id="n62_vols" name="btnPreview" src="ga16d" fileName="components/Button3.xml" xy="927,241" group="n66_vols" controller="c1,0">
       <Button icon="ui://drx9d1usvek8v"/>
     </component>
-    <image id="n34_njmn" name="n34" src="idkdtar" fileName="imagesNews/zx_jindu_bg.png" xy="911,343" group="n36_njmn"/>
-    <text id="n35_njmn" name="txtOwned" xy="940,372" pivot="0.5,0" size="44,39" group="n36_njmn" fontSize="28" color="#faf6e6" align="center" vars="true" text="{v1=0}/{v2=0}">
-      <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
+    <image id="n64_vols" name="n64" src="fka75" fileName="images/cj_dikuangtw.png" xy="861,354" group="n66_vols"/>
+    <text id="n65_vols" name="txtOwned" xy="898,353" size="143,36" group="n66_vols" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有：{v1=0}/{v2=0}">
+      <relation target="n64_vols" sidePair="center-center,middle-middle"/>
     </text>
-    <group id="n36_njmn" name="n36" xy="911,240" size="108,203" advanced="true">
+    <group id="n66_vols" name="n66" xy="861,241" size="226,148" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
-    <image id="n46_idkd" name="n46" src="idkdtar" fileName="imagesNews/zx_jindu_bg.png" xy="637,1632" group="n31_njmn"/>
-    <image id="n45_idkd" name="n45" src="idkdtar" fileName="imagesNews/zx_jindu_bg.png" xy="154,1563" group="n31_njmn"/>
-    <component id="n26_njmn" name="comCostOne" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="256,1597" pivot="0.5,0" anchor="true" group="n31_njmn">
+    <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">
+      <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">
       <relation target="" sidePair="left-left"/>
     </component>
-    <component id="n27_njmn" name="comCostTen" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="741,1597" pivot="0.5,0" anchor="true" group="n31_njmn">
+    <component id="n56_vols" name="comCostTen" src="vek812" fileName="components/ComCost.xml" xy="741,1635" pivot="0.5,0" anchor="true" group="n61_vols">
       <relation target="" sidePair="left-left"/>
     </component>
-    <image id="n30_njmn" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1565" group="n31_njmn">
-      <relation target="n29_njmn" sidePair="left-left,top-top"/>
+    <component id="n57_vols" name="btnBuyOne" src="ga16b" fileName="components/Button1.xml" xy="45,1688" group="n61_vols"/>
+    <component id="n58_vols" name="btnBuyTen" src="ga16c" fileName="components/Button2.xml" xy="531,1688" group="n61_vols"/>
+    <image id="n59_vols" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1603" group="n61_vols">
+      <relation target="n58_vols" sidePair="left-left,top-top"/>
     </image>
-    <text id="n37_njmn" name="txtRemainTimes" xy="540,1464" pivot="0.5,0" anchor="true" size="303,54" group="n31_njmn" fontSize="40" color="#915e15" align="center" vars="true" text="今日剩余次数：{v1=0}">
+    <text id="n60_vols" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="244,44" group="n61_vols" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数：{v1=0}">
       <relation target="" sidePair="center-center"/>
     </text>
-    <component id="n28_njmn" name="btnBuyOne" src="idkdtnh" fileName="components/BtnStyle006.xml" pkg="eg2y0ldp" xy="45,1650" group="n47_idkd"/>
-    <component id="n29_njmn" name="btnBuyTen" src="idkdtnh" fileName="components/BtnStyle006.xml" pkg="eg2y0ldp" xy="531,1650" group="n47_idkd"/>
-    <group id="n47_idkd" name="n47" xy="45,1650" size="802,102" group="n31_njmn" advanced="true"/>
-    <group id="n31_njmn" name="n31" xy="45,1464" size="989,288" advanced="true">
+    <group id="n61_vols" name="n61" xy="45,1603" size="989,250" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
   </displayList>

FGUIProject/assets/LuckyBox/components/ButtonTab1.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="238,74" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n0_ga16" name="n0" src="volstc8" fileName="imageNews/zx_tc_tab_xuanzhong.png" xy="0,0" pivot="0.5,0.5" scale="-1,1">
+      <gearDisplay controller="button" pages="1,2,3"/>
+      <gearSize controller="c1" pages="1" values="238,74,-1,1" default="238,74,1,1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n2_ga16" name="title" xy="0,0" size="238,74" fontSize="40" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="物品预览">
+      <gearColor controller="button" pages="0,1" values="#716660,#000000|#5a3e16,#000000"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/LuckyBox/components/CompLuckyBoxBonusListItem.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="770,355">
   <displayList>
-    <image id="n12_qr4e" name="n12" src="qr4e28" fileName="images/wpzs_bji.png" xy="21,2"/>
-    <text id="n9_ga16" name="txtName" xy="72,2" size="349,60" fontSize="40" color="#998570" autoSize="none" text="示例"/>
-    <list id="n11_ga16" name="list" xy="0,65" size="770,290" layout="flow_hz" colGap="50" lineItemCount="3" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
+    <image id="n12_qr4e" name="n12" src="volstc9" fileName="imageNews/zx_tc_taozhuang_zhuagnshi.png" xy="21,22"/>
+    <text id="n9_ga16" name="txtName" xy="57,6" size="84,54" fontSize="40" color="#5a3e16" text="示例"/>
+    <list id="n11_ga16" name="list" xy="0,65" size="770,290" layout="flow_hz" lineGap="25" colGap="70" lineItemCount="3" defaultItem="ui://eg2y0ldpvolstnk" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/LuckyBox/components/Component1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="805,677" overflow="scroll">
   <displayList>
-    <text id="n9_ga16" name="txtShow" xy="0,0" size="805,677" fontSize="36" color="#9b8355" letterSpacing="3" ubb="true" autoSize="none" autoClearText="true" text="示例\nhahakdfjla"/>
+    <text id="n9_ga16" name="txtShow" xy="0,0" size="805,677" fontSize="38" color="#5a3e16" letterSpacing="3" ubb="true" autoSize="none" autoClearText="true" text="示例\nhahakdfjla"/>
   </displayList>
 </component>