Browse Source

Merge remote-tracking branch 'remotes/origin/zhaoyang'

zhaoyang 2 years ago
parent
commit
95dac885e5
38 changed files with 772 additions and 170 deletions
  1. 1 0
      FGUIProject/assets/CommonGame/components/BtnStyle006.xml
  2. 47 0
      FGUIProject/assets/LuckyBox/LuckBoxBonusShowUI.xml
  3. 1 1
      FGUIProject/assets/LuckyBox/LuckBoxBonusUI.xml
  4. 10 1
      FGUIProject/assets/LuckyBox/LuckyBoxNewDressUI.xml
  5. 46 35
      FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml
  6. 5 3
      FGUIProject/assets/LuckyBox/combox/ComBox1.xml
  7. 4 4
      FGUIProject/assets/LuckyBox/components/ComCard.xml
  8. 30 25
      FGUIProject/assets/LuckyBox/components/Component2.xml
  9. 9 0
      FGUIProject/assets/LuckyBox/components/LuckyBoxBonusShowItem.xml
  10. BIN
      FGUIProject/assets/LuckyBox/imageNews/zx_wp_jin_jiaobiao.png
  11. BIN
      FGUIProject/assets/LuckyBox/imageNews/zx_wp_lan_grey.png
  12. 4 1
      FGUIProject/assets/LuckyBox/package.xml
  13. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle006.cs
  14. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle006.cs.meta
  15. 9 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs
  16. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Component2.cs
  17. 136 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusShowUI.cs
  18. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusShowUI.cs.meta
  19. 75 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusShowItem.cs
  20. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusShowItem.cs.meta
  21. 9 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxNewDressUI.cs
  22. 17 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs
  23. 145 0
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs
  24. 11 0
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs.meta
  25. 7 22
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewCardView.cs
  26. 57 45
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs
  27. 21 12
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs
  28. 21 18
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  29. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  30. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  31. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  32. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png
  33. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png
  34. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png
  35. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png
  36. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3!a.png
  37. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3.png
  38. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes

+ 1 - 0
FGUIProject/assets/CommonGame/components/BtnStyle006.xml

@@ -8,6 +8,7 @@
     <text id="n1_9qpb" name="title" xy="0,0" size="316,94" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
     <text id="n1_9qpb" name="title" xy="0,0" size="316,94" 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"/>
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </text>
     </text>
+    <graph id="n3_e050" name="holder" xy="158,51" size="10,10" type="rect"/>
   </displayList>
   </displayList>
   <Button/>
   <Button/>
   <relation target="n2_idkd" sidePair="width-width,height-height"/>
   <relation target="n2_idkd" sidePair="width-width,height-height"/>

+ 47 - 0
FGUIProject/assets/LuckyBox/LuckBoxBonusShowUI.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <loader id="n17_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
+    <graph id="n25_e050" name="holder_star" xy="535,210" size="10,10">
+      <relation target="" sidePair="center-center,top-top"/>
+    </graph>
+    <graph id="n26_e050" name="holder_bg" xy="535,955" size="10,10">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <graph id="n27_e050" name="holder_cloud" xy="535,1810" size="10,10">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </graph>
+    <component id="n14_ga16" name="itemOne" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,960">
+      <gearDisplay controller="c1" pages="0"/>
+    </component>
+    <component id="n1_ga16" name="item0" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="385,475" group="n21_e050"/>
+    <component id="n5_ga16" name="item1" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="695,475" group="n21_e050"/>
+    <group id="n21_e050" name="n21" xy="210,300" size="660,350" group="n15_ga16" advanced="true" layout="hz" colGap="-40" excludeInvisibles="true"/>
+    <component id="n6_ga16" name="item2" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="220,798" group="n22_e050"/>
+    <component id="n7_ga16" name="item3" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,798" group="n22_e050"/>
+    <component id="n8_ga16" name="item4" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="860,798" group="n22_e050"/>
+    <group id="n22_e050" name="n22" xy="45,623" size="990,350" group="n15_ga16" advanced="true" layout="hz" colGap="-30" excludeInvisibles="true"/>
+    <component id="n9_ga16" name="item5" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="220,1121" group="n23_e050"/>
+    <component id="n10_ga16" name="item6" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,1121" group="n23_e050"/>
+    <component id="n11_ga16" name="item7" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="860,1121" group="n23_e050"/>
+    <group id="n23_e050" name="n23" xy="45,946" size="990,350" group="n15_ga16" advanced="true" layout="hz" colGap="-30" excludeInvisibles="true"/>
+    <component id="n12_ga16" name="item8" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="385,1444" group="n24_e050"/>
+    <component id="n13_ga16" name="item9" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="695,1444" group="n24_e050"/>
+    <group id="n24_e050" name="n24" xy="210,1269" size="660,350" group="n15_ga16" advanced="true" layout="hz" colGap="-40" excludeInvisibles="true"/>
+    <group id="n15_ga16" name="grpItems" xy="45,300" size="990,1319" advanced="true" layout="vt" lineGap="-27">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n14_ga16" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n15_ga16" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n14_ga16" value="0"/>
+    <item time="0" type="Alpha" target="n15_ga16" value="0"/>
+  </transition>
+</component>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
   <displayList>
     <loader id="n17_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
     <loader id="n17_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>

+ 10 - 1
FGUIProject/assets/LuckyBox/LuckyBoxNewDressUI.xml

@@ -4,6 +4,15 @@
     <loader id="n4_duuf" name="loaBg" xy="0,-240" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchWidth">
     <loader id="n4_duuf" name="loaBg" xy="0,-240" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,center-center,middle-middle"/>
       <relation target="" sidePair="width-width,center-center,middle-middle"/>
     </loader>
     </loader>
+    <graph id="n10_e050" name="holder_star" xy="535,210" size="10,10">
+      <relation target="" sidePair="center-center,top-top"/>
+    </graph>
+    <graph id="n11_e050" name="holder_bg" xy="535,955" size="10,10">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <graph id="n12_e050" name="holder_cloud" xy="535,1810" size="10,10">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </graph>
     <image id="n5_duuf" name="n5" src="volstat" fileName="imageNews/zx_tx_qianjing.png" xy="9,411" group="n9_duuf"/>
     <image id="n5_duuf" name="n5" src="volstat" fileName="imageNews/zx_tx_qianjing.png" xy="9,411" group="n9_duuf"/>
     <image id="n6_duuf" name="n6" src="volstar" fileName="imageNews/zx_tx_hengxiang.png" xy="0,420" group="n9_duuf"/>
     <image id="n6_duuf" name="n6" src="volstar" fileName="imageNews/zx_tx_hengxiang.png" xy="0,420" group="n9_duuf"/>
     <image id="n7_duuf" name="n7" src="volstav" fileName="imageNews/zx_tx_yuanquan.png" xy="28,381" group="n9_duuf"/>
     <image id="n7_duuf" name="n7" src="volstav" fileName="imageNews/zx_tx_yuanquan.png" xy="28,381" group="n9_duuf"/>
@@ -14,7 +23,7 @@
     <component id="n0_qdrt" name="comCard" src="qdrt1a" fileName="components/ComCard.xml" xy="66,475" pivot="0.5,0.5" touchable="false">
     <component id="n0_qdrt" name="comCard" src="qdrt1a" fileName="components/ComCard.xml" xy="66,475" pivot="0.5,0.5" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     </component>
-    <component id="n3_qdrt" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="917,1802">
+    <component id="n3_qdrt" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="917,1720">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button icon="ui://drx9d1usvolstbo"/>
       <Button icon="ui://drx9d1usvolstbo"/>
     </component>
     </component>

+ 46 - 35
FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://drx9d1usw1qi2n" designImageOffsetY="-240">
 <component size="1080,1920" designImage="ui://drx9d1usw1qi2n" designImageOffsetY="-240">
-  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="1">
+  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="0">
     <remark page="0" value="买一次"/>
     <remark page="0" value="买一次"/>
     <remark page="1" value="买十次"/>
     <remark page="1" value="买十次"/>
   </controller>
   </controller>
@@ -10,6 +10,15 @@
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     </loader>
+    <graph id="n54_e050" name="holder_star" xy="535,210" size="10,10">
+      <relation target="" sidePair="center-center,top-top"/>
+    </graph>
+    <graph id="n55_e050" name="holder_bg" xy="535,955" size="10,10">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <graph id="n56_e050" name="holder_cloud" xy="535,1810" size="10,10">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </graph>
     <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n20_f5bl" name="comStar0_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="540,960">
     <component id="n20_f5bl" name="comStar0_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="540,960">
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay controller="ctrlBuyType" pages="0"/>
@@ -23,48 +32,50 @@
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
     </component>
     </component>
-    <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="232,537" group="n19_l5nz"/>
-    <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="449,224" group="n19_l5nz"/>
-    <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="849,557" group="n19_l5nz"/>
-    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="419,676" group="n19_l5nz"/>
-    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="278,861" group="n19_l5nz"/>
-    <component id="n34_o139" name="comStar1_0_5" src="l5nzq" fileName="components/ComStar.xml" xy="828,1066" group="n19_l5nz"/>
-    <component id="n35_o139" name="comStar1_0_6" src="l5nzq" fileName="components/ComStar.xml" xy="253,1398" group="n19_l5nz"/>
-    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="618,1272" group="n19_l5nz"/>
-    <component id="n37_o139" name="comStar1_0_8" src="l5nzq" fileName="components/ComStar.xml" xy="586,1619" group="n19_l5nz"/>
-    <component id="n51_e050" name="comStar1_0_9" src="l5nzq" fileName="components/ComStar.xml" xy="901,438" group="n19_l5nz"/>
-    <group id="n19_l5nz" name="grpComStar0" xy="227,219" size="679,1405" advanced="true">
+    <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="205,477" group="n19_l5nz"/>
+    <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="422,166" group="n19_l5nz"/>
+    <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="822,642" group="n19_l5nz"/>
+    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="392,653" group="n19_l5nz"/>
+    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="251,928" group="n19_l5nz"/>
+    <component id="n34_o139" name="comStar1_0_5" src="l5nzq" fileName="components/ComStar.xml" xy="801,1066" group="n19_l5nz"/>
+    <component id="n35_o139" name="comStar1_0_6" src="l5nzq" fileName="components/ComStar.xml" xy="226,1404" group="n19_l5nz"/>
+    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="591,1272" group="n19_l5nz"/>
+    <component id="n37_o139" name="comStar1_0_8" src="l5nzq" fileName="components/ComStar.xml" xy="522,1705" group="n19_l5nz"/>
+    <component id="n51_e050" name="comStar1_0_9" src="l5nzq" fileName="components/ComStar.xml" xy="874,438" group="n19_l5nz"/>
+    <group id="n19_l5nz" name="grpComStar0" xy="200,161" size="679,1549" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>
-      <relation target="" sidePair="left-center,top-middle"/>
+      <relation target="" sidePair="center-center,top-top"/>
     </group>
     </group>
-    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="420,283" group="n25_iakb"/>
-    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="227,499" group="n25_iakb"/>
-    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="229,848" group="n25_iakb"/>
-    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="431,1035" group="n25_iakb"/>
-    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="186,1279" group="n25_iakb"/>
-    <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="430,1471" group="n25_iakb"/>
-    <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="610,644" group="n25_iakb"/>
-    <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="832,903" group="n25_iakb"/>
-    <component id="n50_w1qi" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="779,1480" group="n25_iakb"/>
-    <group id="n25_iakb" name="grpComStar1" xy="147,244" size="724,1275" advanced="true">
+    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="476,261" group="n25_iakb"/>
+    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="261,534" group="n25_iakb"/>
+    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="215,882" group="n25_iakb"/>
+    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="517,1035" group="n25_iakb"/>
+    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="272,1368" group="n25_iakb"/>
+    <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="516,1728" group="n25_iakb"/>
+    <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="679,567" group="n25_iakb"/>
+    <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="854,865" group="n25_iakb"/>
+    <component id="n50_w1qi" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="865,1426" group="n25_iakb"/>
+    <component id="n52_e050" name="comStar1_1_9" src="l5nzq" fileName="components/ComStar.xml" xy="833,146" group="n25_iakb"/>
+    <group id="n25_iakb" name="grpComStar1" xy="210,141" size="660,1592" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="1" condition="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="1" condition="0"/>
-      <relation target="" sidePair="left-center,top-middle"/>
+      <relation target="" sidePair="center-center,top-top"/>
     </group>
     </group>
-    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="722,318" group="n30_iakb"/>
-    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="338,446" group="n30_iakb"/>
-    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="625,1568" group="n30_iakb"/>
-    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="198,708" group="n30_iakb"/>
-    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="341,1060" group="n30_iakb"/>
-    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="276,1365" group="n30_iakb"/>
-    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="819,1405" group="n30_iakb"/>
-    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="797,1132" group="n30_iakb"/>
-    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="708,665" group="n30_iakb"/>
-    <group id="n30_iakb" name="grpComStar2" xy="159,279" size="699,1328" advanced="true">
+    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="861,228" group="n30_iakb"/>
+    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="305,306" group="n30_iakb"/>
+    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="598,1749" group="n30_iakb"/>
+    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="201,766" group="n30_iakb"/>
+    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="492,1217" group="n30_iakb"/>
+    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="312,1475" group="n30_iakb"/>
+    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="835,1478" group="n30_iakb"/>
+    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="879,1091" group="n30_iakb"/>
+    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="587,574" group="n30_iakb"/>
+    <component id="n53_e050" name="comStar1_2_9" src="l5nzq" fileName="components/ComStar.xml" xy="626,867" group="n30_iakb"/>
+    <group id="n30_iakb" name="grpComStar2" xy="196,223" size="688,1531" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
-      <relation target="" sidePair="left-center,top-middle"/>
+      <relation target="" sidePair="center-center,top-top"/>
     </group>
     </group>
     <movieclip id="n49_hibu" name="effEnd" src="hibu2m" fileName="effect/MovieClip3.jta" xy="0,0" size="1080,1920" visible="false">
     <movieclip id="n49_hibu" name="effEnd" src="hibu2m" fileName="effect/MovieClip3.jta" xy="0,0" size="1080,1920" visible="false">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>

+ 5 - 3
FGUIProject/assets/LuckyBox/combox/ComBox1.xml

@@ -38,12 +38,14 @@
     <component id="n58_vols" name="btnBuyTen" src="volstng" fileName="components/BtnStyle006.xml" pkg="eg2y0ldp" xy="618,1675" group="n61_vols">
     <component id="n58_vols" name="btnBuyTen" src="volstng" fileName="components/BtnStyle006.xml" pkg="eg2y0ldp" xy="618,1675" group="n61_vols">
       <Button title="摘星十次" icon="ui://eg2y0ldpvolstnk"/>
       <Button title="摘星十次" icon="ui://eg2y0ldpvolstnk"/>
     </component>
     </component>
-    <image id="n59_vols" name="imgSpecial" src="volstbn" fileName="imageNews/bt_jiaobiao_bichu.png" xy="865,1623" group="n61_vols">
-      <relation target="n58_vols" sidePair="left-left,top-top"/>
-    </image>
     <text id="n60_vols" name="txtRemainTimes" xy="539,1538" pivot="0.5,0" anchor="true" size="303,54" group="n61_vols" fontSize="40" color="#915e15" align="center" vars="true" text="今日剩余次数:{v1=0}">
     <text id="n60_vols" name="txtRemainTimes" xy="539,1538" pivot="0.5,0" anchor="true" size="303,54" group="n61_vols" fontSize="40" color="#915e15" align="center" vars="true" text="今日剩余次数:{v1=0}">
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>
     </text>
     </text>
+    <image id="n59_vols" name="imgSpecial" src="volstbn" fileName="imageNews/bt_jiaobiao_bichu.png" xy="865,1623" group="n84_e050"/>
+    <graph id="n83_e050" name="holder" xy="919,1675" size="10,10" group="n84_e050" type="rect"/>
+    <group id="n84_e050" name="grpSpecial" xy="865,1623" size="112,123" group="n61_vols" advanced="true">
+      <relation target="n58_vols" sidePair="right-right,top-top"/>
+    </group>
     <group id="n61_vols" name="n61" xy="140,1538" size="837,287" advanced="true">
     <group id="n61_vols" name="n61" xy="140,1538" size="837,287" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
     </group>

+ 4 - 4
FGUIProject/assets/LuckyBox/components/ComCard.xml

@@ -2,15 +2,15 @@
 <component size="948,970">
 <component size="948,970">
   <displayList>
   <displayList>
     <graph id="n6_dcro" name="holder" xy="473,484" size="1,1" visible="false" touchable="false" type="rect"/>
     <graph id="n6_dcro" name="holder" xy="473,484" size="1,1" visible="false" touchable="false" type="rect"/>
-    <loader id="n2_qdrt" name="loaIcon" xy="332,294" pivot="0.5,0.5" size="350,350" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <loader id="n2_qdrt" name="loaIcon" xy="299,294" pivot="0.5,0.5" size="350,350" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scaleMatchWidth"/>
     <text id="n5_qdrt" name="txtDiscribe" xy="473,1056" pivot="0.5,0" anchor="true" size="406,101" visible="false" fontSize="30" color="#c2a773" autoSize="none" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>
     <text id="n5_qdrt" name="txtDiscribe" xy="473,1056" pivot="0.5,0" anchor="true" size="406,101" visible="false" fontSize="30" color="#c2a773" autoSize="none" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>
     <image id="n12_duuf" name="n12" src="volstbk" fileName="imageNews/zx_zhuangshi_diaoshi.png" xy="645,164" group="n13_duuf"/>
     <image id="n12_duuf" name="n12" src="volstbk" fileName="imageNews/zx_zhuangshi_diaoshi.png" xy="645,164" group="n13_duuf"/>
     <loader id="n1_qdrt" name="loaType" xy="645,299" size="44,94" group="n13_duuf" url="ui://eg2y0ldpo9ghtll" fill="scaleMatchWidth" autoSize="true"/>
     <loader id="n1_qdrt" name="loaType" xy="645,299" size="44,94" group="n13_duuf" url="ui://eg2y0ldpo9ghtll" fill="scaleMatchWidth" autoSize="true"/>
     <loader id="n3_qdrt" name="loaProperty" xy="645,242" size="44,44" group="n13_duuf" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
     <loader id="n3_qdrt" name="loaProperty" xy="645,242" size="44,44" group="n13_duuf" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
     <group id="n13_duuf" name="n13" xy="645,164" size="54,248"/>
     <group id="n13_duuf" name="n13" xy="645,164" size="54,248"/>
-    <image id="n14_duuf" name="n14" src="volstax" fileName="imageNews/zx_wp_baseboard.png" xy="336,880" size="332,50" group="n15_duuf"/>
-    <text id="n4_qdrt" name="txtName" xy="502,905" pivot="0.5,0.5" anchor="true" size="84,54" group="n15_duuf" fontSize="40" color="#915e15" text="服装"/>
-    <group id="n15_duuf" name="n15" xy="336,878" size="332,54"/>
+    <image id="n14_duuf" name="n14" src="volstax" fileName="imageNews/zx_wp_baseboard.png" xy="308,880" size="332,50" group="n15_duuf"/>
+    <text id="n4_qdrt" name="txtName" xy="474,905" pivot="0.5,0.5" anchor="true" size="84,54" group="n15_duuf" fontSize="40" color="#915e15" text="服装"/>
+    <group id="n15_duuf" name="n15" xy="308,878" size="332,54"/>
     <graph id="n17_duuf" name="holder1" xy="473,484" size="1,1" visible="false" touchable="false" type="rect"/>
     <graph id="n17_duuf" name="holder1" xy="473,484" size="1,1" visible="false" touchable="false" type="rect"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 30 - 25
FGUIProject/assets/LuckyBox/components/Component2.xml

@@ -1,38 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="385,385">
 <component size="385,385">
-  <controller name="c1" pages="0,,1,,2,,3,,4," selected="1"/>
+  <controller name="c1" exported="true" pages="0,,1,,2,,3,,4," selected="3"/>
   <displayList>
   <displayList>
-    <image id="n10_v95q" name="n10" src="v95q2u" fileName="images/cj_hd_hdh_1.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="0,4"/>
+    <graph id="n19_e050" name="holder" xy="192,187" size="10,10" group="n9_v95q" type="rect">
+      <gearDisplay controller="c1" pages="3,4"/>
+    </graph>
+    <image id="n10_v95q" name="n10" src="volstb2" fileName="imageNews/zx_wp_jin_bg.png" xy="42,57" pivot="0.5,0.5" group="n9_v95q">
+      <gearDisplay controller="c1" pages="0"/>
     </image>
     </image>
-    <image id="n11_v95q" name="n11" src="v95q2v" fileName="images/cj_hd_hdh_2.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="2"/>
-    </image>
-    <image id="n12_v95q" name="n12" src="v95q2w" fileName="images/cj_hd_hdh_3.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="3"/>
-    </image>
-    <image id="n13_v95q" name="n13" src="v95q2x" fileName="images/cj_hd_hdh_4.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <loader id="n3_ga16" name="icon" xy="115,120" size="158,158" group="n9_v95q" aspect="true" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
-    <loader id="n4_ga16" name="rarity" xy="272,68" size="42,96" group="n9_v95q" url="ui://eg2y0ldpd4iw52"/>
-    <image id="n7_pzq1" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="76,99" group="n9_v95q" visible="false"/>
-    <image id="n14_v95q" name="n14" src="v95q33" fileName="images/cj_hd_zik_1.png" xy="67,268" group="n9_v95q">
-      <gearDisplay controller="c1" pages="0,4"/>
+    <image id="n12_v95q" name="n12" src="volstay" fileName="imageNews/zx_wp_fen_bg.png" xy="98,117" pivot="0.5,0.5" group="n9_v95q">
+      <gearDisplay controller="c1" pages="0"/>
     </image>
     </image>
-    <image id="n15_v95q" name="n15" src="v95q34" fileName="images/cj_hd_zik_2.png" xy="67,268" group="n9_v95q">
-      <gearDisplay controller="c1" pages="3"/>
+    <image id="n18_e050" name="n18" src="volstb8" fileName="imageNews/zx_wp_lan_diguang.png" xy="87,90" group="n9_v95q">
+      <gearDisplay controller="c1" pages="2"/>
     </image>
     </image>
-    <image id="n16_v95q" name="n16" src="v95q35" fileName="images/cj_hd_zik_3.png" xy="67,268" group="n9_v95q">
+    <image id="n11_v95q" name="n11" src="volstb7" fileName="imageNews/zx_wp_lan_bg.png" xy="129,111" pivot="0.5,0.5" group="n9_v95q">
       <gearDisplay controller="c1" pages="2"/>
       <gearDisplay controller="c1" pages="2"/>
     </image>
     </image>
-    <image id="n17_v95q" name="n17" src="v95q36" fileName="images/cj_hd_zik_4.png" xy="67,268" group="n9_v95q">
+    <image id="n13_v95q" name="n13" src="e050tf5" fileName="imageNews/zx_wp_lan_grey.png" xy="88,94" pivot="0.5,0.5" group="n9_v95q">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay controller="c1" pages="1"/>
     </image>
     </image>
-    <text id="n2_ga16" name="txtName" xy="106,268" pivot="0.5,0" size="172,39" group="n9_v95q" fontSize="28" color="#b0967d" align="center" text="岭南荔夏·闲">
-      <gearColor controller="c1" pages="0,1,2,3,4" values="#bf9e73,#000000|#b0967d,#000000|#939b89,#000000|#89a2b0,#000000|#bf9e73,#000000"/>
-      <relation target="" sidePair="center-center"/>
+    <loader id="n3_ga16" name="icon" xy="194,195" pivot="0.5,0.5" anchor="true" size="116,116" group="n9_v95q" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scale" shrinkOnly="true">
+      <gearSize controller="c1" pages="1,2,3,4" values="98,98,1,1|100,100,1,1|116,116,1,1|180,180,1,1" default="158,158,1,1"/>
+    </loader>
+    <loader id="n4_ga16" name="rarity" xy="229,109" pivot="0.5,0" size="38,88" group="n9_v95q" aspect="true" url="ui://eg2y0ldpo9ghtll" align="center" fill="scale">
+      <gearXY controller="c1" pages="1,2,3,4" values="230,131|229,130|229,109|253,76" default="272,68"/>
+      <gearSize controller="c1" pages="1,2,3" values="26,59,1,1|26,60,1,1|38,88,1,1" default="42,96,1,1"/>
+    </loader>
+    <image id="n7_pzq1" name="imgNew" src="volstb5" fileName="imageNews/zx_wp_jin_jiaobiao.png" xy="90,121" pivot="0.5,0.5" size="77,44" group="n9_v95q" aspect="true" visible="false">
+      <gearXY controller="c1" pages="1,2,3,4" values="108,137|108,137|90,121|56,93" default="76,99"/>
+      <gearSize controller="c1" pages="1,2,3" values="63,36,1,1|63,36,1,1|77,44,1,1" default="91,52,1,1"/>
+    </image>
+    <image id="n20_e050" name="n20" src="volstb9" fileName="imageNews/zx_wp_mingcheng_bg.png" xy="192,289" pivot="0.5,0" anchor="true" size="133,32" group="n9_v95q">
+      <relation target="n21_e050" sidePair="width-width,center-center,middle-middle"/>
+    </image>
+    <text id="n21_e050" name="txtName" xy="195,305" pivot="0.5,0.5" anchor="true" size="96,29" group="n9_v95q" fontSize="20" color="#ffffff" align="center" letterSpacing="-2" text="孔雀东南飞">
+      <gearFontSize controller="c1" pages="4" values="28" default="20"/>
+      <relation target="n3_ga16" sidePair="center-center,top-bottom"/>
     </text>
     </text>
-    <group id="n9_v95q" name="n9" xy="58,60" size="270,270"/>
+    <group id="n9_v95q" name="n9" xy="42,57" size="300,270"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 9 - 0
FGUIProject/assets/LuckyBox/components/LuckyBoxBonusShowItem.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="350,350" pivot="0.5,0.5" anchor="true">
+  <displayList>
+    <component id="n1_ga16" name="comIcon" src="dcrotaa" fileName="components/Component2.xml" xy="175,157" pivot="0.5,0.5" anchor="true" controller="c1,3"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Scale" target="n1_ga16" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Linear"/>
+  </transition>
+</component>

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


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


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

@@ -93,7 +93,7 @@
     <image id="volstb6" name="zx_wp_jin_xian.png" path="/imageNews/"/>
     <image id="volstb6" name="zx_wp_jin_xian.png" path="/imageNews/"/>
     <image id="volstb7" name="zx_wp_lan_bg.png" path="/imageNews/"/>
     <image id="volstb7" name="zx_wp_lan_bg.png" path="/imageNews/"/>
     <image id="volstb8" name="zx_wp_lan_diguang.png" path="/imageNews/"/>
     <image id="volstb8" name="zx_wp_lan_diguang.png" path="/imageNews/"/>
-    <image id="volstb9" name="zx_wp_mingcheng_bg.png" path="/imageNews/"/>
+    <image id="volstb9" name="zx_wp_mingcheng_bg.png" path="/imageNews/" scale="9grid" scale9grid="23,8,98,16"/>
     <image id="volstba" name="zx_yuan_tx_diandian.png" path="/imageNews/"/>
     <image id="volstba" name="zx_yuan_tx_diandian.png" path="/imageNews/"/>
     <image id="volstbb" name="zx_yuan_tx_hengguang.png" path="/imageNews/"/>
     <image id="volstbb" name="zx_yuan_tx_hengguang.png" path="/imageNews/"/>
     <image id="volstbc" name="zx_yuan_tx_neiquan.png" path="/imageNews/"/>
     <image id="volstbc" name="zx_yuan_tx_neiquan.png" path="/imageNews/"/>
@@ -155,6 +155,9 @@
     <component id="duuftec" name="Component3.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="duuftf0" name="zx_title_1.png" path="/imageNews/" exported="true"/>
     <image id="duuftf2" name="zx_bg.png" path="/imageNews/" atlas="alone_npot"/>
     <image id="duuftf2" name="zx_bg.png" path="/imageNews/" atlas="alone_npot"/>
+    <component id="e050tf3" name="LuckBoxBonusShowUI.xml" path="/" exported="true"/>
+    <component id="e050tf4" name="LuckyBoxBonusShowItem.xml" path="/components/"/>
+    <image id="e050tf5" name="zx_wp_lan_grey.png" path="/imageNews/"/>
   </resources>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle006.cs

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

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

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

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

@@ -18,8 +18,10 @@ namespace UI.LuckyBox
         public UI_ComCost m_comCostTen;
         public UI_ComCost m_comCostTen;
         public GButton m_btnBuyOne;
         public GButton m_btnBuyOne;
         public GButton m_btnBuyTen;
         public GButton m_btnBuyTen;
-        public GImage m_imgSpecial;
         public GTextField m_txtRemainTimes;
         public GTextField m_txtRemainTimes;
+        public GImage m_imgSpecial;
+        public GGraph m_holder;
+        public GGroup m_grpSpecial;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
         public const string RES_NAME = "ComBox1";
@@ -78,8 +80,10 @@ namespace UI.LuckyBox
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
             m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
             m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
             m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
             m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
-            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
@@ -97,8 +101,10 @@ namespace UI.LuckyBox
             m_comCostTen = null;
             m_comCostTen = null;
             m_btnBuyOne = null;
             m_btnBuyOne = null;
             m_btnBuyTen = null;
             m_btnBuyTen = null;
-            m_imgSpecial = null;
             m_txtRemainTimes = null;
             m_txtRemainTimes = null;
+            m_imgSpecial = null;
+            m_holder = null;
+            m_grpSpecial = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

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

@@ -8,6 +8,7 @@ namespace UI.LuckyBox
     {
     {
         public GComponent target;
         public GComponent target;
         public Controller m_c1;
         public Controller m_c1;
+        public GGraph m_holder;
         public GLoader m_icon;
         public GLoader m_icon;
         public GLoader m_rarity;
         public GLoader m_rarity;
         public GImage m_imgNew;
         public GImage m_imgNew;
@@ -60,6 +61,7 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_c1 = comp.GetController("c1");
             m_c1 = comp.GetController("c1");
+            m_holder = (GGraph)comp.GetChild("holder");
             m_icon = (GLoader)comp.GetChild("icon");
             m_icon = (GLoader)comp.GetChild("icon");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_imgNew = (GImage)comp.GetChild("imgNew");
             m_imgNew = (GImage)comp.GetChild("imgNew");
@@ -68,6 +70,7 @@ namespace UI.LuckyBox
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_c1 = null;
             m_c1 = null;
+            m_holder = null;
             m_icon = null;
             m_icon = null;
             m_rarity = null;
             m_rarity = null;
             m_imgNew = null;
             m_imgNew = null;

+ 136 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusShowUI.cs

@@ -0,0 +1,136 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_LuckBoxBonusShowUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaBg;
+        public GGraph m_holder_star;
+        public GGraph m_holder_bg;
+        public GGraph m_holder_cloud;
+        public UI_LuckyBoxBonusShowItem m_itemOne;
+        public UI_LuckyBoxBonusShowItem m_item0;
+        public UI_LuckyBoxBonusShowItem m_item1;
+        public UI_LuckyBoxBonusShowItem m_item2;
+        public UI_LuckyBoxBonusShowItem m_item3;
+        public UI_LuckyBoxBonusShowItem m_item4;
+        public UI_LuckyBoxBonusShowItem m_item5;
+        public UI_LuckyBoxBonusShowItem m_item6;
+        public UI_LuckyBoxBonusShowItem m_item7;
+        public UI_LuckyBoxBonusShowItem m_item8;
+        public UI_LuckyBoxBonusShowItem m_item9;
+        public GGroup m_grpItems;
+        public Transition m_t0;
+        public Transition m_t1;
+        public const string URL = "ui://drx9d1use050tf3";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "LuckBoxBonusShowUI";
+        private static UI_LuckBoxBonusShowUI _proxy;
+
+        public static UI_LuckBoxBonusShowUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LuckBoxBonusShowUI();
+            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_LuckBoxBonusShowUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LuckBoxBonusShowUI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_holder_star = (GGraph)comp.GetChild("holder_star");
+            m_holder_bg = (GGraph)comp.GetChild("holder_bg");
+            m_holder_cloud = (GGraph)comp.GetChild("holder_cloud");
+            m_itemOne = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("itemOne"));
+            m_item0 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item0"));
+            m_item1 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item1"));
+            m_item2 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item2"));
+            m_item3 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item3"));
+            m_item4 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item4"));
+            m_item5 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item5"));
+            m_item6 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item6"));
+            m_item7 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item7"));
+            m_item8 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item8"));
+            m_item9 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item9"));
+            m_grpItems = (GGroup)comp.GetChild("grpItems");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaBg = null;
+            m_holder_star = null;
+            m_holder_bg = null;
+            m_holder_cloud = null;
+            m_itemOne.Dispose();
+            m_itemOne = null;
+            m_item0.Dispose();
+            m_item0 = null;
+            m_item1.Dispose();
+            m_item1 = null;
+            m_item2.Dispose();
+            m_item2 = null;
+            m_item3.Dispose();
+            m_item3 = null;
+            m_item4.Dispose();
+            m_item4 = null;
+            m_item5.Dispose();
+            m_item5 = null;
+            m_item6.Dispose();
+            m_item6 = null;
+            m_item7.Dispose();
+            m_item7 = null;
+            m_item8.Dispose();
+            m_item8 = null;
+            m_item9.Dispose();
+            m_item9 = null;
+            m_grpItems = null;
+            m_t0 = null;
+            m_t1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 75 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusShowItem.cs

@@ -0,0 +1,75 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_LuckyBoxBonusShowItem
+    {
+        public GComponent target;
+        public UI_Component2 m_comIcon;
+        public Transition m_t0;
+        public const string URL = "ui://drx9d1use050tf4";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "LuckyBoxBonusShowItem";
+        private static UI_LuckyBoxBonusShowItem _proxy;
+
+        public static UI_LuckyBoxBonusShowItem Create(GObject gObject = null)
+        {
+            var ui = new UI_LuckyBoxBonusShowItem();
+            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_LuckyBoxBonusShowItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LuckyBoxBonusShowItem();
+            }
+            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_comIcon = (UI_Component2)UI_Component2.Create(comp.GetChild("comIcon"));
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comIcon.Dispose();
+            m_comIcon = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 9 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxNewDressUI.cs

@@ -8,6 +8,9 @@ namespace UI.LuckyBox
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
+        public GGraph m_holder_star;
+        public GGraph m_holder_bg;
+        public GGraph m_holder_cloud;
         public UI_ComCard m_comCard;
         public UI_ComCard m_comCard;
         public GButton m_btnPass;
         public GButton m_btnPass;
         public Transition m_t_open;
         public Transition m_t_open;
@@ -60,6 +63,9 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_holder_star = (GGraph)comp.GetChild("holder_star");
+            m_holder_bg = (GGraph)comp.GetChild("holder_bg");
+            m_holder_cloud = (GGraph)comp.GetChild("holder_cloud");
             m_comCard = (UI_ComCard)UI_ComCard.Create(comp.GetChild("comCard"));
             m_comCard = (UI_ComCard)UI_ComCard.Create(comp.GetChild("comCard"));
             m_btnPass = (GButton)comp.GetChild("btnPass");
             m_btnPass = (GButton)comp.GetChild("btnPass");
             m_t_open = comp.GetTransition("t_open");
             m_t_open = comp.GetTransition("t_open");
@@ -68,6 +74,9 @@ namespace UI.LuckyBox
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_loaBg = null;
             m_loaBg = null;
+            m_holder_star = null;
+            m_holder_bg = null;
+            m_holder_cloud = null;
             m_comCard.Dispose();
             m_comCard.Dispose();
             m_comCard = null;
             m_comCard = null;
             m_btnPass = null;
             m_btnPass = null;

+ 17 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs

@@ -10,6 +10,9 @@ namespace UI.LuckyBox
         public Controller m_ctrlBuyType;
         public Controller m_ctrlBuyType;
         public Controller m_ctrlRewardsType;
         public Controller m_ctrlRewardsType;
         public GLoader m_bg;
         public GLoader m_bg;
+        public GGraph m_holder_star;
+        public GGraph m_holder_bg;
+        public GGraph m_holder_cloud;
         public GButton m_btnBack;
         public GButton m_btnBack;
         public UI_ComStar m_comStar0_0_0;
         public UI_ComStar m_comStar0_0_0;
         public UI_ComStar m_comStar0_1_0;
         public UI_ComStar m_comStar0_1_0;
@@ -34,6 +37,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_1_6;
         public UI_ComStar m_comStar1_1_6;
         public UI_ComStar m_comStar1_1_7;
         public UI_ComStar m_comStar1_1_7;
         public UI_ComStar m_comStar1_1_8;
         public UI_ComStar m_comStar1_1_8;
+        public UI_ComStar m_comStar1_1_9;
         public GGroup m_grpComStar1;
         public GGroup m_grpComStar1;
         public UI_ComStar m_comStar1_2_0;
         public UI_ComStar m_comStar1_2_0;
         public UI_ComStar m_comStar1_2_1;
         public UI_ComStar m_comStar1_2_1;
@@ -44,6 +48,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_2_6;
         public UI_ComStar m_comStar1_2_6;
         public UI_ComStar m_comStar1_2_7;
         public UI_ComStar m_comStar1_2_7;
         public UI_ComStar m_comStar1_2_8;
         public UI_ComStar m_comStar1_2_8;
+        public UI_ComStar m_comStar1_2_9;
         public GGroup m_grpComStar2;
         public GGroup m_grpComStar2;
         public GMovieClip m_effEnd;
         public GMovieClip m_effEnd;
         public const string URL = "ui://drx9d1usl5nzm";
         public const string URL = "ui://drx9d1usl5nzm";
@@ -96,6 +101,9 @@ namespace UI.LuckyBox
             m_ctrlBuyType = comp.GetController("ctrlBuyType");
             m_ctrlBuyType = comp.GetController("ctrlBuyType");
             m_ctrlRewardsType = comp.GetController("ctrlRewardsType");
             m_ctrlRewardsType = comp.GetController("ctrlRewardsType");
             m_bg = (GLoader)comp.GetChild("bg");
             m_bg = (GLoader)comp.GetChild("bg");
+            m_holder_star = (GGraph)comp.GetChild("holder_star");
+            m_holder_bg = (GGraph)comp.GetChild("holder_bg");
+            m_holder_cloud = (GGraph)comp.GetChild("holder_cloud");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_comStar0_0_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar0_0_0"));
             m_comStar0_0_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar0_0_0"));
             m_comStar0_1_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar0_1_0"));
             m_comStar0_1_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar0_1_0"));
@@ -120,6 +128,7 @@ namespace UI.LuckyBox
             m_comStar1_1_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_6"));
             m_comStar1_1_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_6"));
             m_comStar1_1_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_7"));
             m_comStar1_1_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_7"));
             m_comStar1_1_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_8"));
             m_comStar1_1_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_8"));
+            m_comStar1_1_9 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_9"));
             m_grpComStar1 = (GGroup)comp.GetChild("grpComStar1");
             m_grpComStar1 = (GGroup)comp.GetChild("grpComStar1");
             m_comStar1_2_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_0"));
             m_comStar1_2_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_0"));
             m_comStar1_2_1 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_1"));
             m_comStar1_2_1 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_1"));
@@ -130,6 +139,7 @@ namespace UI.LuckyBox
             m_comStar1_2_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_6"));
             m_comStar1_2_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_6"));
             m_comStar1_2_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_7"));
             m_comStar1_2_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_7"));
             m_comStar1_2_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_8"));
             m_comStar1_2_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_8"));
+            m_comStar1_2_9 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_9"));
             m_grpComStar2 = (GGroup)comp.GetChild("grpComStar2");
             m_grpComStar2 = (GGroup)comp.GetChild("grpComStar2");
             m_effEnd = (GMovieClip)comp.GetChild("effEnd");
             m_effEnd = (GMovieClip)comp.GetChild("effEnd");
         }
         }
@@ -138,6 +148,9 @@ namespace UI.LuckyBox
             m_ctrlBuyType = null;
             m_ctrlBuyType = null;
             m_ctrlRewardsType = null;
             m_ctrlRewardsType = null;
             m_bg = null;
             m_bg = null;
+            m_holder_star = null;
+            m_holder_bg = null;
+            m_holder_cloud = null;
             m_btnBack = null;
             m_btnBack = null;
             m_comStar0_0_0.Dispose();
             m_comStar0_0_0.Dispose();
             m_comStar0_0_0 = null;
             m_comStar0_0_0 = null;
@@ -184,6 +197,8 @@ namespace UI.LuckyBox
             m_comStar1_1_7 = null;
             m_comStar1_1_7 = null;
             m_comStar1_1_8.Dispose();
             m_comStar1_1_8.Dispose();
             m_comStar1_1_8 = null;
             m_comStar1_1_8 = null;
+            m_comStar1_1_9.Dispose();
+            m_comStar1_1_9 = null;
             m_grpComStar1 = null;
             m_grpComStar1 = null;
             m_comStar1_2_0.Dispose();
             m_comStar1_2_0.Dispose();
             m_comStar1_2_0 = null;
             m_comStar1_2_0 = null;
@@ -203,6 +218,8 @@ namespace UI.LuckyBox
             m_comStar1_2_7 = null;
             m_comStar1_2_7 = null;
             m_comStar1_2_8.Dispose();
             m_comStar1_2_8.Dispose();
             m_comStar1_2_8 = null;
             m_comStar1_2_8 = null;
+            m_comStar1_2_9.Dispose();
+            m_comStar1_2_9 = null;
             m_grpComStar2 = null;
             m_grpComStar2 = null;
             m_effEnd = null;
             m_effEnd = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)

+ 145 - 0
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs

@@ -0,0 +1,145 @@
+using UnityEngine;
+using FairyGUI;
+using UI.LuckyBox;
+using System.Collections.Generic;
+using System.Collections;
+
+namespace GFGGame
+{
+    public class LuckyBoxBonusShowView : BaseWindow
+    {
+        private UI_LuckBoxBonusShowUI _ui;
+        private List<ItemData> _rewardList = new List<ItemData>();
+        private List<GameObject> _gameobjects = new List<GameObject>();
+        private List<GoWrapper> _wrappers = new List<GoWrapper>();
+        private GameObject _gameobject;
+        private GoWrapper _wrapper;
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
+        private int _effectIndex = 0;
+        public override void Dispose()
+        {
+            base.Dispose();
+            for (int i = 0; i < _gameobjects.Count; i++)
+            {
+                SceneController.DestroyObjectFromView(_gameobjects[i], _wrappers[i]);
+
+            }
+            SceneController.DestroyObjectFromView(_gameobject, _wrapper);
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LuckBoxBonusShowUI.PACKAGE_NAME;
+            _ui = UI_LuckBoxBonusShowUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_loaBg.onClick.Add(this.Hide);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
+
+            UpdateEffect();
+        }
+        private void UpdateEffect()
+        {
+
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_liuxing");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_star, resPath0, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_UI");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_bg, resPath1, out _gameObject1, out _wrapper1);
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_cloud");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_cloud, resPath2, out _gameObject2, out _wrapper2);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _rewardList.AddRange(this.viewData as List<ItemData>);
+            _effectIndex = 0;
+            if (_rewardList.Count == 1)
+            {
+                _ui.m_c1.selectedIndex = 0;
+                UpdateItem(_ui.m_itemOne.target, 0);
+            }
+            else
+            {
+                _ui.m_c1.selectedIndex = 1;
+                for (int i = 0; i < _rewardList.Count; i++)
+                {
+                    UpdateItem(_ui.target.GetChild("item" + i).asCom, i);
+                }
+            }
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _rewardList.Clear();
+        }
+
+        private void UpdateItem(GComponent com, int index)
+        {
+            UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(com);
+
+            ItemData itemData = _rewardList[index];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            item.m_comIcon.m_c1.selectedIndex = itemCfg.rarity;
+            item.m_comIcon.m_txtName.text = itemCfg.name;
+            item.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+            RarityIconController.UpdateRarityIcon(item.m_comIcon.m_rarity, itemData.id, false);
+            if (itemCfg.rarity > 2)
+            {
+                string resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", itemCfg.rarity == ConstDressRarity.Rarity_TIANYI ? "CK_all_01" : "CK_all_02");
+                if (_effectIndex > _gameobjects.Count)
+                {
+                    GameObject gameObject = _gameobjects[_effectIndex];
+                    GoWrapper wrapper = _wrappers[_effectIndex];
+                    SceneController.AddObjectToView(gameObject, wrapper, item.m_comIcon.m_holder, resPath, out gameObject, out wrapper);
+                }
+                else
+                {
+                    SceneController.AddObjectToView(null, null, item.m_comIcon.m_holder, resPath, out GameObject gameObject, out GoWrapper wrapper);
+                    _gameobjects.Add(gameObject);
+                    _wrappers.Add(wrapper);
+                }
+                _effectIndex++;
+            }
+            int count = 0;
+            bool isFirst = false;
+            for (int i = 0; i < _rewardList.Count; i++)
+            {
+                if (_rewardList[i].id == itemData.id) count++;
+                if (count == 1 && i == index) isFirst = true;
+            }
+            item.m_comIcon.m_imgNew.visible = count == ItemDataManager.GetItemNum(itemData.id) && isFirst;
+            item.m_t0.Play();
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(ShowItemTips);
+            }
+            item.target.data = itemCfg.id;
+            UI_LuckyBoxBonusShowItem.ProxyEnd();
+        }
+
+        private void ShowItemTips(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int itemID = (int)obj.data;
+
+            GoodsItemTipsController.ShowItemTips(itemID);
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs.meta

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

+ 7 - 22
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewCardView.cs

@@ -9,8 +9,9 @@ namespace GFGGame
     public class LuckyBoxNewCardView : BaseWindow
     public class LuckyBoxNewCardView : BaseWindow
     {
     {
         private UI_LuckyBoxNewCardUI _ui;
         private UI_LuckyBoxNewCardUI _ui;
-        private List<int> _newCardList = new List<int>();
-        private List<ItemData> _newDressList = new List<ItemData>();
+        // private List<int> _newCardList = new List<int>();
+        // private List<ItemData> _newDressList = new List<ItemData>();
+        private int _cardId;
         public override void Dispose()
         public override void Dispose()
         {
         {
             if (_ui != null)
             if (_ui != null)
@@ -29,7 +30,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom = _ui.target;
             isfullScreen = true;
             isfullScreen = true;
 
 
-            _ui.m_loaBg.onClick.Add(OnClickBtnBg);
+            _ui.m_loaBg.onClick.Add(Hide);
         }
         }
         protected override void AddEventListener()
         protected override void AddEventListener()
         {
         {
@@ -39,17 +40,15 @@ namespace GFGGame
         protected override void OnShown()
         protected override void OnShown()
         {
         {
             base.OnShown();
             base.OnShown();
-
-            _newCardList = new List<int>((this.viewData as object[])[0] as List<int>);
-            _newDressList = new List<ItemData>((this.viewData as object[])[1] as List<ItemData>);
+            _cardId = (int)this.viewData;
+            // _newCardList = new List<int>((this.viewData as object[])[0] as List<int>);
             updateView();
             updateView();
 
 
         }
         }
         private void updateView()
         private void updateView()
         {
         {
-            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(_newCardList[0]);
+            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(_cardId);
             _ui.m_loaBg.url = ResPathUtil.GetCardPath(cfg.res);
             _ui.m_loaBg.url = ResPathUtil.GetCardPath(cfg.res);
-            _newCardList.RemoveAt(0);
         }
         }
         protected override void OnHide()
         protected override void OnHide()
         {
         {
@@ -63,19 +62,5 @@ namespace GFGGame
 
 
         }
         }
 
 
-        private void OnClickBtnBg()
-        {
-            if (_newCardList.Count == 0)
-            {
-                this.Hide();
-                if (_newDressList.Count > 0)
-                {
-                    ViewManager.Show<LuckyBoxNewDressView>(_newDressList);
-                }
-                return;
-            }
-            updateView();
-
-        }
     }
     }
 }
 }

+ 57 - 45
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs

@@ -12,8 +12,9 @@ namespace GFGGame
     {
     {
         private UI_LuckyBoxNewDressUI _ui;
         private UI_LuckyBoxNewDressUI _ui;
         private List<ItemData> _rewardList = new List<ItemData>();
         private List<ItemData> _rewardList = new List<ItemData>();
-        // private List<ItemData> _newRewardList = new List<ItemData>();
-        // private List<ItemData> _oldRewardList = new List<ItemData>();
+        private List<ItemData> _rewardParamList = new List<ItemData>();
+        private List<ItemData> _newRewardList = new List<ItemData>();
+        private List<ItemData> _oldRewardList = new List<ItemData>();
         // private List<ItemData> _showRewardList = new List<ItemData>();
         // private List<ItemData> _showRewardList = new List<ItemData>();
 
 
         // private int _type = 0;//弹窗类型:0可跳过,1:首次获得物品不可跳过,2首次获得物品不可跳过,不弹获得套装界面
         // private int _type = 0;//弹窗类型:0可跳过,1:首次获得物品不可跳过,2首次获得物品不可跳过,不弹获得套装界面
@@ -24,12 +25,21 @@ namespace GFGGame
         private GoWrapper wrapper1;
         private GoWrapper wrapper1;
         private GameObject gameObject2;
         private GameObject gameObject2;
         private GoWrapper wrapper2;
         private GoWrapper wrapper2;
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
         public override void Dispose()
         public override void Dispose()
         {
         {
             base.Dispose();
             base.Dispose();
             SceneController.DestroyObjectFromView(gameObject, wrapper);
             SceneController.DestroyObjectFromView(gameObject, wrapper);
             SceneController.DestroyObjectFromView(gameObject1, wrapper1);
             SceneController.DestroyObjectFromView(gameObject1, wrapper1);
             SceneController.DestroyObjectFromView(gameObject2, wrapper2);
             SceneController.DestroyObjectFromView(gameObject2, wrapper2);
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
             if (_ui != null)
             if (_ui != null)
             {
             {
                 _ui.Dispose();
                 _ui.Dispose();
@@ -49,46 +59,53 @@ namespace GFGGame
 
 
 
 
             _ui.m_loaBg.onTouchBegin.Add(OnClickBg);
             _ui.m_loaBg.onTouchBegin.Add(OnClickBg);
-            _ui.m_btnPass.onClick.Add(OnClickBtnPass);
+            _ui.m_btnPass.onClick.Add(Hide);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
 
 
+
+
+            UpdateEffect();
+        }
+        private void UpdateEffect()
+        {
             string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_zs");
             string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_zs");
             SceneController.AddObjectToView(gameObject, null, _ui.m_comCard.m_holder, resPath, out gameObject, out wrapper);
             SceneController.AddObjectToView(gameObject, null, _ui.m_comCard.m_holder, resPath, out gameObject, out wrapper);
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_liuxing");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_star, resPath0, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_UI");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_bg, resPath1, out _gameObject1, out _wrapper1);
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_cloud");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_cloud, resPath2, out _gameObject2, out _wrapper2);
         }
         }
         protected override void OnShown()
         protected override void OnShown()
         {
         {
             base.OnShown();
             base.OnShown();
-
-            _rewardList = this.viewData as List<ItemData>;
+            _rewardParamList.Clear();
+            _rewardParamList.AddRange(this.viewData as List<ItemData>);
+            _rewardList.AddRange(this.viewData as List<ItemData>);
             _ui.m_btnPass.visible = false;
             _ui.m_btnPass.visible = false;
-            // _newRewardList.Clear();
-            // _oldRewardList.Clear();
-            // for (int i = 0; i < _rewardList.Count; i++)
-            // {
-            //     if (GetThisCount(_rewardList[i].id, _rewardList) == ItemDataManager.GetItemNum(_rewardList[i].id) && !IsAddToNewRewardList(_rewardList[i].id))
-            //     {
-            //         _newRewardList.Add(_rewardList[i]);
-            //     }
-            //     else
-            //     {
-            //         _oldRewardList.Add(_rewardList[i]);
-            //     }
-            // }
-            // if (LuckyBoxDataManager.Instance.luckyBoxId > 0)//必展示必掉奖励
-            // {
-            //     int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
-            //     List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
-            //     _newRewardList.AddRange(itemDatas);
-            //     LuckyBoxDataManager.Instance.luckyBoxId = 0;
-            // }
+            _newRewardList.Clear();
+            _oldRewardList.Clear();
+            for (int i = 0; i < _rewardList.Count; i++)
+            {
+                if (GetThisCount(_rewardList[i].id, _rewardList) == ItemDataManager.GetItemNum(_rewardList[i].id) && !IsAddToNewRewardList(_rewardList[i].id))
+                {
+                    _newRewardList.Add(_rewardList[i]);
+                }
+                else
+                {
+                    _oldRewardList.Add(_rewardList[i]);
+                }
+            }
+
             LuckyBoxDataManager.Instance.luckyBoxId = 0;
             LuckyBoxDataManager.Instance.luckyBoxId = 0;
 
 
             UpdateView();
             UpdateView();
         }
         }
         private void UpdateView()
         private void UpdateView()
         {
         {
-            // _ui.m_btnPass.visible = _newRewardList.Count <= 1;
-            // _newRewardList.Count > 0 ? _newRewardList : _oldRewardList;
+            _ui.m_btnPass.visible = _newRewardList.Count <= 1;
+            _rewardList = _newRewardList.Count > 0 ? _newRewardList : _oldRewardList;
 
 
             if (_rewardList.Count - 1 < 0) return;
             if (_rewardList.Count - 1 < 0) return;
             ItemData itemdata = _rewardList[_rewardList.Count - 1];
             ItemData itemdata = _rewardList[_rewardList.Count - 1];
@@ -130,7 +147,17 @@ namespace GFGGame
             _ui.m_comCard.m_loaProperty.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + itemCfg.mainScore);
             _ui.m_comCard.m_loaProperty.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + itemCfg.mainScore);
             _ui.m_comCard.m_txtName.text = itemCfg.name;
             _ui.m_comCard.m_txtName.text = itemCfg.name;
             _ui.m_comCard.m_txtDiscribe.text = itemCfg.desc;
             _ui.m_comCard.m_txtDiscribe.text = itemCfg.desc;
-            _ui.m_t_open.Play();
+            if (itemCfg.itemType == ConstItemType.CARD)
+            {
+                _ui.m_t_open.Play(() =>
+                {
+                    ViewManager.Show<LuckyBoxNewCardView>(itemCfg.id);
+                });
+            }
+            else
+            {
+                _ui.m_t_open.Play();
+            }
             if (LuckyBoxDataManager.Instance.FirstRewardList.ContainsKey(_rewardList.Count - 1) == true)
             if (LuckyBoxDataManager.Instance.FirstRewardList.ContainsKey(_rewardList.Count - 1) == true)
             {
             {
                 LuckyBoxDataManager.Instance.FirstRewardList.Remove(_rewardList.Count - 1);
                 LuckyBoxDataManager.Instance.FirstRewardList.Remove(_rewardList.Count - 1);
@@ -141,22 +168,11 @@ namespace GFGGame
 
 
         private void OnClickBg()
         private void OnClickBg()
         {
         {
-            if (_rewardList.Count == 0)
+            if (_newRewardList.Count == 0 && _oldRewardList.Count == 0)
             {
             {
-                //     // if (_type == (int)FirstGetCardViewType.JUMP)
-                //     // {
-                //     ViewManager.Show(ViewName.LUCKY_BOX_BONUS_VIEW, new object[] { (this.viewData as object[])[0] as List<ItemData>, _rewardList });
-                //     // }
-                //     // else if (_type == (int)FirstGetCardViewType.CANNOT_JUMP)
-                //     // {
-                //     //     GetSuitItemController.TryShow(0);
-
-                //     // }
                 this.Hide();
                 this.Hide();
                 return;
                 return;
             }
             }
-
-
             _ui.m_t_close.Play(() =>
             _ui.m_t_close.Play(() =>
             {
             {
                 _ui.m_comCard.m_holder.visible = false;
                 _ui.m_comCard.m_holder.visible = false;
@@ -188,18 +204,14 @@ namespace GFGGame
             }
             }
             return false;
             return false;
         }
         }
-        private void OnClickBtnPass()
-        {
 
 
-            ViewManager.Show(ViewName.LUCKY_BOX_BONUS_VIEW, new object[] { (this.viewData as object[])[0], _rewardList });
-            this.Hide();
-        }
         protected override void OnHide()
         protected override void OnHide()
         {
         {
             _ui.m_t_close.Stop(true, false);
             _ui.m_t_close.Stop(true, false);
             _ui.m_t_open.Stop(true, false);
             _ui.m_t_open.Stop(true, false);
             _rewardList.Clear();
             _rewardList.Clear();
             base.OnHide();
             base.OnHide();
+            ViewManager.Show<LuckyBoxBonusShowView>(_rewardParamList);
         }
         }
     }
     }
 }
 }

+ 21 - 12
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -25,6 +25,12 @@ namespace GFGGame
         private Dictionary<int, List<GoWrapper>> dicWraper = new Dictionary<int, List<GoWrapper>>();
         private Dictionary<int, List<GoWrapper>> dicWraper = new Dictionary<int, List<GoWrapper>>();
         private List<GameObject> lineObj = new List<GameObject>();
         private List<GameObject> lineObj = new List<GameObject>();
         private List<GoWrapper> lineWrapper = new List<GoWrapper>();
         private List<GoWrapper> lineWrapper = new List<GoWrapper>();
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
         private GObject curComStar;//当前选中的星星
         private GObject curComStar;//当前选中的星星
         private Vector2 lastPos;//鼠标的上一个位置,每颗星星初始时默认为Vector2.right;
         private Vector2 lastPos;//鼠标的上一个位置,每颗星星初始时默认为Vector2.right;
 
 
@@ -73,6 +79,9 @@ namespace GFGGame
             {
             {
                 SceneController.DestroyObjectFromView(lineObj[i], lineWrapper[i]);
                 SceneController.DestroyObjectFromView(lineObj[i], lineWrapper[i]);
             }
             }
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
             notClickComStars.Clear();
             notClickComStars.Clear();
             clickComStars.Clear();
             clickComStars.Clear();
             dicGameobj.Clear();
             dicGameobj.Clear();
@@ -90,7 +99,16 @@ namespace GFGGame
             _ui.m_btnBack.visible = false;
             _ui.m_btnBack.visible = false;
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
 
 
-
+            UpdateEffect();
+        }
+        private void UpdateEffect()
+        {
+            string resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_liuxing");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_star, resPath, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_thing");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_bg, resPath1, out _gameObject1, out _wrapper1);
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_cloud");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_cloud, resPath2, out _gameObject2, out _wrapper2);
         }
         }
         protected override void OnShown()
         protected override void OnShown()
         {
         {
@@ -144,16 +162,6 @@ namespace GFGGame
                 gcom1.scale = new Vector2(scale, scale);
                 gcom1.scale = new Vector2(scale, scale);
                 gcom1.rotation = rotation;
                 gcom1.rotation = rotation;
 
 
-                // GComponent gcom2 = CreateEffect(comStar, 3, "ui_ck_xs");
-                // gcom2.visible = false;
-                // comStar.target.AddChildAt(gcom2, 3);
-
-                // GComponent gcom3 = CreateEffect(comStar, 4, "ui_ck_dj_2");
-                // gcom3.visible = false;
-                // comStar.target.AddChildAt(gcom3, 4);
-
-
-
                 star.data = new Vector2(comStar.target.x, comStar.target.y);
                 star.data = new Vector2(comStar.target.x, comStar.target.y);
                 comStars.Add(star);
                 comStars.Add(star);
 
 
@@ -340,7 +348,8 @@ namespace GFGGame
             {
             {
 
 
                 RemoveListener();
                 RemoveListener();
-                ViewManager.Show<LuckyBoxBonusView>(new object[] { _rewardList });
+                // ViewManager.Show<LuckyBoxBonusView>(new object[] { _rewardList });
+                ViewManager.Show<LuckyBoxNewDressView>(_rewardList);
                 this.Hide();
                 this.Hide();
             }
             }
         }
         }

+ 21 - 18
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -14,21 +14,12 @@ namespace GFGGame
         private ValueBarController _valueBarController;
         private ValueBarController _valueBarController;
         private Dictionary<int, LuckyBoxController> _lcukyBoxCtrl = new Dictionary<int, LuckyBoxController>();
         private Dictionary<int, LuckyBoxController> _lcukyBoxCtrl = new Dictionary<int, LuckyBoxController>();
 
 
-        //private GameObject _gameObject;
-        //private GoWrapper _wrapper;
-        //private GameObject _gameObject1;
-        //private GoWrapper _wrapper1;
-        //private GameObject _gameObject2;
-        //private GoWrapper _wrapper2;
-        //private GameObject _gameObject3;
-        //private GoWrapper _wrapper3;
-
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
         private DressUpObjUI _dressUpObjUIXiHe;
         private DressUpObjUI _dressUpObjUIXiHe;
 
 
-        //private GameObject _scenePrefab;
-        //private GameObject _sceneObject;
-        //private GoWrapper _wrapper4;
-        //private DressUpObj _dressUpObj;
         private DressUpObjUI _dressUpObjUIChangXi;
         private DressUpObjUI _dressUpObjUIChangXi;
 
 
         private bool isActiveBoxOpen = false;
         private bool isActiveBoxOpen = false;
@@ -57,11 +48,8 @@ namespace GFGGame
                 _dressUpObjUIChangXi.Dispose();
                 _dressUpObjUIChangXi.Dispose();
                 _dressUpObjUIChangXi = null;
                 _dressUpObjUIChangXi = null;
             }
             }
-
-            //SceneController.DestroyObjectFromView(_gameObject, _wrapper);
-            //SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
-            //SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
-            //SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
 
 
             if (_ui != null)
             if (_ui != null)
             {
             {
@@ -222,6 +210,14 @@ namespace GFGGame
 
 
             LuckyBoxDataManager.Instance.GetOwnedCount(boxId, out int count, out int totalCount);
             LuckyBoxDataManager.Instance.GetOwnedCount(boxId, out int count, out int totalCount);
             comBox.m_imgSpecial.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
             comBox.m_imgSpecial.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            GGraph holder = comBox.m_btnBuyTen.GetChild("holder").asGraph;
+            holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            comBox.m_holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "Button_Glow");
+            SceneController.AddObjectToView(null, null, holder, resPath0, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "but_text_dc");
+            SceneController.AddObjectToView(null, null, comBox.m_holder, resPath1, out _gameObject1, out _wrapper1);
+
             comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
             comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
             comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
             comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(cfg.numericType);
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(cfg.numericType);
@@ -267,6 +263,13 @@ namespace GFGGame
             }
             }
             UI_ComBox1.ProxyEnd();
             UI_ComBox1.ProxyEnd();
         }
         }
+
+        private void UpdateEffect()
+        {
+
+
+
+        }
         private void CheckTime(object param = null)
         private void CheckTime(object param = null)
         {
         {
             if (LuckyBoxDataManager.Instance.currentBoxId != _activeBoxId) return;
             if (LuckyBoxDataManager.Instance.currentBoxId != _activeBoxId) return;

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


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


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


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


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