zhaoyang 2 жил өмнө
parent
commit
53b9518e99
43 өөрчлөгдсөн 313 нэмэгдсэн , 75 устгасан
  1. 1 1
      FGUIProject/assets/CommonGame/GetSuitItemUI.xml
  2. 0 13
      FGUIProject/assets/CommonGame/components/Component2.xml
  3. 0 10
      FGUIProject/assets/CommonGame/components/LuckyBoxBonusItem.xml
  4. 0 0
      FGUIProject/assets/CommonGame/imagesExport/grxx_xinxin.png
  5. 1 2
      FGUIProject/assets/CommonGame/package.xml
  6. 11 11
      FGUIProject/assets/LuckyBox/LuckBoxBonusUI.xml
  7. 37 0
      FGUIProject/assets/LuckyBox/components/Component2.xml
  8. 22 0
      FGUIProject/assets/LuckyBox/components/LuckyBoxBonusItem.xml
  9. BIN
      FGUIProject/assets/LuckyBox/images/cj_anniu_wp.png
  10. BIN
      FGUIProject/assets/LuckyBox/images/cj_dikuanghw.png
  11. BIN
      FGUIProject/assets/LuckyBox/images/cj_glglgl.png
  12. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_hdh_1.png
  13. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_hdh_2.png
  14. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_hdh_3.png
  15. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_hdh_4.png
  16. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_kdi_1.png
  17. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_kdi_2.png
  18. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_kdi_3.png
  19. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_kdi_4.png
  20. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_xin.png
  21. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_zik_1.png
  22. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_zik_2.png
  23. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_zik_3.png
  24. BIN
      FGUIProject/assets/LuckyBox/images/cj_hd_zik_4.png
  25. BIN
      FGUIProject/assets/LuckyBox/images/cj_xk_xx.png
  26. BIN
      FGUIProject/assets/LuckyBox/images/cj_xk_yd.png
  27. BIN
      FGUIProject/assets/LuckyBox/images/hd_sxicon_1.png
  28. BIN
      FGUIProject/assets/LuckyBox/images/hd_sxicon_2.png
  29. BIN
      FGUIProject/assets/LuckyBox/images/hd_sxicon_3.png
  30. BIN
      FGUIProject/assets/LuckyBox/images/hd_sxicon_4.png
  31. 16 8
      FGUIProject/assets/LuckyBox/package.xml
  32. 1 1
      FGUIProject/assets/RoleInfo/components/ListHeadBorderItem.xml
  33. 1 1
      FGUIProject/assets/RoleInfo/components/ListHeadItem.xml
  34. 0 1
      FGUIProject/assets/RoleInfo/package.xml
  35. 83 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Component2.cs
  36. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Component2.cs.meta
  37. 33 22
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusUI.cs
  38. 81 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusItem.cs
  39. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusItem.cs.meta
  40. 4 5
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusView.cs
  41. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  42. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  43. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes

+ 1 - 1
FGUIProject/assets/CommonGame/GetSuitItemUI.xml

@@ -27,7 +27,7 @@
     <group id="n6_tu96" name="n6" xy="204,1391" size="672,166" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1712" visible="false">
+    <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1712" visible="false" pkg="drx9d1us">
       <relation target="n6_tu96" sidePair="top-bottom"/>
     </component>
   </displayList>

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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="250,256">
-  <displayList>
-    <image id="n1_ga16" name="n1" src="9cth8z" fileName="imagesExport/cj_hd_kdi.png" xy="0,6"/>
-    <text id="n2_ga16" name="txtName" xy="95,203" size="60,39" fontSize="28" color="#efe4af" align="center" text="物品">
-      <relation target="n1_ga16" sidePair="center-center"/>
-    </text>
-    <loader id="n3_ga16" name="icon" xy="65,59" size="120,120" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
-    <loader id="n4_ga16" name="rarity" xy="192,18" size="42,96" url="ui://eg2y0ldpd4iw52"/>
-    <image id="n5_9cth" name="n5" src="9cth90" fileName="imagesExport/cj_hd_zik.png" xy="1,203"/>
-    <image id="n7_pzq1" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" xy="19,0" visible="false"/>
-  </displayList>
-</component>

+ 0 - 10
FGUIProject/assets/CommonGame/components/LuckyBoxBonusItem.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="290,293" pivot="0.5,0.5" anchor="true">
-  <displayList>
-    <component id="n1_ga16" name="comIcon" src="dcrotaa" fileName="components/Component2.xml" xy="145,146" pivot="0.5,0.5" anchor="true"/>
-    <graph id="n8_dcro" name="holder" xy="144,146" size="1,1" touchable="false" type="rect"/>
-  </displayList>
-  <transition name="t0">
-    <item time="0" type="Scale" target="n1_ga16" tween="true" startValue="0,0" endValue="1,1" duration="4" ease="Expo.In"/>
-  </transition>
-</component>

+ 0 - 0
FGUIProject/assets/RoleInfo/images/grxx_xinxin.png → FGUIProject/assets/CommonGame/imagesExport/grxx_xinxin.png


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

@@ -40,7 +40,6 @@
     <component id="tu965l" name="Component1.xml" path="/components/"/>
     <image id="tu965m" name="cj_tzzsbj.jpg" path="/images/" atlas="alone_npot"/>
     <image id="fka73" name="cj_dikuang.png" path="/imagesExport/" exported="true"/>
-    <component id="ga16g" name="LuckyBoxBonusItem.xml" path="/components/" exported="true"/>
     <image id="u67n5n" name="cj_tskuang_2.png" path="/images/"/>
     <image id="hinb5p" name="fzd_anniu_1.png" path="/imagesExport/" exported="true"/>
     <component id="hinb5q" name="Button6.xml" path="/components/" exported="true"/>
@@ -143,7 +142,6 @@
     <image id="qdrt18" name="hd_sxicon_4.png" path="/imagesExport/" exported="true"/>
     <component id="n3xha1" name="ComCostCurrency.xml" path="/components/" exported="true"/>
     <font id="k1kha2" name="SIMKAI.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
-    <component id="dcrotaa" name="Component2.xml" path="/components/"/>
     <image id="ohuntac" name="zhuxian_shuoto.png" path="/imagesExport/" exported="true"/>
     <movieclip id="lj7ea8" name="MovieClip1.jta" path="/effect/"/>
     <component id="wet2tae" name="ComRewardItem.xml" path="/components/"/>
@@ -239,6 +237,7 @@
     <image id="v95qtjz" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>
     <image id="v95qtk0" name="ejzjm_gbzt.png" path="/imagesExport/" exported="true"/>
     <image id="v95qtk1" name="luyin.png" path="/imgItemIcon/" exported="true"/>
+    <image id="r9ril" name="grxx_xinxin.png" path="/imagesExport/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -4,17 +4,17 @@
     <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>
-    <component id="n1_ga16" name="item0" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="360,452" group="n15_ga16"/>
-    <component id="n5_ga16" name="item1" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="718,452" group="n15_ga16"/>
-    <component id="n6_ga16" name="item2" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="182,790" group="n15_ga16"/>
-    <component id="n7_ga16" name="item3" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="540,790" group="n15_ga16"/>
-    <component id="n8_ga16" name="item4" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="898,790" group="n15_ga16"/>
-    <component id="n9_ga16" name="item5" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="182,1128" group="n15_ga16"/>
-    <component id="n10_ga16" name="item6" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="540,1128" group="n15_ga16"/>
-    <component id="n11_ga16" name="item7" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="898,1128" group="n15_ga16"/>
-    <component id="n12_ga16" name="item8" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="360,1466" group="n15_ga16"/>
-    <component id="n13_ga16" name="item9" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="718,1466" group="n15_ga16"/>
-    <component id="n14_ga16" name="itemOne" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" pkg="eg2y0ldp" xy="540,978" group="n15_ga16"/>
+    <component id="n1_ga16" name="item0" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="360,452" group="n15_ga16"/>
+    <component id="n5_ga16" name="item1" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="718,452" group="n15_ga16"/>
+    <component id="n6_ga16" name="item2" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="182,790" group="n15_ga16"/>
+    <component id="n7_ga16" name="item3" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,790" group="n15_ga16"/>
+    <component id="n8_ga16" name="item4" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="898,790" group="n15_ga16"/>
+    <component id="n9_ga16" name="item5" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="182,1128" group="n15_ga16"/>
+    <component id="n10_ga16" name="item6" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1128" group="n15_ga16"/>
+    <component id="n11_ga16" name="item7" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="898,1128" group="n15_ga16"/>
+    <component id="n12_ga16" name="item8" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="360,1466" group="n15_ga16"/>
+    <component id="n13_ga16" name="item9" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="718,1466" group="n15_ga16"/>
+    <component id="n14_ga16" name="itemOne" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,978" group="n15_ga16"/>
     <group id="n15_ga16" name="n15" xy="37,306" size="1006,1307" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>

+ 37 - 0
FGUIProject/assets/LuckyBox/components/Component2.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="385,385">
+  <controller name="c1" pages="0,,1,,2,,3,,4," selected="4"/>
+  <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="4"/>
+    </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>
+    <image id="n14_v95q" name="n14" src="v95q33" fileName="images/cj_hd_zik_1.png" xy="100,270" group="n9_v95q">
+      <gearDisplay controller="c1" pages="4"/>
+    </image>
+    <image id="n15_v95q" name="n15" src="v95q34" fileName="images/cj_hd_zik_2.png" xy="100,270" group="n9_v95q">
+      <gearDisplay controller="c1" pages="3"/>
+    </image>
+    <image id="n16_v95q" name="n16" src="v95q35" fileName="images/cj_hd_zik_3.png" xy="100,270" group="n9_v95q">
+      <gearDisplay controller="c1" pages="2"/>
+    </image>
+    <image id="n17_v95q" name="n17" src="v95q36" fileName="images/cj_hd_zik_4.png" xy="100,270" group="n9_v95q">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n7_pzq1" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="71,88" group="n9_v95q" visible="false"/>
+    <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="278,62" size="42,96" group="n9_v95q" url="ui://eg2y0ldpd4iw52"/>
+    <text id="n2_ga16" name="txtName" xy="163,267" size="60,39" group="n9_v95q" fontSize="28" color="#bf9e73" align="center" text="物品">
+      <gearColor controller="c1" pages="1,2,3,4" values="#b0967d,#000000|#939b89,#000000|#89a2b0,#000000|#bf9e73,#000000" default="#efe4af,#000000"/>
+    </text>
+    <group id="n9_v95q" name="n9" xy="58,60" size="270,270"/>
+  </displayList>
+</component>

+ 22 - 0
FGUIProject/assets/LuckyBox/components/LuckyBoxBonusItem.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="385,385" pivot="0.5,0.5" anchor="true">
+  <controller name="c1" pages="0,,1,,2,,3,,4," selected="4"/>
+  <displayList>
+    <image id="n13_v95q" name="n13" src="v95q2t" fileName="images/cj_glglgl.png" xy="0,0"/>
+    <image id="n9_v95q" name="n9" src="v95q2y" fileName="images/cj_hd_kdi_1.png" xy="58,60">
+      <gearDisplay controller="c1" pages="4"/>
+    </image>
+    <image id="n10_v95q" name="n10" src="v95q2z" fileName="images/cj_hd_kdi_2.png" xy="58,60">
+      <gearDisplay controller="c1" pages="3"/>
+    </image>
+    <image id="n11_v95q" name="n11" src="v95q30" fileName="images/cj_hd_kdi_3.png" xy="58,60">
+      <gearDisplay controller="c1" pages="2"/>
+    </image>
+    <image id="n12_v95q" name="n12" src="v95q31" fileName="images/cj_hd_kdi_4.png" xy="58,60">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <component id="n1_ga16" name="comIcon" src="dcrotaa" fileName="components/Component2.xml" xy="192,192" pivot="0.5,0.5" anchor="true"/>
+    <graph id="n8_dcro" name="holder" xy="144,146" size="1,1" visible="false" touchable="false" type="rect"/>
+  </displayList>
+  <transition name="t0"/>
+</component>

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


+ 16 - 8
FGUIProject/assets/LuckyBox/package.xml

@@ -3,8 +3,6 @@
   <resources>
     <image id="fka70" name="cj_anniu_1.png" path="/images/"/>
     <image id="fka71" name="cj_anniu_2.png" path="/images/"/>
-    <image id="fka72" name="cj_anniu_wp.png" path="/images/"/>
-    <image id="fka74" name="cj_dikuanghw.png" path="/images/"/>
     <image id="fka75" name="cj_dikuangtw.png" path="/images/" scale="9grid" scale9grid="56,8,112,16"/>
     <image id="fka76" name="cj_jlbj.jpg" path="/images/" atlas="alone_npot"/>
     <image id="fka78" name="cj_yydik.png" path="/images/"/>
@@ -17,8 +15,6 @@
     <component id="ga16j" name="Component1.xml" path="/components/"/>
     <component id="ga16k" name="CompLuckyBoxBonusListItem.xml" path="/components/"/>
     <component id="l5nzm" name="LuckyBoxStarUI.xml" path="/" exported="true"/>
-    <image id="l5nzn" name="cj_xk_xx.png" path="/images/"/>
-    <image id="l5nzo" name="cj_xk_yd.png" path="/images/"/>
     <image id="l5nzp" name="cj_xk_xian.png" path="/images/" scale="9grid" scale9grid="8,0,9,12"/>
     <component id="l5nzq" name="ComStar.xml" path="/components/"/>
     <image id="vek8s" name="cj_ditua.png" path="/images/"/>
@@ -27,9 +23,6 @@
     <component id="vek811" name="ComListBgItem.xml" path="/components/"/>
     <component id="vek812" name="ComCost.xml" path="/components/"/>
     <image id="qdrt14" name="hd_dkdk_1.png" path="/images/"/>
-    <image id="qdrt16" name="hd_sxicon_2.png" path="/images/" exported="true"/>
-    <image id="qdrt17" name="hd_sxicon_3.png" path="/images/" exported="true"/>
-    <image id="qdrt18" name="hd_sxicon_4.png" path="/images/" exported="true"/>
     <component id="qdrt19" name="LuckyBoxCardUI.xml" path="/" exported="true"/>
     <component id="qdrt1a" name="ComCard.xml" path="/components/"/>
     <image id="qdrt1b" name="hd_tiaoguo.png" path="/images/"/>
@@ -47,7 +40,22 @@
     <component id="njmn2p" name="ComBox_1.xml" path="/combox/" exported="true"/>
     <component id="wono2q" name="LuckyBoxUI.xml" path="/" exported="true"/>
     <image id="v95q2r" name="hd_kkbt_1.png" path="/images/"/>
-    <image id="v95q2s" name="hd_sxicon_1.png" path="/images/"/>
+    <image id="v95q2t" name="cj_glglgl.png" path="/images/"/>
+    <image id="v95q2u" name="cj_hd_hdh_1.png" path="/images/"/>
+    <image id="v95q2v" name="cj_hd_hdh_2.png" path="/images/"/>
+    <image id="v95q2w" name="cj_hd_hdh_3.png" path="/images/"/>
+    <image id="v95q2x" name="cj_hd_hdh_4.png" path="/images/"/>
+    <image id="v95q2y" name="cj_hd_kdi_1.png" path="/images/"/>
+    <image id="v95q2z" name="cj_hd_kdi_2.png" path="/images/"/>
+    <image id="v95q30" name="cj_hd_kdi_3.png" path="/images/"/>
+    <image id="v95q31" name="cj_hd_kdi_4.png" path="/images/"/>
+    <image id="v95q32" name="cj_hd_xin.png" path="/images/"/>
+    <image id="v95q33" name="cj_hd_zik_1.png" path="/images/"/>
+    <image id="v95q34" name="cj_hd_zik_2.png" path="/images/"/>
+    <image id="v95q35" name="cj_hd_zik_3.png" path="/images/"/>
+    <image id="v95q36" name="cj_hd_zik_4.png" path="/images/"/>
+    <component id="dcrotaa" name="Component2.xml" path="/components/"/>
+    <component id="ga16g" name="LuckyBoxBonusItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/RoleInfo/components/ListHeadBorderItem.xml

@@ -7,7 +7,7 @@
       <gearDisplay controller="button" pages="1"/>
     </image>
     <loader id="n6_v95q" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" aspect="true" touchable="false" url="ui://374k3dwvr9ri23" autoSize="true"/>
-    <image id="n7_v95q" name="imgNew" src="r9ril" fileName="images/grxx_xinxin.png" xy="154,45"/>
+    <image id="n7_v95q" name="imgNew" src="r9ril" fileName="images/grxx_xinxin.png" xy="154,45" pkg="eg2y0ldp"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

+ 1 - 1
FGUIProject/assets/RoleInfo/components/ListHeadItem.xml

@@ -7,7 +7,7 @@
     <image id="n5_r9ri" name="n5" src="r9rik" fileName="images/grxx_txxzlx.png" xy="2,2">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n7_r9ri" name="imgNew" src="r9ril" fileName="images/grxx_xinxin.png" xy="140,18"/>
+    <image id="n7_r9ri" name="imgNew" src="r9ril" fileName="images/grxx_xinxin.png" xy="140,18" pkg="eg2y0ldp"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

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

@@ -29,7 +29,6 @@
     <image id="r9rii" name="grxx_ditup.png" path="/images/"/>
     <image id="r9rij" name="grxx_txkuang.png" path="/images/"/>
     <image id="r9rik" name="grxx_txxzlx.png" path="/images/"/>
-    <image id="r9ril" name="grxx_xinxin.png" path="/images/"/>
     <image id="r9rim" name="grxx_xtxtx.png" path="/images/" scale="9grid" scale9grid="204,1,408,2"/>
     <image id="r9rin" name="grxx_xztxtx_1.png" path="/images/"/>
     <image id="r9rio" name="grxx_xztxtx_2.png" path="/images/"/>

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

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_Component2
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GImage m_imgNew;
+        public GLoader m_icon;
+        public GLoader m_rarity;
+        public GTextField m_txtName;
+        public const string URL = "ui://drx9d1usdcrotaa";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "Component2";
+        private static UI_Component2 _proxy;
+
+        public static UI_Component2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component2();
+            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_Component2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component2();
+            }
+            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_imgNew = (GImage)comp.GetChild("imgNew");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_rarity = (GLoader)comp.GetChild("rarity");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_imgNew = null;
+            m_icon = null;
+            m_rarity = null;
+            m_txtName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 33 - 22
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusUI.cs

@@ -8,17 +8,17 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GComponent m_item0;
-        public GComponent m_item1;
-        public GComponent m_item2;
-        public GComponent m_item3;
-        public GComponent m_item4;
-        public GComponent m_item5;
-        public GComponent m_item6;
-        public GComponent m_item7;
-        public GComponent m_item8;
-        public GComponent m_item9;
-        public GComponent m_itemOne;
+        public UI_LuckyBoxBonusItem m_item0;
+        public UI_LuckyBoxBonusItem m_item1;
+        public UI_LuckyBoxBonusItem m_item2;
+        public UI_LuckyBoxBonusItem m_item3;
+        public UI_LuckyBoxBonusItem m_item4;
+        public UI_LuckyBoxBonusItem m_item5;
+        public UI_LuckyBoxBonusItem m_item6;
+        public UI_LuckyBoxBonusItem m_item7;
+        public UI_LuckyBoxBonusItem m_item8;
+        public UI_LuckyBoxBonusItem m_item9;
+        public UI_LuckyBoxBonusItem m_itemOne;
         public const string URL = "ui://drx9d1usfka7a";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckBoxBonusUI";
@@ -67,31 +67,42 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_item0 = (GComponent)comp.GetChild("item0");
-            m_item1 = (GComponent)comp.GetChild("item1");
-            m_item2 = (GComponent)comp.GetChild("item2");
-            m_item3 = (GComponent)comp.GetChild("item3");
-            m_item4 = (GComponent)comp.GetChild("item4");
-            m_item5 = (GComponent)comp.GetChild("item5");
-            m_item6 = (GComponent)comp.GetChild("item6");
-            m_item7 = (GComponent)comp.GetChild("item7");
-            m_item8 = (GComponent)comp.GetChild("item8");
-            m_item9 = (GComponent)comp.GetChild("item9");
-            m_itemOne = (GComponent)comp.GetChild("itemOne");
+            m_item0 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item0"));
+            m_item1 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item1"));
+            m_item2 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item2"));
+            m_item3 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item3"));
+            m_item4 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item4"));
+            m_item5 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item5"));
+            m_item6 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item6"));
+            m_item7 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item7"));
+            m_item8 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item8"));
+            m_item9 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item9"));
+            m_itemOne = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("itemOne"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = 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_itemOne.Dispose();
             m_itemOne = null;
             if(disposeTarget && target != null)
             {

+ 81 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusItem.cs

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

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

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

+ 4 - 5
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusView.cs

@@ -1,7 +1,6 @@
 using UnityEngine;
 using FairyGUI;
 using UI.LuckyBox;
-using UI.CommonGame;
 using System.Collections.Generic;
 
 namespace GFGGame
@@ -142,8 +141,8 @@ namespace GFGGame
         private void ShowBonus(ItemData itemData)
         {
             HideAllItem();
-            _ui.m_itemOne.visible = true;
-            UI_LuckyBoxBonusItem itemUI = UI_LuckyBoxBonusItem.Proxy(_ui.m_itemOne);
+            _ui.m_itemOne.target.visible = true;
+            UI_LuckyBoxBonusItem itemUI = UI_LuckyBoxBonusItem.Proxy(_ui.m_itemOne.target);
             UpdateItem(itemUI, itemData, 0);
             UI_LuckyBoxBonusItem.ProxyEnd();
             _ui.m_loaBg.touchable = true;
@@ -151,7 +150,7 @@ namespace GFGGame
 
         private void HideAllItem()
         {
-            _ui.m_itemOne.visible = false;
+            _ui.m_itemOne.target.visible = false;
             for (int i = 0; i < 10; i++)
             {
                 GObject itemObject = _ui.target.GetChild("item" + i);
@@ -196,7 +195,7 @@ namespace GFGGame
 
         private void InitAllItem()
         {
-            _ui.m_itemOne.onClick.Add(OnClickItemUI);
+            _ui.m_itemOne.target.onClick.Add(OnClickItemUI);
             for (int i = 0; i < 10; i++)
             {
                 GObject itemObject = _ui.target.GetChild("item" + i);

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


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


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