Merge branch 'master' into yujie

* master:
  限时任务
  抽奖活动
  抽奖
  抽奖活动
  抽奖活动
  抽奖
  月卡单品领取

# Conflicts:
#	FGUIProject/assets/CommonGame/package.xml
#	GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
#	GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

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/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/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,18 +308,18 @@
     <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"/>
@@ -327,6 +327,11 @@
     <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>

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();

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 int 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/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/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.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_ActivityThemeLuckyBoxTaskUI
+    {
+        public GComponent target;
+        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_ActivityThemeLuckyBoxTaskUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityThemeLuckyBoxTaskUI();
+            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_ActivityThemeLuckyBoxTaskUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityThemeLuckyBoxTaskUI();
+            }
+            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/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.cs.meta

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

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/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs.meta

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

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/ActivityThemeLuckyBox/UI_ListTaskItem.cs.meta

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

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComBg001
+    {
+        public GComponent target;
+        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_ComBg001 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComBg001();
+            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_ComBg001 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComBg001();
+            }
+            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_btnClose = (GButton)comp.GetChild("btnClose");
+            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnClose = null;
+            m_loaTitle = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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/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/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

@@ -104,7 +104,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());
@@ -112,6 +112,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;
                 }
             }

GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs

@@ -38,7 +38,6 @@ namespace GFGGame
             int days = (int)Math.Ceiling((decimal)time / TimeUtil.SECOND_PER_DAY);
             return days;
         }
-
         /// <summary>
         /// 
         /// </summary>
@@ -74,27 +73,25 @@ namespace GFGGame
             str = "秒";
         }
 
-
         /// <summary>
-        /// 将时间戳转换成yyyy/m/d格式
+        /// 将时间戳转换成yyyy-mm-dd hh-mm-ss格式
         /// </summary>
         /// <param name="timeMsec">毫秒</param>
-        public static string FormattingTime(long timeMsec)
+        public static string FormattingTime1(long timeMsec)
         {
             DateTime date = TimeInfo.Instance.ToDateTime(timeMsec);
-            string str = date.ToString("yyyy/MM/dd ");
+            string str = date.ToString("yyyy-MM-dd HH:mm:ss");
 
             return str;
         }
-
         /// <summary>
-        /// 将时间戳转换成yyyy-mm-dd hh-mm-ss格式
+        /// 将时间戳转换成yyyy/MM/dd格式
         /// </summary>
         /// <param name="timeMsec">毫秒</param>
-        public static string FormattingTime1(long timeMsec)
+        public static string FormattingTimeTo_yyyMMdd0(long timeMsec)
         {
             DateTime date = TimeInfo.Instance.ToDateTime(timeMsec);
-            string str = date.ToString("yyyy-MM-dd HH:mm:ss");
+            string str = date.ToString("yyyy/MM/dd ");
 
             return str;
         }
@@ -103,7 +100,7 @@ namespace GFGGame
         /// 将时间戳转换成yyyy.MM.dd格式
         /// </summary>
         /// <param name="timeMSec">毫秒</param>
-        public static string FormattingTime2(long timeMSec)
+        public static string FormattingTimeTo_yyyMMdd1(long timeMSec)
         {
             DateTime date = TimeInfo.Instance.ToDateTime(timeMSec);
             string str = date.ToString("yyyy.MM.dd");
@@ -112,25 +109,25 @@ namespace GFGGame
         }
 
         /// <summary>
-        /// 将时间戳转换成MM/dd格式
+        /// 将时间戳转换成yyyy-MM-dd格式
         /// </summary>
-        /// <param name="timeSec"></param>
-        public static string FormattingTime3(long timeSec)
+        /// <param name="timeMsec"></param>
+        public static string FormattingTimeTo_yyyMMdd2(long timeMsec)
         {
-            DateTime date = TimeInfo.Instance.ToDateTime(timeSec);
-            string str = date.ToString("MM/dd");
+            DateTime date = TimeInfo.Instance.ToDateTime(timeMsec);
+            string str = date.ToString("yyyy-MM-dd ");
 
             return str;
         }
 
         /// <summary>
-        /// 将时间戳转换成yyyy/m/d格式
+        /// 将时间戳转换成MM/dd格式
         /// </summary>
-        /// <param name="timeMsec"></param>
-        public static string FormattingTime4(long timeMsec)
+        /// <param name="timeSec"></param>
+        public static string FormattingTimeTo_MMdd(long timeSec)
         {
-            DateTime date = TimeInfo.Instance.ToDateTime(timeMsec);
-            string str = date.ToString("yyyy-MM-dd ");
+            DateTime date = TimeInfo.Instance.ToDateTime(timeSec);
+            string str = date.ToString("MM/dd");
 
             return str;
         }
@@ -139,7 +136,7 @@ namespace GFGGame
         /// 输入一段时间（毫秒秒），将时间转换成HH:mm:ss格式
         /// </summary>
         /// <param name="timeMsec"></param>
-        public static string FormattingTime5(int timeMsec)
+        public static string FormattingTimeTo_HHmmss(int timeMsec)
         {
             TimeSpan ts = new TimeSpan(0, 0, timeMsec / 1000);
             string strH = ts.Hours.ToString().Length == 1 ? "0" + ts.Hours : ts.Hours.ToString();
@@ -147,26 +144,36 @@ namespace GFGGame
             string strS = ts.Seconds.ToString().Length == 1 ? "0" + ts.Seconds : ts.Seconds.ToString();
             return string.Format("{0}:{1}:{2}", strH, strM, strS);
         }
-
+        /// <summary>
+        /// 输入一段时间（毫秒），将时间转换成DD天HH小时mm分格式
+        /// </summary>
+        /// <param name="timeMsec"></param>
+        public static string FormattingTimeTo_DDHHmm(long timeMsec)
+        {
+            TimeSpan ts = new TimeSpan(0, 0, ((int)timeMsec / 1000));
+            string strD = ts.Days.ToString().Length == 1 ? "0" + ts.Days : ts.Days.ToString();
+            string strH = ts.Hours.ToString().Length == 1 ? "0" + ts.Hours : ts.Hours.ToString();
+            string strM = ts.Minutes.ToString().Length == 1 ? "0" + ts.Minutes : ts.Minutes.ToString();
+            return string.Format("{0}天{1}小时{2}分", strD, strH, strM);
+        }
         /// <summary>
         /// <summary>
         /// 将时间戳转换成HH:mm格式
         /// </summary>
         /// <param name="timeMsec">毫秒</param>
-        public static string FormattingTime6(long timeMsec)
+        public static string FormattingTimeTo_HHmm(long timeMsec)
         {
             DateTime date = TimeInfo.Instance.ToDateTime(timeMsec);
             string str = date.ToString("HH:mm");
 
             return str;
         }
-
         /// <summary>
         /// <summary>
         /// 将时间戳转换成mm:ss格式
         /// </summary>
         /// <param name="timeMsec">毫秒</param>
-        public static string FormattingTime7(long timeMsec)
+        public static string FormattingTimeTo_mmss(long timeMsec)
         {
             DateTime date = TimeInfo.Instance.ToDateTime(timeMsec);
             string str = date.ToString("mm:ss");
@@ -174,4 +181,4 @@ namespace GFGGame
             return str;
         }
     }
-}
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -0,0 +1,56 @@
+using ET;
+using FairyGUI;
+using UI.ActivityThemeLuckyBox;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ActivityThemeLuckyBoxTaskView : BaseWindow
+    {
+        private UI_ActivityThemeLuckyBoxTaskUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityThemeLuckyBoxTaskUI.PACKAGE_NAME;
+            _ui = UI_ActivityThemeLuckyBoxTaskUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -0,0 +1,89 @@
+
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.ActivityThemeLuckyBox;
+using UI.CommonGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ActivityThemeLuckyBoxView : BaseWindow
+    {
+        private UI_ActivityThemeLuckyBoxUI _ui;
+        private ActivityOpenCfg _activityCfg;
+        private LuckyBoxCfg _luckyBoxCfg;
+        private int _activityId;
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityThemeLuckyBoxUI.PACKAGE_NAME;
+            _ui = UI_ActivityThemeLuckyBoxUI.Create();
+            this.viewCom = _ui.target;
+            // this.modal = true;
+            // this.viewCom.Center();
+            isfullScreen = true;
+
+            // viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            _ui.m_btnTask.onClick.Add(OnBtnTaskClick);
+            _ui.m_btnLuckyBox.onClick.Add(OnBtnLuckyBoxClick);
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.LimitLuckyBox);
+            _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
+            _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res);
+            Timers.inst.Add(1, 0, UpdateTime);
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+            Timers.inst.Remove(UpdateTime);
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.GoBackFrom(typeof(ActivityThemeLuckyBoxView).FullName);
+        }
+
+        private void OnBtnTaskClick()
+        {
+
+        }
+        private void OnBtnLuckyBoxClick()
+        {
+            long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
+            long curTime = TimeHelper.ServerNow();
+            if (endTime < curTime) return;
+            ViewManager.Show<LuckyBoxActivityView>(_activityId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData }, true);
+        }
+        private void UpdateTime(object param = null)
+        {
+            long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
+            long curTime = TimeHelper.ServerNow();
+            if (endTime < curTime)
+            {
+                Timers.inst.Remove(UpdateTime);
+                return;
+            }
+            TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
+            _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -319,8 +319,8 @@ namespace GFGGame
             _ui.m_loaScore0.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[0]);
             _ui.m_loaScore1.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[1]);
             _ui.m_loaScore2.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[2]);
-            string openTime = TimeUtil.FormattingTime3(TimeUtil.DateTimeToTimestamp(_arenaCfg.openTime));
-            string endTime = TimeUtil.FormattingTime3(TimeUtil.DateTimeToTimestamp(_arenaCfg.endTime));
+            string openTime = TimeUtil.FormattingTimeTo_MMdd(TimeUtil.DateTimeToTimestamp(_arenaCfg.openTime));
+            string endTime = TimeUtil.FormattingTimeTo_MMdd(TimeUtil.DateTimeToTimestamp(_arenaCfg.endTime));
             _ui.m_txtTime.text = string.Format("赛季时间：{0}-{1}", openTime, endTime);
             _ui.m_txtName.text = RoleDataManager.roleName;
             _ui.m_txtRank.text = string.Format("段位排名：{0}", _dataManager.Rank);

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs

@@ -61,9 +61,10 @@ namespace GFGGame
             _ui.m_listMaterials.numItems = cfg.materialsArr.Length;
             long has = ItemDataManager.GetItemNum(cfg.costId);
             int need = cfg.costNum;
-            UI_ComCostCurrency comConsume = UI_ComCostCurrency.Proxy(_ui.m_ComConsume);
-            comConsume.m_txtNeed.text = need.ToString();
-            UI_ComCostCurrency.ProxyEnd();
+            // UI_ComCostCurrency comConsume = UI_ComCostCurrency.Proxy(_ui.m_ComConsume);
+            // comConsume.m_txtNeed.text = need.ToString();
+            // UI_ComCostCurrency.ProxyEnd();
+            ItemUtil.UpdateItemNeedNum(_ui.m_ComConsume, cfg.costId, cfg.costNum);
             if (_canFoster && has < need) _canFoster = false;
 
             _ui.m_listPropertyAdd.numItems = _propertyList.Count;

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

@@ -0,0 +1,84 @@
+using UI.LuckyBox;
+using FairyGUI;
+using ET;
+using System.Collections.Generic;
+using System;
+
+namespace GFGGame
+{
+    public class LuckyBoxController
+    {
+        private GComponent _com;
+        private UI_ComModel _comModel;
+        private DressUpObjUI _dressUpObjUI;
+        private LuckyBoxCfg _luckyBoxCfg;
+        private const int _turnTime = 3;
+        private int _curTime = _turnTime;
+        private int _bgIndex = 0;
+        private int _modelIndex = 0;
+
+        public LuckyBoxController(GComponent comModel)
+        {
+            _dressUpObjUI = new DressUpObjUI("SceneDressUp");
+            _com = comModel;
+        }
+
+        public void OnShown(int luckyBoxId)
+        {
+            _comModel = UI_ComModel.Proxy(_com);
+            _curTime = _turnTime;
+            _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId);
+            _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_bgIndex]);
+            if (_luckyBoxCfg.suitShowArr.Length > 0)
+            {
+                _dressUpObjUI.ResetSceneObj(100, false, false, null, false);
+                _dressUpObjUI.dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitShowArr[_modelIndex][0], true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
+                _dressUpObjUI.UpdateWrapper(_comModel.m_holder);
+            }
+            if (_luckyBoxCfg.resArr.Length > 1 || _luckyBoxCfg.suitShowArr.Length > 1)
+            {
+                Timers.inst.Remove(UpdateTime);
+                Timers.inst.Add(1, 0, UpdateTime);
+            }
+        }
+
+        private void UpdateTime(object param)
+        {
+            _curTime = _curTime - 1 == 0 ? _turnTime : _curTime - 1;
+            _bgIndex = _bgIndex + 1 == _luckyBoxCfg.resArr.Length ? 0 : _bgIndex + 1;
+            _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitShowArr.Length ? 0 : _modelIndex + 1;
+            if (_curTime == _turnTime)
+            {
+                if (_luckyBoxCfg.resArr.Length > 1)
+                {
+                    _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_bgIndex]);
+
+                }
+                if (_luckyBoxCfg.suitShowArr.Length > 0)
+                {
+                    _dressUpObjUI.ResetSceneObj(100, false, false, null, false);
+                    _dressUpObjUI.dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitShowArr[_modelIndex][0], true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
+                    _dressUpObjUI.UpdateWrapper(_comModel.m_holder);
+                }
+            }
+        }
+
+        public void OnHide()
+        {
+            UI_ComModel.ProxyEnd();
+            Timers.inst.Remove(UpdateTime);
+            _bgIndex = 0;
+            _modelIndex = 0;
+            _dressUpObjUI.ResetSceneObj(0, false, false, null, false);
+        }
+
+        public void Dispose()
+        {
+            if (_dressUpObjUI != null)
+            {
+                _dressUpObjUI.Dispose();
+                _dressUpObjUI = null;
+            }
+        }
+    }
+}

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

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

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

@@ -97,7 +97,7 @@ namespace GFGGame
 
             long openTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.openTime).ToString("HH:mm:ss"));
             long endTime = TimeUtil.GetCurDayTime(TimeUtil.GetDateTime(supplyCfg.endTime).ToString("HH:mm:ss"));
-            item.m_txtTime.text = TimeUtil.FormattingTime6(openTime) + "-" + TimeUtil.FormattingTime6(endTime);
+            item.m_txtTime.text = TimeUtil.FormattingTimeTo_HHmm(openTime) + "-" + TimeUtil.FormattingTimeTo_HHmm(endTime);
             item.m_txtCount.text = supplyCfg.bonusArr[0][1].ToString();
 
             ItemUtil.UpdateItemNeedNum(item.m_comCost, GlobalCfgArray.globalCfg.dailySupplyConsumeArr[0], false, "#FFF6ED");

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

@@ -102,7 +102,7 @@ namespace GFGGame
                 Timers.inst.Remove(UpdateTime);
                 return;
             }
-            _ui.m_txtTime.text = string.Format("{0}后开启", TimeUtil.FormattingTime5((int)(endTime - curTime)));
+            _ui.m_txtTime.text = string.Format("{0}后开启", TimeUtil.FormattingTimeTo_HHmmss((int)(endTime - curTime)));
 
         }
     }

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

@@ -141,7 +141,7 @@ namespace GFGGame
             //     ViewManager.GoBackFrom(typeof(LeagueAnsweringView).FullName);
             //     return;
             // }
-            _ui.m_txtTime.text = string.Format("{0}{1}", str, TimeUtil.FormattingTime7(endTime - curTime));
+            _ui.m_txtTime.text = string.Format("{0}{1}", str, TimeUtil.FormattingTimeTo_mmss(endTime - curTime));
         }
         private void UpdateQuestionState()
         {
@@ -194,7 +194,7 @@ namespace GFGGame
                 Timers.inst.Remove(UpdateAnswerTime);
                 return;
             }
-            _ui.m_txtAnswerTime.text = TimeUtil.FormattingTime7((int)(endTime - curTime));
+            _ui.m_txtAnswerTime.text = TimeUtil.FormattingTimeTo_mmss((int)(endTime - curTime));
         }
         private void UpdateResult()
         {

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

@@ -64,7 +64,7 @@ namespace GFGGame
 
             RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, logData.RoleInfo.headId, logData.RoleInfo.headBorderId, logData.RoleInfo.roleLv);
             item.m_txtName.text = logData.RoleInfo.roleName;
-            item.m_txtTime.text = TimeUtil.CheckIsSameTime(logData.Time, TimeHelper.ClientNow()) ? TimeUtil.FormattingTime6(logData.Time) : TimeUtil.FormattingTime2(logData.Time);
+            item.m_txtTime.text = TimeUtil.CheckIsSameTime(logData.Time, TimeHelper.ClientNow()) ? TimeUtil.FormattingTimeTo_HHmm(logData.Time) : TimeUtil.FormattingTimeTo_yyyMMdd1(logData.Time);
             string strInfo = "";
             switch (logData.Type)
             {

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

@@ -184,7 +184,7 @@ namespace GFGGame
                 // _ui.m_btnRecruit.m_txtTime.text = "";
                 Timers.inst.Remove(OnUpdateTimer);
             }
-            string time = TimeUtil.FormattingTime5(timeCount);
+            string time = TimeUtil.FormattingTimeTo_HHmmss(timeCount);
             _ui.m_btnRecruit.m_txtTime.text = string.Format("剩余时间: {0}", time);
         }
         private void UpdateLeader(GObject obj, long roleId)

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

@@ -153,7 +153,7 @@ namespace GFGGame
             {
                 long curTime = TimeHelper.ServerNow();
                 long endTime = TimeUtil.GetNextTime(GlobalCfgArray.globalCfg.leagueQuestionStartTime);
-                _ui.m_btnAnswer.m_txtTime.text = string.Format("{0}后开启", TimeUtil.FormattingTime5((int)(endTime - curTime)));
+                _ui.m_btnAnswer.m_txtTime.text = string.Format("{0}后开启", TimeUtil.FormattingTimeTo_HHmmss((int)(endTime - curTime)));
             }
             else
             {

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

@@ -0,0 +1,220 @@
+using FairyGUI;
+using UI.LuckyBox;
+using UI.CommonGame;
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using ET;
+
+namespace GFGGame
+{
+    public class LuckyBoxActivityView : BaseWindow
+    {
+        private UI_LuckyBoxActivityUI _ui;
+        private ValueBarController _valueBarController;
+        private LuckyBoxController _luckyBoxCtrl;
+        private ActivityOpenCfg _activityCfg;
+        private LuckyBoxCfg _luckyBoxCfg;
+        private int _activityId;
+
+        public override void Dispose()
+        {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+            if (_luckyBoxCtrl != null)
+            {
+                _luckyBoxCtrl.Dispose();
+                _luckyBoxCtrl = null;
+            }
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LuckyBoxActivityUI.PACKAGE_NAME;
+            _ui = UI_LuckyBoxActivityUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
+            _luckyBoxCtrl = new LuckyBoxController(_ui.m_comBox.m_comModel.target);
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_btnReward.onClick.Add(OnClikcBtnReward);
+            _ui.m_btnShop.onClick.Add(OnClikcBtnShop);
+            _ui.m_btnGiftBag.onClick.Add(OnClikcBtnGiftBag);
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.ACTIVITY_LUCKY_BOX, UpdateView);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _activityId = (int)this.viewData;
+            _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
+            _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
+            _valueBarController.OnShown();
+            _valueBarController.UpdateList(new List<int>() { _luckyBoxCfg.costID });
+            _luckyBoxCtrl.OnShown(_luckyBoxCfg.id);
+            UpdateView();
+            Timers.inst.Add(1, 0, UpdateTime);
+        }
+        private void UpdateTime(object param = null)
+        {
+            long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
+            long curTime = TimeHelper.ServerNow();
+            if (endTime < curTime)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                Timers.inst.Remove(UpdateTime);
+                OnClickBtnBack();
+                return;
+            }
+            TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
+            _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+        }
+
+        private void UpdateView()
+        {
+            _ui.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastCount.ToString()).FlushVars();
+            _ui.m_txtCount.SetVar("name", _activityCfg.themeName).FlushVars();
+            UI_ComBox_4 comBox = UI_ComBox_4.Proxy(_ui.m_comBox.target);
+
+            LuckyBoxDataManager.Instance.InitData(_luckyBoxCfg.id);
+            comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
+            comBox.m_btnPreview.m_c1.selectedIndex = 1;
+            LuckyBoxDataManager.Instance.GetOwnedCount(_luckyBoxCfg.id, out int count, out int totalCount);
+            comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
+            comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
+            int boughtCount = GameGlobal.myNumericComponent.GetAsInt(_luckyBoxCfg.numericType);
+            comBox.m_txtRemainTimes.text = string.Format("今日剩余次数：{0}", _luckyBoxCfg.maxCount - boughtCount);
+
+            comBox.m_comCostOne.m_txtCost.text = _luckyBoxCfg.costNum.ToString();
+            comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(_luckyBoxCfg.costID).res);
+            comBox.m_comCostTen.m_txtCost.text = _luckyBoxCfg.costNumTen.ToString();
+            comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(_luckyBoxCfg.costID).res);
+
+            if (comBox.m_btnBuyOne.target.data == null)
+            {
+                comBox.m_btnBuyOne.target.onClick.Add(OnClickBtnBuyOne);
+            }
+            comBox.m_btnBuyOne.target.data = _luckyBoxCfg.id;
+
+            if (comBox.m_btnBuyTen.target.data == null)
+            {
+                comBox.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
+            }
+            comBox.m_btnBuyTen.target.data = _luckyBoxCfg.id;
+
+            if (comBox.m_btnPreview.target.data == null)
+            {
+                comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);
+            }
+            comBox.m_btnPreview.target.data = _luckyBoxCfg.id;
+
+            comBox.target.data = _luckyBoxCfg.id;
+
+            UI_ComBox_4.ProxyEnd();
+        }
+
+        private void OnClickBtnPreview(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int boxId = (int)obj.data;
+            ViewManager.Show(ViewName.LUCKY_BOX_PRE_SHOW_VIEW, boxId);
+        }
+
+        private void OnClickBtnBuyOne(EventContext context)
+        {
+            int boughtCount = GameGlobal.myNumericComponent.GetAsInt(_luckyBoxCfg.numericType);
+            if (boughtCount + LuckyBoxDataManager.ONCE_TIME > _luckyBoxCfg.maxCount)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("抽奖次数不足");
+                return;
+            }
+            LuckyBoxDataManager.Instance.CheckItemEnough(_luckyBoxCfg.id, LuckyBoxDataManager.ONCE_TIME, async () =>
+             {
+                 bool result = await LuckyBoxSProxy.ReqGetBonus(_luckyBoxCfg.id, LuckyBoxDataManager.ONCE_TIME);
+                 if (result)
+                 {
+                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId }, true);
+                     //  LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
+                 }
+             });
+        }
+
+        private void OnClickBtnBuyTen(EventContext context)
+        {
+
+            GObject obj = context.sender as GObject;
+            int boughtCount = GameGlobal.myNumericComponent.GetAsInt(_luckyBoxCfg.numericType);
+            if (boughtCount + LuckyBoxDataManager.TEN_TIME > _luckyBoxCfg.maxCount)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("抽奖次数不足");
+                return;
+            }
+            LuckyBoxDataManager.Instance.CheckItemEnough(this._luckyBoxCfg.id, LuckyBoxDataManager.TEN_TIME, async () =>
+            {
+                bool result = await LuckyBoxSProxy.ReqGetBonus(this._luckyBoxCfg.id, LuckyBoxDataManager.TEN_TIME);
+                if (result)
+                {
+                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId }, true);
+                    // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
+                }
+            });
+        }
+
+        private void OnClikcBtnReward()
+        {
+
+        }
+        private void OnClikcBtnShop()
+        {
+
+        }
+        private void OnClikcBtnGiftBag()
+        {
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _valueBarController.OnHide();
+            _luckyBoxCtrl.OnHide();
+            Timers.inst.Remove(UpdateTime);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(LuckyBoxActivityView).FullName);
+        }
+
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+        }
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+        }
+    }
+}

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

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

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

@@ -22,6 +22,9 @@ namespace GFGGame
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
         private GameObject _gameobject;
         private GoWrapper _wrapper;
+
+        private string _goBackViewName;
+        private object _goBackParams;
         public override void Dispose()
         {
             base.Dispose();
@@ -57,6 +60,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _goBackViewName = ViewManager.GetGoBackDatas(typeof(LuckyBoxStarView).FullName)[0].ToString();
+            _goBackParams = ViewManager.GetGoBackDatas(typeof(LuckyBoxStarView).FullName)[1];
 
             itemList = (viewData as object[])[0] as List<ItemData>;
             itemListAni = new List<ItemData>(itemList.ToArray());
@@ -123,7 +128,7 @@ namespace GFGGame
             else
             {
                 this.Hide();
-                ViewManager.Show(ViewName.LUCKY_BOX_VIEW, ViewManager.GetGoBackDatas(ViewName.LUCKY_BOX_STAR_VIEW));
+                ViewManager.Show(_goBackViewName, _goBackParams);
                 GetSuitItemController.TryShow(0);
                 _ui.m_t0.Stop(true, false);
             }

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

@@ -94,9 +94,11 @@ namespace GFGGame
             _ui.m_effEnd.visible = false;
             _rewardList = LuckyBoxDataManager.Instance.RewardList;
             _ui.m_ctrlBuyType.selectedIndex = _rewardList != null && _rewardList.Count > 1 ? 1 : 0;
-            _ui.m_ctrlRewardsType.selectedIndex = LuckyBoxDataManager.Instance.currentBoxId - 1;
-            //Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.Instance.currentBoxId);
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("cj_tp_" + LuckyBoxDataManager.Instance.currentBoxId);
+
+            bool isLuckyBox = LuckyBoxDataManager.Instance.luckyBoxIds.IndexOf(LuckyBoxDataManager.Instance.currentBoxId) >= 0;
+            _ui.m_ctrlRewardsType.selectedIndex = isLuckyBox ? (LuckyBoxDataManager.Instance.currentBoxId - 1) : 0;
+            string resPath = string.Format("cj_tp_{0}", isLuckyBox ? LuckyBoxDataManager.Instance.currentBoxId : 1);
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath(resPath);
 
             ResetStartView();
             Timers.inst.AddUpdate(CheckGuide);

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

@@ -12,6 +12,7 @@ namespace GFGGame
     {
         private UI_LuckyBoxUI _ui;
         private ValueBarController _valueBarController;
+        private List<LuckyBoxController> _lcukyBoxCtrl = new List<LuckyBoxController>();
 
         //private GameObject _gameObject;
         //private GoWrapper _wrapper;
@@ -42,6 +43,11 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
+            for (int i = 0; i < _lcukyBoxCtrl.Count; i++)
+            {
+                _lcukyBoxCtrl[i].Dispose();
+            }
+            _lcukyBoxCtrl.Clear();
             if (_dressUpObjUIXiHe != null)
             {
                 _dressUpObjUIXiHe.Dispose();
@@ -52,6 +58,7 @@ namespace GFGGame
                 _dressUpObjUIChangXi.Dispose();
                 _dressUpObjUIChangXi = null;
             }
+
             //SceneController.DestroyObjectFromView(_gameObject, _wrapper);
             //SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
             //SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
@@ -88,7 +95,7 @@ namespace GFGGame
             _ui.m_listBg.itemProvider = GetListItemResource;
             _ui.m_listBg.scrollPane.onScrollEnd.Add(OnListBgScroll);
 
-
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("jingzhongh_bg");
         }
         protected override void AddEventListener()
         {
@@ -104,24 +111,6 @@ namespace GFGGame
             LuckyBoxDataManager.Instance.luckyBoxIds.Clear();
             LuckyBoxDataManager.Instance.luckyBoxIds.Add(LuckyBoxDataManager.BOX_ID_2);
             LuckyBoxDataManager.Instance.luckyBoxIds.Add(LuckyBoxDataManager.BOX_ID_3);
-
-            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
-            if (this.viewData != null)
-            {
-                object[] datas = (this.viewData as object[]);
-                if (datas != null && datas.Length > 1)
-                {
-                    boxId = (int)datas[1];
-                }
-                else
-                {
-                    boxId = (int)this.viewData;
-                }
-            }
-
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0) boxId = LuckyBoxDataManager.BOX_ID_2;
-            LuckyBoxDataManager.Instance.currentBoxId = boxId;
-
             _activeBoxId = 0;
             int result = await LuckyBoxSProxy.ReqGetLuckyBoxRotatingInfo();
             if (result > 0)
@@ -130,9 +119,27 @@ namespace GFGGame
                 _activeBoxId = rotatingLuckyBox.luckyBoxId;
                 LuckyBoxDataManager.Instance.endTime = TimeUtil.GetTimestamp(rotatingLuckyBox.endTime);
                 LuckyBoxDataManager.Instance.luckyBoxIds.Insert(0, _activeBoxId);
-                Timers.inst.Add(1, 0, CheckTime);
             }
 
+            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
+            if (this.viewData != null)
+            {
+                // object[] datas = (this.viewData as object[]);
+                // if (datas != null && datas.Length > 1)
+                // {
+                //     boxId = (int)datas[1];
+                // }
+                // else
+                // {
+                boxId = (int)this.viewData;
+                // }
+            }
+
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0) boxId = LuckyBoxDataManager.BOX_ID_2;
+            LuckyBoxDataManager.Instance.currentBoxId = boxId;
+
+            if (_activeBoxId > 0) Timers.inst.Add(1, 0, CheckTime);
+
             _valueBarController.OnShown();
             _valueBarController.Controller(4);
 
@@ -143,7 +150,7 @@ namespace GFGGame
 
             OnListBgScroll();
             updateBoxEffect();
-            Timers.inst.Add(8, 0, UpdateBg);
+            // Timers.inst.Add(8, 0, UpdateBg);
             Timers.inst.AddUpdate(CheckGuide);
         }
         private string GetListItemResource(int index)
@@ -163,53 +170,45 @@ namespace GFGGame
             int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
             LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
             LuckyBoxDataManager.Instance.InitData(boxId);
-            GLoader loaBg = (obj as GComponent).GetChild("loaBg").asLoader;
-            loaBg.url = ResPathUtil.GetBgImgPath(cfg.resArr[0]);
-            GButton btnPreview = (obj as GComponent).GetChild("btnPreview").asButton;
-            btnPreview.GetController("c1").selectedIndex = boxId;
-            // GButton btnExchange = (obj as GComponent).GetChild("btnExchange").asButton;
-            // btnExchange.GetController("c1").selectedIndex = boxId;
-            GTextField txtOwned = (obj as GComponent).GetChild("txtOwned").asTextField;
+
+            UI_ComBox comBox = UI_ComBox.Proxy(obj);
+            comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(cfg.resArr[_bgIndex]);
+            if (_lcukyBoxCtrl.Count <= index)
+            {
+                _lcukyBoxCtrl.Add(new LuckyBoxController(comBox.m_comModel.target));
+                if (_ui.m_listBg.ChildIndexToItemIndex(0) == index)
+                {
+                    _lcukyBoxCtrl[index].OnShown(boxId);
+                }
+            }
+
+            comBox.m_btnPreview.m_c1.selectedIndex = boxId;
             LuckyBoxDataManager.Instance.GetOwnedCount(boxId, out int count, out int totalCount);
-            txtOwned.SetVar("v1", "" + count).FlushVars();
-            txtOwned.SetVar("v2", "" + totalCount).FlushVars();
-            GTextField txtRemainTimes = (obj as GComponent).GetChild("txtRemainTimes").asTextField;
+            comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
+            comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(cfg.numericType);
-            txtRemainTimes.text = string.Format("今日剩余次数：{0}", cfg.maxCount - boughtCount);
-
-            GTextField txtCost = (obj as GComponent).GetChild("comCostOne").asCom.GetChild("txtCost").asTextField;
-            txtCost.text = cfg.costNum.ToString();
-            GLoader loaCost = (obj as GComponent).GetChild("comCostOne").asCom.GetChild("loaCost").asLoader;
-            loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
-            GTextField txtCostTen = (obj as GComponent).GetChild("comCostTen").asCom.GetChild("txtCost").asTextField;
-            txtCostTen.text = cfg.costNumTen.ToString();
-            GLoader loaCostTen = (obj as GComponent).GetChild("comCostTen").asCom.GetChild("loaCost").asLoader;
-            loaCostTen.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
-
-            GButton btnBuyOne = (obj as GComponent).GetChild("btnBuyOne").asButton;
-            if (btnBuyOne.data == null)
+            comBox.m_txtRemainTimes.text = string.Format("今日剩余次数：{0}", cfg.maxCount - boughtCount);
+            comBox.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
+            comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
+            comBox.m_comCostTen.m_txtCost.text = cfg.costNumTen.ToString();
+            comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
+            if (comBox.m_btnBuyOne.target.data == null)
             {
-                btnBuyOne.onClick.Add(OnClickBtnBuyOne);
+                comBox.m_btnBuyOne.target.onClick.Add(OnClickBtnBuyOne);
             }
-            btnBuyOne.data = boxId;
+            comBox.m_btnBuyOne.target.data = boxId;
 
-            GButton btnBuyTen = (obj as GComponent).GetChild("btnBuyTen").asButton;
-            if (btnBuyTen.data == null)
+            if (comBox.m_btnBuyTen.target.data == null)
             {
-                btnBuyTen.onClick.Add(OnClickBtnBuyTen);
+                comBox.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
             }
-            btnBuyTen.data = boxId;
-
-            // if (btnExchange.data == null)
-            // {
-            //     btnExchange.onClick.Add(OnClickBtnExChange);
-            // }
-            // btnExchange.data = boxId;
-            if (btnPreview.data == null)
+            comBox.m_btnBuyTen.target.data = boxId;
+
+            if (comBox.m_btnPreview.target.data == null)
             {
-                btnPreview.onClick.Add(OnClickBtnPreview);
+                comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);
             }
-            btnPreview.data = boxId;
+            comBox.m_btnPreview.target.data = boxId;
 
             obj.data = boxId;
 
@@ -218,71 +217,53 @@ namespace GFGGame
                 long endTime = LuckyBoxDataManager.Instance.endTime;
                 long curTime = TimeHelper.ServerNow();
                 TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
-                (obj as GComponent).GetChild("txtTime").asTextField.text = string.Format("剩余{0}{1}", num, str);
-
-                GGraph holder = (obj as GComponent).GetChild("holder").asGraph;
-                holder.visible = false;
-                if (cfg.suitShowArr.Length > 0)
-                {
-                    //羲和
-                    holder.SetXY(cfg.suitShowArr[0][1], cfg.suitShowArr[0][2]);
-                    _dressUpObjUIXiHe.ResetSceneObj(100, false, false, null, false);
-                    _dressUpObjUIXiHe.dressUpObj.PutOnSuitCfg(cfg.suitShowArr[0][0], true, null, false, false);
-                    _dressUpObjUIXiHe.UpdateWrapper(holder);
-                }
+                comBox.m_txtTime.text = string.Format("剩余{0}{1}", num, str);
+            }
 
+            UI_ComBox.ProxyEnd();
 
-                GGraph holder1 = (obj as GComponent).GetChild("holder1").asGraph;
-                holder1.visible = false;
-                if (cfg.suitShowArr.Length > 1)
-                {
-                    //羲和
-                    holder.SetXY(cfg.suitShowArr[1][1], cfg.suitShowArr[1][2]);
-                    //常曦
-                    _dressUpObjUIChangXi.ResetSceneObj(100, false, false, null, false);
-                    _dressUpObjUIChangXi.dressUpObj.PutOnSuitCfg(cfg.suitShowArr[1][0], true, null, false, false);
-                    _dressUpObjUIChangXi.UpdateWrapper(holder1);
-                }
-            }
         }
 
-        private void UpdateBg(object param)
-        {
-            string[] resArr = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.currentBoxId).resArr;
-            _bgIndex++;
-            if (_bgIndex >= resArr.Length) _bgIndex = 0;
-            GObject gObject = _ui.m_listBg.GetChildAt(0);
-            if (gObject == null) return;
-            GComponent item = gObject.asCom;
-            if (item.gameObjectName != "ComBox_2") return;
-            GLoader loaBg = item.GetChild("loaBg").asLoader;
-            loaBg.url = ResPathUtil.GetBgImgPath(resArr[_bgIndex]);
-        }
+        // private void UpdateBg(object param)
+        // {
+        //     string[] resArr = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.currentBoxId).resArr;
+        //     _bgIndex++;
+        //     if (_bgIndex >= resArr.Length) _bgIndex = 0;
+        //     GObject gObject = _ui.m_listBg.GetChildAt(0);
+        //     if (gObject == null) return;
+        //     GComponent item = gObject.asCom;
+        //     if (item.gameObjectName != "ComBox_2") return;
+        //     GLoader loaBg = item.GetChild("loaBg").asLoader;
+        //     loaBg.url = ResPathUtil.GetBgImgPath(resArr[_bgIndex]);
+        // }
 
 
         private void OnBtnLeftClick()
         {
-            _curIndex--;
-            _curIndex = Mathf.Max(0, _curIndex);
-            _ui.m_listBg.ScrollToView(_curIndex, true);
-            OnListBgScroll();
+            int index = _curIndex - 1;
+            // _curIndex--;
+            index = Mathf.Max(0, index);
+            _ui.m_listBg.ScrollToView(index, true);
+            // OnListBgScroll();
         }
 
         private void OnBtnRightClick()
         {
-            _curIndex++;
-            _curIndex = Mathf.Min(_ui.m_listBg.numItems - 1, _curIndex);
-            _ui.m_listBg.ScrollToView(_curIndex, true);
-            OnListBgScroll();
+            int index = _curIndex + 1;
+            // _curIndex++;
+            index = Mathf.Min(_ui.m_listBg.numItems - 1, index);
+            _ui.m_listBg.ScrollToView(index, true);
+            // OnListBgScroll();
         }
 
         private void OnListBgScroll()
         {
+            _lcukyBoxCtrl[_curIndex].OnHide();
             _curIndex = _ui.m_listBg.ChildIndexToItemIndex(0);
             LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
             _bgIndex = 0;
             _valueBarController.UpdateCJ();
-
+            _lcukyBoxCtrl[_curIndex].OnShown(LuckyBoxDataManager.Instance.currentBoxId);
             _ui.m_btnLeft.grayed = _curIndex <= 0;
             _ui.m_btnRight.grayed = _curIndex >= _ui.m_listBg.numItems - 1;
 
@@ -391,9 +372,13 @@ namespace GFGGame
         {
             base.OnHide();
             _valueBarController.OnHide();
+            for (int i = 0; i < _lcukyBoxCtrl.Count; i++)
+            {
+                _lcukyBoxCtrl[i].OnHide();
+            }
 
             Timers.inst.Remove(CheckTime);
-            Timers.inst.Remove(UpdateBg);
+            // Timers.inst.Remove(UpdateBg);
             Timers.inst.Remove(CheckGuide);
             // Timers.inst.Remove(UpdateTime);
         }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -101,7 +101,7 @@ namespace GFGGame
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
             }
-            if(_dressUpObjUI == null)
+            if (_dressUpObjUI == null)
             {
                 _dressUpObjUI = new DressUpObjUI();
             }
@@ -378,13 +378,13 @@ namespace GFGGame
                 _ui.m_dialogHead.m_comphead.m_holder.visible = true;
 
                 if (headAniCfg.faceId > 0)
-                { 
+                {
                     //ťť×°ąíÇé
                     _ui.m_dialogHead.m_compDressUp.target.visible = true;
                     _ui.m_dialogHead.m_comphead.target.visible = false;
                     _dressUpObjUI.ResetSceneObj(80, true, false, null, false);
                     _dressUpObjUI.dressUpObj.PutOnDressUpData(CustomSuitDataManager.GetCurrentSuitData().dressUpData);
-                    if(_dressUpObjUI.dressUpObj.actionId > 0)
+                    if (_dressUpObjUI.dressUpObj.actionId > 0)
                     {
                         _dressUpObjUI.dressUpObj.CancelAction(true);
                     }