zhaoyang 2 gadi atpakaļ
vecāks
revīzija
963485f594
65 mainītis faili ar 637 papildinājumiem un 218 dzēšanām
  1. 0 15
      FGUIProject/assets/CommonGame/components/ButtonTab1.xml
  2. 0 0
      FGUIProject/assets/CommonGame/components/ComIcon000.xml
  3. 0 0
      FGUIProject/assets/CommonGame/components/ComIcon001.xml
  4. 0 0
      FGUIProject/assets/CommonGame/components/ComIcon002.xml
  5. 17 0
      FGUIProject/assets/CommonGame/components/ComIcon003.xml
  6. 0 0
      FGUIProject/assets/CommonGame/components/ComItem000.xml
  7. 0 0
      FGUIProject/assets/CommonGame/components/ComItem001_1.xml
  8. 0 0
      FGUIProject/assets/CommonGame/components/ComItem001_2.xml
  9. 0 0
      FGUIProject/assets/CommonGame/components/ComItem002.xml
  10. 0 0
      FGUIProject/assets/CommonGame/imagesNew/wp_bg_yuan.png
  11. 9 8
      FGUIProject/assets/CommonGame/package.xml
  12. 16 9
      FGUIProject/assets/LuckyBox/LuckyBoxPreShowUI.xml
  13. 1 0
      FGUIProject/assets/LuckyBox/combox/ComBox.xml
  14. 16 0
      FGUIProject/assets/LuckyBox/components/ButtonTab1.xml
  15. 2 2
      FGUIProject/assets/LuckyBox/components/CompLuckyBoxBonusListItem.xml
  16. 1 1
      FGUIProject/assets/LuckyBox/components/Component1.xml
  17. 2 2
      FGUIProject/assets/LuckyBox/package.xml
  18. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs
  19. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs.meta
  20. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs
  21. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta
  22. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs
  23. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs.meta
  24. 89 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs
  25. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs.meta
  26. 9 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs
  27. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs.meta
  28. 9 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs
  29. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs.meta
  30. 9 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs
  31. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs.meta
  32. 9 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem002.cs
  33. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem002.cs.meta
  34. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs.meta
  35. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew.cs.meta
  36. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew1.cs.meta
  37. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button3.cs.meta
  38. 8 8
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs
  39. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs.meta
  40. 5 16
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox.cs
  41. 112 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox_1.cs
  42. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox_1.cs.meta
  43. 4 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox_2.cs
  44. 4 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox_3.cs
  45. 4 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox_4.cs
  46. 6 10
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxPreShowUI.cs
  47. 2 2
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardPreView.cs
  48. 4 4
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/FirstChargeBonusView.cs
  49. 2 2
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs
  50. 3 4
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs
  51. 3 4
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  52. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRewardGetView.cs
  53. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRewardView.cs
  54. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRuleView.cs
  55. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingRewardView.cs
  56. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  57. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  58. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  59. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png
  60. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png
  61. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png
  62. 96 0
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png.meta
  63. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png
  64. 96 0
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png.meta
  65. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes

+ 0 - 15
FGUIProject/assets/CommonGame/components/ButtonTab1.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="292,84" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
-  <displayList>
-    <image id="n0_ga16" name="n0" src="qr4etht" fileName="imagesExport/wpzs_anniu_2.png" xy="0,0">
-      <gearDisplay controller="button" pages="1,2,3"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n2_ga16" name="title" xy="0,0" size="292,84" fontSize="38" color="#998b7d" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
-      <gearColor controller="button" pages="0" values="#998b7d,#000000" default="#fff7e4,#000000"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button mode="Radio"/>
-</component>

+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItemIcon.xml → FGUIProject/assets/CommonGame/components/ComIcon000.xml


+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItemIconNew.xml → FGUIProject/assets/CommonGame/components/ComIcon001.xml


+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItemIconNew1.xml → FGUIProject/assets/CommonGame/components/ComIcon002.xml


+ 17 - 0
FGUIProject/assets/CommonGame/components/ComIcon003.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="180,180">
+  <displayList>
+    <image id="n25_pu55" name="n25" src="hhx9j" fileName="imagesNew/wp_baseboard1.png" xy="1,1"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="89,94" pivot="0.5,0.5" anchor="true" size="122,122" group="n30_9jv6" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
+    <text id="n17_j48o" name="txtHasCount" xy="90,225" pivot="0.5,0" anchor="true" size="100,36" group="n30_9jv6" visible="false" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
+    <loader id="n18_j48o" name="loaRarity" xy="115,38" size="27,58" group="n30_9jv6" aspect="true" url="ui://eg2y0ldpo9ghtll" fill="scale"/>
+    <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n22_cs8j" name="imgNotHas" src="cs8jthx" fileName="images/yx_whd.png" xy="-1,73" size="178,40" group="n29_pu55"/>
+    <image id="n28_pu55" name="imgShowTong" src="tc539z" fileName="images/zx_jqgka_stjl.png" xy="8,73" size="160,40" group="n29_pu55"/>
+    <group id="n29_pu55" name="n29" xy="-1,73" size="178,40" group="n30_9jv6" advanced="true"/>
+    <image id="n24_pu55" name="n24" src="l500tlx" fileName="imagesNew/wpk_zz.png" xy="32,37" group="n27_pu55"/>
+    <image id="n26_pu55" name="n26" src="orsttis" fileName="images/pfjl_ywc.png" xy="46,68" size="85,49" group="n27_pu55"/>
+    <group id="n27_pu55" name="grpGot" xy="32,37" size="112,112" group="n30_9jv6" visible="false" advanced="true"/>
+    <group id="n30_9jv6" name="n30" xy="-1,33" size="178,228"/>
+  </displayList>
+</component>

+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItem.xml → FGUIProject/assets/CommonGame/components/ComItem000.xml


+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItemBlue.xml → FGUIProject/assets/CommonGame/components/ComItem001_1.xml


+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItemNew.xml → FGUIProject/assets/CommonGame/components/ComItem001_2.xml


+ 0 - 0
FGUIProject/assets/CommonGame/components/ComItemNew1.xml → FGUIProject/assets/CommonGame/components/ComItem002.xml


+ 0 - 0
FGUIProject/assets/LuckyBox/imagesNews/wp_bg_yuan.png → FGUIProject/assets/CommonGame/imagesNew/wp_bg_yuan.png


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

@@ -20,7 +20,6 @@
     <image id="d4iwj" name="sc_anniu_1.png" path="/imagesExport/" exported="true"/>
     <image id="pal5v" name="zx_anniutz_1.png" path="/imagesExport/" exported="true"/>
     <image id="ga165b" name="hz_ssuodikuang.png" path="/imagesExport/" exported="true"/>
-    <component id="ga165c" name="ButtonTab1.xml" path="/components/" exported="true"/>
     <image id="s2cc55" name="zd_xztup_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="21,3,8,6"/>
     <image id="fka77" name="cj_yihde.png" path="/imagesExport/" exported="true"/>
     <component id="tu965e" name="GetSuitItemUI.xml" path="/" exported="true"/>
@@ -88,7 +87,7 @@
     <image id="9cth90" name="cj_hd_zik.png" path="/imagesExport/"/>
     <component id="ojlzk" name="ListScoreItem.xml" path="/components/" exported="true"/>
     <component id="ih7596" name="ComFilterType.xml" path="/components/" exported="true"/>
-    <component id="j48o98" name="ComItem.xml" path="/components/" exported="true"/>
+    <component id="j48o98" name="ComItem000.xml" path="/components/" exported="true"/>
     <image id="j48o99" name="kp_sjsj_di_3.png" path="/images/" exported="true"/>
     <image id="j48o9a" name="kp_sjsj_di_4.png" path="/images/" exported="true" scale="9grid" scale9grid="68,7,20,14"/>
     <image id="j48o9b" name="yx_yilq.png" path="/images/"/>
@@ -176,7 +175,7 @@
     <image id="orsttis" name="pfjl_ywc.png" path="/images/" exported="true"/>
     <image id="orsttit" name="wpbb_di.png" path="/images/" exported="true"/>
     <image id="pu55tiw" name="pfjl_and.png" path="/images/"/>
-    <component id="ng0itiz" name="ComItemIcon.xml" path="/components/"/>
+    <component id="ng0itiz" name="ComIcon000.xml" path="/components/"/>
     <image id="qqattj1" name="zjm_kuang_2.png" path="/images/"/>
     <image id="qqattj2" name="zjm_gnkuang.png" path="/images/"/>
     <image id="uyuxtj3" name="tujian_zkanniu.png" path="/images/" exported="true"/>
@@ -276,8 +275,8 @@
     <image id="a0cf2l" name="lm_huizhangdk.png" path="/imagesNew/"/>
     <component id="o9ghtlr" name="ComHeadLv1.xml" path="/components/" exported="true"/>
     <image id="a0cf2k" name="lm_db_lvl.png" path="/imagesNew/"/>
-    <component id="9jv6tls" name="ComItemNew.xml" path="/components/" exported="true"/>
-    <component id="9jv6tlt" name="ComItemIconNew.xml" path="/components/"/>
+    <component id="9jv6tls" name="ComItem001_2.xml" path="/components/" exported="true"/>
+    <component id="9jv6tlt" name="ComIcon001.xml" path="/components/"/>
     <image id="9jv6tlu" name="lm_daoju_db.png" path="/images/"/>
     <image id="miy37t" name="tb_suo.png" path="/imagesNew/" exported="true"/>
     <component id="rv091p" name="BtnStyle1Big.xml" path="/components/" exported="true"/>
@@ -300,8 +299,8 @@
     <image id="l500tlv" name="wpk_db_1.png" path="/imagesNew/"/>
     <image id="l500tlw" name="wpk_sz_db.png" path="/imagesNew/"/>
     <image id="l500tlx" name="wpk_zz.png" path="/imagesNew/" exported="true"/>
-    <component id="qik1tly" name="ComItemNew1.xml" path="/components/" exported="true"/>
-    <component id="qik1tlz" name="ComItemIconNew1.xml" path="/components/" exported="true"/>
+    <component id="qik1tly" name="ComItem002.xml" path="/components/" exported="true"/>
+    <component id="qik1tlz" name="ComIcon002.xml" path="/components/" exported="true"/>
     <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="qik1tm0" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
     <component id="qik1tm1" name="BtnStyle000.xml" path="/components/" exported="true"/>
@@ -324,7 +323,7 @@
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
     <image id="qik1tm7" name="db_jiajian_1.png" path="/images/"/>
-    <component id="mdmdtn5" name="ComItemBlue.xml" path="/components/" exported="true"/>
+    <component id="mdmdtn5" name="ComItem001_1.xml" path="/components/" exported="true"/>
     <image id="uxxstma" name="wpk_db_2.png" path="/imagesNew/" exported="true"/>
     <image id="uxxstm5" name="wpk_sz_db2.png" path="/imagesNew/" exported="true"/>
     <image id="mbf14" name="sj_dk.png" path="/imagesNew/" exported="true"/>
@@ -345,6 +344,8 @@
     <image id="idkdtnf" name="an_bt_bai.png" path="/imagesNew/" exported="true"/>
     <component id="idkdtng" name="BtnStyle005.xml" path="/components/" exported="true"/>
     <component id="idkdtnh" name="BtnStyle006.xml" path="/components/" exported="true"/>
+    <component id="imyrtni" name="ComIcon003.xml" path="/components/" exported="true"/>
+    <image id="idkdtcb" name="wp_bg_yuan.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 16 - 9
FGUIProject/assets/LuckyBox/LuckyBoxPreShowUI.xml

@@ -2,18 +2,25 @@
 <component size="962,1158">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n0_ga16" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1167"/>
-    <text id="n2_ga16" name="txtTitle" xy="118,53" size="726,69" fontSize="52" color="#9b7853" align="center" autoSize="none" text="物品展示"/>
-    <image id="n9_qr4e" name="n9" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,145"/>
-    <image id="n3_ga16" name="n3" src="qr4e27" fileName="images/wpzs_anniu_1.png" xy="190,181" group="n10_dhoa"/>
-    <component id="n4_ga16" name="btnItem" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="189,182" group="n10_dhoa">
+    <image id="n12_imyr" name="n12" src="idkdtce" fileName="imagesNews/zx_tc_piaodai_shang.png" xy="-62,-119"/>
+    <image id="n13_imyr" name="n13" src="idkdtcf" fileName="imagesNews/zx_tc_piaodai_xia.png" xy="552,831"/>
+    <image id="n11_imyr" name="n11" src="idkdtcd" fileName="imagesNews/zx_tc_bg.png" xy="5,11"/>
+    <image id="n15_imyr" name="n15" src="idkdtc9" fileName="imagesNews/zx_tc_title_zhuangshi.png" xy="32,61" group="n16_imyr"/>
+    <text id="n2_ga16" name="n2" xy="68,67" size="64,79" group="n16_imyr" fontSize="60" color="#5a3e16" text="物"/>
+    <text id="n18_imyr" name="n18" xy="126,77" size="54,66" group="n16_imyr" fontSize="50" color="#5a3e16" text="品"/>
+    <text id="n17_imyr" name="n17" xy="174,67" size="64,79" group="n16_imyr" fontSize="60" color="#5a3e16" text="展"/>
+    <text id="n19_imyr" name="n19" xy="232,77" size="54,66" group="n16_imyr" fontSize="50" color="#5a3e16" text="示"/>
+    <group id="n16_imyr" name="n16" xy="32,61" size="254,110"/>
+    <image id="n3_ga16" name="n3" src="idkdtcg" fileName="imagesNews/zx_tc_tab_bg.png" xy="244,177" size="474,74" group="n10_dhoa"/>
+    <component id="n4_ga16" name="btnItem" src="ga165c" fileName="components/ButtonTab1.xml" xy="244,177" group="n10_dhoa">
       <Button checked="true" title="物品预览" controller="c1" page="0"/>
     </component>
-    <component id="n5_ga16" name="btnProb" src="ga165c" fileName="components/ButtonTab1.xml" pkg="eg2y0ldp" xy="482,181" group="n10_dhoa">
+    <component id="n5_ga16" name="btnProb" src="ga165c" fileName="components/ButtonTab1.xml" xy="478,177" group="n10_dhoa" controller="c1,1">
       <Button title="概率公示" controller="c1" page="1"/>
     </component>
-    <group id="n10_dhoa" name="n10" xy="189,181" size="585,85"/>
-    <list id="n6_ga16" name="list" xy="96,318" size="770,790" overflow="scroll" lineGap="20" defaultItem="ui://drx9d1usga16k" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
+    <image id="n14_imyr" name="n14" src="idkdtch" fileName="imagesNews/zx_tc_tab_biankuang.png" xy="33,177" group="n10_dhoa"/>
+    <group id="n10_dhoa" name="n10" xy="33,177" size="896,74"/>
+    <list id="n6_ga16" name="list" xy="96,300" size="770,755" overflow="scroll" lineGap="20" defaultItem="ui://drx9d1usga16k" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
       <item/>
@@ -21,7 +28,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n8_ga16" name="compText" src="ga16j" fileName="components/Component1.xml" xy="70,334" size="822,790">
+    <component id="n8_ga16" name="compText" src="ga16j" fileName="components/Component1.xml" xy="70,300" size="822,755">
       <gearDisplay controller="c1" pages="1"/>
     </component>
   </displayList>

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

@@ -31,6 +31,7 @@
     <group id="n31_njmn" name="n31" xy="45,1461" size="989,291" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
+    <text id="n45_y8ps" name="txtTime" xy="507,340" size="62,237" font="ui://eg2y0ldpwonotj9" fontSize="46" color="#fffbdd" align="center" vAlign="middle" autoSize="height" strokeColor="#a98538" strokeSize="2" text="剩余80天"/>
   </displayList>
   <customProperty target="loaBg" propertyId="1"/>
 </component>

+ 16 - 0
FGUIProject/assets/LuckyBox/components/ButtonTab1.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="238,74" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
+  <displayList>
+    <loader id="n3_imyr" name="icon" xy="0,0" pivot="0.5,0.5" size="238,74" scale="-1,1" url="ui://drx9d1usidkdtci" autoSize="true">
+      <gearSize controller="c1" pages="1" values="238,74,-1,1" default="238,74,1,1"/>
+      <gearIcon controller="button" pages="1" values="ui://drx9d1usidkdtci" default=""/>
+    </loader>
+    <text id="n2_ga16" name="title" xy="0,0" size="238,74" fontSize="40" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <gearColor controller="button" pages="0,1" values="#716660,#000000|#5a3e16,#000000"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

+ 2 - 2
FGUIProject/assets/LuckyBox/components/CompLuckyBoxBonusListItem.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="770,355">
   <displayList>
-    <image id="n12_qr4e" name="n12" src="qr4e28" fileName="images/wpzs_bji.png" xy="21,2"/>
-    <text id="n9_ga16" name="txtName" xy="72,2" size="349,60" fontSize="40" color="#998570" autoSize="none" text="示例"/>
+    <image id="n12_qr4e" name="n12" src="idkdtcj" fileName="imagesNews/zx_tc_taozhuang_zhuagnshi.png" xy="35,19"/>
+    <text id="n9_ga16" name="txtName" xy="72,2" size="349,60" fontSize="40" color="#5a3e16" autoSize="none" text="示例"/>
     <list id="n11_ga16" name="list" xy="0,65" size="770,290" layout="flow_hz" colGap="50" lineItemCount="3" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
       <item/>
       <item/>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="805,677" overflow="scroll">
   <displayList>
-    <text id="n9_ga16" name="txtShow" xy="0,0" size="805,677" fontSize="36" color="#9b8355" letterSpacing="3" ubb="true" autoSize="none" autoClearText="true" text="示例\nhahakdfjla"/>
+    <text id="n9_ga16" name="txtShow" xy="0,0" size="805,677" fontSize="36" color="#5a3e16" letterSpacing="3" ubb="true" autoSize="none" autoClearText="true" text="示例\nhahakdfjla"/>
   </displayList>
 </component>

+ 2 - 2
FGUIProject/assets/LuckyBox/package.xml

@@ -131,15 +131,15 @@
     <image id="idkdtc8" name="zx_zhuangshi_diaoshi.png" path="/imagesNews/"/>
     <image id="idkdtc9" name="zx_tc_title_zhuangshi.png" path="/imagesNews/"/>
     <image id="idkdtca" name="wp_bg_shuliang.png" path="/imagesNews/"/>
-    <image id="idkdtcb" name="wp_bg_yuan.png" path="/imagesNews/"/>
     <image id="idkdtcc" name="wp_own.png" path="/imagesNews/"/>
     <image id="idkdtcd" name="zx_tc_bg.png" path="/imagesNews/"/>
     <image id="idkdtce" name="zx_tc_piaodai_shang.png" path="/imagesNews/"/>
     <image id="idkdtcf" name="zx_tc_piaodai_xia.png" path="/imagesNews/"/>
-    <image id="idkdtcg" name="zx_tc_tab_bg.png" path="/imagesNews/"/>
+    <image id="idkdtcg" name="zx_tc_tab_bg.png" path="/imagesNews/" scale="9grid" scale9grid="38,0,76,74"/>
     <image id="idkdtch" name="zx_tc_tab_biankuang.png" path="/imagesNews/"/>
     <image id="idkdtci" name="zx_tc_tab_xuanzhong.png" path="/imagesNews/"/>
     <image id="idkdtcj" name="zx_tc_taozhuang_zhuagnshi.png" path="/imagesNews/"/>
+    <component id="ga165c" name="ButtonTab1.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIcon.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemIcon
+    public partial class UI_ComIcon000
     {
         public GComponent target;
         public GLoader m_loaIcon;
@@ -16,12 +16,12 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldpng0itiz";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemIcon";
-        private static UI_ComItemIcon _proxy;
+        public const string RES_NAME = "ComIcon000";
+        private static UI_ComIcon000 _proxy;
 
-        public static UI_ComItemIcon Create(GObject gObject = null)
+        public static UI_ComIcon000 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemIcon();
+            var ui = new UI_ComIcon000();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -30,11 +30,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemIcon Proxy(GObject gObject = null)
+        public static UI_ComIcon000 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemIcon();
+                _proxy = new UI_ComIcon000();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 27270b2db69f5bb4a9bcdc40af3f3ee2
+guid: 6ab0ba8a5e22ea948a6f5e2dbe615dd4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemIconNew
+    public partial class UI_ComIcon001
     {
         public GComponent target;
         public GLoader m_bg;
@@ -18,12 +18,12 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldp9jv6tlt";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemIconNew";
-        private static UI_ComItemIconNew _proxy;
+        public const string RES_NAME = "ComIcon001";
+        private static UI_ComIcon001 _proxy;
 
-        public static UI_ComItemIconNew Create(GObject gObject = null)
+        public static UI_ComIcon001 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemIconNew();
+            var ui = new UI_ComIcon001();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -32,11 +32,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemIconNew Proxy(GObject gObject = null)
+        public static UI_ComIcon001 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemIconNew();
+                _proxy = new UI_ComIcon001();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b37e991627d2d46ca8f4e2ecc8288820
+guid: 4ad5e828cb8d0004488ba34ffb26c6e0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemIconNew1
+    public partial class UI_ComIcon002
     {
         public GComponent target;
         public GLoader m_loaIcon;
@@ -16,12 +16,12 @@ namespace UI.CommonGame
         public GGroup m_grpGot;
         public const string URL = "ui://eg2y0ldpqik1tlz";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemIconNew1";
-        private static UI_ComItemIconNew1 _proxy;
+        public const string RES_NAME = "ComIcon002";
+        private static UI_ComIcon002 _proxy;
 
-        public static UI_ComItemIconNew1 Create(GObject gObject = null)
+        public static UI_ComIcon002 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemIconNew1();
+            var ui = new UI_ComIcon002();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -30,11 +30,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemIconNew1 Proxy(GObject gObject = null)
+        public static UI_ComIcon002 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemIconNew1();
+                _proxy = new UI_ComIcon002();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIcon.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7a5d537a09290ee498209390a8913151
+guid: 8aa459e7d8832484abfa8f7737db7902
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 89 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComIcon003
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtHasCount;
+        public GLoader m_loaRarity;
+        public GImage m_imgHas;
+        public GImage m_imgNotHas;
+        public GImage m_imgShowTong;
+        public GGroup m_grpGot;
+        public const string URL = "ui://eg2y0ldpimyrtni";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComIcon003";
+        private static UI_ComIcon003 _proxy;
+
+        public static UI_ComIcon003 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComIcon003();
+            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_ComIcon003 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComIcon003();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_imgHas = (GImage)comp.GetChild("imgHas");
+            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
+            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
+            m_grpGot = (GGroup)comp.GetChild("grpGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtHasCount = null;
+            m_loaRarity = null;
+            m_imgHas = null;
+            m_imgNotHas = null;
+            m_imgShowTong = null;
+            m_grpGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemIconNew.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f7099fc706293db4d811169e4e3c899d
+guid: 8e9c5f8ad208b9448aa5016042fa8782
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 9 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem000.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItem
+    public partial class UI_ComItem000
     {
         public GComponent target;
-        public UI_ComItemIcon m_comItemIcon;
+        public UI_ComIcon000 m_comItemIcon;
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldpj48o98";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItem";
-        private static UI_ComItem _proxy;
+        public const string RES_NAME = "ComItem000";
+        private static UI_ComItem000 _proxy;
 
-        public static UI_ComItem Create(GObject gObject = null)
+        public static UI_ComItem000 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItem();
+            var ui = new UI_ComItem000();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItem Proxy(GObject gObject = null)
+        public static UI_ComItem000 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItem();
+                _proxy = new UI_ComItem000();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIcon)UI_ComItemIcon.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon000)UI_ComIcon000.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }

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

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

+ 9 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemBlue.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_1.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemBlue
+    public partial class UI_ComItem001_1
     {
         public GComponent target;
-        public UI_ComItemIconNew m_comItemIcon;
+        public UI_ComIcon001 m_comItemIcon;
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldpmdmdtn5";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemBlue";
-        private static UI_ComItemBlue _proxy;
+        public const string RES_NAME = "ComItem001_1";
+        private static UI_ComItem001_1 _proxy;
 
-        public static UI_ComItemBlue Create(GObject gObject = null)
+        public static UI_ComItem001_1 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemBlue();
+            var ui = new UI_ComItem001_1();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemBlue Proxy(GObject gObject = null)
+        public static UI_ComItem001_1 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemBlue();
+                _proxy = new UI_ComItem001_1();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIconNew)UI_ComItemIconNew.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }

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

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

+ 9 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem001_2.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemNew
+    public partial class UI_ComItem001_2
     {
         public GComponent target;
-        public UI_ComItemIconNew m_comItemIcon;
+        public UI_ComIcon001 m_comItemIcon;
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public const string URL = "ui://eg2y0ldp9jv6tls";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemNew";
-        private static UI_ComItemNew _proxy;
+        public const string RES_NAME = "ComItem001_2";
+        private static UI_ComItem001_2 _proxy;
 
-        public static UI_ComItemNew Create(GObject gObject = null)
+        public static UI_ComItem001_2 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemNew();
+            var ui = new UI_ComItem001_2();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemNew Proxy(GObject gObject = null)
+        public static UI_ComItem001_2 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemNew();
+                _proxy = new UI_ComItem001_2();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIconNew)UI_ComItemIconNew.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon001)UI_ComIcon001.Create(comp.GetChild("comItemIcon"));
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }

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

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

+ 9 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItemNew1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem002.cs

@@ -4,20 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComItemNew1
+    public partial class UI_ComItem002
     {
         public GComponent target;
-        public UI_ComItemIconNew1 m_comItemIcon;
+        public UI_ComIcon002 m_comItemIcon;
         public GTextField m_txtName;
         public GTextField m_txtCount;
         public const string URL = "ui://eg2y0ldpqik1tly";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItemNew1";
-        private static UI_ComItemNew1 _proxy;
+        public const string RES_NAME = "ComItem002";
+        private static UI_ComItem002 _proxy;
 
-        public static UI_ComItemNew1 Create(GObject gObject = null)
+        public static UI_ComItem002 Create(GObject gObject = null)
         {
-            var ui = new UI_ComItemNew1();
+            var ui = new UI_ComItem002();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComItemNew1 Proxy(GObject gObject = null)
+        public static UI_ComItem002 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComItemNew1();
+                _proxy = new UI_ComItem002();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,7 +57,7 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comItemIcon = (UI_ComItemIconNew1)UI_ComItemIconNew1.Create(comp.GetChild("comItemIcon"));
+            m_comItemIcon = (UI_ComIcon002)UI_ComIcon002.Create(comp.GetChild("comItemIcon"));
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
         }

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

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

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

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

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

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

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

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

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

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

+ 8 - 8
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button3.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ButtonTab1.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.LuckyBox
 {
-    public partial class UI_Button3
+    public partial class UI_ButtonTab1
     {
         public GButton target;
         public Controller m_c1;
-        public const string URL = "ui://drx9d1usga16d";
+        public const string URL = "ui://drx9d1usga165c";
         public const string PACKAGE_NAME = "LuckyBox";
-        public const string RES_NAME = "Button3";
-        private static UI_Button3 _proxy;
+        public const string RES_NAME = "ButtonTab1";
+        private static UI_ButtonTab1 _proxy;
 
-        public static UI_Button3 Create(GObject gObject = null)
+        public static UI_ButtonTab1 Create(GObject gObject = null)
         {
-            var ui = new UI_Button3();
+            var ui = new UI_ButtonTab1();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.LuckyBox
             return ui;
         }
 
-        public static UI_Button3 Proxy(GObject gObject = null)
+        public static UI_ButtonTab1 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Button3();
+                _proxy = new UI_ButtonTab1();
             }
             var ui = _proxy;
             if(gObject == null)

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

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

+ 5 - 16
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox.cs

@@ -8,18 +8,15 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public UI_ComModel m_comModel;
-        public UI_Button3 m_btnPreview;
-        public UI_Button3 m_btnExchange;
+        public GButton m_btnPreview;
         public GTextField m_txtOwned;
-        public GGraph m_holder;
-        public GGraph m_holder1;
-        public GTextField m_txtTime;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
         public UI_Button1 m_btnBuyOne;
         public UI_Button2 m_btnBuyTen;
         public GImage m_imgSpecial;
         public GTextField m_txtRemainTimes;
+        public GTextField m_txtTime;
         public const string URL = "ui://drx9d1usnjmn2p";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox";
@@ -68,31 +65,22 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
-            m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
-            m_btnExchange = (UI_Button3)UI_Button3.Create(comp.GetChild("btnExchange"));
+            m_btnPreview = (GButton)comp.GetChild("btnPreview");
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
             m_btnBuyOne = (UI_Button1)UI_Button1.Create(comp.GetChild("btnBuyOne"));
             m_btnBuyTen = (UI_Button2)UI_Button2.Create(comp.GetChild("btnBuyTen"));
             m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comModel.Dispose();
             m_comModel = null;
-            m_btnPreview.Dispose();
             m_btnPreview = null;
-            m_btnExchange.Dispose();
-            m_btnExchange = null;
             m_txtOwned = null;
-            m_holder = null;
-            m_holder1 = null;
-            m_txtTime = null;
             m_comCostOne.Dispose();
             m_comCostOne = null;
             m_comCostTen.Dispose();
@@ -103,6 +91,7 @@ namespace UI.LuckyBox
             m_btnBuyTen = null;
             m_imgSpecial = null;
             m_txtRemainTimes = null;
+            m_txtTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 112 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox_1.cs

@@ -0,0 +1,112 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_ComBox_1
+    {
+        public GComponent target;
+        public UI_ComModel m_comModel;
+        public GButton m_btnPreview;
+        public GButton m_btnExchange;
+        public GTextField m_txtOwned;
+        public GGraph m_holder;
+        public GGraph m_holder1;
+        public GTextField m_txtTime;
+        public UI_ComCost m_comCostOne;
+        public UI_ComCost m_comCostTen;
+        public UI_Button1 m_btnBuyOne;
+        public UI_Button2 m_btnBuyTen;
+        public GImage m_imgSpecial;
+        public GTextField m_txtRemainTimes;
+        public const string URL = "ui://drx9d1usidkdtan";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "ComBox_1";
+        private static UI_ComBox_1 _proxy;
+
+        public static UI_ComBox_1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComBox_1();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComBox_1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComBox_1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
+            m_btnPreview = (GButton)comp.GetChild("btnPreview");
+            m_btnExchange = (GButton)comp.GetChild("btnExchange");
+            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
+            m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
+            m_btnBuyOne = (UI_Button1)UI_Button1.Create(comp.GetChild("btnBuyOne"));
+            m_btnBuyTen = (UI_Button2)UI_Button2.Create(comp.GetChild("btnBuyTen"));
+            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
+            m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comModel.Dispose();
+            m_comModel = null;
+            m_btnPreview = null;
+            m_btnExchange = null;
+            m_txtOwned = null;
+            m_holder = null;
+            m_holder1 = null;
+            m_txtTime = null;
+            m_comCostOne.Dispose();
+            m_comCostOne = null;
+            m_comCostTen.Dispose();
+            m_comCostTen = null;
+            m_btnBuyOne.Dispose();
+            m_btnBuyOne = null;
+            m_btnBuyTen.Dispose();
+            m_btnBuyTen = null;
+            m_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_ComBox_1.cs.meta

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

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

@@ -8,8 +8,8 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public UI_ComModel m_comModel;
-        public UI_Button3 m_btnPreview;
-        public UI_Button3 m_btnExchange;
+        public GButton m_btnPreview;
+        public GButton m_btnExchange;
         public GTextField m_txtOwned;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
@@ -65,8 +65,8 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
-            m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
-            m_btnExchange = (UI_Button3)UI_Button3.Create(comp.GetChild("btnExchange"));
+            m_btnPreview = (GButton)comp.GetChild("btnPreview");
+            m_btnExchange = (GButton)comp.GetChild("btnExchange");
             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"));
@@ -79,9 +79,7 @@ namespace UI.LuckyBox
         {
             m_comModel.Dispose();
             m_comModel = null;
-            m_btnPreview.Dispose();
             m_btnPreview = null;
-            m_btnExchange.Dispose();
             m_btnExchange = null;
             m_txtOwned = null;
             m_comCostOne.Dispose();

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

@@ -9,8 +9,8 @@ namespace UI.LuckyBox
         public GComponent target;
         public UI_ComModel m_comModel;
         public GLoader m_loaImg;
-        public UI_Button3 m_btnPreview;
-        public UI_Button3 m_btnExchange;
+        public GButton m_btnPreview;
+        public GButton m_btnExchange;
         public GTextField m_txtOwned;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
@@ -66,8 +66,8 @@ namespace UI.LuckyBox
         {
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
             m_loaImg = (GLoader)comp.GetChild("loaImg");
-            m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
-            m_btnExchange = (UI_Button3)UI_Button3.Create(comp.GetChild("btnExchange"));
+            m_btnPreview = (GButton)comp.GetChild("btnPreview");
+            m_btnExchange = (GButton)comp.GetChild("btnExchange");
             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"));
@@ -80,9 +80,7 @@ namespace UI.LuckyBox
             m_comModel.Dispose();
             m_comModel = null;
             m_loaImg = null;
-            m_btnPreview.Dispose();
             m_btnPreview = null;
-            m_btnExchange.Dispose();
             m_btnExchange = null;
             m_txtOwned = null;
             m_comCostOne.Dispose();

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

@@ -8,8 +8,8 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public UI_ComModel m_comModel;
-        public UI_Button3 m_btnPreview;
-        public UI_Button3 m_btnExchange;
+        public GButton m_btnPreview;
+        public GButton m_btnExchange;
         public GTextField m_txtOwned;
         public GTextField m_txtTime;
         public UI_ComCost m_comCostOne;
@@ -65,8 +65,8 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
-            m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
-            m_btnExchange = (UI_Button3)UI_Button3.Create(comp.GetChild("btnExchange"));
+            m_btnPreview = (GButton)comp.GetChild("btnPreview");
+            m_btnExchange = (GButton)comp.GetChild("btnExchange");
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
@@ -79,9 +79,7 @@ namespace UI.LuckyBox
         {
             m_comModel.Dispose();
             m_comModel = null;
-            m_btnPreview.Dispose();
             m_btnPreview = null;
-            m_btnExchange.Dispose();
             m_btnExchange = null;
             m_txtOwned = null;
             m_txtTime = null;

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

@@ -8,10 +8,8 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public Controller m_c1;
-        public GComponent m_bg;
-        public GTextField m_txtTitle;
-        public GButton m_btnItem;
-        public GButton m_btnProb;
+        public UI_ButtonTab1 m_btnItem;
+        public UI_ButtonTab1 m_btnProb;
         public GList m_list;
         public UI_Component1 m_compText;
         public const string URL = "ui://drx9d1usga16e";
@@ -62,19 +60,17 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_bg = (GComponent)comp.GetChild("bg");
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
-            m_btnItem = (GButton)comp.GetChild("btnItem");
-            m_btnProb = (GButton)comp.GetChild("btnProb");
+            m_btnItem = (UI_ButtonTab1)UI_ButtonTab1.Create(comp.GetChild("btnItem"));
+            m_btnProb = (UI_ButtonTab1)UI_ButtonTab1.Create(comp.GetChild("btnProb"));
             m_list = (GList)comp.GetChild("list");
             m_compText = (UI_Component1)UI_Component1.Create(comp.GetChild("compText"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_bg = null;
-            m_txtTitle = null;
+            m_btnItem.Dispose();
             m_btnItem = null;
+            m_btnProb.Dispose();
             m_btnProb = null;
             m_list = null;
             m_compText.Dispose();

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardPreView.cs

@@ -48,7 +48,7 @@ namespace GFGGame
         }
         private void ListItemRender(int index, GObject obj)
         {
-            UI_ComItem item = UI_ComItem.Proxy(obj);
+            // UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = _rewardDatas[index];
             if (obj.data == null)
             {
@@ -56,7 +56,7 @@ namespace GFGGame
             }
             (obj.data as ItemView).SetData(reward);
 
-            UI_ComItem.ClearProxy();
+            // UI_ComItem.ClearProxy();
         }
 
     }

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/FirstChargeBonusView.cs

@@ -57,7 +57,7 @@ namespace GFGGame
             var itemInfo = GlobalCfgArray.globalCfg.firstChargeBonusArr[0];
             var itemId = itemInfo[0];
             var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            if(itemCfg.suitId > 0)
+            if (itemCfg.suitId > 0)
             {
                 var suitCfg = SuitCfgArray.Instance.GetCfg(itemCfg.suitId);
                 _ui.m_txtName.text = suitCfg.name;
@@ -80,7 +80,7 @@ namespace GFGGame
             {
                 UpdateView();
             }
-        
+
         }
 
         private void OnNumericChange(EventContext context)
@@ -99,7 +99,7 @@ namespace GFGGame
 
         private void ListItemRender(int index, GObject obj)
         {
-            UI_ComItem item = UI_ComItem.Proxy(obj);
+            // UI_ComItem item = UI_ComItem.Proxy(obj);
             int[] reward = GlobalCfgArray.globalCfg.firstChargeBonusArr[index];
             ItemData itemData = ItemUtil.createItemData(reward);
             if (obj.data == null)
@@ -107,7 +107,7 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
                    (obj.data as ItemView).SetData(itemData);
-            UI_ComItem.ProxyEnd();
+            // UI_ComItem.ProxyEnd();
         }
 
     }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs

@@ -100,7 +100,7 @@ namespace GFGGame
         }
         private void RenderListRewardItem(int index, GObject obj)
         {
-            UI_ComItem item = UI_ComItem.Proxy(obj);
+            // UI_ComItem item = UI_ComItem.Proxy(obj);
             int[] reward = GlobalCfgArray.globalCfg.firstChargeBonusArr[index];
             ItemData itemData = ItemUtil.createItemData(reward);
             if (obj.data == null)
@@ -108,7 +108,7 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
                    (obj.data as ItemView).SetData(itemData);
-            UI_ComItem.ProxyEnd();
+            // UI_ComItem.ProxyEnd();
         }
 
         private async void OnBtnGetClick(EventContext context)

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

@@ -95,7 +95,6 @@ namespace GFGGame
 
             LuckyBoxDataManager.Instance.InitData(_luckyBoxCfg.id);
             comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
-            comBox.m_btnPreview.m_c1.selectedIndex = 1;
             LuckyBoxDataManager.Instance.GetOwnedCount(_luckyBoxCfg.id, out int count, out int totalCount);
             comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
             comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
@@ -119,11 +118,11 @@ namespace GFGGame
             }
             comBox.m_btnBuyTen.target.data = _luckyBoxCfg.id;
 
-            if (comBox.m_btnPreview.target.data == null)
+            if (comBox.m_btnPreview.data == null)
             {
-                comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);
+                comBox.m_btnPreview.onClick.Add(OnClickBtnPreview);
             }
-            comBox.m_btnPreview.target.data = _luckyBoxCfg.id;
+            comBox.m_btnPreview.data = _luckyBoxCfg.id;
 
             comBox.target.data = _luckyBoxCfg.id;
 

+ 3 - 4
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -182,7 +182,6 @@ namespace GFGGame
                 }
             }
 
-            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();
@@ -204,11 +203,11 @@ namespace GFGGame
             }
             comBox.m_btnBuyTen.target.data = boxId;
 
-            if (comBox.m_btnPreview.target.data == null)
+            if (comBox.m_btnPreview.data == null)
             {
-                comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);
+                comBox.m_btnPreview.onClick.Add(OnClickBtnPreview);
             }
-            comBox.m_btnPreview.target.data = boxId;
+            comBox.m_btnPreview.data = boxId;
 
             obj.data = boxId;
 

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRewardGetView.cs

@@ -87,7 +87,7 @@ namespace GFGGame
 
         private void RenderListItem(int index, GObject obj)
         {
-            UI_ComItem item = UI_ComItem.Proxy(obj);
+            // UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = _rewardDatas[index];
             if (obj.data == null)
             {
@@ -97,7 +97,7 @@ namespace GFGGame
             // (obj.data as ItemView).SetComItemScale = 0.72f;
             // (obj.data as ItemView).SetTxtCountScale = 0.8f;
             // (obj.data as ItemView).SetTxtCountPos(185, 155);
-            UI_ComItem.ClearProxy();
+            // UI_ComItem.ClearProxy();
         }
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRewardView.cs

@@ -69,7 +69,7 @@ namespace GFGGame
         {
             int rewardIndex = (int)obj.parent.data;
             int[][] rewards = GalleryRewardCfgArray.Instance.dataArray[rewardIndex].itemsArr;
-            UI_ComItem item = UI_ComItem.Proxy(obj);
+            // UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = ItemUtil.createItemData(rewards[index]);//_rewardDatas[index];
             if (obj.data == null)
             {
@@ -79,7 +79,7 @@ namespace GFGGame
             (obj.data as ItemView).SetComItemScale = 0.72f;
             // (obj.data as ItemView).SetTxtCountScale = 0.8f;
             (obj.data as ItemView).SetTxtCountPos(185, 155);
-            UI_ComItem.ClearProxy();
+            // UI_ComItem.ClearProxy();
         }
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryRuleView.cs

@@ -75,7 +75,7 @@ namespace GFGGame
         {
             int rewardIndex = (int)obj.parent.data;
             int[][] rewards = GalleryRewardCfgArray.Instance.dataArray[rewardIndex].itemsArr;
-            UI_ComItem item = UI_ComItem.Proxy(obj);
+            // UI_ComItem item = UI_ComItem.Proxy(obj);
             ItemData reward = ItemUtil.createItemData(rewards[index]);//_rewardDatas[index];
             if (obj.data == null)
             {
@@ -85,7 +85,7 @@ namespace GFGGame
             (obj.data as ItemView).SetComItemScale = 0.72f;
             // (obj.data as ItemView).SetTxtCountScale = 0.8f;
             (obj.data as ItemView).SetTxtCountPos(185, 155);
-            UI_ComItem.ClearProxy();
+            // UI_ComItem.ClearProxy();
         }
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingRewardView.cs

@@ -79,7 +79,7 @@ namespace GFGGame
         {
             int rewardIndex = (int)obj.parent.data;
             int[][] rewards = FilingRewardCfgArray.Instance.GetCfgsByid(StudioDataManager.Instance.filingChapterId)[rewardIndex].itemsArr;
-            UI_ComItem item = UI_ComItem.Proxy(obj);
+
             ItemData reward = ItemUtil.createItemData(rewards[index]);//_rewardDatas[index];
             if (obj.data == null)
             {
@@ -89,7 +89,7 @@ namespace GFGGame
             (obj.data as ItemView).GrpGotVisible = StudioDataManager.Instance.GetFilingRewardStateByIndex(StudioDataManager.Instance.filingChapterId, rewardIndex) == ConstBonusStatus.GOT ? true : false;
             (obj.data as ItemView).SetComItemScale = 0.6f;
             (obj.data as ItemView).SetTxtCountPos(175, 135);
-            UI_ComItem.ClearProxy();
+
         }
 
         private void OnBtnGetClcik()

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


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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 59a07f84c6a459f42afe597d6eec5a84
+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_2.png


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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 1ccff23747f09b74ba9b4a82dd2eaeb8
+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_fui.bytes