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

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusUI.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1344">
+  <displayList>
+    <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
+      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1b"/>
+    </component>
+    <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n4_mbf1" name="n4" src="mbf17" fileName="images/tx_xuanxiang_zz.png" xy="99,1134"/>
+  </displayList>
+</component>

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskUI.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1344">
+  <displayList>
+    <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
+      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1b"/>
+    </component>
+    <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n4_mbf1" name="n4" src="mbf17" fileName="images/tx_xuanxiang_zz.png" xy="99,1134"/>
+  </displayList>
+</component>

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxUI.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n0_mbf1" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://eg2y0ldpgd29ti0" align="center" vAlign="middle" fill="scaleMatchHeight">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
+    <component id="n1_mbf1" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n3_mbf1" name="btnTask" src="mbf1l" fileName="compoents/Button1.xml" xy="953,127" size="94,95" group="n8_mbf1">
+      <Button icon="ui://ubfk2kobmbf12"/>
+    </component>
+    <component id="n7_mbf1" name="btnShop" src="mbf1l" fileName="compoents/Button1.xml" xy="1055,127" size="94,95" group="n8_mbf1" visible="false">
+      <Button icon="ui://ubfk2kobmbf11"/>
+    </component>
+    <group id="n8_mbf1" name="n8" xy="953,127" size="94,95" advanced="true" layout="hz" colGap="8" excludeInvisibles="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
+    <image id="n6_mbf1" name="n6" src="mbf14" fileName="imagesNew/sj_dk.png" pkg="eg2y0ldp" xy="416,105" group="n9_mbf1"/>
+    <text id="n5_mbf1" name="txtTime" xy="443,106" pivot="0.5,0" size="193,44" group="n9_mbf1" fontSize="32" color="#fffbf9" align="center" text="00天00时00分"/>
+    <group id="n9_mbf1" name="n9" xy="416,105" size="247,45"/>
+    <image id="n10_mbf1" name="n10" src="mbf15" fileName="images/cj_xiafang_db.png" xy="0,1551" group="n11_mbf1"/>
+    <component id="n4_mbf1" name="btnLuckyBox" src="qkjstlg" fileName="components/BtnNormal0.xml" pkg="eg2y0ldp" xy="353,1527" group="n11_mbf1">
+      <Button title="获取套装" icon="ui://ubfk2kobmbf10"/>
+    </component>
+    <group id="n11_mbf1" name="n11" xy="0,1527" size="1080,393" advanced="true">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </group>
+  </displayList>
+</component>

FGUIProject/assets/ActivityThemeLuckyBox/compoents/Button1.xml

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

FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListRewardItem.xml

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

FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListTaskItem.xml

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

FGUIProject/assets/ActivityThemeLuckyBox/package.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="ubfk2kob">
+  <resources>
+    <component id="mbf1k" name="ActivityThemeLuckyBoxUI.xml" path="/" exported="true"/>
+    <component id="mbf1l" name="Button1.xml" path="/compoents/"/>
+    <image id="mbf10" name="wz_hqtz.png" path="/images/"/>
+    <image id="mbf11" name="cj_huodongsd.png" path="/images/"/>
+    <image id="mbf12" name="cj_xianshirw.png" path="/images/"/>
+    <image id="mbf13" name="tc_xuanxiangkuang.png" path="/images/"/>
+    <image id="mbf15" name="cj_xiafang_db.png" path="/images/"/>
+    <component id="mbf16" name="ActivityThemeLuckyBoxBonusUI.xml" path="/" exported="true"/>
+    <image id="mbf17" name="tx_xuanxiang_zz.png" path="/images/"/>
+    <component id="mbf19" name="ListTaskItem.xml" path="/compoents/"/>
+    <component id="mbf1a" name="ListRewardItem.xml" path="/compoents/"/>
+    <image id="mbf1b" name="lm_biaotizi_15.png" path="/images/"/>
+    <image id="mbf1c" name="lm_biaotizi_14.png" path="/images/"/>
+    <component id="mbf1d" name="ActivityThemeLuckyBoxTaskUI.xml" path="/" exported="true"/>
+  </resources>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox" packageCount="2" genCode="true"/>
+</packageDescription>

FGUIProject/assets/ClothingFoster/ClothingFosterUI.xml

@@ -19,6 +19,8 @@
     <component id="n9_py5g" name="btnFoster" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,849">
       <Button title="确定"/>
     </component>
-    <component id="n10_j5a5" name="ComConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="359,778"/>
+    <component id="n10_j5a5" name="ComConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="424,778" pivot="0.5,0">
+      <relation target="" sidePair="center-center"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/ClothingFoster/ClothingUI.xml

@@ -9,7 +9,7 @@
     <graph id="n1_pjip" name="holder" xy="389,623" pivot="0.5,0.5" size="394,268" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <component id="n9_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <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"/>
     <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">
@@ -34,10 +34,10 @@
     <group id="n41_r9ri" name="n41" xy="346,1128" size="387,78" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <text id="n22_nk8d" name="txtRenewProperty" xy="357,1386" size="353,46" group="n29_nk8d" fontSize="34" color="#aa9063" text="套装所有部件属性+10%"/>
+    <text id="n22_nk8d" name="txtRenewProperty" xy="357,1386" size="352,46" group="n29_nk8d" fontSize="34" color="#aa9063" text="套装所有部件属性+10%"/>
     <component id="n26_nk8d" name="comRenewCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="400,1717" size="237,46" group="n29_nk8d"/>
     <component id="n27_nk8d" name="btnRenew" src="bd1c1r" fileName="components/Button8.xml" xy="368,1766" group="n29_nk8d"/>
-    <text id="n28_nk8d" name="txtRenewTips" xy="442,1851" size="193,44" group="n29_nk8d" fontSize="32" color="#bbafa3" text="完成养护阶段"/>
+    <text id="n28_nk8d" name="txtRenewTips" xy="442,1851" size="196,44" group="n29_nk8d" fontSize="32" color="#bbafa3" text="完成养护阶段"/>
     <component id="n23_nk8d" name="comRenewReward" src="nk8d14" fileName="components/ComRenewReward.xml" xy="68,1411" size="300,300" group="n39_l4ui"/>
     <list id="n25_nk8d" name="listRenewMaterial" xy="428,1468" size="584,216" group="n39_l4ui" layout="row" colGap="36" defaultItem="ui://uicwtr5bpy5gu" align="center">
       <item/>
@@ -53,7 +53,7 @@
     </group>
     <image id="n36_bd1c" name="n36" src="bd1c1g" fileName="images/fzyc_yhditu_3.png" xy="0,1416" group="n21_nk8d"/>
     <component id="n19_nk8d" name="comFosterReward" src="nk8d13" fileName="components/ComFosterReward.xml" xy="854,1140" group="n21_nk8d"/>
-    <component id="n16_py5g" name="btnPropertyShow" src="py5gn" fileName="components/Button6.xml" xy="983,1432" group="n21_nk8d"/>
+    <component id="n16_py5g" name="btnPropertyShow" src="py5gn" fileName="components/Button6.xml" xy="983,1432" group="n21_nk8d" visible="false"/>
     <list id="n11_py5g" name="listProperty" xy="118,1432" size="844,58" group="n21_nk8d" layout="row" colGap="10" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
       <item/>
       <item/>
@@ -71,8 +71,8 @@
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <text id="n30_nk8d" name="n30" xy="414,1410" size="248,66" group="n34_nk8d" fontSize="50" color="#aa9063" text="已完成焕新"/>
-    <text id="n31_nk8d" name="txtRenewShow" xy="336,1506" size="395,51" group="n34_nk8d" fontSize="38" color="#aa9063" text="套装所有部件属性+10%"/>
+    <text id="n30_nk8d" name="n30" xy="414,1410" size="252,66" group="n34_nk8d" fontSize="50" color="#aa9063" text="已完成焕新"/>
+    <text id="n31_nk8d" name="txtRenewShow" xy="336,1506" size="393,51" group="n34_nk8d" fontSize="38" color="#aa9063" text="套装所有部件属性+10%"/>
     <component id="n32_nk8d" name="comRenewRewardGet" src="nk8d15" fileName="components/ComRenewRewardGet.xml" xy="390,1578" group="n34_nk8d"/>
     <group id="n34_nk8d" name="grpRenewFinish" xy="336,1410" size="408,468" advanced="true">
       <gearDisplay controller="c1" pages="1"/>

FGUIProject/assets/CommonGame/components/BtnStyle003.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="189,58" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n0_9qpb" name="n0" src="o9gh4l" fileName="imagesNew/lm_an__weixuan_qifu.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_9qpb" name="title" xy="0,0" size="189,58" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#7c7263" align="center" vAlign="middle" autoSize="none" singleLine="true" text="前往">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/BtnStyle1Big.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="187,56" extention="Button">
-  <controller name="button" pages="0,up,1,down,4,,5,,6,disable" selected="4"/>
+  <controller name="button" pages="0,up,1,down,4,,5,,6,disable" selected="0"/>
   <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="187,56" aspect="true" url="ui://eg2y0ldpwm603g" fill="scale" autoSize="true">
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="187,56" aspect="true" url="ui://eg2y0ldpwm603f" fill="scale" autoSize="true">
       <gearIcon controller="button" pages="4,6" values="|ui://eg2y0ldpwm603g" default="ui://eg2y0ldpwm603f"/>
     </loader>
     <text id="n3_u2u3" name="title" xy="71,8" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
-      <relation target="" sidePair="middle-middle,left-right"/>
+      <relation target="" sidePair="center-center"/>
     </text>
   </displayList>
   <Button/>

FGUIProject/assets/CommonGame/components/ComItemBlue.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="124,124" pivot="0.5,0.5" overflow="hidden" opaque="false">
+  <displayList>
+    <component id="n25_pu55" name="comItemIcon" src="9jv6tlt" fileName="components/ComItemIconNew.xml" xy="0,0" pivot="0.5,0.5" aspect="true">
+      <property target="bg" propertyId="1" value="ui://eg2y0ldpuxxstma"/>
+      <property target="numBg" propertyId="1" value="ui://eg2y0ldpuxxstm5"/>
+    </component>
+    <text id="n15_ehs9" name="txtCount" xy="61,78" pivot="0.5,0" anchor="true" size="97,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" vars="true" text="x00200">
+      <relation target="n25_pu55" sidePair="center-center"/>
+    </text>
+    <text id="n26_r9ri" name="txtName" xy="62,124" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
+      <relation target="n25_pu55" sidePair="bottom-bottom"/>
+    </text>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/components/ComItemIconNew.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="124,124">
   <displayList>
-    <image id="n25_pu55" name="n25" src="l500tlv" fileName="imagesNew/wpk_db_1.png" xy="1,1" group="n30_9jv6"/>
+    <loader id="n25_pu55" name="bg" xy="1,1" size="123,123" group="n30_9jv6" url="ui://eg2y0ldpl500tlv"/>
     <loader id="n12_ehs9" name="loaIcon" xy="63,63" pivot="0.5,0.5" anchor="true" size="102,102" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
-    <text id="n17_j48o" name="txtHasCount" xy="64,194" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <text id="n17_j48o" name="txtHasCount" xy="64,194" pivot="0.5,0" anchor="true" size="101,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
     <loader id="n18_j48o" name="loaRarity" xy="89,7" size="27,58" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale"/>
-    <image id="n31_l500" name="n31" src="l500tlw" fileName="imagesNew/wpk_sz_db.png" xy="7,86" group="n30_9jv6"/>
+    <loader id="n31_l500" name="numBg" xy="7,86" size="112,32" group="n30_9jv6" url="ui://eg2y0ldpl500tlw"/>
     <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="-27,42" size="178,40" group="n29_pu55"/>
     <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="-27,42" size="178,40" group="n29_pu55"/>
     <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="-18,42" size="160,40" group="n29_pu55"/>
@@ -15,4 +15,6 @@
     <group id="n27_pu55" name="grpGot" xy="6,6" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
     <group id="n30_9jv6" name="n30" xy="-27,1" size="178,229"/>
   </displayList>
+  <customProperty target="bg" propertyId="1"/>
+  <customProperty target="numBg" propertyId="1"/>
 </component>

FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,70" opaque="false">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10,,12,,13,,14," selected="12">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10,,12,,13,,14," selected="0">
     <remark page="0" value="体力金币马蹄珍珠"/>
     <remark page="1" value="体力金币马蹄"/>
     <remark page="2" value="抽卡兑换"/>
@@ -16,57 +16,57 @@
     <remark page="12" value="商店列表"/>
   </controller>
   <displayList>
-    <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
+    <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,0">
       <gearDisplay controller="c1" pages="3"/>
       <gearXY controller="c1" pages="0,3" values="460,0|814,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n44_vek8" name="btnCJHuoDong" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
+    <component id="n44_vek8" name="btnCJHuoDong" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,0">
       <gearDisplay controller="c1" pages="4"/>
       <gearXY controller="c1" pages="0,4" values="460,0|814,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n47_wono" name="btnTravel" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+    <component id="n47_wono" name="btnTravel" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
       <gearDisplay controller="c1" pages="8"/>
       <gearXY controller="c1" pages="0,1,5,6,8" values="814,0|684,2|684,2|684,2|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
-    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
       <gearDisplay controller="c1" pages="9"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,9" values="814,0|684,2|814,2|684,2|684,2|814,2|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpdhoatk2"/>
     </component>
-    <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="0,5">
+    <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="37,0">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearXY controller="c1" pages="0,1,5" values="37,0|296,0|296,5" default="0,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n46_ighs" name="btnCJ" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
+    <component id="n46_ighs" name="btnCJ" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="-215,0">
       <gearDisplay controller="c1" pages="5"/>
       <gearXY controller="c1" pages="0,1,3,5" values="-215,0|1079,5|979,5|296,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="230,5">
+    <component id="n40_r9gf" name="btnGold" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="296,0">
       <gearDisplay controller="c1" pages="0,1,6,7,10,12"/>
       <gearXY controller="c1" pages="0,1,6,7,10,12" values="296,0|555,0|555,0|814,0|296,0|296,0" default="230,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x3"/>
     </component>
-    <component id="n39_r9gf" name="btnDiamondRed" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
+    <component id="n39_r9gf" name="btnDiamondRed" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="555,0">
       <gearDisplay controller="c1" pages="0,1,5,6,10,12"/>
       <gearXY controller="c1" pages="0,1,3,5,6,10,12" values="555,0|814,0|979,5|555,0|814,0|555,0|555,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x6"/>
     </component>
-    <component id="n41_r9gf" name="btnDiamondPurple" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+    <component id="n41_r9gf" name="btnDiamondPurple" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
       <gearDisplay controller="c1" pages="0,5,10"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,10" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
-    <component id="n49_psph" name="btnArena" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+    <component id="n49_psph" name="btnArena" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
       <gearDisplay controller="c1" pages="12"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,10,12" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpkztethq"/>
     </component>
-    <component id="n50_pvb4" name="btnLeagueContribuation" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+    <component id="n50_pvb4" name="btnLeagueContribuation" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
       <gearDisplay controller="c1" pages="13"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,10,12,13" values="814,0|814,2|1207,5|814,0|814,2|688,5|814,0|814,0|814,1" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpkztethq"/>
@@ -74,8 +74,6 @@
     <list id="n51_l500" name="list" xy="232,0" size="821,70" layout="row" colGap="30" defaultItem="ui://eg2y0ldpr9gf5z" align="right">
       <gearDisplay controller="c1" pages="14"/>
       <item/>
-      <item/>
-      <item/>
     </list>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/TaskListItem.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1037,224">
-  <controller name="c1" pages="1,,2,,3," selected="2">
+  <controller name="c1" pages="1,,2,,3," selected="0">
     <remark page="0" value="未完成"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
   </controller>
   <controller name="c2" pages="0,CanGo,1,NotGo" selected="0"/>
-  <controller name="c3" pages="0,不显示积分,1,显示积分" selected="1"/>
+  <controller name="c3" pages="0,不显示积分,1,显示积分" selected="0"/>
   <displayList>
     <image id="n13_ids4" name="n13" src="uxxstmj" fileName="imagesNew/mrrw_db.png" xy="-4,8"/>
     <image id="n12_ids4" name="n12" src="uxxstmq" fileName="imagesNew/mrrw_bq_qb.png" xy="35,12"/>
     <text id="n1_lh8v" name="txtDesc" xy="56,19" size="260,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" text="任务描述任务描述"/>
     <text id="n14_ids4" name="txtCount" xy="390,20" size="80,44" fontSize="32" color="#915e15" text="1/100"/>
-    <list id="n7_wet2" name="listTaskReward" xy="93,78" size="265,125" layout="row" colGap="6" defaultItem="ui://eg2y0ldpnd1743" autoClearItems="true">
+    <list id="n7_wet2" name="listTaskReward" xy="93,78" size="265,125" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls" autoClearItems="true">
       <item/>
       <item/>
     </list>
-    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" xy="804,82" size="189,58">
+    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" xy="804,82" size="204,63">
       <gearDisplay controller="c1" pages="2"/>
       <Button title="领取" icon="ui://eg2y0ldpo9gh4k"/>
     </component>

FGUIProject/assets/CommonGame/componentsBg/ComBg001.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,992">
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1tm6" fileName="componentsBg/tanchuang_2.png" xy="0,0">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="896,8"/>
+    <loader id="n6_mbf1" name="loaTitle" xy="264,94" pivot="0.5,0" size="560,34" url="ui://eg2y0ldpmbf1tn6" autoSize="true"/>
+  </displayList>
+  <customProperty target="loaTitle" propertyId="1"/>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -286,7 +286,7 @@
     <image id="wm603f" name="lm_an__3xuanzhong.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4m" name="lm_an__tongyi.png" path="/imagesNew/" exported="true"/>
     <image id="9jv66c" name="lm_an__3xuanzhong2.png" path="/imagesNew/" exported="true"/>
-    <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/imagesExport/" exported="true"/>
+    <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4b" name="lm_tb_tishi.png" path="/imagesNew/" exported="true"/>
     <image id="a0cf2h" name="lm_tb.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4o" name="lm_an_jujue.png" path="/imagesNew/" exported="true"/>
@@ -308,22 +308,30 @@
     <component id="nyhmtly" name="ButtonRed.xml" path="/components/" exported="true"/>
     <image id="uxxstm7" name="txz_lvl_db.png" path="/imagesNew/" exported="true"/>
     <component id="lh8v5" name="TaskListItem.xml" path="/components/" exported="true"/>
-    <component id="9qpb4h" name="ComeBt.xml" path="/components/" exported="true"/>
+    <component id="9qpb4h" name="BtnStyle001.xml" path="/components/" exported="true"/>
     <component id="nd1743" name="RewardIconYellow.xml" path="/components/" exported="true"/>
     <image id="uxxstmq" name="mrrw_bq_qb.png" path="/imagesNew/" exported="true"/>
     <image id="uxxstmj" name="mrrw_db.png" path="/imagesNew/" exported="true"/>
     <image id="uxxstn3" name="txz_tb_ylq.png" path="/imagesNew/" exported="true"/>
     <image id="ittstn4" name="lm_an_jujue_1.png" path="/imagesNew/" exported="true"/>
-    <image id="nyhm6" name="qrhd_ylq_db.png" path="/imagesNew/" exported="true"/>
+    <image id="nyhm6" name="lm_an_qrhd_ylq_db.png" path="/imagesNew/" exported="true"/>
     <image id="qik1tm2" name="jzsjzs_txktx.png" path="/images/" scale9grid="30,30,60,60"/>
     <image id="qik1tm3" name="jjsjs_txk_2.png" path="/images/"/>
     <image id="qik1tm4" name="pmts_xtk_1.png" path="/images/"/>
     <image id="qik1tm5" name="phbphb_txkk.png" path="/images/"/>
-    <image id="qik1tm6" name="tanchuang_2.png" path="/componentsBg/"/>
+    <image id="qik1tm6" name="tanchuang_2.png" path="/componentsBg/" scale="9grid" scale9grid="254,247,510,329"/>
     <component id="qik1tcb" name="ComBg000.xml" path="/componentsBg/" exported="true"/>
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
     <image id="qik1tm7" name="db_jiajian_1.png" path="/images/"/>
+    <component id="mdmdtn5" name="ComItemBlue.xml" path="/components/" exported="true"/>
+    <image id="uxxstma" name="wpk_db_2.png" path="/imagesNew/" exported="true"/>
+    <image id="uxxstm5" name="wpk_sz_db2.png" path="/imagesNew/" exported="true"/>
+    <image id="mbf14" name="sj_dk.png" path="/imagesNew/" exported="true"/>
+    <component id="mbf1tn5" name="ComBg001.xml" path="/componentsBg/" exported="true"/>
+    <image id="mbf1tn6" name="lm_biaotizi_14.png" path="/componentsBg/"/>
+    <component id="mbf1tn7" name="BtnStyle003.xml" path="/components/" exported="true"/>
+    <image id="mbf1tn8" name="lm_an__xuanzhong.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/LuckyBox/LuckyBoxActiveUI.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
-  <displayList>
-    <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">
-      <relation target="" sidePair="right-right"/>
-    </component>
-    <component id="n6_fka7" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.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"/>
-    <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>
-</component>

FGUIProject/assets/LuckyBox/LuckyBoxActivityUI.xml

@@ -0,0 +1,36 @@
+<?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>
+    <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">
+      <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"/>
+    <text id="n43_mbf1" name="txtTime" xy="443,105" pivot="0.5,0" size="193,44" group="n55_mbf1" fontSize="32" color="#fffbf9" align="center" text="00天00时00分"/>
+    <group id="n55_mbf1" name="n55" xy="416,105" size="247,44" advanced="true">
+      <relation target="" sidePair="top-top"/>
+    </group>
+    <component id="n46_mbf1" name="btnReward" src="mbf1taf" fileName="components/Button5.xml" xy="35,213" group="n52_mbf1">
+      <Button icon="ui://drx9d1usmbf1tai"/>
+    </component>
+    <component id="n45_mbf1" name="btnShop" src="mbf1taf" fileName="components/Button5.xml" xy="35,328" group="n52_mbf1">
+      <Button icon="ui://drx9d1usmbf1taj"/>
+    </component>
+    <component id="n47_mbf1" name="btnGiftBag" src="mbf1taf" fileName="components/Button5.xml" xy="35,443" group="n51_mbf1">
+      <Button icon="ui://drx9d1usmbf1tak"/>
+    </component>
+    <image id="n49_mbf1" name="n49" src="mbf1tal" fileName="images/cj_sj_db.png" xy="18,523" group="n51_mbf1"/>
+    <text id="n50_mbf1" name="txtGiftBagTime" xy="32,518" pivot="0.5,0" size="100,39" group="n51_mbf1" fontSize="28" color="#fffbf9" align="center" text="03:23:45"/>
+    <group id="n51_mbf1" name="n51" xy="18,443" size="128,114" group="n52_mbf1" advanced="true"/>
+    <group id="n52_mbf1" name="n52" xy="18,213" size="128,344" 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="240,1496" pivot="0.5,0" size="600,42" 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>
+  </displayList>
+</component>

FGUIProject/assets/LuckyBox/LuckyBoxUI.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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://drx9d1uso1391h" align="center" vAlign="middle" fill="scale">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
     <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">
       <relation target="" sidePair="right-right"/>
     </component>
-    <component id="n6_fka7" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80" group="n32_vek8"/>
+    <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"/>
     <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"/>

FGUIProject/assets/LuckyBox/combox/ComBox.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://drx9d1usdhoatab" designImageOffsetY="-240">
   <displayList>
-    <loader id="n25_vek8" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1useshh1f" align="center" vAlign="middle" fill="scaleMatchHeight">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
+    <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="920,177" group="n36_njmn" controller="c1,0">
       <Button icon="ui://drx9d1usvek8v"/>
     </component>
@@ -11,7 +11,7 @@
       <Button icon="ui://drx9d1usvek8t"/>
     </component>
     <image id="n34_njmn" name="n34" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n36_njmn"/>
-    <text id="n35_njmn" name="txtOwned" xy="891,289" size="142,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有：{v1=0}/{v2=0}">
+    <text id="n35_njmn" name="txtOwned" xy="891,289" size="143,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有：{v1=0}/{v2=0}">
       <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
     </text>
     <group id="n36_njmn" name="n36" xy="854,177" size="226,148" advanced="true">
@@ -21,7 +21,7 @@
     <graph id="n40_dhoa" name="holder1" xy="869,1097" size="100,100"/>
     <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,50" group="n42_dhoa" font="ui://eg2y0ldpwonotj9" fontSize="46" color="#fffbdd" align="center" vAlign="middle" autoSize="height" strokeColor="#a98538" strokeSize="2" text="剩余80天"/>
+    <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" advanced="true">
       <relation target="" sidePair="middle-middle"/>
     </group>
@@ -36,7 +36,7 @@
     <image id="n30_njmn" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1603" group="n31_njmn">
       <relation target="n29_njmn" sidePair="left-left,top-top"/>
     </image>
-    <text id="n37_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="246,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数：{v1=0}">
+    <text id="n37_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="244,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数：{v1=0}">
       <relation target="" sidePair="center-center"/>
     </text>
     <group id="n31_njmn" name="n31" xy="45,1603" size="989,250" advanced="true">

FGUIProject/assets/LuckyBox/combox/ComBox_2.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <loader id="n25_vek8" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1useshh1f" fill="scaleMatchWidth">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
+    <component id="n39_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="920,177" group="n36_njmn" controller="c1,0">
       <Button icon="ui://drx9d1usvek8v"/>
     </component>
@@ -11,7 +11,7 @@
       <Button icon="ui://drx9d1usvek8t"/>
     </component>
     <image id="n34_njmn" name="n34" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n36_njmn"/>
-    <text id="n35_njmn" name="txtOwned" xy="891,289" size="142,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有：{v1=0}/{v2=0}">
+    <text id="n35_njmn" name="txtOwned" xy="891,289" size="143,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有：{v1=0}/{v2=0}">
       <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
     </text>
     <group id="n36_njmn" name="n36" xy="854,177" size="226,148" advanced="true">
@@ -28,7 +28,7 @@
     <image id="n30_njmn" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1603" group="n31_njmn">
       <relation target="n29_njmn" sidePair="left-left,top-top"/>
     </image>
-    <text id="n37_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="246,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数：{v1=0}">
+    <text id="n37_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="244,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数：{v1=0}">
       <relation target="" sidePair="center-center"/>
     </text>
     <group id="n31_njmn" name="n31" xy="45,1603" size="989,250" advanced="true">

FGUIProject/assets/LuckyBox/combox/ComBox_3.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <loader id="n25_vek8" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1useshh1f" fill="scaleMatchWidth">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
+    <component id="n39_mbf1" name="comModel" src="mbf1tah" fileName="combox/ComModel.xml" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
     <loader id="n32_njmn" name="loaImg" xy="0,1378" size="1080,542" url="ui://drx9d1usvek8s" autoSize="true">
       <relation target="" sidePair="bottom-bottom"/>
     </loader>
@@ -14,7 +14,7 @@
       <Button icon="ui://drx9d1usvek8t"/>
     </component>
     <image id="n35_njmn" name="n35" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n37_njmn"/>
-    <text id="n36_njmn" name="txtOwned" xy="891,289" size="142,36" group="n37_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有：{v1=0}/{v2=0}">
+    <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">
@@ -28,7 +28,7 @@
     </component>
     <component id="n28_njmn" name="btnBuyOne" src="ga16b" fileName="components/Button1.xml" xy="90,1688" group="n31_njmn"/>
     <component id="n29_njmn" name="btnBuyTen" src="ga16c" fileName="components/Button2.xml" xy="576,1688" group="n31_njmn"/>
-    <text id="n38_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="246,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数：{v1=0}">
+    <text id="n38_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="244,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数：{v1=0}">
       <relation target="" sidePair="center-center"/>
     </text>
     <group id="n31_njmn" name="n31" xy="90,1635" size="898,218" advanced="true">

FGUIProject/assets/LuckyBox/combox/ComBox_4.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" designImage="ui://drx9d1usdhoatab" designImageOffsetY="-240">
+  <displayList>
+    <component id="n45_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="920,177" group="n36_njmn" controller="c1,0">
+      <Button icon="ui://drx9d1usvek8v"/>
+    </component>
+    <component id="n33_njmn" name="btnExchange" src="ga16d" fileName="components/Button3.xml" xy="966,177" group="n36_njmn" visible="false">
+      <Button icon="ui://drx9d1usvek8t"/>
+    </component>
+    <image id="n34_njmn" name="n34" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n36_njmn"/>
+    <text id="n35_njmn" name="txtOwned" xy="891,289" size="143,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有：{v1=0}/{v2=0}">
+      <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n36_njmn" name="n36" xy="854,177" size="226,148" advanced="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
+    <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">
+      <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">
+      <relation target="" sidePair="left-left"/>
+    </component>
+    <component id="n27_njmn" name="comCostTen" src="vek812" fileName="components/ComCost.xml" xy="787,1667" pivot="0.5,0" anchor="true" group="n31_njmn">
+      <relation target="" sidePair="left-left"/>
+    </component>
+    <component id="n28_njmn" name="btnBuyOne" src="ga16b" fileName="components/Button1.xml" xy="91,1720" group="n31_njmn"/>
+    <component id="n29_njmn" name="btnBuyTen" src="ga16c" fileName="components/Button2.xml" xy="577,1720" group="n31_njmn"/>
+    <text id="n37_njmn" name="txtRemainTimes" xy="540,1841" pivot="0.5,0" anchor="true" size="244,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数：{v1=0}">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <group id="n31_njmn" name="n31" xy="91,1667" size="898,218" advanced="true">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </group>
+  </displayList>
+  <customProperty target="loaBg" propertyId="1"/>
+</component>

FGUIProject/assets/LuckyBox/combox/ComModel.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"/>
+    </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"/>
+    </graph>
+  </displayList>
+</component>

FGUIProject/assets/LuckyBox/components/Button5.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="94,95" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <loader id="n1_vek8" name="icon" xy="0,0" size="94,95" url="ui://drx9d1usvek8v" autoSize="true"/>
+    <text id="n4_mbf1" name="title" xy="27,26" pivot="0.5,0.5" size="40,42" fontSize="30" align="center" vAlign="middle" text="">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+  </displayList>
+  <Button/>
+  <relation target="n1_vek8" sidePair="width-width,height-height"/>
+</component>

FGUIProject/assets/LuckyBox/package.xml

@@ -62,7 +62,15 @@
     <image id="v95q3b" name="hdkp_dj.png" path="/images/"/>
     <image id="dhoatab" name="cj_bj_2.png" path="/images/"/>
     <image id="mzf8tac" name="cj_zizi_3.png" path="/images/"/>
-    <component id="mbf1tad" name="LuckyBoxActiveUI.xml" path="/" exported="true"/>
+    <component id="mbf1tad" name="LuckyBoxActivityUI.xml" path="/" exported="true"/>
+    <component id="mbf1tae" name="ComBox_4.xml" path="/combox/" exported="true"/>
+    <component id="mbf1taf" name="Button5.xml" path="/components/"/>
+    <component id="mbf1tah" name="ComModel.xml" path="/combox/"/>
+    <image id="mbf1tai" name="cj_zhaixingjl.png" path="/images/"/>
+    <image id="mbf1taj" name="cj_zhaixingth.png" path="/images/"/>
+    <image id="mbf1tak" name="cj_meirith.png" path="/images/"/>
+    <image id="mbf1tal" name="cj_sj_db.png" path="/images/"/>
+    <image id="mbf1tam" name="cj_tswz_db.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -13,6 +13,7 @@
       <relation target="" sidePair="left-left,top-top"/>
       <Button title="福利大厅"/>
     </component>
+    <component id="n75_mbf1" name="btnActivityLuckyBox" src="mbf1o4" fileName="components/Button4.xml" xy="18,595" group="n52_qqat"/>
     <component id="n4_q08x" name="btnMain" src="q08xu" fileName="components/ButtonModle1.xml" xy="720,1617" size="310,275" group="n52_qqat">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fm"/>

FGUIProject/assets/Main/components/Button4.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="467,120" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_ox5b" name="n0" src="qqatfy" fileName="images/zjm_hdhd_2.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <graph id="n1_ox5b" name="holder" xy="235,50" size="1,1" touchable="false"/>
+    <text id="n2_fqor" name="title" xy="165,123" pivot="0.5,0.5" size="136,42" fontSize="30" align="center" text="1天23小时"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Main/package.xml

@@ -616,6 +616,7 @@
     <component id="o9gho1" name="ProgressBar3.xml" path="/components/"/>
     <image id="9jv6o2" name="3Second.png" path="/imagesNew/"/>
     <component id="fqoro3" name="ComResultProMask.xml" path="/components/"/>
+    <component id="mbf1o4" name="Button4.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
-  <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="1"/>
+  <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">
       <relation target="" sidePair="left-right"/>
     </image>
     <text id="n19_nd17" name="LeftTime" xy="59,240" size="172,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="9天1时5分"/>
-    <image id="n16_nd17" name="n16" src="o9gh4b" fileName="imagesNew/lm_tb_tishi.png" pkg="eg2y0ldp" xy="246,233" size="61,61"/>
+    <component id="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">
       <relation target="" sidePair="left-left"/>
       <ProgressBar value="50" max="100"/>

FGUIProject/assets/Task/BuyBattlePassLevelUI.xml

@@ -8,7 +8,7 @@
     <image id="n3_or80" name="n3" src="uxxstms" fileName="images/lm_biaotizi_13.png" xy="248,83"/>
     <text id="n4_or80" name="n4" xy="186,130" size="228,39" fontSize="28" color="#b79f7d" text="立即获得以下奖励"/>
     <image id="n5_or80" name="n5" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="148,488"/>
-    <list id="n6_or80" name="Rewards" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://eg2y0ldpnd1743" autoClearItems="true">
+    <list id="n6_or80" name="Rewards" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://eg2y0ldp9jv6tls" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Task/CombTaskUI.xml

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

FGUIProject/assets/Task/OpenBattlePassUI.xml

@@ -8,7 +8,7 @@
     <image id="n3_or80" name="n3" src="uxxstmv" fileName="images/lm_biaotizi_12.png" xy="248,83"/>
     <text id="n4_or80" name="n4" xy="186,130" size="228,39" fontSize="28" color="#b79f7d" text="解锁特别制造奖励"/>
     <image id="n5_or80" name="n5" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="148,488"/>
-    <list id="n6_or80" name="Rewards" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://eg2y0ldpnd1743" autoClearItems="true">
+    <list id="n6_or80" name="Rewards" xy="183,173" size="724,309" layout="flow_hz" overflow="scroll" lineGap="4" colGap="26" defaultItem="ui://eg2y0ldp9jv6tls" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Task/components/BattlePassReward.xml

@@ -8,10 +8,10 @@
   </controller>
   <controller name="c2" pages="0,能前往,1,不能前往" selected="0"/>
   <displayList>
-    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="9,10" pkg="eg2y0ldp"/>
-    <component id="n7_nd17" name="NormalReward" src="nd1742" fileName="components/RewardIconBlue.xml" xy="203,11"/>
+    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="imagesNew/txz_lvl_db.png" pkg="eg2y0ldp" xy="9,10"/>
+    <component id="n7_nd17" name="NormalReward" src="mdmdtn5" fileName="components/ComItemBlue.xml" pkg="eg2y0ldp" xy="203,11"/>
     <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
-    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldpnd1743" align="center" vAlign="middle">
+    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
       <item/>
       <item/>
     </list>

FGUIProject/assets/Task/components/BattlePassRewardItem.xml

@@ -8,8 +8,8 @@
   </controller>
   <controller name="c2" pages="0,能前往,1,不能前往" selected="0"/>
   <displayList>
-    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="images/txz_lvl_db.png" xy="9,10" pkg="eg2y0ldp"/>
-    <component id="n7_nd17" name="NormalReward" src="nd1742" fileName="components/RewardIconBlue.xml" xy="203,11"/>
+    <image id="n6_nd17" name="n6" src="uxxstm7" fileName="imagesNew/txz_lvl_db.png" pkg="eg2y0ldp" xy="9,10"/>
+    <component id="n7_nd17" name="NormalReward" src="mdmdtn5" fileName="components/ComItemBlue.xml" pkg="eg2y0ldp" xy="203,11"/>
     <component id="n12_nd17" name="ComeBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay2 controller="c2" pages="0" condition="0"/>
@@ -23,12 +23,12 @@
       <gearDisplay controller="c1" pages="2"/>
       <Button title=" 已领取" icon="ui://eg2y0ldpo9gh4l"/>
     </component>
-    <component id="n11_nd17" name="ContinueBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
+    <component id="n11_nd17" name="ContinueBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="204,63">
       <gearDisplay controller="c1" pages="3"/>
       <Button title="继续领取" icon="ui://eg2y0ldpo9gh4k"/>
     </component>
     <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
-    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldpnd1743" align="center" vAlign="middle">
+    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
       <item/>
       <item/>
     </list>

FGUIProject/assets/Task/components/RewardIconBlue.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="123,123">
-  <controller name="c1" pages="0,NotGet,1,Get" selected="0"/>
-  <displayList>
-    <image id="n0_nd17" name="n0" src="uxxstma" fileName="images/wpk_db_2.png" xy="0,0"/>
-    <loader id="n3_vixc" name="loaIcon" xy="64,60" pivot="0.5,0.5" anchor="true" size="74,74" aspect="true" url="ui://xz8kxrecng0i27" fill="scaleFree"/>
-    <image id="n1_nd17" name="n1" src="uxxstm5" fileName="images/wpk_sz_db2.png" xy="5,85"/>
-    <text id="n2_nd17" name="num" xy="0,78" size="123,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" autoSize="none" text="120"/>
-    <image id="n4_itts" name="n4" src="uxxstn3" fileName="images/txz_tb_ylq.png" xy="71,-1" pkg="eg2y0ldp">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-  </displayList>
-</component>

FGUIProject/assets/Task/package.xml

@@ -6,7 +6,6 @@
     <component id="nd173r" name="BattlePassRewardUI.xml" path="/" exported="true"/>
     <component id="nd173t" name="ExpProcess2.xml" path="/components/"/>
     <component id="nd173u" name="BattlePassRewardItem.xml" path="/components/"/>
-    <component id="nd1742" name="RewardIconBlue.xml" path="/components/"/>
     <component id="nd1745" name="ButtonOpenBattlePass.xml" path="/components/"/>
     <component id="ids449" name="LivenessRewardProcess.xml" path="/components/"/>
     <component id="ids44e" name="TabButton.xml" path="/components/"/>
@@ -16,11 +15,9 @@
     <component id="or80tm1" name="BuyBattlePassLevelUI.xml" path="/" exported="true"/>
     <image id="uxxstm3" name="bt_db_ptzz.png" path="/images/"/>
     <image id="uxxstm4" name="wz_kqjlzz.png" path="/images/"/>
-    <image id="uxxstm5" name="wpk_sz_db2.png" path="/images/"/>
     <image id="uxxstm6" name="an_jia.png" path="/images/"/>
     <image id="uxxstm8" name="yeqian_db.png" path="/images/"/>
     <image id="uxxstm9" name="db_jiajian.png" path="/images/"/>
-    <image id="uxxstma" name="wpk_db_2.png" path="/images/"/>
     <image id="uxxstmc" name="txz_jlzz_db_jlzz.png" path="/images/"/>
     <image id="uxxstmd" name="jyt_pink.png" path="/images/"/>
     <image id="uxxstme" name="txz_nr_db.png" path="/images/"/>

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -120,8 +120,9 @@ namespace GFGGame
         public const string OTHER_ROLE_INFO_CHANGE = "OTHER_ROLE_INFO_CHANGE"; //���������Ϣ�仯
         public const string NOTICE_CHAT_MESSAGE = "NOTICE_CHAT_MESSAGE"; //֪ͨ������Ϣ
         public const string ACTIVE_SKILL = "ACTIVE_SKILL"; //���ܼ���
-        
+
         public const string CONTINUOUS_REBATE_GIFT = "CONTINUOUS_REBATE_GIFT";//领取连续返利礼包
         public const string CONTINUOUS_REBATE_GIFT_SHOP_BUY = "CONTINUOUS_REBATE_GIFT_SHOP_BUY";
+        public const string ACTIVITY_LUCKY_BOX = "ACTIVITY_LUCKY_BOX";//通知限时抽奖活动剩余次数
     }
 }

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -177,6 +177,7 @@ namespace GFGGame
             TravelDataManager.Instance.Clear();
             ArenaDataManager.Instance.Clear();
             ChatDataManager.Instance.Clear();
+            ActivityDataManager.Instance.Clear();
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();
@@ -239,6 +240,7 @@ namespace GFGGame
             MainStorySProxy.GetStoryInfos().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
             TaskSProxy.GetTaskInfos();
+            BattlePassTaskSProxy.GetBattlePassInfo().Coroutine();
             // RechargeSProxy.ReqRechargeInfo().Coroutine();
             // RechargeSProxy.ReqExchangeInfo().Coroutine();
             DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();

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

@@ -4,6 +4,52 @@ namespace GFGGame
 {
     public class ActivityDataManager : SingletonBase<ActivityDataManager>
     {
+        public void Clear()
+        {
+            luckyBoxActBonusState.Clear();
+        }
+
+        /**********************************************************活动*************************************************/
+        /// <summary>
+        /// 获取指定类型活动当前开启的活动id
+        /// </summary>
+        /// <returns></returns>
+        public int GetCurOpenActiveByType(int type)
+        {
+            List<ActivityOpenCfg> activityOpenCfgs = ActivityOpenCfgArray.Instance.GetCfgsBytype(type);
+            for (int i = 0; i < activityOpenCfgs.Count; i++)
+            {
+                if (TimeUtil.IsBeforeCurTime(activityOpenCfgs[i].openTime) && TimeUtil.IsLaterCurTime(activityOpenCfgs[i].endTime))
+                {
+                    return activityOpenCfgs[i].id;
+                }
+            }
+            return 0;
+        }
+
+        /**********************************************************限时抽奖活动*********************************************/
+        /// <summary>
+        /// 当前抽奖活动id
+        /// </summary>
+        /// <value></value>
+        public int activityId { get; set; }
+        /// <summary>
+        /// 抽奖总次数
+        /// </summary>
+        /// <value></value>
+        public long allPlayTimes { get; set; }
+        /// <summary>
+        /// 限时抽奖必掉次数
+        /// </summary>
+        /// <value></value>
+        public int lastCount { get; set; }
+        /// <summary>
+        /// </summary>
+        /// <typeparam name="int">奖励key，这里对应抽奖次数</typeparam>
+        /// <typeparam name="int">值由ConstBonusStatus定义</typeparam>
+        /// <returns></returns>
+        public Dictionary<int, int> luckyBoxActBonusState = new Dictionary<int, int>();
+
 
         /**********************************************************每日登录*************************************************/
         private int _sevenDayLoginLoginId = 1;

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

@@ -0,0 +1,12 @@
+using ET;
+
+namespace GFGGame
+{
+    public class ActivityDay7DataManager : SingletonBase<ActivityDay7DataManager>
+    {
+        public int GetActivityDay7Day()
+        {
+            return GameGlobal.myNumericComponent.GetAsInt(NumericType.Day7Activity);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Data/ActivityDay7DataManager.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 25cb38549cc4495eb8a8992d9d955477
+timeCreated: 1685517339

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

@@ -23,7 +23,7 @@ namespace GFGGame
         private HashSet<int> SuperRewards = new HashSet<int>();
 
         //所有特别奖励
-        private List<KeyValuePair<int, long>> tempItems = new List<KeyValuePair<int, long>>();
+        private List<KeyValuePair<int, int>> tempItems = new List<KeyValuePair<int, int>>();
 
         public int GetSeasonId()
         {
@@ -124,7 +124,7 @@ namespace GFGGame
         }
 
         //获取所有特别奖励
-        public List<KeyValuePair<int, long>> GetAllSpecialCfg()
+        public List<KeyValuePair<int, int>> GetAllSpecialCfg()
         {
             return tempItems;
         }
@@ -133,7 +133,7 @@ namespace GFGGame
         {
             tempItems.Clear();
             var battlePassCfgs = BattlePassCfgArray.Instance.GetCfgsByid(GetSeasonId());
-            var items = new Dictionary<int, long>();
+            var items = new Dictionary<int, int>();
             foreach (var itemsInfo in battlePassCfgs.SelectMany(battlePassCfg => battlePassCfg.bonusSpecialArr))
             {
                 items.TryGetValue(itemsInfo[0], out var num);

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

@@ -245,8 +245,8 @@ namespace GFGGame
                     endTime = TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1, GlobalCfgArray.globalCfg.galleryClearingEndTime);
                 }
             }
-            string strStartTime = TimeUtil.FormattingTime3(startTime);
-            string strEndTime = TimeUtil.FormattingTime3(endTime); ;
+            string strStartTime = TimeUtil.FormattingTimeTo_MMdd(startTime);
+            string strEndTime = TimeUtil.FormattingTimeTo_MMdd(endTime); ;
             return string.Format("{0}至{1}", strStartTime, strEndTime);
         }
 

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjUI.cs

@@ -49,7 +49,7 @@ namespace GFGGame
                 dressUpObj = null;
             }
 
-            if(wrapper != null)
+            if (wrapper != null)
             {
                 wrapper.Dispose();
                 wrapper = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 97fa65719da81b041b600670723539d3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxBonusUI.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityThemeLuckyBox
+{
+    public partial class UI_ActivityThemeLuckyBoxBonusUI
+    {
+        public GComponent target;
+        public GComponent m_comBg;
+        public GList m_list;
+        public const string URL = "ui://ubfk2kobmbf16";
+        public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
+        public const string RES_NAME = "ActivityThemeLuckyBoxBonusUI";
+        private static UI_ActivityThemeLuckyBoxBonusUI _proxy;
+
+        public static UI_ActivityThemeLuckyBoxBonusUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityThemeLuckyBoxBonusUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ActivityThemeLuckyBoxBonusUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityThemeLuckyBoxBonusUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_comBg = (GComponent)comp.GetChild("comBg");
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comBg = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox_1.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxBonusUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c91e6fc8242bedc4eb4a77673cea57ad
+guid: d1920705c5c70f9458a8944f113b5507
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconYellow.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.cs

@@ -2,22 +2,21 @@
 
 using FairyGUI;
 
-namespace UI.Task
+namespace UI.ActivityThemeLuckyBox
 {
-    public partial class UI_RewardIconYellow
+    public partial class UI_ActivityThemeLuckyBoxTaskUI
     {
         public GComponent target;
-        public Controller m_c1;
-        public GLoader m_loaIcon;
-        public GTextField m_num;
-        public const string URL = "ui://5mpsibzznd1743";
-        public const string PACKAGE_NAME = "Task";
-        public const string RES_NAME = "RewardIconYellow";
-        private static UI_RewardIconYellow _proxy;
+        public GComponent m_comBg;
+        public GList m_list;
+        public const string URL = "ui://ubfk2kobmbf1d";
+        public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
+        public const string RES_NAME = "ActivityThemeLuckyBoxTaskUI";
+        private static UI_ActivityThemeLuckyBoxTaskUI _proxy;
 
-        public static UI_RewardIconYellow Create(GObject gObject = null)
+        public static UI_ActivityThemeLuckyBoxTaskUI Create(GObject gObject = null)
         {
-            var ui = new UI_RewardIconYellow();
+            var ui = new UI_ActivityThemeLuckyBoxTaskUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +25,11 @@ namespace UI.Task
             return ui;
         }
 
-        public static UI_RewardIconYellow Proxy(GObject gObject = null)
+        public static UI_ActivityThemeLuckyBoxTaskUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_RewardIconYellow();
+                _proxy = new UI_ActivityThemeLuckyBoxTaskUI();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,15 +56,13 @@ namespace UI.Task
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_num = (GTextField)comp.GetChild("num");
+            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_loaIcon = null;
-            m_num = null;
+            m_comBg = null;
+            m_list = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconBlue.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cc2c40ade55094709b2e9bf36d0e73f6
+guid: 6bb29bf3134461e4f8b83f4e0e76d0a1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityThemeLuckyBox
+{
+    public partial class UI_ActivityThemeLuckyBoxUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GButton m_btnTask;
+        public GButton m_btnShop;
+        public GTextField m_txtTime;
+        public GButton m_btnLuckyBox;
+        public const string URL = "ui://ubfk2kobmbf1k";
+        public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
+        public const string RES_NAME = "ActivityThemeLuckyBoxUI";
+        private static UI_ActivityThemeLuckyBoxUI _proxy;
+
+        public static UI_ActivityThemeLuckyBoxUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityThemeLuckyBoxUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ActivityThemeLuckyBoxUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityThemeLuckyBoxUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnTask = (GButton)comp.GetChild("btnTask");
+            m_btnShop = (GButton)comp.GetChild("btnShop");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnLuckyBox = (GButton)comp.GetChild("btnLuckyBox");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_btnTask = null;
+            m_btnShop = null;
+            m_txtTime = null;
+            m_btnLuckyBox = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconYellow.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 72132a2f53f5a427d9997b4e92566a14
+guid: 93d658c2c4c8a4847add9155a72f7b5a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ListTaskItem.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityThemeLuckyBox
+{
+    public partial class UI_ListTaskItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GList m_lsitRewards;
+        public GTextField m_txtTitle;
+        public GButton m_btnGetNone;
+        public GButton m_btnGet;
+        public GButton m_btnGot;
+        public GButton m_btnGo;
+        public const string URL = "ui://ubfk2kobmbf19";
+        public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
+        public const string RES_NAME = "ListTaskItem";
+        private static UI_ListTaskItem _proxy;
+
+        public static UI_ListTaskItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListTaskItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListTaskItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListTaskItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_c1 = comp.GetController("c1");
+            m_lsitRewards = (GList)comp.GetChild("lsitRewards");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_btnGetNone = (GButton)comp.GetChild("btnGetNone");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_btnGot = (GButton)comp.GetChild("btnGot");
+            m_btnGo = (GButton)comp.GetChild("btnGo");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_lsitRewards = null;
+            m_txtTitle = null;
+            m_btnGetNone = null;
+            m_btnGet = null;
+            m_btnGot = null;
+            m_btnGo = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskListItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ListTaskItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8738dbc55acf3418c8a76d66c77c227f
+guid: a760567c6036cbf49b9c0dacad857c9d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_RewardIconBlue.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs

@@ -2,22 +2,21 @@
 
 using FairyGUI;
 
-namespace UI.Task
+namespace UI.CommonGame
 {
-    public partial class UI_RewardIconBlue
+    public partial class UI_ComBg001
     {
         public GComponent target;
-        public Controller m_c1;
-        public GLoader m_loaIcon;
-        public GTextField m_num;
-        public const string URL = "ui://5mpsibzznd1742";
-        public const string PACKAGE_NAME = "Task";
-        public const string RES_NAME = "RewardIconBlue";
-        private static UI_RewardIconBlue _proxy;
+        public GButton m_btnClose;
+        public GLoader m_loaTitle;
+        public const string URL = "ui://eg2y0ldpmbf1tn5";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComBg001";
+        private static UI_ComBg001 _proxy;
 
-        public static UI_RewardIconBlue Create(GObject gObject = null)
+        public static UI_ComBg001 Create(GObject gObject = null)
         {
-            var ui = new UI_RewardIconBlue();
+            var ui = new UI_ComBg001();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +25,11 @@ namespace UI.Task
             return ui;
         }
 
-        public static UI_RewardIconBlue Proxy(GObject gObject = null)
+        public static UI_ComBg001 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_RewardIconBlue();
+                _proxy = new UI_ComBg001();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,15 +56,13 @@ namespace UI.Task
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_num = (GTextField)comp.GetChild("num");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_loaIcon = null;
-            m_num = null;
+            m_btnClose = null;
+            m_loaTitle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskListItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs

@@ -2,27 +2,22 @@
 
 using FairyGUI;
 
-namespace UI.Task
+namespace UI.CommonGame
 {
-    public partial class UI_TaskListItem
+    public partial class UI_ComItemBlue
     {
         public GComponent target;
-        public Controller m_c1;
-        public Controller m_c2;
-        public GTextField m_txtDesc;
+        public UI_ComItemIconNew m_comItemIcon;
         public GTextField m_txtCount;
-        public GList m_listTaskReward;
-        public GButton m_GetRewardBt;
-        public GButton m_ComeBt;
-        public GButton m_HadGet;
-        public const string URL = "ui://5mpsibzzlh8v5";
-        public const string PACKAGE_NAME = "Task";
-        public const string RES_NAME = "TaskListItem";
-        private static UI_TaskListItem _proxy;
+        public GTextField m_txtName;
+        public const string URL = "ui://eg2y0ldpmdmdtn5";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComItemBlue";
+        private static UI_ComItemBlue _proxy;
 
-        public static UI_TaskListItem Create(GObject gObject = null)
+        public static UI_ComItemBlue Create(GObject gObject = null)
         {
-            var ui = new UI_TaskListItem();
+            var ui = new UI_ComItemBlue();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -31,11 +26,11 @@ namespace UI.Task
             return ui;
         }
 
-        public static UI_TaskListItem Proxy(GObject gObject = null)
+        public static UI_ComItemBlue Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_TaskListItem();
+                _proxy = new UI_ComItemBlue();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -62,25 +57,16 @@ namespace UI.Task
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_c2 = comp.GetController("c2");
-            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_comItemIcon = (UI_ComItemIconNew)UI_ComItemIconNew.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_listTaskReward = (GList)comp.GetChild("listTaskReward");
-            m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
-            m_ComeBt = (GButton)comp.GetChild("ComeBt");
-            m_HadGet = (GButton)comp.GetChild("HadGet");
+            m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_c2 = null;
-            m_txtDesc = null;
+            m_comItemIcon.Dispose();
+            m_comItemIcon = null;
             m_txtCount = null;
-            m_listTaskReward = null;
-            m_GetRewardBt = null;
-            m_ComeBt = null;
-            m_HadGet = null;
+            m_txtName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew.cs

@@ -7,9 +7,11 @@ namespace UI.CommonGame
     public partial class UI_ComItemIconNew
     {
         public GComponent target;
+        public GLoader m_bg;
         public GLoader m_loaIcon;
         public GTextField m_txtHasCount;
         public GLoader m_loaRarity;
+        public GLoader m_numBg;
         public GImage m_imgHas;
         public GImage m_imgNotHas;
         public GImage m_imgShowTong;
@@ -61,9 +63,11 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_bg = (GLoader)comp.GetChild("bg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_numBg = (GLoader)comp.GetChild("numBg");
             m_imgHas = (GImage)comp.GetChild("imgHas");
             m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
             m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
@@ -71,9 +75,11 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
             m_loaIcon = null;
             m_txtHasCount = null;
             m_loaRarity = null;
+            m_numBg = null;
             m_imgHas = null;
             m_imgNotHas = null;
             m_imgShowTong = null;

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

@@ -4,10 +4,10 @@ using FairyGUI;
 
 namespace UI.LuckyBox
 {
-    public partial class UI_ComBox_1
+    public partial class UI_ComBox
     {
         public GComponent target;
-        public GLoader m_loaBg;
+        public UI_ComModel m_comModel;
         public UI_Button3 m_btnPreview;
         public UI_Button3 m_btnExchange;
         public GTextField m_txtOwned;
@@ -22,12 +22,12 @@ namespace UI.LuckyBox
         public GTextField m_txtRemainTimes;
         public const string URL = "ui://drx9d1usnjmn2p";
         public const string PACKAGE_NAME = "LuckyBox";
-        public const string RES_NAME = "ComBox_1";
-        private static UI_ComBox_1 _proxy;
+        public const string RES_NAME = "ComBox";
+        private static UI_ComBox _proxy;
 
-        public static UI_ComBox_1 Create(GObject gObject = null)
+        public static UI_ComBox Create(GObject gObject = null)
         {
-            var ui = new UI_ComBox_1();
+            var ui = new UI_ComBox();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -36,11 +36,11 @@ namespace UI.LuckyBox
             return ui;
         }
 
-        public static UI_ComBox_1 Proxy(GObject gObject = null)
+        public static UI_ComBox Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComBox_1();
+                _proxy = new UI_ComBox();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -67,7 +67,7 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
             m_btnExchange = (UI_Button3)UI_Button3.Create(comp.GetChild("btnExchange"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
@@ -83,7 +83,8 @@ namespace UI.LuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
+            m_comModel.Dispose();
+            m_comModel = null;
             m_btnPreview.Dispose();
             m_btnPreview = null;
             m_btnExchange.Dispose();

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

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

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

@@ -7,7 +7,7 @@ namespace UI.LuckyBox
     public partial class UI_ComBox_2
     {
         public GComponent target;
-        public GLoader m_loaBg;
+        public UI_ComModel m_comModel;
         public UI_Button3 m_btnPreview;
         public UI_Button3 m_btnExchange;
         public GTextField m_txtOwned;
@@ -64,7 +64,7 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
             m_btnExchange = (UI_Button3)UI_Button3.Create(comp.GetChild("btnExchange"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
@@ -77,7 +77,8 @@ namespace UI.LuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
+            m_comModel.Dispose();
+            m_comModel = null;
             m_btnPreview.Dispose();
             m_btnPreview = null;
             m_btnExchange.Dispose();

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

@@ -7,7 +7,7 @@ namespace UI.LuckyBox
     public partial class UI_ComBox_3
     {
         public GComponent target;
-        public GLoader m_loaBg;
+        public UI_ComModel m_comModel;
         public GLoader m_loaImg;
         public UI_Button3 m_btnPreview;
         public UI_Button3 m_btnExchange;
@@ -64,7 +64,7 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
             m_loaImg = (GLoader)comp.GetChild("loaImg");
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
             m_btnExchange = (UI_Button3)UI_Button3.Create(comp.GetChild("btnExchange"));
@@ -77,7 +77,8 @@ namespace UI.LuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaBg = null;
+            m_comModel.Dispose();
+            m_comModel = null;
             m_loaImg = null;
             m_btnPreview.Dispose();
             m_btnPreview = null;

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

@@ -0,0 +1,105 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_ComBox_4
+    {
+        public GComponent target;
+        public UI_ComModel m_comModel;
+        public UI_Button3 m_btnPreview;
+        public UI_Button3 m_btnExchange;
+        public GTextField m_txtOwned;
+        public GTextField m_txtTime;
+        public UI_ComCost m_comCostOne;
+        public UI_ComCost m_comCostTen;
+        public UI_Button1 m_btnBuyOne;
+        public UI_Button2 m_btnBuyTen;
+        public GTextField m_txtRemainTimes;
+        public const string URL = "ui://drx9d1usmbf1tae";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "ComBox_4";
+        private static UI_ComBox_4 _proxy;
+
+        public static UI_ComBox_4 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComBox_4();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComBox_4 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComBox_4();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
+            m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
+            m_btnExchange = (UI_Button3)UI_Button3.Create(comp.GetChild("btnExchange"));
+            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            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"));
+            m_btnBuyTen = (UI_Button2)UI_Button2.Create(comp.GetChild("btnBuyTen"));
+            m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comModel.Dispose();
+            m_comModel = null;
+            m_btnPreview.Dispose();
+            m_btnPreview = null;
+            m_btnExchange.Dispose();
+            m_btnExchange = null;
+            m_txtOwned = null;
+            m_txtTime = null;
+            m_comCostOne.Dispose();
+            m_comCostOne = null;
+            m_comCostTen.Dispose();
+            m_comCostTen = null;
+            m_btnBuyOne.Dispose();
+            m_btnBuyOne = null;
+            m_btnBuyTen.Dispose();
+            m_btnBuyTen = null;
+            m_txtRemainTimes = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox_4.cs.meta

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

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_ComModel
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GGraph m_holder;
+        public const string URL = "ui://drx9d1usmbf1tah";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "ComModel";
+        private static UI_ComModel _proxy;
+
+        public static UI_ComModel Create(GObject gObject = null)
+        {
+            var ui = new UI_ComModel();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComModel Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComModel();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComModel.cs.meta

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

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

@@ -0,0 +1,96 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_LuckyBoxActivityUI
+    {
+        public GComponent target;
+        public UI_ComBox_4 m_comBox;
+        public GButton m_btnBack;
+        public GComponent m_valueBar;
+        public GTextField m_txtTime;
+        public GButton m_btnReward;
+        public GButton m_btnShop;
+        public GButton m_btnGiftBag;
+        public GTextField m_txtGiftBagTime;
+        public GTextField m_txtCount;
+        public const string URL = "ui://drx9d1usmbf1tad";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "LuckyBoxActivityUI";
+        private static UI_LuckyBoxActivityUI _proxy;
+
+        public static UI_LuckyBoxActivityUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LuckyBoxActivityUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_LuckyBoxActivityUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LuckyBoxActivityUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_comBox = (UI_ComBox_4)UI_ComBox_4.Create(comp.GetChild("comBox"));
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnShop = (GButton)comp.GetChild("btnShop");
+            m_btnGiftBag = (GButton)comp.GetChild("btnGiftBag");
+            m_txtGiftBagTime = (GTextField)comp.GetChild("txtGiftBagTime");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comBox.Dispose();
+            m_comBox = null;
+            m_btnBack = null;
+            m_valueBar = null;
+            m_txtTime = null;
+            m_btnReward = null;
+            m_btnShop = null;
+            m_btnGiftBag = null;
+            m_txtGiftBagTime = null;
+            m_txtCount = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -7,6 +7,7 @@ namespace UI.LuckyBox
     public partial class UI_LuckyBoxUI
     {
         public GComponent target;
+        public GLoader m_loaBg;
         public GList m_listBg;
         public GComponent m_valueBar;
         public GButton m_btnBack;
@@ -61,6 +62,7 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_listBg = (GList)comp.GetChild("listBg");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
@@ -71,6 +73,7 @@ namespace UI.LuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBg = null;
             m_listBg = null;
             m_valueBar = null;
             m_btnBack = null;

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_Button4
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public const string URL = "ui://mfvz4q8kmbf1o4";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "Button4";
+        private static UI_Button4 _proxy;
+
+        public static UI_Button4 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button4();
+            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_Button4 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button4();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -11,6 +11,7 @@ namespace UI.Main
         public UI_ComponentHeadBar m_headBar;
         public UI_Button2 m_btnDailyLogin;
         public UI_Button2 m_btnDailyWelfare;
+        public UI_Button4 m_btnActivityLuckyBox;
         public UI_ButtonModle1 m_btnMain;
         public UI_ButtonModle1 m_btnHuanZhuang;
         public UI_ButtonModle1 m_btnXiuFang;
@@ -86,6 +87,7 @@ namespace UI.Main
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_btnDailyLogin = (UI_Button2)UI_Button2.Create(comp.GetChild("btnDailyLogin"));
             m_btnDailyWelfare = (UI_Button2)UI_Button2.Create(comp.GetChild("btnDailyWelfare"));
+            m_btnActivityLuckyBox = (UI_Button4)UI_Button4.Create(comp.GetChild("btnActivityLuckyBox"));
             m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
             m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
@@ -120,6 +122,8 @@ namespace UI.Main
             m_btnDailyLogin = null;
             m_btnDailyWelfare.Dispose();
             m_btnDailyWelfare = null;
+            m_btnActivityLuckyBox.Dispose();
+            m_btnActivityLuckyBox = null;
             m_btnMain.Dispose();
             m_btnMain = null;
             m_btnHuanZhuang.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassReward.cs

@@ -9,7 +9,7 @@ namespace UI.Task
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
-        public UI_RewardIconBlue m_NormalReward;
+        public GComponent m_NormalReward;
         public GTextField m_Level;
         public GList m_RewardList;
         public const string URL = "ui://5mpsibzzor80tlw";
@@ -61,7 +61,7 @@ namespace UI.Task
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
-            m_NormalReward = (UI_RewardIconBlue)UI_RewardIconBlue.Create(comp.GetChild("NormalReward"));
+            m_NormalReward = (GComponent)comp.GetChild("NormalReward");
             m_Level = (GTextField)comp.GetChild("Level");
             m_RewardList = (GList)comp.GetChild("RewardList");
         }
@@ -69,7 +69,6 @@ namespace UI.Task
         {
             m_c1 = null;
             m_c2 = null;
-            m_NormalReward.Dispose();
             m_NormalReward = null;
             m_Level = null;
             m_RewardList = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardItem.cs

@@ -9,7 +9,7 @@ namespace UI.Task
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
-        public UI_RewardIconBlue m_NormalReward;
+        public GComponent m_NormalReward;
         public GButton m_ComeBt;
         public GButton m_GetRewardBt;
         public GButton m_HadGet;
@@ -65,7 +65,7 @@ namespace UI.Task
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
-            m_NormalReward = (UI_RewardIconBlue)UI_RewardIconBlue.Create(comp.GetChild("NormalReward"));
+            m_NormalReward = (GComponent)comp.GetChild("NormalReward");
             m_ComeBt = (GButton)comp.GetChild("ComeBt");
             m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
             m_HadGet = (GButton)comp.GetChild("HadGet");
@@ -77,7 +77,6 @@ namespace UI.Task
         {
             m_c1 = null;
             m_c2 = null;
-            m_NormalReward.Dispose();
             m_NormalReward = null;
             m_ComeBt = null;
             m_GetRewardBt = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardUI.cs

@@ -9,6 +9,7 @@ namespace UI.Task
         public GComponent target;
         public Controller m_c1;
         public GTextField m_LeftTime;
+        public GButton m_tip;
         public UI_ExpProcess m_LevelProcess;
         public GButton m_btnBuyLevel;
         public GButton m_btnOpen;
@@ -64,6 +65,7 @@ namespace UI.Task
         {
             m_c1 = comp.GetController("c1");
             m_LeftTime = (GTextField)comp.GetChild("LeftTime");
+            m_tip = (GButton)comp.GetChild("tip");
             m_LevelProcess = (UI_ExpProcess)UI_ExpProcess.Create(comp.GetChild("LevelProcess"));
             m_btnBuyLevel = (GButton)comp.GetChild("btnBuyLevel");
             m_btnOpen = (GButton)comp.GetChild("btnOpen");
@@ -75,6 +77,7 @@ namespace UI.Task
         {
             m_c1 = null;
             m_LeftTime = null;
+            m_tip = null;
             m_LevelProcess.Dispose();
             m_LevelProcess = null;
             m_btnBuyLevel = null;

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -5,6 +5,17 @@ using GFGGame;
 
 namespace GFGGame
 {
+
+    public class NoticeTimeLimitLuckyBoxDropOutCount : AMHandler<S2C_NoticeTimeLimitLuckyBoxDropOutCount>
+    {
+        protected override async ETTask Run(Session session, S2C_NoticeTimeLimitLuckyBoxDropOutCount message)
+        {
+            ActivityDataManager.Instance.lastCount = message.Count;
+            EventAgent.DispatchEvent(ConstMessage.ACTIVITY_LUCKY_BOX);
+            await ETTask.CompletedTask;
+        }
+    }
+
     /**********************************************************七日登录*************************************************/
     public static class ActivitySProxy
     {
@@ -60,6 +71,62 @@ namespace GFGGame
             }
             return false;
         }
+        /*************************************************************限时抽奖活动*****************************************************/
+
+        //请求限时抽奖活动信息
+        public static async ETTask<bool> ReqGetTimeLimitLuckyBoxInfo(int activityId)
+        {
+            S2C_GetTimeLimitLuckyBoxInfo response = null;
+            response = (S2C_GetTimeLimitLuckyBoxInfo)await MessageHelper.SendToServer(new C2S_GetTimeLimitLuckyBoxInfo() { ActivityId = activityId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    if (ActivityDataManager.Instance.activityId != response.ActivityId)
+                    {
+                        ActivityDataManager.Instance.luckyBoxActBonusState.Clear();
+                    }
+                    ActivityDataManager.Instance.activityId = response.ActivityId;
+                    ActivityDataManager.Instance.allPlayTimes = response.AllPlayTimes;
+                    ActivityDataManager.Instance.lastCount = response.Count;
+                    for (int i = 0; i < response.KsBonusState.Count; i++)
+                    {
+                        ActivityDataManager.Instance.luckyBoxActBonusState[response.KsBonusState[i]] = response.VsBonusState[i];
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 领取抽奖奖励
+        /// </summary>
+        /// <param name="activityId"></param>
+        /// <param name="bonusKey">奖励key，这里对应抽奖次数</param>
+        /// <returns></returns>
+        public static async ETTask<bool> ReqGetTimeLimitLuckyBoxBonus(int activityId, int bonusKey)
+        {
+            S2C_GetTimeLimitLuckyBoxBonus response = null;
+            response = (S2C_GetTimeLimitLuckyBoxBonus)await MessageHelper.SendToServer(new C2S_GetTimeLimitLuckyBoxBonus() { ActivityId = activityId, BonusKey = bonusKey });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    if (ActivityDataManager.Instance.activityId != response.ActivityId)
+                    {
+                        return false;
+                    }
+                    ActivityDataManager.Instance.luckyBoxActBonusState[response.BonusKey] = response.BonusStatus;
+
+                    int[][] bonus = ActivityLuckybonusCfgArray.Instance.GetCfgByidAndnum(response.ActivityId, response.BonusKey).bonusArr;
+                    BonusController.TryShowBonusList(bonus);
+
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }
 

GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs

@@ -106,7 +106,7 @@ namespace GFGGame
             return false;
         }
         //领取专属单品
-        public static async ETTask<bool> ReqGetMonthCardItem(int monthCardType)
+        public static async ETTask<bool> ReqGetMonthCardItem(int month)
         {
             S2C_GetMonthCardItem response = null;
             response = (S2C_GetMonthCardItem)await MessageHelper.SendToServer(new C2S_GetMonthCardItem());
@@ -114,6 +114,9 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    MonthlyCardClothesCfg clothesCfg = MonthlyCardClothesCfgArray.Instance.GetCfgByyearAndmonth(TimeUtil.GetCurYear(), month);
+                    List<ItemData> itemDatas = ItemUtil.CreateItemDataList(clothesCfg.clothesArr[0], clothesCfg.clothesArr[1]);
+                    BonusController.TryShowBonusList(itemDatas);
                     return true;
                 }
             }