zhaoyang 2 年 前
コミット
05ccd1fca3
100 ファイル変更482 行追加192 行削除
  1. 2 6
      FGUIProject/assets/CommonGame/components/BtnStyle005.xml
  2. 3 3
      FGUIProject/assets/CommonGame/package.xml
  3. 1 1
      FGUIProject/assets/LuckyBox/LuckyBoxActivityUI.xml
  4. 3 3
      FGUIProject/assets/LuckyBox/LuckyBoxUI.xml
  5. 1 1
      FGUIProject/assets/LuckyBox/combox/ComBox.xml
  6. 0 1
      FGUIProject/assets/LuckyBox/combox/ComBox1.xml
  7. 2 4
      FGUIProject/assets/LuckyBox/combox/ComModel.xml
  8. 1 1
      FGUIProject/assets/LuckyBox/components/ComStar.xml
  9. 2 4
      FGUIProject/assets/LuckyBox/components/ComponentLine.xml
  10. 0 0
      FGUIProject/assets/LuckyBox/imageNews/zx_bg.png
  11. BIN
      FGUIProject/assets/LuckyBox/imageNews/zx_title_1.png
  12. BIN
      FGUIProject/assets/LuckyBox/imagesNew/pro_activate.png
  13. BIN
      FGUIProject/assets/LuckyBox/imagesNews/bt_jiaobiao_bichu.png
  14. BIN
      FGUIProject/assets/LuckyBox/imagesNews/bt_tiaoguo.png
  15. BIN
      FGUIProject/assets/LuckyBox/imagesNews/wp_bg_shuliang.png
  16. BIN
      FGUIProject/assets/LuckyBox/imagesNews/wp_own.png
  17. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_bg_yueliang.png
  18. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_bg_zhuangshi.png
  19. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_jindu_bg.png
  20. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_bg_zhuangshi.png
  21. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_guangquan.png
  22. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_shang.png
  23. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_star_1.png
  24. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_star_2.png
  25. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_star_3.png
  26. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_xia.png
  27. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_xian.png
  28. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_guangquan.png
  29. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_shang.png
  30. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_star_1.png
  31. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_star_2.png
  32. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_star_3.png
  33. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_xia.png
  34. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_xian.png
  35. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_bg.png
  36. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_piaodai_shang.png
  37. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_piaodai_xia.png
  38. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_tab_bg.png
  39. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_tab_biankuang.png
  40. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_tab_xuanzhong.png
  41. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_taozhuang_zhuagnshi.png
  42. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_title_zhuangshi.png
  43. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_bg.png
  44. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_guangdian.png
  45. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_xianding.png
  46. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_zi.png
  47. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_zi_guangxiao.png
  48. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_zi_star.png
  49. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_zi_zhuangshi.png
  50. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tx_hengxiang.png
  51. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tx_jiguang.png
  52. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tx_qianjing.png
  53. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tx_star.png
  54. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tx_yuanquan.png
  55. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tx_zhongjian.png
  56. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_baseboard.png
  57. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_fen_bg.png
  58. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_fen_diguang.png
  59. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_fen_guangxiao.png
  60. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_fen_xian.png
  61. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_bg.png
  62. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_diguang.png
  63. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_guangxiao.png
  64. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_jiaobiao.png
  65. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_xian.png
  66. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_lan_bg.png
  67. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_lan_diguang.png
  68. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_mingcheng_bg.png
  69. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_diandian.png
  70. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_hengguang.png
  71. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_neiquan.png
  72. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_star.png
  73. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_waiquan.png
  74. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yulan_diaoshi.png
  75. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yulan_tubiao.png
  76. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yulan_tubiao_bg.png
  77. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yulan_xinggui.png
  78. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_zhuangshi_diaoshi.png
  79. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_zhuangshi_xinggui.png
  80. 7 4
      FGUIProject/assets/LuckyBox/package.xml
  81. 0 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox.cs
  82. 110 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs
  83. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs.meta
  84. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComCost.cs
  85. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComModel.cs
  86. 4 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComponentLine.cs
  87. 42 38
      GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs
  88. 1 3
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs
  89. 94 110
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  90. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  91. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  92. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  93. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  94. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  95. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png
  96. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png
  97. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3!a.png
  98. 96 0
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3!a.png.meta
  99. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3.png
  100. 96 0
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3.png.meta

+ 2 - 6
FGUIProject/assets/CommonGame/components/BtnStyle005.xml

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="316,102" extention="Button">
+<component size="94,94" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n2_idkd" name="icon" xy="0,0" pivot="0.5,0.5" size="316,102" url="ui://eg2y0ldpvolstnf" autoSize="true"/>
-    <text id="n1_9qpb" name="title" xy="0,-4" size="316,102" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="前往">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </text>
+    <image id="n0_duuf" name="n0" src="volstnj" fileName="imagesNew/an_bt_cut.png" xy="0,0"/>
   </displayList>
   <Button/>
-  <relation target="n2_idkd" sidePair="width-width,height-height"/>
 </component>

+ 3 - 3
FGUIProject/assets/CommonGame/package.xml

@@ -341,12 +341,12 @@
     <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
     <component id="volstnd" name="ComIcon003.xml" path="/components/"/>
     <image id="volstne" name="lm_fl_db.png" path="/bgimg/" exported="true"/>
-    <component id="volstnf" name="BtnStyle005.xml" path="/components/"/>
+    <component id="volstnf" name="BtnStyle005.xml" path="/components/" exported="true"/>
     <component id="volstng" name="BtnStyle006.xml" path="/components/" exported="true"/>
     <component id="volstnh" name="ComItem003.xml" path="/components/" exported="true"/>
-    <image id="volstni" name="an_bt_bai.png" path="/imagesNew/"/>
+    <image id="volstni" name="an_bt_bai.png" path="/imagesNew/" exported="true"/>
     <image id="volstnj" name="an_bt_cut.png" path="/imagesNew/"/>
-    <image id="volstnk" name="an_bt_jin.png" path="/imagesNew/"/>
+    <image id="volstnk" name="an_bt_jin.png" path="/imagesNew/" exported="true"/>
     <image id="volstnl" name="wp_bg_yuan.png" path="/imagesNew/"/>
     <image id="volstnm" name="wp_own.png" path="/imagesNew/"/>
   </resources>

+ 1 - 1
FGUIProject/assets/LuckyBox/LuckyBoxActivityUI.xml

@@ -27,7 +27,7 @@
     <group id="n52_mbf1" name="n52" xy="9,246" size="151,459" 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="210,1496" pivot="0.5,0" size="659,42" group="n54_mbf1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fff7d4" align="center" vars="true" text="{value=15}次摘星内必得【{name=沧海月明}】限定部件或对应词牌"/>
+    <text id="n44_mbf1" name="txtCount" xy="284,1496" pivot="0.5,0" size="511,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>

+ 3 - 3
FGUIProject/assets/LuckyBox/LuckyBoxUI.xml

@@ -14,9 +14,9 @@
       <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"/>
+    <component id="n7_fka7" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220" group="n32_vek8" visible="false"/>
     <group id="n32_vek8" name="grpTop" xy="0,80" size="1080,230" 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"/>
+    <component id="n33_ly9g" name="btnLeft" src="volstnf" fileName="components/BtnStyle005.xml" pkg="eg2y0ldp" xy="74,960" pivot="0.5,0.5" anchor="true" rotation="180"/>
+    <component id="n39_ly9g" name="btnRight" src="volstnf" fileName="components/BtnStyle005.xml" pkg="eg2y0ldp" xy="1000,960" pivot="0.5,0.5" anchor="true"/>
   </displayList>
 </component>

+ 1 - 1
FGUIProject/assets/LuckyBox/combox/ComBox.xml

@@ -14,7 +14,7 @@
     <group id="n66_vols" name="n66" xy="861,241" size="226,148" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
-    <image id="n72_vols" name="imgActLuckyBox" src="volstcj" fileName="imageNews/cj_wz_jhsy.png" xy="101,376" visible="false">
+    <image id="n72_vols" name="imgActLuckyBox" src="volstcj" fileName="imageNews/cj_wz_jhsy.png" xy="101,376">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     <component id="n55_vols" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="256,1635" pivot="0.5,0" anchor="true" group="n61_vols">

+ 0 - 1
FGUIProject/assets/LuckyBox/combox/ComBox1.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" overflow="hidden" designImage="ui://drx9d1usduuftcs" designImageOffsetY="-240" designImageAlpha="100">
   <displayList>
-    <image id="n83_duuf" name="n83" src="duuftcs" fileName="zx_bg.png" xy="0,-240"/>
     <component id="n44_mbf1" name="comModel" src="mbf1tah" fileName="combox/ComModel.xml" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </component>

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

@@ -1,12 +1,10 @@
 <?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://drx9d1usduuftcu" align="center" vAlign="middle" autoSize="true">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
-    <loader id="n41_duuf" name="loaRes" xy="540,1300" pivot="0.5,0.5" anchor="true" size="1080,1840" url="ui://drx9d1usduuftco" align="center" vAlign="middle" autoSize="true">
+    <loader id="n40_mbf1" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
+    <loader id="n43_duuf" name="loaRes" xy="354,717" pivot="0.5,0.5" anchor="true" size="50,50" align="center" vAlign="middle"/>
     <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>

+ 1 - 1
FGUIProject/assets/LuckyBox/components/ComStar.xml

@@ -2,6 +2,6 @@
 <component size="78,78" pivot="0.5,0.5" anchor="true">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n8_t6j1" name="comLine" src="t6j1tek" fileName="components/Component21.xml" xy="0,27"/>
+    <component id="n8_t6j1" name="comLine" src="duufteb" fileName="components/ComponentLine.xml" xy="0,27"/>
   </displayList>
 </component>

+ 2 - 4
FGUIProject/assets/LuckyBox/components/ComponentLine.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="850,24" mask="n3_o9gh">
+<component size="850,24" mask="n4_duuf">
   <displayList>
     <graph id="n2_o9gh" name="holder" xy="424,11" size="1,1"/>
-    <image id="n3_o9gh" name="imgMask" src="t6j1tem" fileName="imagesNew/pro_activate.png" xy="0,-99" size="850,239">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    <graph id="n4_duuf" name="grpMask" xy="0,0" size="850,24" type="rect"/>
   </displayList>
 </component>

+ 0 - 0
FGUIProject/assets/LuckyBox/zx_bg.png → FGUIProject/assets/LuckyBox/imageNews/zx_bg.png


BIN
FGUIProject/assets/LuckyBox/imageNews/zx_title_1.png


BIN
FGUIProject/assets/LuckyBox/imagesNew/pro_activate.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/bt_jiaobiao_bichu.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/bt_tiaoguo.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/wp_bg_shuliang.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/wp_own.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_bg_yueliang.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_bg_zhuangshi.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_jindu_bg.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_bg_zhuangshi.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_guangquan.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_shang.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_star_1.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_star_2.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_star_3.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_xia.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_xian.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_guangquan.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_shang.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_star_1.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_star_2.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_star_3.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_xia.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_xian.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tc_bg.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tc_piaodai_shang.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tc_piaodai_xia.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tc_tab_bg.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tc_tab_biankuang.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tc_tab_xuanzhong.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tc_taozhuang_zhuagnshi.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tc_title_zhuangshi.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_title_bg.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_title_guangdian.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_title_xianding.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_title_zi.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_title_zi_guangxiao.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_title_zi_star.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_title_zi_zhuangshi.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tx_hengxiang.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tx_jiguang.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tx_qianjing.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tx_star.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tx_yuanquan.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_tx_zhongjian.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_baseboard.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_fen_bg.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_fen_diguang.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_fen_guangxiao.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_fen_xian.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_bg.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_diguang.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_guangxiao.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_jiaobiao.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_xian.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_lan_bg.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_lan_diguang.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_wp_mingcheng_bg.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_diandian.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_hengguang.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_neiquan.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_star.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_waiquan.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_yulan_diaoshi.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_yulan_tubiao.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_yulan_tubiao_bg.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_yulan_xinggui.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_zhuangshi_diaoshi.png


BIN
FGUIProject/assets/LuckyBox/imagesNews/zx_zhuangshi_xinggui.png


+ 7 - 4
FGUIProject/assets/LuckyBox/package.xml

@@ -105,7 +105,6 @@
     <image id="volstbi" name="zx_yulan_xinggui.png" path="/imageNews/"/>
     <image id="volstbj" name="zx_wp_jin_guangxiao.png" path="/imageNews/"/>
     <image id="volstbk" name="zx_zhuangshi_diaoshi.png" path="/imageNews/"/>
-    <image id="volstbl" name="zx_title_1.png" path="/imageNews/"/>
     <image id="volstbm" name="zx_title_guangdian.png" path="/imageNews/"/>
     <image id="volstbn" name="bt_jiaobiao_bichu.png" path="/imageNews/"/>
     <image id="volstbo" name="bt_tiaoguo.png" path="/imageNews/"/>
@@ -145,13 +144,17 @@
     <image id="t6j1tcm" name="cj_zxth_db.png" path="/images/"/>
     <image id="duuftcn" name="zx_bgzz.png" path="/imageNews/"/>
     <image id="duuftco" name="lh_scfsls.png" path="/imageNews/" exported="true"/>
-    <image id="duuftcp" name="zx_title_2.png" path="/imageNews/"/>
-    <image id="duuftcq" name="zx_title_3.png" path="/imageNews/"/>
+    <image id="duuftcp" name="zx_title_2.png" path="/imageNews/" exported="true"/>
+    <image id="duuftcq" name="zx_title_3.png" path="/imageNews/" exported="true"/>
     <component id="duuftcr" name="ComBox1.xml" path="/combox/" exported="true"/>
-    <image id="duuftcs" name="zx_bg.png" path="/"/>
     <component id="duuftct" name="Button6.xml" path="/components/"/>
     <image id="duuftcw" name="dz_liuli.png" path="/imageNews/"/>
     <image id="duuftcx" name="dz_danxiaozj.png" path="/imageNews/"/>
+    <component id="duuftcy" name="ComBox_1.xml" path="/combox/"/>
+    <component id="duufteb" name="ComponentLine.xml" path="/components/"/>
+    <component id="duuftec" name="Component3.xml" path="/components/"/>
+    <image id="duuftf0" name="zx_title_1.png" path="/imageNews/" exported="true"/>
+    <image id="duuftf2" name="zx_bg.png" path="/imageNews/" atlas="alone_npot"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -11,8 +11,6 @@ namespace UI.LuckyBox
         public UI_Button3 m_btnPreview;
         public GTextField m_txtOwned;
         public GImage m_imgActLuckyBox;
-        public GTextField m_txtTime;
-        public GGroup m_grpLuckyBox;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
         public UI_Button1 m_btnBuyOne;
@@ -70,8 +68,6 @@ namespace UI.LuckyBox
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_imgActLuckyBox = (GImage)comp.GetChild("imgActLuckyBox");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_grpLuckyBox = (GGroup)comp.GetChild("grpLuckyBox");
             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"));
@@ -87,8 +83,6 @@ namespace UI.LuckyBox
             m_btnPreview = null;
             m_txtOwned = null;
             m_imgActLuckyBox = null;
-            m_txtTime = null;
-            m_grpLuckyBox = null;
             m_comCostOne.Dispose();
             m_comCostOne = null;
             m_comCostTen.Dispose();

+ 110 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs

@@ -0,0 +1,110 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_ComBox1
+    {
+        public GComponent target;
+        public UI_ComModel m_comModel;
+        public GLoader m_loaTitle;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public GGroup m_grpTitle;
+        public GButton m_btnPreview;
+        public GTextField m_txtOwned;
+        public UI_ComCost m_comCostOne;
+        public UI_ComCost m_comCostTen;
+        public GButton m_btnBuyOne;
+        public GButton m_btnBuyTen;
+        public GImage m_imgSpecial;
+        public GTextField m_txtRemainTimes;
+        public const string URL = "ui://drx9d1usduuftcr";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "ComBox1";
+        private static UI_ComBox1 _proxy;
+
+        public static UI_ComBox1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComBox1();
+            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_ComBox1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComBox1();
+            }
+            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_loaTitle = (GLoader)comp.GetChild("loaTitle");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_grpTitle = (GGroup)comp.GetChild("grpTitle");
+            m_btnPreview = (GButton)comp.GetChild("btnPreview");
+            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
+            m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
+            m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
+            m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
+            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
+            m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comModel.Dispose();
+            m_comModel = null;
+            m_loaTitle = null;
+            m_txtTime = null;
+            m_grpTime = null;
+            m_grpTitle = null;
+            m_btnPreview = null;
+            m_txtOwned = null;
+            m_comCostOne.Dispose();
+            m_comCostOne = null;
+            m_comCostTen.Dispose();
+            m_comCostTen = null;
+            m_btnBuyOne = null;
+            m_btnBuyTen = null;
+            m_imgSpecial = null;
+            m_txtRemainTimes = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs.meta

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

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComCost.cs

@@ -7,8 +7,8 @@ namespace UI.LuckyBox
     public partial class UI_ComCost
     {
         public GComponent target;
-        public GTextField m_txtCost;
         public GLoader m_loaCost;
+        public GTextField m_txtCost;
         public const string URL = "ui://drx9d1usvek812";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComCost";
@@ -56,13 +56,13 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
-            m_txtCost = (GTextField)comp.GetChild("txtCost");
             m_loaCost = (GLoader)comp.GetChild("loaCost");
+            m_txtCost = (GTextField)comp.GetChild("txtCost");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtCost = null;
             m_loaCost = null;
+            m_txtCost = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComModel.cs

@@ -8,6 +8,7 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_loaRes;
         public GGraph m_holder;
         public const string URL = "ui://drx9d1usmbf1tah";
         public const string PACKAGE_NAME = "LuckyBox";
@@ -57,11 +58,13 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaRes = (GLoader)comp.GetChild("loaRes");
             m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_loaRes = null;
             m_holder = null;
             if(disposeTarget && target != null)
             {

+ 4 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComponentLine.cs

@@ -8,8 +8,8 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public GGraph m_holder;
-        public GImage m_imgMask;
-        public const string URL = "ui://drx9d1ust6j1tek";
+        public GGraph m_grpMask;
+        public const string URL = "ui://drx9d1usduufteb";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComponentLine";
         private static UI_ComponentLine _proxy;
@@ -57,12 +57,12 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_holder = (GGraph)comp.GetChild("holder");
-            m_imgMask = (GImage)comp.GetChild("imgMask");
+            m_grpMask = (GGraph)comp.GetChild("grpMask");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_holder = null;
-            m_imgMask = null;
+            m_grpMask = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 42 - 38
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -29,67 +29,70 @@ namespace GFGGame
             _comModel = UI_ComModel.Proxy(_com);
             _curTime = _turnTime;
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId);
-            _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_bgIndex]);
-            if (_luckyBoxCfg.suitShowArr.Length > 0)
+            ChangeRes();
+            Timers.inst.Add(_turnTime, 0, UpdateTime);
+        }
+
+        private void UpdateTime(object param)
+        {
+
+            _bgIndex = _bgIndex + 1 == _luckyBoxCfg.bgResArr.Length ? 0 : _bgIndex + 1;
+            if (_luckyBoxCfg.resArr.Length > 0)
             {
-                int scale = 100;
-                int direction = 1;
-                if (_luckyBoxCfg.scaleArr.Length > 0)
-                {
-                    scale = Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]);
-                    direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
-                }
-                _dressUpObjUI.ResetSceneObj(scale, false, false, null, false);
-                _dressUpObjUI.dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitShowArr[_modelIndex][0], true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
-                _dressUpObjUI.UpdateWrapper(_comModel.m_holder);
-                _dressUpObjUI.sceneObject.transform.localPosition = new Vector3(_luckyBoxCfg.suitShowArr[_modelIndex][1], _luckyBoxCfg.suitShowArr[_modelIndex][2], 0);
-                _dressUpObjUI.sceneObject.transform.localScale = new Vector3(direction * scale, scale, scale);
+                _modelIndex = _modelIndex + 1 == _luckyBoxCfg.resArr.Length ? 0 : _modelIndex + 1;
             }
-            if (_luckyBoxCfg.resArr.Length > 1 || _luckyBoxCfg.suitShowArr.Length > 1)
+            else
             {
-                Timers.inst.Remove(UpdateTime);
-                Timers.inst.Add(_turnTime, 0, UpdateTime);
+                _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitIdArr.Length ? 0 : _modelIndex + 1;
             }
+            ChangeRes();
         }
 
-        private void UpdateTime(object param)
+        private void ChangeRes()
         {
-            // _curTime = _curTime - 1 == 0 ? _turnTime : _curTime - 1;
 
-            // if (_curTime == _turnTime)
-            // {
-            _bgIndex = _bgIndex + 1 == _luckyBoxCfg.resArr.Length ? 0 : _bgIndex + 1;
-            _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitShowArr.Length ? 0 : _modelIndex + 1;
-            if (_luckyBoxCfg.resArr.Length > 1)
+            _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
+            if (_luckyBoxCfg.resArr.Length > 0)
             {
-                _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_bgIndex]);
-
+                _comModel.m_loaRes.url = string.Format("ui://LuckyBox/{0}", _luckyBoxCfg.resArr[_modelIndex]);
+                _comModel.m_loaRes.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
             }
-            if (_luckyBoxCfg.suitShowArr.Length > 0)
+            else if (_luckyBoxCfg.suitIdArr.Length > 0)
             {
-                int scale = 100;
                 int direction = 1;
                 if (_luckyBoxCfg.scaleArr.Length > 0)
                 {
-                    scale = Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]);
                     direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
                 }
-                _dressUpObjUI.ResetSceneObj(scale, false, false, null, false);
-                _dressUpObjUI.dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitShowArr[_modelIndex][0], true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
-                _dressUpObjUI.UpdateWrapper(_comModel.m_holder);
-                _dressUpObjUI.sceneObject.transform.localPosition = new Vector3(_luckyBoxCfg.suitShowArr[_modelIndex][1], _luckyBoxCfg.suitShowArr[_modelIndex][2], 0);
-                _dressUpObjUI.sceneObject.transform.localScale = new Vector3(direction * scale, scale, scale);
+                if (_luckyBoxCfg.isAni == 0)
+                {
+                    SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_luckyBoxCfg.suitIdArr[_modelIndex]);
+                    _comModel.m_loaRes.url = ResPathUtil.GetDressUpPath(suitCfg.picRes);
+
+                    float scale = _luckyBoxCfg.scaleArr.Length > 0 ? Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]) / 10000f : 1;
+                    _comModel.m_loaRes.SetScale(direction * scale, scale);
+                    _comModel.m_loaRes.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
+                }
+                else
+                {
+                    _comModel.m_loaRes.url = "";
+
+                    int scale = _luckyBoxCfg.scaleArr.Length > 0 ? Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]) / 10000 : 100;
+                    _dressUpObjUI.ResetSceneObj(scale, false, false, null, false);
+                    _dressUpObjUI.dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitIdArr[_modelIndex], true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
+                    _dressUpObjUI.UpdateWrapper(_comModel.m_holder);
+                    _dressUpObjUI.sceneObject.transform.localScale = new Vector3(direction * scale, scale, scale);
+                    _comModel.m_holder.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
+                }
             }
-            // }
         }
-
         public void OnHide()
         {
-            UI_ComModel.ProxyEnd();
-            Timers.inst.Remove(UpdateTime);
             _bgIndex = 0;
             _modelIndex = 0;
             _dressUpObjUI.ResetSceneObj(0, false, false, null, false);
+            _comModel.m_loaRes.url = "";
+            Timers.inst.Remove(UpdateTime);
         }
 
         public void Dispose()
@@ -99,6 +102,7 @@ namespace GFGGame
                 _dressUpObjUI.Dispose();
                 _dressUpObjUI = null;
             }
+            UI_ComModel.ProxyEnd();
         }
     }
 }

+ 1 - 3
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -101,7 +101,7 @@ namespace GFGGame
         private void UpdateView()
         {
             _ui.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastDrawCount.ToString()).FlushVars();
-            _ui.m_txtCount.SetVar("name", _activityCfg.themeName).FlushVars();
+            _ui.m_txtCount.SetVar("name", _luckyBoxCfg.name).FlushVars();
             UI_ComBox comBox = UI_ComBox.Proxy(_ui.m_comBox.target);
 
             LuckyBoxDataManager.Instance.InitData(_luckyBoxCfg.id);
@@ -129,8 +129,6 @@ namespace GFGGame
                 comBox.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
             }
             comBox.m_btnBuyTen.target.data = _luckyBoxCfg.id;
-            comBox.m_imgActLuckyBox.visible = true;
-            comBox.m_grpLuckyBox.visible = false;
             if (comBox.m_btnPreview.target.data == null)
             {
                 comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);

+ 94 - 110
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -33,7 +33,6 @@ namespace GFGGame
 
         private bool isActiveBoxOpen = false;
         private int _activeBoxId = 0;
-        private int _bgIndex = 0;
         private int _curIndex = 0;
 
         public override void Dispose()
@@ -85,17 +84,17 @@ namespace GFGGame
             // _ui.m_txtRemainTimes.visible = false;
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnHome.onClick.Add(OnClickBtnHome);
+            // _ui.m_btnHome.onClick.Add(OnClickBtnHome);
 
             _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
             _ui.m_btnRight.onClick.Add(OnBtnRightClick);
 
-            _ui.m_listBg.SetVirtual();
+            // _ui.m_listBg.SetVirtual();
             _ui.m_listBg.itemRenderer = RenderListBgItem;
-            _ui.m_listBg.itemProvider = GetListItemResource;
+            // _ui.m_listBg.itemProvider = GetListItemResource;
             _ui.m_listBg.scrollPane.onScrollEnd.Add(OnListBgScroll);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("jingzhongh_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
         }
         protected override void AddEventListener()
         {
@@ -144,94 +143,30 @@ namespace GFGGame
 
             Timers.inst.AddUpdate(CheckGuide);
         }
-        private string GetListItemResource(int index)
-        {
-            if (index == 0 && _activeBoxId > 0)
-            {
-                return "UI://LuckyBox/ComBox";
-            }
-            else
-            {
-                int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
-                return string.Format("UI://LuckyBox/ComBox_{0}", boxId);
-            }
-        }
+        // private string GetListItemResource(int index)
+        // {
+        //     if (index == 0 && _activeBoxId > 0)
+        //     {
+        //         return "UI://LuckyBox/ComBox";
+        //     }
+        //     else
+        //     {
+        //         int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
+        //         return string.Format("UI://LuckyBox/ComBox_{0}", boxId);
+        //     }
+        // }
         private void RenderListBgItem(int index, GObject obj)
         {
             int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
-            LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
-            LuckyBoxDataManager.Instance.InitData(boxId);
-
-            UI_ComBox comBox = UI_ComBox.Proxy(obj);
-            comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(cfg.resArr[_bgIndex]);
-            if (!_lcukyBoxCtrl.ContainsKey(boxId))
-            {
-                _lcukyBoxCtrl.Add(boxId, new LuckyBoxController(comBox.m_comModel.target));
-                if (_ui.m_listBg.ChildIndexToItemIndex(0) == index)
-                {
-                    _lcukyBoxCtrl[boxId].OnShown(boxId);
-                }
-            }
-            comBox.m_btnPreview.m_c1.selectedIndex = boxId;
-            LuckyBoxDataManager.Instance.GetOwnedCount(boxId, 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(cfg.numericType);
-            comBox.m_txtRemainTimes.text = string.Format("今日剩余次数:{0}", cfg.maxCount - boughtCount);
-            comBox.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
-            comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
-            comBox.m_comCostTen.m_txtCost.text = cfg.costNumTen.ToString();
-            comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
-            if (comBox.m_btnBuyOne.target.data == null)
-            {
-                comBox.m_btnBuyOne.target.onClick.Add(OnClickBtnBuyOne);
-            }
-            comBox.m_btnBuyOne.target.data = boxId;
+            // LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
+            // LuckyBoxDataManager.Instance.InitData(boxId);
 
-            if (comBox.m_btnBuyTen.target.data == null)
-            {
-                comBox.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
-            }
-            comBox.m_btnBuyTen.target.data = boxId;
+            // UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
 
-            if (comBox.m_btnPreview.target.data == null)
-            {
-                comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);
-            }
-            comBox.m_btnPreview.target.data = boxId;
-
-            obj.data = boxId;
-            // if (comBox.m_grpLuckyBox != null)
-            // {
-            //     comBox.m_grpLuckyBox.visible = boxId == _activeBoxId;
-            // }
-            if (boxId == _activeBoxId)
-            {
-                long endTime = LuckyBoxDataManager.Instance.endTime;
-                long curTime = TimeHelper.ServerNow();
-                TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
-                comBox.m_txtTime.text = string.Format("剩余{0}{1}", num, str);
-                comBox.m_grpLuckyBox.visible = boxId == _activeBoxId;
-            }
-
-            UI_ComBox.ProxyEnd();
 
+            // UI_ComBox1.ProxyEnd();
         }
 
-        // private void UpdateBg(object param)
-        // {
-        //     string[] resArr = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.currentBoxId).resArr;
-        //     _bgIndex++;
-        //     if (_bgIndex >= resArr.Length) _bgIndex = 0;
-        //     GObject gObject = _ui.m_listBg.GetChildAt(0);
-        //     if (gObject == null) return;
-        //     GComponent item = gObject.asCom;
-        //     if (item.gameObjectName != "ComBox_2") return;
-        //     GLoader loaBg = item.GetChild("loaBg").asLoader;
-        //     loaBg.url = ResPathUtil.GetBgImgPath(resArr[_bgIndex]);
-        // }
-
-
         private void OnBtnLeftClick()
         {
             int index = _curIndex - 1;
@@ -252,18 +187,82 @@ namespace GFGGame
 
         private void OnListBgScroll()
         {
-            _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnHide();
-            _curIndex = _ui.m_listBg.ChildIndexToItemIndex(0);
+            if (_lcukyBoxCtrl.ContainsKey(LuckyBoxDataManager.Instance.currentBoxId)) _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnHide();
+            _curIndex = _ui.m_listBg.GetFirstChildInView();
             LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
-
-            _bgIndex = 0;
             _valueBarController.UpdateCJ();
-            _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnShown(LuckyBoxDataManager.Instance.currentBoxId);
+            UpdateListItem();
             _ui.m_btnLeft.grayed = _curIndex <= 0;
             _ui.m_btnRight.grayed = _curIndex >= _ui.m_listBg.numItems - 1;
 
         }
 
+        private void UpdateListItem()
+        {
+            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
+            LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
+            LuckyBoxDataManager.Instance.InitData(boxId);
+
+            GObject obj = _ui.m_listBg.GetChildAt(_curIndex);
+            UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
+
+            if (!_lcukyBoxCtrl.ContainsKey(boxId))
+            {
+                _lcukyBoxCtrl.Add(boxId, new LuckyBoxController(comBox.m_comModel.target));
+                // if (_ui.m_listBg.ChildIndexToItemIndex(0) == _curIndex)
+                // {
+                //     _lcukyBoxCtrl[boxId].OnShown(boxId);
+                // }
+            }
+            _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnShown(LuckyBoxDataManager.Instance.currentBoxId);
+
+            LuckyBoxDataManager.Instance.GetOwnedCount(boxId, 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(cfg.numericType);
+            comBox.m_txtRemainTimes.text = string.Format("今日剩余次数:{0}", cfg.maxCount - boughtCount);
+            comBox.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
+            comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
+            comBox.m_comCostTen.m_txtCost.text = cfg.costNumTen.ToString();
+            comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
+            if (comBox.m_btnBuyOne.data == null)
+            {
+                comBox.m_btnBuyOne.onClick.Add(OnClickBtnBuyOne);
+            }
+            comBox.m_btnBuyOne.data = boxId;
+
+            if (comBox.m_btnBuyTen.data == null)
+            {
+                comBox.m_btnBuyTen.onClick.Add(OnClickBtnBuyTen);
+            }
+            comBox.m_btnBuyTen.data = boxId;
+
+            if (comBox.m_btnPreview.data == null)
+            {
+                comBox.m_btnPreview.onClick.Add(OnClickBtnPreview);
+            }
+            comBox.m_btnPreview.data = boxId;
+
+            obj.data = boxId;
+
+            comBox.m_grpTime.visible = boxId == _activeBoxId;
+            if (boxId == _activeBoxId)
+            {
+                long endTime = LuckyBoxDataManager.Instance.endTime;
+                long curTime = TimeHelper.ServerNow();
+                // TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
+                long time = endTime - curTime;
+                string strTime = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+                comBox.m_txtTime.text = string.Format("活动时间:剩余{0}", strTime);
+                comBox.m_loaTitle.url = "ui://LuckyBox/zx_title_1";
+            }
+            else
+            {
+                comBox.m_loaTitle.url = string.Format("ui://LuckyBox/zx_title_{0}", boxId);
+            }
+            UI_ComBox1.ProxyEnd();
+        }
         private void CheckTime(object param = null)
         {
             if (LuckyBoxDataManager.Instance.currentBoxId != _activeBoxId) return;
@@ -275,34 +274,19 @@ namespace GFGGame
             if (item == null) return;
             GObject textField = item.asCom.GetChild("txtTime");
             if (textField == null) return;
-            textField.asTextField.text = string.Format("剩余{0}{1}", num, str);
+
+            long time = endTime - curTime;
+            string strTime = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+            textField.asTextField.text = string.Format("活动时间:剩余{0}", strTime);
         }
         private void updateBoxEffect()
         {
             if (isActiveBoxOpen)
             {
-                // int index = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1);
-                // UI_ComListBgItem item = UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(index));
-                // string resPath = ResPathUtil.GetViewEffectPath("ui_cj", "ui_cj_bt");
-                // SceneController.AddObjectToView(_gameObject, _wrapper, item.m_holder, resPath, out _gameObject, out _wrapper);
-                // string resPath3 = ResPathUtil.GetDressUpAnimationPath("dz_jiyuet");
-                // SceneController.AddObjectToView(_gameObject3, _wrapper3, item.m_holder1, resPath3, out _gameObject3, out _wrapper3, 120);
-
-                // string resPath1 = ResPathUtil.GetViewEffectPath("ui_cj", "ui_cj_sl");
-                // SceneController.AddObjectToView(_gameObject1, _wrapper1, _ui.m_btnBuyOne.m_holder, resPath1, out _gameObject1, out _wrapper1);
-                // SceneController.AddObjectToView(_gameObject2, _wrapper2, _ui.m_btnBuyTen.m_holder, resPath1, out _gameObject2, out _wrapper2);
-                // UI_ComListBgItem.ProxyEnd();
 
             }
         }
-        // private void OnClickBtnExChange(EventContext context)
-        // {
-        //     GObject obj = context.sender as GObject;
-        //     int boxId = (int)obj.data;
-        //     int storeId = boxId == LuckyBoxDataManager.BOX_ID_1 ? ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID : ConstStoreId.LUCKY_BOX_STORE_ID;
-        //     ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { storeId }, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
-        //     this.Hide();
-        // }
+
         private void OnClickBtnPreview(EventContext context)
         {
             GObject obj = context.sender as GObject;

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_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_atlas0_1!a.png


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


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


+ 96 - 0
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 0782a0567c8ea4b44b9167b65261e3cc
+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/LuckyBox/LuckyBox_atlas0_3.png


+ 96 - 0
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3.png.meta

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

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません