抽奖活动

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxUI.xml

@@ -0,0 +1,16 @@
+<?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="LimitThemeActiveCompoents/Button1.xml" xy="51,296">
+      <Button title="限时任务"/>
+    </component>
+    <component id="n4_mbf1" name="btnLuckyBox" src="mbf1l" fileName="LimitThemeActiveCompoents/Button1.xml" xy="490,1338">
+      <Button title="获取套装"/>
+    </component>
+    <text id="n5_mbf1" name="txtTime" xy="520,115" pivot="0.5,0" size="40,42" fontSize="30" align="center" text=""/>
+  </displayList>
+</component>

FGUIProject/assets/ActivityThemeLuckyBox/LimitThemeActiveCompoents/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/package.xml

@@ -0,0 +1,8 @@
+<?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="/LimitThemeActiveCompoents/"/>
+  </resources>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox" packageCount="2" genCode="true"/>
+</packageDescription>

FGUIProject/assets/LuckyBox/LuckyBoxActiveUI.xml

@@ -1,19 +0,0 @@
-<?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/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"/>
-    <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,28 @@
+<?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" visible="false" url="ui://drx9d1uso1391h" align="center" vAlign="middle" fill="scale">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
+    <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>
+    <text id="n43_mbf1" name="txtTime" xy="520,194" pivot="0.5,0" size="40,42" fontSize="30" align="center" text=""/>
+    <text id="n44_mbf1" name="txtCount" xy="521,1546" pivot="0.5,0" size="40,42" fontSize="30" align="center" text="">
+      <relation target="" sidePair="bottom-bottom"/>
+    </text>
+    <component id="n46_mbf1" name="btnReward" src="mbf1taf" fileName="components/Button5.xml" xy="45,216">
+      <Button title="摘星奖励"/>
+    </component>
+    <component id="n45_mbf1" name="btnShop" src="mbf1taf" fileName="components/Button5.xml" xy="45,337">
+      <Button title="商店"/>
+    </component>
+    <component id="n47_mbf1" name="btnGiftBag" src="mbf1taf" fileName="components/Button5.xml" xy="45,461">
+      <Button title="每日特惠"/>
+    </component>
+  </displayList>
+</component>

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,9 @@
+<?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" visible="false" 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="585,1005" pivot="0.5,0.5" anchor="true" size="10,10"/>
+  </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,10 @@
     <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/"/>
   </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/Data/ActivityDataManager.cs

@@ -5,6 +5,24 @@ namespace GFGGame
     public class ActivityDataManager : SingletonBase<ActivityDataManager>
     {
 
+        /**********************************************************活动*************************************************/
+        /// <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;
+        }
+
         /**********************************************************每日登录*************************************************/
         private int _sevenDayLoginLoginId = 1;
         /// <summary>

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_ActivityThemeLuckyBoxUI.cs

@@ -0,0 +1,83 @@
+/** 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_btnLuckyBox;
+        public GTextField m_txtTime;
+        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_btnLuckyBox = (GButton)comp.GetChild("btnLuckyBox");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_btnTask = null;
+            m_btnLuckyBox = null;
+            m_txtTime = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxActiveUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs.meta

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

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

@@ -7,7 +7,7 @@ namespace UI.LuckyBox
     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;
@@ -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_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_LuckyBoxActiveUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxActivityUI.cs

@@ -4,25 +4,26 @@ using FairyGUI;
 
 namespace UI.LuckyBox
 {
-    public partial class UI_LuckyBoxActiveUI
+    public partial class UI_LuckyBoxActivityUI
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GList m_listBg;
-        public GComponent m_valueBar;
+        public UI_ComBox_4 m_comBox;
         public GButton m_btnBack;
-        public GButton m_btnHome;
-        public GGroup m_grpTop;
-        public GButton m_btnLeft;
-        public GButton m_btnRight;
+        public GComponent m_valueBar;
+        public GTextField m_txtTime;
+        public GTextField m_txtCount;
+        public GButton m_btnReward;
+        public GButton m_btnShop;
+        public GButton m_btnGiftBag;
         public const string URL = "ui://drx9d1usmbf1tad";
         public const string PACKAGE_NAME = "LuckyBox";
-        public const string RES_NAME = "LuckyBoxActiveUI";
-        private static UI_LuckyBoxActiveUI _proxy;
+        public const string RES_NAME = "LuckyBoxActivityUI";
+        private static UI_LuckyBoxActivityUI _proxy;
 
-        public static UI_LuckyBoxActiveUI Create(GObject gObject = null)
+        public static UI_LuckyBoxActivityUI Create(GObject gObject = null)
         {
-            var ui = new UI_LuckyBoxActiveUI();
+            var ui = new UI_LuckyBoxActivityUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -31,11 +32,11 @@ namespace UI.LuckyBox
             return ui;
         }
 
-        public static UI_LuckyBoxActiveUI Proxy(GObject gObject = null)
+        public static UI_LuckyBoxActivityUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_LuckyBoxActiveUI();
+                _proxy = new UI_LuckyBoxActivityUI();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -63,24 +64,27 @@ 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_comBox = (UI_ComBox_4)UI_ComBox_4.Create(comp.GetChild("comBox"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_btnHome = (GButton)comp.GetChild("btnHome");
-            m_grpTop = (GGroup)comp.GetChild("grpTop");
-            m_btnLeft = (GButton)comp.GetChild("btnLeft");
-            m_btnRight = (GButton)comp.GetChild("btnRight");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnShop = (GButton)comp.GetChild("btnShop");
+            m_btnGiftBag = (GButton)comp.GetChild("btnGiftBag");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_listBg = null;
-            m_valueBar = null;
+            m_comBox.Dispose();
+            m_comBox = null;
             m_btnBack = null;
-            m_btnHome = null;
-            m_grpTop = null;
-            m_btnLeft = null;
-            m_btnRight = null;
+            m_valueBar = null;
+            m_txtTime = null;
+            m_txtCount = null;
+            m_btnReward = null;
+            m_btnShop = null;
+            m_btnGiftBag = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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/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/Utils/TimeUtil.cs

@@ -73,26 +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;
         }
@@ -101,33 +100,34 @@ 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");
 
             return str;
         }
+
         /// <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;
         }
@@ -136,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();
@@ -145,11 +145,23 @@ namespace GFGGame
             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");
@@ -161,7 +173,7 @@ namespace GFGGame
         /// 将时间戳转换成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");

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/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(_luckyBoxCfg.resArr[0]);
+            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/Common/Controller/LuckyBoxController.cs

@@ -0,0 +1,47 @@
+using UI.LuckyBox;
+using FairyGUI;
+using ET;
+using System.Collections.Generic;
+using System;
+
+namespace GFGGame
+{
+    public class LuckyBoxController
+    {
+        private UI_ComModel _comModel;
+        private LuckyBoxCfg _luckyBoxCfg;
+        private int _time = 8;
+        private int _bgIndex = 0;
+        private int _modelIndex = 0;
+
+        public LuckyBoxController(GComponent comModel, int luckyBoxId)
+        {
+            _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId);
+            _comModel = UI_ComModel.Proxy(comModel);
+            _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
+            if (_luckyBoxCfg.resArr.Length > 1)
+            {
+                Timers.inst.Add(1, 0, UpdateTime);
+            }
+        }
+
+        public void Dispose()
+        {
+
+        }
+        private void UpdateTime(object param)
+        {
+
+
+
+            _time = _time - 1 == 0 ? 8 : _time - 1;
+            _bgIndex = _bgIndex + 1 == _luckyBoxCfg.resArr.Length ? 0 : _bgIndex + 1;
+            _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitShowArr.Length ? 0 : _modelIndex + 1;
+        }
+
+        public void OnHide()
+        {
+            UI_ComModel.ProxyEnd();
+        }
+    }
+}

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,209 @@
+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 ActivityOpenCfg _activityCfg;
+        private LuckyBoxCfg _luckyBoxCfg;
+        private int _activityId;
+
+        public override void Dispose()
+        {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = 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);
+
+            _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();
+        }
+        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));
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
+            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_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(ViewName.LUCKY_BOX_STAR_VIEW, null, new object[] { ViewName.LUCKY_BOX_VIEW, _luckyBoxCfg.id });
+                     //  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(ViewName.LUCKY_BOX_STAR_VIEW, null, new object[] { ViewName.LUCKY_BOX_VIEW, this._luckyBoxCfg.id });
+                    // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
+                }
+            });
+        }
+
+        private void OnClikcBtnReward()
+        {
+
+        }
+        private void OnClikcBtnShop()
+        {
+
+        }
+        private void OnClikcBtnGiftBag()
+        {
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _valueBarController.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/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);
                     }

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

@@ -135,6 +135,7 @@ namespace GFGGame
             _ui.m_btnArena.target.onClick.Add(OnClickBtnArena);
             _ui.m_btnTravel.target.onClick.Add(OnClickBtnTravel);
             _ui.m_btnDailyWelfare.target.onClick.Add(OnClickBtnDailyWelfare);
+            _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
             _btnLeague.onClick.Add(OnClickBtnLeague);
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
@@ -466,6 +467,10 @@ namespace GFGGame
             // });
 
         }
+        private void OnClickBtnActivityLuckyBox()
+        {
+            ViewManager.Show<ActivityThemeLuckyBoxView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData }, true);
+        }
         private void OnClickBtnCiPai()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 1);
@@ -587,6 +592,13 @@ namespace GFGGame
         private void Update(object param)
         {
             ShowExitAlert();
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.LimitLuckyBox);
+            _ui.m_btnActivityLuckyBox.target.visible = activityId > 0;
+            if (activityId > 0)
+            {
+                ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
+                _ui.m_btnActivityLuckyBox.target.title = TimeUtil.FormattingTimeTo_DDHHmm(TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow());
+            }
         }
         private void ShowExitAlert()
         {
@@ -630,6 +642,7 @@ namespace GFGGame
             _ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
             _ui.m_btnTravel.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).Name, false);
             _ui.m_btnArena.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false);
+            _ui.m_btnActivityLuckyBox.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.LimitLuckyBox) > 0;
 
             _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
             || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs

@@ -103,7 +103,7 @@ namespace GFGGame
             NoticeInfo noticeInfo = NoticeDataManager.Instance.NoticeInfos[index];
             UI_ListNoticeItem item = UI_ListNoticeItem.Proxy(obj);
             item.m_txtTitle.text = noticeInfo.title;
-            item.m_txtTime.text = TimeUtil.FormattingTime(noticeInfo.time);
+            item.m_txtTime.text = TimeUtil.FormattingTimeTo_yyyMMdd0(noticeInfo.time);
             // item.m_imgTips.visible = !noticeInfo.readStatus;
             RedDotController.Instance.SetComRedDot(item.target, !noticeInfo.readStatus, "gg_gg_hdhdgth", -13, 12);
             if (item.m_btnGo.data == null)

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryPreviewView.cs

@@ -56,7 +56,7 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = _sortType;
             _ui.m_txtName.text = _galleryData.AuthorName;
 
-            string themeTime = TimeUtil.FormattingTime4(_galleryData.CreateTime);
+            string themeTime = TimeUtil.FormattingTimeTo_yyyMMdd2(_galleryData.CreateTime);
             GalleryThemeCfg themeCfg = GalleryThemeCfgArray.Instance.GetCfg((int)_galleryData.ThemeId);
             string themeName = themeCfg.theme;
             _ui.m_txtTheme.text = string.Format("{0}  主题:{1}", themeTime, themeName);// PoemGalleryDataManager.Instance.GetThemeTime();

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoPreView.cs

@@ -138,7 +138,7 @@ namespace GFGGame
 
             item.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
             item.m_txtLocationName.text = loactionCfg.name;
-            item.m_txtTime.text = TimeUtil.FormattingTime2(photoData.CreationTime);
+            item.m_txtTime.text = TimeUtil.FormattingTimeTo_yyyMMdd1(photoData.CreationTime);
             item.m_comTravel.m_loaRole.url = "";
             if (photoData.TravelSuitId > 0)
             {

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoShareView.cs

@@ -61,7 +61,7 @@ namespace GFGGame
 
                 _ui.m_comPostcard.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
                 _ui.m_comPostcard.m_txtLocationName.text = loactionCfg.name;
-                _ui.m_comPostcard.m_txtTime.text = TimeUtil.FormattingTime2(_curPhotoData.CreationTime);
+                _ui.m_comPostcard.m_txtTime.text = TimeUtil.FormattingTimeTo_yyyMMdd1(_curPhotoData.CreationTime);
                 _ui.m_comPostcard.m_comTravel.m_loaRole.url = "";
                 if (_curPhotoData.TravelSuitId > 0)
                 {

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelRewardView.cs

@@ -64,7 +64,7 @@ namespace GFGGame
 
             _ui.m_comPostCard.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
             _ui.m_comPostCard.m_txtLocationName.text = loactionCfg.name;
-            _ui.m_comPostCard.m_txtTime.text = TimeUtil.FormattingTime2(travelData.CreationTime);
+            _ui.m_comPostCard.m_txtTime.text = TimeUtil.FormattingTimeTo_yyyMMdd1(travelData.CreationTime);
 
             if (travelData.TravelSuitId > 0)
             {

GameClient/Assets/ResIn/Fight/jingzhongh_bg.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: fe80edd5adcb4884e90062e6406f0f4a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/Prefab/SceneActivityLuckyBox.prefab

@@ -0,0 +1,161 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7860077764652272168
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1194540582299406076}
+  - component: {fileID: 7834967496332474392}
+  m_Layer: 0
+  m_Name: MaskRole
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1194540582299406076
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7860077764652272168}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -2.6, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8934048990737965464}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!331 &7834967496332474392
+SpriteMask:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7860077764652272168}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10758, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: d54fd5ac44f2b4f4bb2cb4c7033d0ddd, type: 3}
+  m_MaskAlphaCutoff: 0.2
+  m_FrontSortingLayerID: 0
+  m_BackSortingLayerID: 0
+  m_FrontSortingLayer: 0
+  m_BackSortingLayer: 0
+  m_FrontSortingOrder: 9999
+  m_BackSortingOrder: -998
+  m_IsCustomRangeActive: 1
+  m_SpriteSortPoint: 0
+--- !u!1001 &2721400830508684605
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1095836205521704273, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_Size.x
+      value: 10.8046875
+      objectReference: {fileID: 0}
+    - target: {fileID: 1095836205521704273, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: d5e3578f9df618f42a579b7e10d9feec, type: 3}
+    - target: {fileID: 1095836205521704273, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252972580790849, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_MaskInteraction
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252974363538596, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_Name
+      value: SceneDressUpMask
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+--- !u!4 &8934048990737965464 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
+  m_PrefabInstance: {fileID: 2721400830508684605}
+  m_PrefabAsset: {fileID: 0}

GameClient/Assets/ResIn/Prefab/SceneActivityLuckyBox.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 39f81f0340a579b4a9aca330c0422932
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox.meta

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

GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f0312174fb0851e449a7b7139e17dc5d
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: