zhaoyang hace 2 años
padre
commit
b4b1c2a041
Se han modificado 35 ficheros con 231 adiciones y 59 borrados
  1. 17 5
      FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxUI.xml
  2. 0 0
      FGUIProject/assets/ActivityThemeLuckyBox/compoents/Button1.xml
  3. BIN
      FGUIProject/assets/ActivityThemeLuckyBox/images/cj_huodongsd.png
  4. BIN
      FGUIProject/assets/ActivityThemeLuckyBox/images/cj_xiafang_db.png
  5. BIN
      FGUIProject/assets/ActivityThemeLuckyBox/images/cj_xianshirw.png
  6. BIN
      FGUIProject/assets/ActivityThemeLuckyBox/images/tc_xuanxiangkuang.png
  7. BIN
      FGUIProject/assets/ActivityThemeLuckyBox/images/wz_hqtz.png
  8. 6 1
      FGUIProject/assets/ActivityThemeLuckyBox/package.xml
  9. 12 14
      FGUIProject/assets/CommonGame/components/ComponentValueBar.xml
  10. BIN
      FGUIProject/assets/CommonGame/imagesNew/sj_dk.png
  11. 1 0
      FGUIProject/assets/CommonGame/package.xml
  12. 22 13
      FGUIProject/assets/LuckyBox/LuckyBoxActivityUI.xml
  13. 4 2
      FGUIProject/assets/LuckyBox/combox/ComModel.xml
  14. BIN
      FGUIProject/assets/LuckyBox/images/cj_meirith.png
  15. BIN
      FGUIProject/assets/LuckyBox/images/cj_sj_db.png
  16. BIN
      FGUIProject/assets/LuckyBox/images/cj_tswz_db.png
  17. BIN
      FGUIProject/assets/LuckyBox/images/cj_zhaixingjl.png
  18. BIN
      FGUIProject/assets/LuckyBox/images/cj_zhaixingth.png
  19. 5 0
      FGUIProject/assets/LuckyBox/package.xml
  20. 6 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs
  21. 6 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxActivityUI.cs
  22. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs
  23. 45 12
      GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs
  24. 10 2
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs
  25. BIN
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png
  26. 96 0
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png.meta
  27. BIN
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes
  28. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  29. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  30. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  31. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  32. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  33. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  34. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  35. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes

+ 17 - 5
FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxUI.xml

@@ -5,12 +5,24 @@
       <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 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="n4_mbf1" name="btnLuckyBox" src="mbf1l" fileName="LimitThemeActiveCompoents/Button1.xml" xy="490,1338">
-      <Button title="获取套装"/>
+    <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>
-    <text id="n5_mbf1" name="txtTime" xy="520,115" pivot="0.5,0" size="40,42" fontSize="30" align="center" text=""/>
+    <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>

+ 0 - 0
FGUIProject/assets/ActivityThemeLuckyBox/LimitThemeActiveCompoents/Button1.xml → FGUIProject/assets/ActivityThemeLuckyBox/compoents/Button1.xml


BIN
FGUIProject/assets/ActivityThemeLuckyBox/images/cj_huodongsd.png


BIN
FGUIProject/assets/ActivityThemeLuckyBox/images/cj_xiafang_db.png


BIN
FGUIProject/assets/ActivityThemeLuckyBox/images/cj_xianshirw.png


BIN
FGUIProject/assets/ActivityThemeLuckyBox/images/tc_xuanxiangkuang.png


BIN
FGUIProject/assets/ActivityThemeLuckyBox/images/wz_hqtz.png


+ 6 - 1
FGUIProject/assets/ActivityThemeLuckyBox/package.xml

@@ -2,7 +2,12 @@
 <packageDescription id="ubfk2kob">
   <resources>
     <component id="mbf1k" name="ActivityThemeLuckyBoxUI.xml" path="/" exported="true"/>
-    <component id="mbf1l" name="Button1.xml" path="/LimitThemeActiveCompoents/"/>
+    <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/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox" packageCount="2" genCode="true"/>
 </packageDescription>

+ 12 - 14
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>

BIN
FGUIProject/assets/CommonGame/imagesNew/sj_dk.png


+ 1 - 0
FGUIProject/assets/CommonGame/package.xml

@@ -324,6 +324,7 @@
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
     <image id="qik1tm7" name="db_jiajian_1.png" path="/images/"/>
+    <image id="mbf14" name="sj_dk.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 22 - 13
FGUIProject/assets/LuckyBox/LuckyBoxActivityUI.xml

@@ -1,9 +1,6 @@
 <?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>
@@ -11,18 +8,30 @@
     <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="摘星奖励"/>
+    <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="45,337">
-      <Button title="商店"/>
+    <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="45,461">
-      <Button title="每日特惠"/>
+    <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="n53_mbf1" name="n53" src="mbf1tam" fileName="images/cj_tswz_db.png" xy="25,1496" group="n54_mbf1"/>
+    <text id="n44_mbf1" name="txtCount" xy="302,1494" pivot="0.5,0" size="488,44" group="n54_mbf1" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#fff7d4" align="center" vars="true" text="{value=15}次摘星内必得{name=沧海月明}套装部件">
+      <relation target="" sidePair="bottom-bottom"/>
+    </text>
+    <group id="n54_mbf1" name="n54" xy="25,1494" size="1030,44" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
   </displayList>
 </component>

+ 4 - 2
FGUIProject/assets/LuckyBox/combox/ComModel.xml

@@ -1,9 +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" visible="false" url="ui://drx9d1useshh1f" align="center" vAlign="middle" fill="scale">
+    <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="585,1005" pivot="0.5,0.5" anchor="true" size="10,10"/>
+    <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>

BIN
FGUIProject/assets/LuckyBox/images/cj_meirith.png


BIN
FGUIProject/assets/LuckyBox/images/cj_sj_db.png


BIN
FGUIProject/assets/LuckyBox/images/cj_tswz_db.png


BIN
FGUIProject/assets/LuckyBox/images/cj_zhaixingjl.png


BIN
FGUIProject/assets/LuckyBox/images/cj_zhaixingth.png


+ 5 - 0
FGUIProject/assets/LuckyBox/package.xml

@@ -66,6 +66,11 @@
     <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>

+ 6 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs

@@ -10,8 +10,9 @@ namespace UI.ActivityThemeLuckyBox
         public GLoader m_loaBg;
         public GButton m_btnBack;
         public GButton m_btnTask;
-        public GButton m_btnLuckyBox;
+        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";
@@ -62,16 +63,18 @@ namespace UI.ActivityThemeLuckyBox
             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_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_btnLuckyBox = null;
+            m_btnShop = null;
             m_txtTime = null;
+            m_btnLuckyBox = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 6 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxActivityUI.cs

@@ -7,15 +7,15 @@ namespace UI.LuckyBox
     public partial class UI_LuckyBoxActivityUI
     {
         public GComponent target;
-        public GLoader m_loaBg;
         public UI_ComBox_4 m_comBox;
         public GButton m_btnBack;
         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 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";
@@ -63,28 +63,28 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GLoader)comp.GetChild("loaBg");
             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_txtCount = (GTextField)comp.GetChild("txtCount");
             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_loaBg = null;
             m_comBox.Dispose();
             m_comBox = null;
             m_btnBack = null;
             m_valueBar = null;
             m_txtTime = null;
-            m_txtCount = null;
             m_btnReward = null;
             m_btnShop = null;
             m_btnGiftBag = null;
+            m_txtGiftBagTime = null;
+            m_txtCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -48,7 +48,7 @@ namespace GFGGame
             _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]);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res);
             Timers.inst.Add(1, 0, UpdateTime);
         }
         protected override void OnHide()

+ 45 - 12
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -8,40 +8,73 @@ namespace GFGGame
 {
     public class LuckyBoxController
     {
+        private GComponent _com;
         private UI_ComModel _comModel;
+        private DressUpObjUI _dressUpObjUI;
         private LuckyBoxCfg _luckyBoxCfg;
-        private int _time = 8;
+        private const int _turnTime = 3;
+        private int _curTime = _turnTime;
         private int _bgIndex = 0;
         private int _modelIndex = 0;
 
-        public LuckyBoxController(GComponent comModel, int luckyBoxId)
+        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 = UI_ComModel.Proxy(comModel);
             _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
-            if (_luckyBoxCfg.resArr.Length > 1)
+            if (_luckyBoxCfg.suitShowArr.Length > 0)
+            {
+                _dressUpObjUI.ResetSceneObj(100, false, false, null, false);
+                _dressUpObjUI.dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitShowArr[0][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.Add(1, 0, UpdateTime);
             }
         }
 
-        public void Dispose()
-        {
-
-        }
         private void UpdateTime(object param)
         {
-
-
-
-            _time = _time - 1 == 0 ? 8 : _time - 1;
+            _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);
+        }
+
+        public void Dispose()
+        {
+            if (_dressUpObjUI != null)
+            {
+                _dressUpObjUI.Dispose();
+                _dressUpObjUI = null;
+            }
         }
     }
 }

+ 10 - 2
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -12,6 +12,7 @@ namespace GFGGame
     {
         private UI_LuckyBoxActivityUI _ui;
         private ValueBarController _valueBarController;
+        private LuckyBoxController _luckyBoxCtrl;
         private ActivityOpenCfg _activityCfg;
         private LuckyBoxCfg _luckyBoxCfg;
         private int _activityId;
@@ -23,6 +24,11 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
+            if (_luckyBoxCtrl != null)
+            {
+                _luckyBoxCtrl.Dispose();
+                _luckyBoxCtrl = null;
+            }
 
             if (_ui != null)
             {
@@ -41,6 +47,7 @@ namespace GFGGame
             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);
@@ -59,8 +66,8 @@ namespace GFGGame
             _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]);
+            _valueBarController.UpdateList(new List<int>() { _luckyBoxCfg.costID });
+            _luckyBoxCtrl.OnShown(_luckyBoxCfg.id);
             UpdateView();
             Timers.inst.Add(1, 0, UpdateTime);
         }
@@ -184,6 +191,7 @@ namespace GFGGame
         {
             base.OnHide();
             _valueBarController.OnHide();
+            _luckyBoxCtrl.OnHide();
             Timers.inst.Remove(UpdateTime);
         }
 

BIN
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png


+ 96 - 0
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: e5168b861da9f5a4183fab34937a6cf6
+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: 

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


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes