浏览代码

抽奖活动

zhaoyang 2 年之前
父节点
当前提交
7e7108d395
共有 53 个文件被更改,包括 637 次插入40 次删除
  1. 16 0
      FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusUI.xml
  2. 16 0
      FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskUI.xml
  3. 24 0
      FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListRewardItem.xml
  4. 32 0
      FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListTaskItem.xml
  5. 二进制
      FGUIProject/assets/ActivityThemeLuckyBox/images/lm_biaotizi_14.png
  6. 二进制
      FGUIProject/assets/ActivityThemeLuckyBox/images/lm_biaotizi_15.png
  7. 二进制
      FGUIProject/assets/ActivityThemeLuckyBox/images/tx_xuanxiang_zz.png
  8. 7 0
      FGUIProject/assets/ActivityThemeLuckyBox/package.xml
  9. 3 1
      FGUIProject/assets/ClothingFoster/ClothingFosterUI.xml
  10. 6 6
      FGUIProject/assets/ClothingFoster/ClothingUI.xml
  11. 0 0
      FGUIProject/assets/CommonGame/components/BtnStyle001.xml
  12. 13 0
      FGUIProject/assets/CommonGame/components/BtnStyle003.xml
  13. 3 3
      FGUIProject/assets/CommonGame/components/BtnStyle1Big.xml
  14. 11 0
      FGUIProject/assets/CommonGame/componentsBg/ComBg001.xml
  15. 二进制
      FGUIProject/assets/CommonGame/componentsBg/lm_biaotizi_14.png
  16. 二进制
      FGUIProject/assets/CommonGame/imagesNew/lm_an__xuanzhong.png
  17. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_an__xuanzhong_qifu.png
  18. 0 0
      FGUIProject/assets/CommonGame/imagesNew/lm_an_qrhd_ylq_db.png
  19. 8 4
      FGUIProject/assets/CommonGame/package.xml
  20. 4 5
      FGUIProject/assets/LuckyBox/LuckyBoxActivityUI.xml
  21. 二进制
      FGUIProject/assets/LuckyBox/images/cj_tswz_db.png
  22. 2 1
      GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs
  23. 1 0
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  24. 28 0
      GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs
  25. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxBonusUI.cs
  26. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxBonusUI.cs.meta
  27. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.cs
  28. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.cs.meta
  29. 89 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ListTaskItem.cs
  30. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ListTaskItem.cs.meta
  31. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs
  32. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs.meta
  33. 67 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs
  34. 4 3
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs
  35. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs
  36. 5 2
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs
  37. 6 1
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusView.cs
  38. 5 3
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs
  39. 14 11
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  40. 6 0
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  41. 二进制
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png
  42. 二进制
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes
  43. 二进制
      GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes
  44. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  45. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  46. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  47. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  48. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png
  49. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png
  50. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  51. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  52. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  53. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes

+ 16 - 0
FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusUI.xml

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

+ 16 - 0
FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskUI.xml

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

+ 24 - 0
FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListRewardItem.xml

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

+ 32 - 0
FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListTaskItem.xml

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

二进制
FGUIProject/assets/ActivityThemeLuckyBox/images/lm_biaotizi_14.png


二进制
FGUIProject/assets/ActivityThemeLuckyBox/images/lm_biaotizi_15.png


二进制
FGUIProject/assets/ActivityThemeLuckyBox/images/tx_xuanxiang_zz.png


+ 7 - 0
FGUIProject/assets/ActivityThemeLuckyBox/package.xml

@@ -8,6 +8,13 @@
     <image id="mbf12" name="cj_xianshirw.png" path="/images/"/>
     <image id="mbf13" name="tc_xuanxiangkuang.png" path="/images/"/>
     <image id="mbf15" name="cj_xiafang_db.png" path="/images/"/>
+    <component id="mbf16" name="ActivityThemeLuckyBoxBonusUI.xml" path="/" exported="true"/>
+    <image id="mbf17" name="tx_xuanxiang_zz.png" path="/images/"/>
+    <component id="mbf19" name="ListTaskItem.xml" path="/compoents/"/>
+    <component id="mbf1a" name="ListRewardItem.xml" path="/compoents/"/>
+    <image id="mbf1b" name="lm_biaotizi_15.png" path="/images/"/>
+    <image id="mbf1c" name="lm_biaotizi_14.png" path="/images/"/>
+    <component id="mbf1d" name="ActivityThemeLuckyBoxTaskUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox" packageCount="2" genCode="true"/>
 </packageDescription>

+ 3 - 1
FGUIProject/assets/ClothingFoster/ClothingFosterUI.xml

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

+ 6 - 6
FGUIProject/assets/ClothingFoster/ClothingUI.xml

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

+ 0 - 0
FGUIProject/assets/CommonGame/components/ComeBt.xml → FGUIProject/assets/CommonGame/components/BtnStyle001.xml


+ 13 - 0
FGUIProject/assets/CommonGame/components/BtnStyle003.xml

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

+ 3 - 3
FGUIProject/assets/CommonGame/components/BtnStyle1Big.xml

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

+ 11 - 0
FGUIProject/assets/CommonGame/componentsBg/ComBg001.xml

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

二进制
FGUIProject/assets/CommonGame/componentsBg/lm_biaotizi_14.png


二进制
FGUIProject/assets/CommonGame/imagesNew/lm_an__xuanzhong.png


+ 0 - 0
FGUIProject/assets/CommonGame/imagesExport/lm_an__xuanzhong_qifu.png → FGUIProject/assets/CommonGame/imagesNew/lm_an__xuanzhong_qifu.png


+ 0 - 0
FGUIProject/assets/CommonGame/imagesNew/qrhd_ylq_db.png → FGUIProject/assets/CommonGame/imagesNew/lm_an_qrhd_ylq_db.png


+ 8 - 4
FGUIProject/assets/CommonGame/package.xml

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

+ 4 - 5
FGUIProject/assets/LuckyBox/LuckyBoxActivityUI.xml

@@ -26,11 +26,10 @@
     <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">
+    <image id="n56_mbf1" name="n56" src="mbf1tam" fileName="images/cj_tswz_db.png" xy="136,1497" group="n54_mbf1"/>
+    <image id="n53_mbf1" name="n53" src="mbf1tam" fileName="images/cj_tswz_db.png" xy="136,1497" group="n54_mbf1"/>
+    <text id="n44_mbf1" name="txtCount" xy="240,1496" pivot="0.5,0" size="600,42" group="n54_mbf1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fff7d4" align="center" vars="true" text="{value=15}次摘星内必得{name=沧海月明}限定部件或对应词牌"/>
+    <group id="n54_mbf1" name="n54" xy="136,1496" size="808,43" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
   </displayList>

二进制
FGUIProject/assets/LuckyBox/images/cj_tswz_db.png


+ 2 - 1
GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -177,6 +177,7 @@ namespace GFGGame
             TravelDataManager.Instance.Clear();
             ArenaDataManager.Instance.Clear();
             ChatDataManager.Instance.Clear();
+            ActivityDataManager.Instance.Clear();
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();

+ 28 - 0
GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -4,6 +4,10 @@ namespace GFGGame
 {
     public class ActivityDataManager : SingletonBase<ActivityDataManager>
     {
+        public void Clear()
+        {
+            luckyBoxActBonusState.Clear();
+        }
 
         /**********************************************************活动*************************************************/
         /// <summary>
@@ -23,6 +27,30 @@ namespace GFGGame
             return 0;
         }
 
+        /**********************************************************限时抽奖活动*********************************************/
+        /// <summary>
+        /// 当前抽奖活动id
+        /// </summary>
+        /// <value></value>
+        public int activityId { get; set; }
+        /// <summary>
+        /// 抽奖总次数
+        /// </summary>
+        /// <value></value>
+        public int allPlayTimes { get; set; }
+        /// <summary>
+        /// 限时抽奖必掉次数
+        /// </summary>
+        /// <value></value>
+        public int lastCount { get; set; }
+        /// <summary>
+        /// </summary>
+        /// <typeparam name="int">奖励key,这里对应抽奖次数</typeparam>
+        /// <typeparam name="int">值由ConstBonusStatus定义</typeparam>
+        /// <returns></returns>
+        public Dictionary<int, int> luckyBoxActBonusState = new Dictionary<int, int>();
+
+
         /**********************************************************每日登录*************************************************/
         private int _sevenDayLoginLoginId = 1;
         /// <summary>

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxBonusUI.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxBonusUI.cs.meta

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

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.cs.meta

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

+ 89 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ListTaskItem.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ListTaskItem.cs.meta

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

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComBg001
+    {
+        public GComponent target;
+        public GButton m_btnClose;
+        public GLoader m_loaTitle;
+        public const string URL = "ui://eg2y0ldpmbf1tn5";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComBg001";
+        private static UI_ComBg001 _proxy;
+
+        public static UI_ComBg001 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComBg001();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComBg001 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComBg001();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnClose = null;
+            m_loaTitle = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs.meta

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

+ 67 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

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

+ 4 - 3
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -69,6 +69,7 @@ namespace GFGGame
             Timers.inst.Remove(UpdateTime);
             _bgIndex = 0;
             _modelIndex = 0;
+            _dressUpObjUI.ResetSceneObj(0, false, false, null, false);
         }
 
         public void Dispose()

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

@@ -58,6 +58,7 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.ACTIVITY_LUCKY_BOX, UpdateView);
         }
         protected override void OnShown()
         {
@@ -88,6 +89,8 @@ namespace GFGGame
 
         private void UpdateView()
         {
+            _ui.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastCount.ToString()).FlushVars();
+            _ui.m_txtCount.SetVar("name", _activityCfg.themeName).FlushVars();
             UI_ComBox_4 comBox = UI_ComBox_4.Proxy(_ui.m_comBox.target);
 
             LuckyBoxDataManager.Instance.InitData(_luckyBoxCfg.id);
@@ -147,7 +150,7 @@ namespace GFGGame
                  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 });
+                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId }, true);
                      //  LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                  }
              });
@@ -168,7 +171,7 @@ namespace GFGGame
                 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 });
+                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId }, true);
                     // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                 }
             });

+ 6 - 1
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusView.cs

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

+ 5 - 3
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

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

+ 14 - 11
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -124,15 +124,15 @@ namespace GFGGame
             int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
             if (this.viewData != null)
             {
-                object[] datas = (this.viewData as object[]);
-                if (datas != null && datas.Length > 1)
-                {
-                    boxId = (int)datas[1];
-                }
-                else
-                {
-                    boxId = (int)this.viewData;
-                }
+                // object[] datas = (this.viewData as object[]);
+                // if (datas != null && datas.Length > 1)
+                // {
+                //     boxId = (int)datas[1];
+                // }
+                // else
+                // {
+                boxId = (int)this.viewData;
+                // }
             }
 
             if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0) boxId = LuckyBoxDataManager.BOX_ID_2;
@@ -172,11 +172,14 @@ namespace GFGGame
             LuckyBoxDataManager.Instance.InitData(boxId);
 
             UI_ComBox comBox = UI_ComBox.Proxy(obj);
-
+            comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(cfg.resArr[_bgIndex]);
             if (_lcukyBoxCtrl.Count <= index)
             {
                 _lcukyBoxCtrl.Add(new LuckyBoxController(comBox.m_comModel.target));
-                _lcukyBoxCtrl[index].OnShown(boxId);
+                if (_ui.m_listBg.ChildIndexToItemIndex(0) == index)
+                {
+                    _lcukyBoxCtrl[index].OnShown(boxId);
+                }
             }
 
             comBox.m_btnPreview.m_c1.selectedIndex = boxId;

+ 6 - 0
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -17,6 +17,7 @@ namespace GFGGame
         private SwipeGesture swipeGesture;
         private const int swipeDistance = 100;
         private bool isOpen = false;
+        private int _luckyBoxActivtyId = 0;
         private GButton _btnGongGao;
         private GButton _btnHaoYou;
         private GButton _btnYouJian;
@@ -596,6 +597,11 @@ namespace GFGGame
             _ui.m_btnActivityLuckyBox.target.visible = activityId > 0;
             if (activityId > 0)
             {
+                if (activityId != _luckyBoxActivtyId)
+                {
+                    ActivitySProxy.ReqGetTimeLimitLuckyBoxInfo(activityId).Coroutine();
+                    _luckyBoxActivtyId = activityId;
+                }
                 ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
                 _ui.m_btnActivityLuckyBox.target.title = TimeUtil.FormattingTimeTo_DDHHmm(TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow());
             }

二进制
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png


二进制
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes


二进制
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes