zhaoyang 2 years ago
parent
commit
507c5ca5fe
83 changed files with 123 additions and 32 deletions
  1. 13 0
      FGUIProject/assets/CommonGame/components/BtnStyle005.xml
  2. 12 0
      FGUIProject/assets/CommonGame/components/BtnStyle006.xml
  3. BIN
      FGUIProject/assets/CommonGame/imagesNew/an_bt_bai.png
  4. 0 0
      FGUIProject/assets/CommonGame/imagesNew/an_bt_cut.png
  5. BIN
      FGUIProject/assets/CommonGame/imagesNew/an_bt_jin.png
  6. 5 1
      FGUIProject/assets/CommonGame/package.xml
  7. 11 22
      FGUIProject/assets/LuckyBox/combox/ComBox.xml
  8. 5 9
      FGUIProject/assets/LuckyBox/components/Button3.xml
  9. BIN
      FGUIProject/assets/LuckyBox/imagesNews/bt_jiaobiao_bichu.png
  10. BIN
      FGUIProject/assets/LuckyBox/imagesNews/bt_tiaoguo.png
  11. BIN
      FGUIProject/assets/LuckyBox/imagesNews/wp_bg_shuliang.png
  12. BIN
      FGUIProject/assets/LuckyBox/imagesNews/wp_bg_yuan.png
  13. BIN
      FGUIProject/assets/LuckyBox/imagesNews/wp_own.png
  14. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_bg_yueliang.png
  15. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_bg_zhuangshi.png
  16. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_jindu_bg.png
  17. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_bg_zhuangshi.png
  18. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_guangquan.png
  19. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_shang.png
  20. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_star_1.png
  21. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_star_2.png
  22. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_star_3.png
  23. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_xia.png
  24. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_huang_xian.png
  25. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_guangquan.png
  26. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_shang.png
  27. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_star_1.png
  28. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_star_2.png
  29. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_star_3.png
  30. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_xia.png
  31. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_lianxian_lan_xian.png
  32. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_bg.png
  33. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_piaodai_shang.png
  34. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_piaodai_xia.png
  35. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_tab_bg.png
  36. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_tab_biankuang.png
  37. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_tab_xuanzhong.png
  38. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_taozhuang_zhuagnshi.png
  39. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tc_title_zhuangshi.png
  40. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_bg.png
  41. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_guangdian.png
  42. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_xianding.png
  43. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_zi.png
  44. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_zi_guangxiao.png
  45. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_zi_star.png
  46. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_title_zi_zhuangshi.png
  47. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tx_hengxiang.png
  48. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tx_jiguang.png
  49. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tx_qianjing.png
  50. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tx_star.png
  51. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tx_yuanquan.png
  52. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_tx_zhongjian.png
  53. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_baseboard.png
  54. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_fen_bg.png
  55. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_fen_diguang.png
  56. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_fen_guangxiao.png
  57. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_fen_xian.png
  58. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_bg.png
  59. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_diguang.png
  60. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_guangxiao.png
  61. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_jiaobiao.png
  62. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_jin_xian.png
  63. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_lan_bg.png
  64. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_lan_diguang.png
  65. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_wp_mingcheng_bg.png
  66. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_diandian.png
  67. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_hengguang.png
  68. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_neiquan.png
  69. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_star.png
  70. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yuan_tx_waiquan.png
  71. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yulan_diaoshi.png
  72. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yulan_tubiao.png
  73. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yulan_tubiao_bg.png
  74. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_yulan_xinggui.png
  75. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_zhuangshi_diaoshi.png
  76. BIN
      FGUIProject/assets/LuckyBox/imagesNews/zx_zhuangshi_xinggui.png
  77. 68 0
      FGUIProject/assets/LuckyBox/package.xml
  78. 9 0
      GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs
  79. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  80. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  81. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  82. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  83. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="94,94" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_idkd" src="idkdtnd" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+    <text id="n1_idkd" name="title" xy="0,0" size="94,94" fontSize="30" autoSize="none" align="center" vAlign="middle" singleLine="true">
+      <relation target="" sidePair="width,height"/>
+    </text>
+  </displayList>
+</component>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="316,102" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n2_idkd" name="icon" xy="0,3" size="316,102" url="ui://eg2y0ldpidkdtne" autoSize="true"/>
+    <text id="n1_idkd" name="title" xy="0,0" size="316,102" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="摘星十次">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+  <relation target="n2_idkd" sidePair="width-width,height-height"/>
+</component>

BIN
FGUIProject/assets/CommonGame/imagesNew/an_bt_bai.png


+ 0 - 0
FGUIProject/assets/CommonGame/imagesNew/bt_cut.png → FGUIProject/assets/CommonGame/imagesNew/an_bt_cut.png


BIN
FGUIProject/assets/CommonGame/imagesNew/an_bt_jin.png


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

@@ -340,7 +340,11 @@
     <image id="idkdtnb" name="hl_jfscibt.png" path="/imagesNew/"/>
     <image id="idkdtnb" name="hl_jfscibt.png" path="/imagesNew/"/>
     <image id="qqhzk" name="an_yellow_1.png" path="/imagesNew/" exported="true"/>
     <image id="qqhzk" name="an_yellow_1.png" path="/imagesNew/" exported="true"/>
     <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
     <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
-    <image id="idkdtnd" name="bt_cut.png" path="/imagesNew/"/>
+    <image id="idkdtnd" name="an_bt_cut.png" path="/imagesNew/" exported="true"/>
+    <image id="idkdtne" name="an_bt_jin.png" path="/imagesNew/" exported="true"/>
+    <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"/>
   </resources>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 11 - 22
FGUIProject/assets/LuckyBox/combox/ComBox.xml

@@ -4,42 +4,31 @@
     <component id="n44_mbf1" name="comModel" src="mbf1tah" fileName="combox/ComModel.xml" xy="0,0">
     <component id="n44_mbf1" name="comModel" src="mbf1tah" fileName="combox/ComModel.xml" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     </component>
-    <component id="n32_njmn" name="btnPreview" src="ga16d" fileName="components/Button3.xml" xy="920,177" group="n36_njmn" controller="c1,0">
+    <component id="n32_njmn" name="btnPreview" src="ga16d" fileName="components/Button3.xml" xy="917,240" group="n36_njmn">
       <Button icon="ui://drx9d1usvek8v"/>
       <Button icon="ui://drx9d1usvek8v"/>
     </component>
     </component>
-    <component id="n33_njmn" name="btnExchange" src="ga16d" fileName="components/Button3.xml" xy="966,177" group="n36_njmn" visible="false">
-      <Button icon="ui://drx9d1usvek8t"/>
-    </component>
-    <image id="n34_njmn" name="n34" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n36_njmn"/>
-    <text id="n35_njmn" name="txtOwned" xy="891,289" size="143,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有:{v1=0}/{v2=0}">
+    <image id="n34_njmn" name="n34" src="idkdtar" fileName="imagesNews/zx_jindu_bg.png" xy="903,343" group="n36_njmn"/>
+    <text id="n35_njmn" name="txtOwned" xy="940,337" pivot="0.5,0" size="44,39" group="n36_njmn" fontSize="28" color="#faf6e6" align="center" vars="true" text="{v1=0}/{v2=0}">
       <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
       <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
     </text>
     </text>
-    <group id="n36_njmn" name="n36" xy="854,177" size="226,148" advanced="true">
+    <group id="n36_njmn" name="n36" xy="903,240" size="116,136" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     </group>
-    <graph id="n39_dhoa" name="holder" xy="280,910" size="100,100"/>
-    <graph id="n40_dhoa" name="holder1" xy="869,1097" size="100,100"/>
-    <image id="n41_dhoa" name="n41" src="qi041j" fileName="images/cj_zizi_2.png" xy="390,548" group="n42_dhoa"/>
-    <image id="n43_mzf8" name="n43" src="mzf8tac" fileName="images/cj_zizi_3.png" xy="674,703" group="n42_dhoa"/>
-    <text id="n38_dhoa" name="txtTime" xy="641,952" size="62,237" group="n42_dhoa" font="ui://eg2y0ldpwonotj9" fontSize="46" color="#fffbdd" align="center" vAlign="middle" autoSize="height" strokeColor="#a98538" strokeSize="2" text="剩余80天"/>
-    <group id="n42_dhoa" name="n42" xy="390,548" size="387,700" advanced="true">
-      <relation target="" sidePair="middle-middle"/>
-    </group>
-    <component id="n26_njmn" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="256,1635" pivot="0.5,0" anchor="true" group="n31_njmn">
+    <component id="n26_njmn" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="256,1594" pivot="0.5,0" anchor="true" group="n31_njmn">
       <relation target="" sidePair="left-left"/>
       <relation target="" sidePair="left-left"/>
     </component>
     </component>
-    <component id="n27_njmn" name="comCostTen" src="vek812" fileName="components/ComCost.xml" xy="741,1635" pivot="0.5,0" anchor="true" group="n31_njmn">
+    <component id="n27_njmn" name="comCostTen" src="vek812" fileName="components/ComCost.xml" xy="741,1594" pivot="0.5,0" anchor="true" group="n31_njmn">
       <relation target="" sidePair="left-left"/>
       <relation target="" sidePair="left-left"/>
     </component>
     </component>
-    <component id="n28_njmn" name="btnBuyOne" src="ga16b" fileName="components/Button1.xml" xy="45,1688" group="n31_njmn"/>
-    <component id="n29_njmn" name="btnBuyTen" src="ga16c" fileName="components/Button2.xml" xy="531,1688" group="n31_njmn"/>
-    <image id="n30_njmn" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1603" group="n31_njmn">
+    <component id="n28_njmn" name="btnBuyOne" src="ga16b" fileName="components/Button1.xml" xy="45,1647" group="n31_njmn"/>
+    <component id="n29_njmn" name="btnBuyTen" src="ga16c" fileName="components/Button2.xml" xy="531,1647" group="n31_njmn"/>
+    <image id="n30_njmn" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1562" group="n31_njmn">
       <relation target="n29_njmn" sidePair="left-left,top-top"/>
       <relation target="n29_njmn" sidePair="left-left,top-top"/>
     </image>
     </image>
-    <text id="n37_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="244,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数:{v1=0}">
+    <text id="n37_njmn" name="txtRemainTimes" xy="540,1461" pivot="0.5,0" anchor="true" size="303,54" group="n31_njmn" fontSize="40" color="#915e15" align="center" vars="true" text="今日剩余次数:{v1=0}">
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>
     </text>
     </text>
-    <group id="n31_njmn" name="n31" xy="45,1603" size="989,250" advanced="true">
+    <group id="n31_njmn" name="n31" xy="45,1461" size="989,291" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
     </group>
   </displayList>
   </displayList>

+ 5 - 9
FGUIProject/assets/LuckyBox/components/Button3.xml

@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="94,95" extention="Button">
+<component size="90,90" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="button" pages="0,up,1,down" selected="0"/>
-  <controller name="c1" exported="true" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
   <displayList>
-    <loader id="n1_vek8" name="icon" xy="0,0" size="94,95" url="ui://drx9d1usvek8v" autoSize="true"/>
-    <movieclip id="n2_jpnf" name="n2" src="jpnf1x" fileName="effect/MovieClip1.jta" xy="-53,-11">
-      <gearDisplay controller="c1" pages="1,3"/>
-    </movieclip>
-    <movieclip id="n3_jpnf" name="n3" src="jpnf26" fileName="effect/MovieClip2.jta" xy="-53,-10">
-      <gearDisplay controller="c1" pages="2"/>
-    </movieclip>
+    <image id="n6_idkd" name="n6" src="idkdtb1" fileName="imagesNews/zx_yulan_tubiao_bg.png" xy="0,0"/>
+    <image id="n5_idkd" name="n5" src="idkdtb0" fileName="imagesNews/zx_yulan_tubiao.png" xy="22,15"/>
+    <image id="n7_idkd" name="n7" src="idkdtb2" fileName="imagesNews/zx_yulan_xinggui.png" xy="-15,-6"/>
+    <image id="n4_idkd" name="n4" src="idkdtaz" fileName="imagesNews/zx_yulan_diaoshi.png" xy="-9,-92"/>
   </displayList>
   </displayList>
   <Button/>
   <Button/>
 </component>
 </component>

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


+ 68 - 0
FGUIProject/assets/LuckyBox/package.xml

@@ -72,6 +72,74 @@
     <image id="mbf1tal" name="cj_sj_db.png" path="/images/"/>
     <image id="mbf1tal" name="cj_sj_db.png" path="/images/"/>
     <image id="mbf1tam" name="cj_tswz_db.png" path="/images/"/>
     <image id="mbf1tam" name="cj_tswz_db.png" path="/images/"/>
     <component id="idkdtan" name="ComBox_1.xml" path="/combox/" exported="true"/>
     <component id="idkdtan" name="ComBox_1.xml" path="/combox/" exported="true"/>
+    <image id="idkdtao" name="bt_tiaoguo.png" path="/imagesNews/"/>
+    <image id="idkdtap" name="zx_bg_yueliang.png" path="/imagesNews/"/>
+    <image id="idkdtaq" name="zx_bg_zhuangshi.png" path="/imagesNews/"/>
+    <image id="idkdtar" name="zx_jindu_bg.png" path="/imagesNews/"/>
+    <image id="idkdtas" name="zx_title_bg.png" path="/imagesNews/"/>
+    <image id="idkdtat" name="zx_title_guangdian.png" path="/imagesNews/"/>
+    <image id="idkdtau" name="zx_title_xianding.png" path="/imagesNews/"/>
+    <image id="idkdtav" name="zx_title_zi.png" path="/imagesNews/"/>
+    <image id="idkdtaw" name="zx_title_zi_guangxiao.png" path="/imagesNews/"/>
+    <image id="idkdtax" name="zx_title_zi_star.png" path="/imagesNews/"/>
+    <image id="idkdtay" name="zx_title_zi_zhuangshi.png" path="/imagesNews/"/>
+    <image id="idkdtaz" name="zx_yulan_diaoshi.png" path="/imagesNews/"/>
+    <image id="idkdtb0" name="zx_yulan_tubiao.png" path="/imagesNews/"/>
+    <image id="idkdtb1" name="zx_yulan_tubiao_bg.png" path="/imagesNews/"/>
+    <image id="idkdtb2" name="zx_yulan_xinggui.png" path="/imagesNews/"/>
+    <image id="idkdtb3" name="bt_jiaobiao_bichu.png" path="/imagesNews/"/>
+    <image id="idkdtb4" name="zx_lianxian_lan_xian.png" path="/imagesNews/"/>
+    <image id="idkdtb5" name="zx_lianxian_bg_zhuangshi.png" path="/imagesNews/"/>
+    <image id="idkdtb6" name="zx_lianxian_huang_guangquan.png" path="/imagesNews/"/>
+    <image id="idkdtb7" name="zx_lianxian_huang_shang.png" path="/imagesNews/"/>
+    <image id="idkdtb8" name="zx_lianxian_huang_star_1.png" path="/imagesNews/"/>
+    <image id="idkdtb9" name="zx_lianxian_huang_star_2.png" path="/imagesNews/"/>
+    <image id="idkdtba" name="zx_lianxian_huang_star_3.png" path="/imagesNews/"/>
+    <image id="idkdtbb" name="zx_lianxian_huang_xia.png" path="/imagesNews/"/>
+    <image id="idkdtbc" name="zx_lianxian_huang_xian.png" path="/imagesNews/"/>
+    <image id="idkdtbd" name="zx_lianxian_lan_guangquan.png" path="/imagesNews/"/>
+    <image id="idkdtbe" name="zx_lianxian_lan_shang.png" path="/imagesNews/"/>
+    <image id="idkdtbf" name="zx_lianxian_lan_star_1.png" path="/imagesNews/"/>
+    <image id="idkdtbg" name="zx_lianxian_lan_star_2.png" path="/imagesNews/"/>
+    <image id="idkdtbh" name="zx_lianxian_lan_star_3.png" path="/imagesNews/"/>
+    <image id="idkdtbi" name="zx_lianxian_lan_xia.png" path="/imagesNews/"/>
+    <image id="idkdtbj" name="zx_yuan_tx_waiquan.png" path="/imagesNews/"/>
+    <image id="idkdtbk" name="zx_yuan_tx_hengguang.png" path="/imagesNews/"/>
+    <image id="idkdtbl" name="zx_yuan_tx_diandian.png" path="/imagesNews/"/>
+    <image id="idkdtbm" name="zx_wp_mingcheng_bg.png" path="/imagesNews/"/>
+    <image id="idkdtbn" name="zx_wp_lan_diguang.png" path="/imagesNews/"/>
+    <image id="idkdtbo" name="zx_wp_lan_bg.png" path="/imagesNews/"/>
+    <image id="idkdtbp" name="zx_wp_jin_xian.png" path="/imagesNews/"/>
+    <image id="idkdtbq" name="zx_yuan_tx_neiquan.png" path="/imagesNews/"/>
+    <image id="idkdtbr" name="zx_wp_jin_jiaobiao.png" path="/imagesNews/"/>
+    <image id="idkdtbs" name="zx_wp_jin_diguang.png" path="/imagesNews/"/>
+    <image id="idkdtbt" name="zx_wp_jin_bg.png" path="/imagesNews/"/>
+    <image id="idkdtbu" name="zx_wp_fen_xian.png" path="/imagesNews/"/>
+    <image id="idkdtbv" name="zx_wp_fen_guangxiao.png" path="/imagesNews/"/>
+    <image id="idkdtbw" name="zx_wp_fen_diguang.png" path="/imagesNews/"/>
+    <image id="idkdtbx" name="zx_wp_fen_bg.png" path="/imagesNews/"/>
+    <image id="idkdtby" name="zx_wp_jin_guangxiao.png" path="/imagesNews/"/>
+    <image id="idkdtbz" name="zx_yuan_tx_star.png" path="/imagesNews/"/>
+    <image id="idkdtc0" name="zx_zhuangshi_xinggui.png" path="/imagesNews/"/>
+    <image id="idkdtc1" name="zx_tx_hengxiang.png" path="/imagesNews/"/>
+    <image id="idkdtc2" name="zx_tx_jiguang.png" path="/imagesNews/"/>
+    <image id="idkdtc3" name="zx_tx_qianjing.png" path="/imagesNews/"/>
+    <image id="idkdtc4" name="zx_tx_star.png" path="/imagesNews/"/>
+    <image id="idkdtc5" name="zx_tx_yuanquan.png" path="/imagesNews/"/>
+    <image id="idkdtc6" name="zx_tx_zhongjian.png" path="/imagesNews/"/>
+    <image id="idkdtc7" name="zx_wp_baseboard.png" path="/imagesNews/"/>
+    <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="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/"/>
   </resources>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 9 - 0
GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -119,7 +119,16 @@ namespace GFGGame
 
 
             GuideController.TryGuide(_ui.m_component.m_btnDecompose.target, ConstGuideId.CLOTHING_DECOMPOSE, 3, "这里可以消耗重复获得的服饰。");
             GuideController.TryGuide(_ui.m_component.m_btnDecompose.target, ConstGuideId.CLOTHING_DECOMPOSE, 3, "这里可以消耗重复获得的服饰。");
 
 
+
             GuideController.TryGuide(_ui.m_component.m_btnClothingUpgrade.target, ConstGuideId.SUIT_LIST_VIEW, 2, "");
             GuideController.TryGuide(_ui.m_component.m_btnClothingUpgrade.target, ConstGuideId.SUIT_LIST_VIEW, 2, "");
         }
         }
+        protected override void TryCompleteGuide()
+        {
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_DECOMPOSE);
+            if (GuideDataManager.currentGuideId == cfg.id)
+            {
+                GuideController.TryCompleteGuideIndex(cfg.id, 3);
+            }
+        }
     }
     }
 }
 }

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes