Selaa lähdekoodia

Merge remote-tracking branch 'remotes/origin/master' into xiaojie

何晓捷 2 vuotta sitten
vanhempi
commit
9cbc982edc
100 muutettua tiedostoa jossa 565 lisäystä ja 214 poistoa
  1. 2 5
      FGUIProject/assets/Arena/components/ComDanSimpleInfo.xml
  2. 5 6
      FGUIProject/assets/Arena/components/ListRankItem.xml
  3. 1 2
      FGUIProject/assets/Arena/components/ListRankItem3.xml
  4. 7 8
      FGUIProject/assets/Arena/components/ListRankItem4.xml
  5. 6 8
      FGUIProject/assets/Arena/components/ListRecordItem.xml
  6. 6 8
      FGUIProject/assets/Arena/components/ListResultItem.xml
  7. 4 5
      FGUIProject/assets/Arena/components/ListTargetItem.xml
  8. 1 1
      FGUIProject/assets/Arena/package.xml
  9. 2 2
      FGUIProject/assets/Card/components/ComFosterBottom.xml
  10. BIN
      FGUIProject/assets/Card/imagesNew/wz_shengxing.png
  11. 1 0
      FGUIProject/assets/Card/package.xml
  12. 19 0
      FGUIProject/assets/CommonGame/components/BtnStyle000.xml
  13. 10 5
      FGUIProject/assets/CommonGame/components/ComCostCurrency.xml
  14. 17 3
      FGUIProject/assets/CommonGame/components/ComHead.xml
  15. 17 0
      FGUIProject/assets/CommonGame/components/ComItemIconNew1.xml
  16. 14 0
      FGUIProject/assets/CommonGame/components/ComItemNew1.xml
  17. 14 0
      FGUIProject/assets/CommonGame/componentsBg/ComBg000.xml
  18. BIN
      FGUIProject/assets/CommonGame/componentsBg/lm_dt_zsx1.png
  19. BIN
      FGUIProject/assets/CommonGame/componentsBg/lm_dt_zsx2.png
  20. BIN
      FGUIProject/assets/CommonGame/componentsBg/tanchuang_2.png
  21. BIN
      FGUIProject/assets/CommonGame/images/jjsjs_txk_2.png
  22. BIN
      FGUIProject/assets/CommonGame/images/jzsjzs_txktx.png
  23. BIN
      FGUIProject/assets/CommonGame/images/phbphb_txkk.png
  24. BIN
      FGUIProject/assets/CommonGame/images/pmts_xtk_1.png
  25. BIN
      FGUIProject/assets/CommonGame/imagesExport/lm_an__xuanzhong_qifu.png
  26. BIN
      FGUIProject/assets/CommonGame/imagesNew/dikuang_SkillLevel.png
  27. BIN
      FGUIProject/assets/CommonGame/imagesNew/lm_an__3xuanzhong2.png
  28. BIN
      FGUIProject/assets/CommonGame/imagesNew/wp_baseboard1.png
  29. 15 1
      FGUIProject/assets/CommonGame/package.xml
  30. 50 0
      FGUIProject/assets/DailyWelfare/DailySignUI.xml
  31. 14 0
      FGUIProject/assets/DailyWelfare/DailySupplyUI.xml
  32. 5 57
      FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml
  33. 13 0
      FGUIProject/assets/DailyWelfare/components/Button1.xml
  34. 9 5
      FGUIProject/assets/DailyWelfare/components/ComProBonus.xml
  35. 18 5
      FGUIProject/assets/DailyWelfare/components/ComSupply.xml
  36. 11 10
      FGUIProject/assets/DailyWelfare/components/ListSignItem.xml
  37. 9 9
      FGUIProject/assets/DailyWelfare/components/ProgressBar1.xml
  38. BIN
      FGUIProject/assets/DailyWelfare/images/mrbj_shu.png
  39. BIN
      FGUIProject/assets/DailyWelfare/images/mrbj_sj_db.png
  40. BIN
      FGUIProject/assets/DailyWelfare/images/mrbj_sz_db.png
  41. BIN
      FGUIProject/assets/DailyWelfare/images/mrbj_tb1.png
  42. BIN
      FGUIProject/assets/DailyWelfare/images/mrbj_wz2.png
  43. BIN
      FGUIProject/assets/DailyWelfare/images/mrqd_db.png
  44. BIN
      FGUIProject/assets/DailyWelfare/images/mrqd_jdt_db.png
  45. BIN
      FGUIProject/assets/DailyWelfare/images/mrqd_jdt_yellow.png
  46. BIN
      FGUIProject/assets/DailyWelfare/images/mrqd_kbq.png
  47. BIN
      FGUIProject/assets/DailyWelfare/images/mrqd_sz_db.png
  48. BIN
      FGUIProject/assets/DailyWelfare/images/mrqd_zz.png
  49. BIN
      FGUIProject/assets/DailyWelfare/images/mrrw_jl_db.png
  50. BIN
      FGUIProject/assets/DailyWelfare/images/qrhd_jd_fgx1.png
  51. BIN
      FGUIProject/assets/DailyWelfare/images/txz_lvl_db.png
  52. BIN
      FGUIProject/assets/DailyWelfare/images/wz_hjksb.png
  53. BIN
      FGUIProject/assets/DailyWelfare/images/wz_jksb.png
  54. BIN
      FGUIProject/assets/DailyWelfare/images/wz_mrbj.png
  55. BIN
      FGUIProject/assets/DailyWelfare/images/wz_mrbj_ms.png
  56. BIN
      FGUIProject/assets/DailyWelfare/images/wz_yqd.png
  57. BIN
      FGUIProject/assets/DailyWelfare/images/yqd_mr_db.png
  58. BIN
      FGUIProject/assets/DailyWelfare/images/yz_yhd.png
  59. BIN
      FGUIProject/assets/DailyWelfare/imagesNew/ornamental_title.png
  60. BIN
      FGUIProject/assets/DailyWelfare/imagesTest/lm_bq_dcm.png
  61. BIN
      FGUIProject/assets/DailyWelfare/imagesTest/lm_bq_xcm.png
  62. BIN
      FGUIProject/assets/DailyWelfare/imagesTest/pro_activate.png
  63. BIN
      FGUIProject/assets/DailyWelfare/imagesTest/pro_bk_in.png
  64. BIN
      FGUIProject/assets/DailyWelfare/imagesTest/wpbb_xtxt.png
  65. BIN
      FGUIProject/assets/DailyWelfare/imagesTest/wpbb_zi.png
  66. 25 6
      FGUIProject/assets/DailyWelfare/package.xml
  67. 2 5
      FGUIProject/assets/Friend/FriendUI.xml
  68. BIN
      FGUIProject/assets/League/images/lm_db.png
  69. BIN
      FGUIProject/assets/League/images/lm_db_2.png
  70. BIN
      FGUIProject/assets/League/images/lm_db_duan.png
  71. BIN
      FGUIProject/assets/Main/images/zjm_e_6.png
  72. 25 0
      FGUIProject/assets/Store/StoreBlackCardRewardUI.xml
  73. 3 3
      FGUIProject/assets/Store/StoreChargeAddUpUI.xml
  74. 54 0
      FGUIProject/assets/Store/StoreMonthUI.xml
  75. 0 12
      FGUIProject/assets/Store/components/Button1.xml
  76. 18 0
      FGUIProject/assets/Store/components/Button10.xml
  77. 13 0
      FGUIProject/assets/Store/components/Button11.xml
  78. 0 10
      FGUIProject/assets/Store/components/Button2.xml
  79. 2 2
      FGUIProject/assets/Store/components/Button3.xml
  80. 10 0
      FGUIProject/assets/Store/components/Button6.xml
  81. 19 0
      FGUIProject/assets/Store/components/Button7.xml
  82. 13 0
      FGUIProject/assets/Store/components/Button8.xml
  83. 13 0
      FGUIProject/assets/Store/components/Button9.xml
  84. 7 7
      FGUIProject/assets/Store/components/ComTab.xml
  85. 0 18
      FGUIProject/assets/Store/components/Component1.xml
  86. 16 0
      FGUIProject/assets/Store/components/ListBlackRewardtem.xml
  87. 46 0
      FGUIProject/assets/Store/components/ListVipItem.xml
  88. BIN
      FGUIProject/assets/Store/imagesNew/dikuang_SkillItem_zz.png
  89. BIN
      FGUIProject/assets/Store/imagesNew/dydp_db.png
  90. BIN
      FGUIProject/assets/Store/imagesNew/mrqd_kbq.png
  91. BIN
      FGUIProject/assets/Store/imagesNew/sc_tab_duihuan.png
  92. BIN
      FGUIProject/assets/Store/imagesNew/sc_tab_duihuan_xuanzhong.png
  93. BIN
      FGUIProject/assets/Store/imagesNew/sc_tab_feihualing.png
  94. BIN
      FGUIProject/assets/Store/imagesNew/sc_tab_feihualing_xuanzhong.png
  95. BIN
      FGUIProject/assets/Store/imagesNew/sc_yk_dbzz.png
  96. BIN
      FGUIProject/assets/Store/imagesNew/tb_wenhao.png
  97. BIN
      FGUIProject/assets/Store/imagesNew/yf_db.png
  98. BIN
      FGUIProject/assets/Store/imagesNew/yk_hjkdp.png
  99. 28 10
      FGUIProject/assets/Store/package.xml
  100. 1 1
      FGUIProject/assets/Task/CombTaskUI.xml

+ 2 - 5
FGUIProject/assets/Arena/components/ComDanSimpleInfo.xml

@@ -8,12 +8,9 @@
     <loader id="n12_jcej" name="n12" xy="14,144" size="237,286" url="ui://4lc5fhlbjcej1n" autoSize="true">
       <gearIcon controller="c1" pages="0" values="ui://4lc5fhlbjcej1n" default="ui://4lc5fhlbjcej1t"/>
     </loader>
-    <component id="n1_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="21,5" pivot="0.5,0.5" scale="1.5,1.5" controller="c1,1"/>
-    <loader id="n10_jcej" name="n10" xy="8,3" size="250,250" url="ui://4lc5fhlbjcej1r" autoSize="true">
-      <gearIcon controller="c1" pages="1" values="ui://4lc5fhlbjcej1s" default="ui://4lc5fhlbjcej1r"/>
-    </loader>
+    <component id="n1_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="21,5" pivot="0.5,0.5" scale="1.5,1.5" controller="c1,1,c2,3"/>
     <text id="n6_psph" name="txtName" xy="67,254" pivot="0.5,0" size="132,44" fontSize="32" color="#fef7f6" align="center" autoClearText="true" text="名字名字"/>
     <text id="n7_psph" name="txtDanTitle" xy="83,298" pivot="0.5,0" size="100,34" fontSize="24" color="#fef7f6" align="center" autoClearText="true" text="段位段位"/>
-    <text id="n8_psph" name="txtRank" xy="46,327" pivot="0.5,0" size="173,34" fontSize="24" color="#fef7f6" align="center" vars="true" autoClearText="true" text="段位排名 {rank=10000}"/>
+    <text id="n8_psph" name="txtRank" xy="50,327" pivot="0.5,0" size="165,34" fontSize="24" color="#fef7f6" align="center" vars="true" autoClearText="true" text="段位排名 {rank=10000}"/>
   </displayList>
 </component>

+ 5 - 6
FGUIProject/assets/Arena/components/ListRankItem.xml

@@ -4,16 +4,15 @@
   <displayList>
     <image id="n6_jcej" name="n6" src="jcej43" fileName="images/phbphb_pbtdi.png" xy="0,0"/>
     <image id="n16_jcej" name="n16" src="jcej46" fileName="images/phbphb_xxt.png" xy="9,283"/>
-    <component id="n5_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="3,17" scale="1.117,1.117"/>
-    <component id="n9_jcej" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="185,207"/>
-    <image id="n8_jcej" name="n8" src="jcej45" fileName="images/phbphb_txkk.png" xy="36,58"/>
+    <component id="n5_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="3,17" scale="1.117,1.117" controller="c2,4"/>
+    <component id="n9_jcej" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="185,207"/>
     <loader id="n7_jcej" name="loaRank" xy="85,21" size="88,87" url="ui://4lc5fhlbjcej3m" autoSize="true">
       <gearIcon controller="c1" pages="2,3" values="ui://4lc5fhlbjcej3l|ui://4lc5fhlbjcej3k" default="ui://4lc5fhlbjcej3m"/>
     </loader>
     <component id="n10_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="173,64" scale="0.9,0.9"/>
     <loader id="n12_jcej" name="loaDanIcon" xy="94,358" size="69,65" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n15_jcej" name="txtName" xy="68,242" pivot="0.5,0" size="122,42" fontSize="30" color="#927550" align="center" autoClearText="true" text="玩家名称"/>
-    <text id="n13_jcej" name="txtDanRank" xy="30,323" size="137,34" fontSize="24" color="#927550" align="center" autoClearText="true" text="段位排名:1"/>
-    <text id="n14_jcej" name="txtFightScore" xy="30,288" size="206,34" fontSize="24" color="#927550" letterSpacing="-2" text="竞技场战力:111111"/>
+    <text id="n15_jcej" name="txtName" xy="68,242" pivot="0.5,0" size="122,41" fontSize="30" color="#927550" align="center" autoClearText="true" text="玩家名称"/>
+    <text id="n13_jcej" name="txtDanRank" xy="30,323" size="136,34" fontSize="24" color="#927550" align="center" autoClearText="true" text="段位排名:1"/>
+    <text id="n14_jcej" name="txtFightScore" xy="30,288" size="196,34" fontSize="24" color="#927550" letterSpacing="-2" text="竞技场战力:111111"/>
   </displayList>
 </component>

+ 1 - 2
FGUIProject/assets/Arena/components/ListRankItem3.xml

@@ -3,8 +3,7 @@
   <displayList>
     <image id="n19_jcej" name="n19" src="jcej44" fileName="images/phbphb_phdi_1.png" xy="0,0"/>
     <text id="n12_psph" name="txtRank" xy="28,41" pivot="0.5,0" size="132,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
-    <component id="n31_v461" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="167,-18" size="229,230" group="n35_v461" scale="0.73,0.73"/>
-    <image id="n32_v461" name="n32" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="188,9" group="n35_v461"/>
+    <component id="n31_v461" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="167,-18" size="229,230" group="n35_v461" scale="0.73,0.73" controller="c2,2"/>
     <component id="n33_v461" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="272,11" group="n35_v461" scale="0.7,0.7"/>
     <component id="n34_v461" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="273,99" group="n35_v461" scale="0.9,0.9"/>
     <group id="n35_v461" name="n35" xy="167,-18" size="229,230" group="n18_psph"/>

+ 7 - 8
FGUIProject/assets/Arena/components/ListRankItem4.xml

@@ -2,19 +2,18 @@
 <component size="916,165">
   <displayList>
     <image id="n19_jcej" name="n19" src="jcej4d" fileName="images/phbphb_zjpm.png" xy="0,0"/>
-    <text id="n12_psph" name="txtRank" xy="30,54" pivot="0.5,0" size="150,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
-    <component id="n13_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="189,-6" size="229,230" group="n30_jcej" scale="0.73,0.73"/>
-    <image id="n32_v461" name="n32" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="210,21" group="n30_jcej"/>
+    <text id="n12_psph" name="txtRank" xy="39,54" pivot="0.5,0" size="132,59" group="n18_psph" fontSize="44" color="#a98860" align="center" autoClearText="true" text="100000"/>
+    <component id="n13_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="189,-6" size="229,230" group="n30_jcej" scale="0.73,0.73" controller="c2,1"/>
     <component id="n24_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="294,19" group="n30_jcej" scale="0.7,0.7"/>
-    <component id="n23_jcej" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="294,111" group="n30_jcej" scale="0.9,0.9"/>
+    <component id="n23_jcej" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="294,111" group="n30_jcej" scale="0.9,0.9"/>
     <group id="n30_jcej" name="n30" xy="189,-6" size="229,230" group="n18_psph"/>
-    <text id="n14_psph" name="txtName" xy="346,33" size="48,52" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
+    <text id="n14_psph" name="txtName" xy="346,33" size="54,51" group="n29_jcej" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
     <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="344,84" group="n29_jcej"/>
-    <text id="n15_psph" name="txtFightScore" xy="345,91" size="205,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力:--"/>
+    <text id="n15_psph" name="txtFightScore" xy="345,91" size="209,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力:--"/>
     <group id="n29_jcej" name="n29" xy="344,33" size="236,97" group="n18_psph"/>
     <loader id="n16_psph" name="loaDanIcon" xy="617,33" size="99,98" group="n18_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n26_jcej" name="n26" xy="742,37" size="122,42" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
-    <text id="n17_psph" name="txtDanRank" xy="777,71" pivot="0.5,0" size="52,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
+    <text id="n26_jcej" name="n26" xy="742,37" size="122,41" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
+    <text id="n17_psph" name="txtDanRank" xy="773,71" pivot="0.5,0" size="59,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
     <group id="n27_jcej" name="n27" xy="742,37" size="122,90" group="n18_psph"/>
     <group id="n18_psph" name="n18" xy="30,-6" size="834,230"/>
   </displayList>

+ 6 - 8
FGUIProject/assets/Arena/components/ListRecordItem.xml

@@ -2,15 +2,13 @@
 <component size="898,164">
   <displayList>
     <image id="n9_jcej" name="n9" src="jcej24" fileName="images/bpjl_bpdi.png" xy="0,0"/>
-    <loader id="n1_psph" name="loaScore" xy="36,53" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
-    <text id="n2_psph" name="txtMyScore" xy="123,54" pivot="0.5,0" size="100,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="9999"/>
-    <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
+    <loader id="n1_psph" name="loaScore" xy="36,53" size="44,44" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
+    <text id="n2_psph" name="txtMyScore" xy="130,54" pivot="0.5,0" size="85,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="9999"/>
+    <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58" controller="c2,1"/>
     <component id="n4_psph" name="loaMyCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="363,44"/>
-    <text id="n11_jcej" name="n11" xy="465,60" size="36,44" fontSize="32" color="#b07c7c" text="vs"/>
+    <text id="n11_jcej" name="n11" xy="465,60" size="29,44" fontSize="32" color="#b07c7c" text="vs"/>
     <component id="n6_psph" name="loaTargetCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="527,44"/>
-    <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="563,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
-    <text id="n8_psph" name="txtTargetScore" xy="765,54" pivot="0.5,0" size="76,56" fontSize="42" color="#b07c7c" autoClearText="true" text="999"/>
-    <image id="n10_jcej" name="n10" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="241,33"/>
-    <image id="n14_jcej" name="n14" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="628,33"/>
+    <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="563,-36" pivot="0.5,0.5" scale="0.58,0.58" controller="c2,2"/>
+    <text id="n8_psph" name="txtTargetScore" xy="771,54" pivot="0.5,0" size="64,56" fontSize="42" color="#b07c7c" autoClearText="true" text="999"/>
   </displayList>
 </component>

+ 6 - 8
FGUIProject/assets/Arena/components/ListResultItem.xml

@@ -2,15 +2,13 @@
 <component size="958,166">
   <displayList>
     <image id="n9_jcej" name="n9" src="jcej2f" fileName="images/jjsjs_di.png" xy="0,0"/>
-    <loader id="n1_psph" name="loaScore" xy="36,53" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
-    <text id="n2_psph" name="txtMyScore" xy="108,54" pivot="0.5,0" size="124,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
-    <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
+    <loader id="n1_psph" name="loaScore" xy="36,53" size="44,44" url="ui://eg2y0ldp842s6h" autoSize="true" clearOnPublish="true"/>
+    <text id="n2_psph" name="txtMyScore" xy="117,54" pivot="0.5,0" size="105,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
+    <component id="n3_psph" name="comMyHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="177,-36" pivot="0.5,0.5" scale="0.58,0.58" controller="c2,2"/>
     <component id="n4_psph" name="loaMyCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="360,44"/>
-    <text id="n11_jcej" name="txtRound" xy="458,60" size="118,44" fontSize="32" color="#b07c7c" letterSpacing="-2" vars="true" text="Round {value=1}"/>
+    <text id="n11_jcej" name="txtRound" xy="458,60" size="108,44" fontSize="32" color="#b07c7c" letterSpacing="-2" vars="true" text="Round {value=1}"/>
     <component id="n6_psph" name="loaTargetCard" src="jcej2u" fileName="components/ComCardRecord.xml" xy="595,44"/>
-    <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="627,-36" pivot="0.5,0.5" scale="0.58,0.58"/>
-    <text id="n8_psph" name="txtTargetScore" xy="795,54" pivot="0.5,0" size="124,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
-    <image id="n10_jcej" name="n10" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="241,33"/>
-    <image id="n14_jcej" name="n14" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="692,33"/>
+    <component id="n7_psph" name="comTargetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="627,-36" pivot="0.5,0.5" scale="0.58,0.58" controller="c2,2"/>
+    <text id="n8_psph" name="txtTargetScore" xy="804,54" pivot="0.5,0" size="105,56" fontSize="42" color="#b07c7c" align="center" autoClearText="true" text="99900"/>
   </displayList>
 </component>

+ 4 - 5
FGUIProject/assets/Arena/components/ListTargetItem.xml

@@ -3,15 +3,14 @@
   <displayList>
     <loader id="n45_jcej" name="loaBg" xy="0,0" size="573,196" url="ui://4lc5fhlbjcej3b" autoSize="true"/>
     <image id="n37_jcej" name="n37" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="192,85"/>
-    <component id="n31_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="106,95" pivot="0.5,0.5" anchor="true" group="n42_jcej" scale="0.725,0.725"/>
-    <image id="n40_jcej" name="n40" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="44,38" group="n42_jcej"/>
-    <component id="n43_jcej" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="124,122" group="n42_jcej"/>
+    <component id="n31_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="106,95" pivot="0.5,0.5" anchor="true" group="n42_jcej" scale="0.725,0.725" controller="c2,2"/>
+    <component id="n43_jcej" name="comLv" src="psphq" fileName="components/ComHeadLv.xml" pkg="eg2y0ldp" xy="124,122" group="n42_jcej"/>
     <group id="n42_jcej" name="n42" xy="-9,-20" size="230,230"/>
     <text id="n32_psph" name="txtName" xy="193,30" size="148,49" fontSize="36" color="#927550" text="对手名字"/>
     <component id="n44_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="124,30" size="41,41" aspect="true"/>
     <text id="n35_psph" name="txtDanTitle" xy="193,96" size="100,34" fontSize="24" color="#9b7c56" text="段位名称"/>
-    <text id="n33_psph" name="txtRank" xy="352,96" size="191,34" fontSize="24" color="#9b7c56" text="段位排名:10000"/>
-    <text id="n34_psph" name="txtFightScore" xy="192,131" size="215,34" fontSize="24" color="#9b7c56" text="竞技场战力:10000"/>
+    <text id="n33_psph" name="txtRank" xy="352,96" size="182,34" fontSize="24" color="#9b7c56" text="段位排名:10000"/>
+    <text id="n34_psph" name="txtFightScore" xy="192,131" size="206,34" fontSize="24" color="#9b7c56" text="竞技场战力:10000"/>
     <image id="n46_u2u3" name="imgUpDan" src="u2u353" fileName="images/jjsy_jjjj.png" xy="519,15"/>
   </displayList>
 </component>

+ 1 - 1
FGUIProject/assets/Arena/package.xml

@@ -95,7 +95,7 @@
     <component id="jcej30" name="ListResultItem.xml" path="/components/"/>
     <image id="jcej31" name="dwjl_didi.png" path="/images/"/>
     <image id="jcej32" name="jzsjzs_xtxt_1.png" path="/images/"/>
-    <image id="jcej33" name="jzsjzs_txktx.png" path="/images/"/>
+    <image id="jcej33" name="jzsjzs_txktx.png" path="/images/" scale9grid="30,30,60,60"/>
     <image id="jcej34" name="jzsjzs_sxsxa.png" path="/images/"/>
     <image id="jcej35" name="jzsjzs_ssss.png" path="/images/"/>
     <image id="jcej36" name="jzsjzs_sjsjdi.png" path="/images/"/>

+ 2 - 2
FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -7,7 +7,7 @@
   <displayList>
     <image id="n70_lc71" name="n70" src="qkjsbm" fileName="imagesNew/dikuang_back.png" xy="0,-212" size="1080,1039" group="n115_o9gh"/>
     <image id="n97_qkjs" name="n97" src="qkjsbb" fileName="imagesNew/card_DividingLine.png" xy="38,426" size="972,8" group="n115_o9gh"/>
-    <loader id="n101_qkjs" name="loaScore" xy="55,143" size="44,94" group="n115_o9gh" url="ui://eg2y0ldpo9ghtll" autoSize="true"/>
+    <loader id="n101_qkjs" name="loaRarity" xy="55,143" size="44,94" group="n115_o9gh" url="ui://eg2y0ldpo9ghtll" autoSize="true"/>
     <text id="n27_842s" name="txtName0" xy="143,129" pivot="0.5,0" anchor="true" size="74,91" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="70" color="#915e15" autoClearText="true" text="斗"/>
     <text id="n102_qkjs" name="txtName1" xy="199,156" pivot="0.5,0" anchor="true" size="10,62" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#915e15" autoClearText="true" text=""/>
     <text id="n103_qkjs" name="txtName2" xy="195,210" pivot="0.5,0" anchor="true" size="44,54" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#915e15" autoClearText="true" text="婵"/>
@@ -57,7 +57,7 @@
       <gearDisplay controller="ctrlTab" pages="0"/>
     </group>
     <component id="n52_l2by" name="btnUpStar" src="qkjstlg" fileName="components/BtnNormal0.xml" pkg="eg2y0ldp" xy="706,6" size="374,342" group="n79_v461">
-      <Button title="升星" icon="ui://7l6lvkayqkjsb2"/>
+      <Button title="升星" icon="ui://7l6lvkayqik1tch"/>
     </component>
     <component id="n51_l2by" name="comStarCousumeGold" src="qkjstlh" fileName="components/ComCost.xml" pkg="eg2y0ldp" xy="754,278" size="289,46" group="n79_v461" controller="c1,1"/>
     <text id="n108_qkjs" name="txtTips" xy="796,279" pivot="0.5,0" size="205,46" group="n79_v461" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716660" align="center" vAlign="middle" ubb="true" autoClearText="true" text="需要达到15级"/>

BIN
FGUIProject/assets/Card/imagesNew/wz_shengxing.png


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

@@ -142,6 +142,7 @@
     <component id="vek88j" name="btnMinus.xml" path="/components/"/>
     <image id="fqortln" name="cp_yeqian_bg_shang.png" path="/images/"/>
     <image id="fqortlo" name="cp_yeqian_bg_xia.png" path="/images/"/>
+    <image id="qik1tch" name="wz_shengxing.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Card" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 19 - 0
FGUIProject/assets/CommonGame/components/BtnStyle000.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="204,63" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="o9gh4k" fileName="imagesExport/lm_an__xuanzhong_qifu.png" xy="0,0">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n2_qik1" name="n2" src="o9gh4l" fileName="imagesNew/lm_an__weixuan_qifu.png" xy="0,0" size="204,63">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="204,63" fontSize="34" color="#685539" align="center" vAlign="middle" autoSize="none" singleLine="true" text="领取">
+      <gearColor controller="c1" pages="1" values="#685539,#000000" default="#744d16,#000000"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

+ 10 - 5
FGUIProject/assets/CommonGame/components/ComCostCurrency.xml

@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="129,46">
+<component size="114,46">
   <controller name="c1" exported="true" pages="0,,1," selected="1">
     <remark page="0" value="免费"/>
     <remark page="1" value="付费"/>
   </controller>
+  <controller name="style" exported="true" pages="0,,1,,2," selected="2">
+    <remark page="0" value="默认"/>
+  </controller>
   <displayList>
-    <loader id="n1_ojlz" name="loaIcon" xy="0,-2" size="50,50" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n6_j5a5" name="txtNeed" xy="60,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
-    <group id="n7_si5z" name="n7" xy="0,-2" size="129,50" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
+    <loader id="n1_ojlz" name="loaIcon" xy="0,3" size="40,40" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n6_j5a5" name="txtNeed" xy="45,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fff6ed" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999">
+      <gearColor controller="style" pages="1,2" values="#8c8580,#000000|#fff6ed,#000000" default="#716b59,#000000"/>
+    </text>
+    <group id="n7_si5z" name="n7" xy="0,0" size="114,46" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <text id="n11_a0cf" name="n11" xy="28,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
+    <text id="n11_a0cf" name="n11" xy="20,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </text>

+ 17 - 3
FGUIProject/assets/CommonGame/components/ComHead.xml

@@ -4,6 +4,9 @@
     <remark page="0" value="可见"/>
     <remark page="1" value="不可见"/>
   </controller>
+  <controller name="c2" exported="true" pages="0,,1,,2,,3,,4," selected="4">
+    <remark page="0" value="默认边框"/>
+  </controller>
   <displayList>
     <image id="n43_jcej" name="n43" src="jcejtkj" fileName="images/grxx_123.png" xy="33,40" pivot="0.5,0.5" size="160,160" group="n41_r9ri">
       <relation target="" sidePair="width-width,height-height"/>
@@ -11,9 +14,20 @@
     <component id="n39_r9ri" name="comHead" src="jcejtki" fileName="components/ComHeadIcon.xml" xy="30,37" pivot="0.5,0.5" group="n41_r9ri">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <image id="n35_r9ri" name="n35" src="r9ritjs" fileName="images/grxx_zytxtx.png" xy="28,36" pivot="0.5,0.5" size="170,171" group="n41_r9ri" aspect="true">
-      <gearDisplay controller="c1" pages="0"/>
-      <relation target="" sidePair="width-width,height-height"/>
+    <image id="n45_qik1" name="n45" src="r9ritjs" fileName="images/grxx_zytxtx.png" xy="28,37" pivot="0.5,0.5" size="170,170" group="n41_r9ri" aspect="true">
+      <gearDisplay controller="c2" pages="0"/>
+    </image>
+    <image id="n46_qik1" name="n46" src="qik1tm2" fileName="images/jzsjzs_txktx.png" xy="29,36" pivot="0.5,0.5" size="166,168" group="n41_r9ri">
+      <gearDisplay controller="c2" pages="1"/>
+    </image>
+    <image id="n47_qik1" name="n47" src="qik1tm3" fileName="images/jjsjs_txk_2.png" xy="30,39" size="165,165" group="n41_r9ri" aspect="true">
+      <gearDisplay controller="c2" pages="2"/>
+    </image>
+    <image id="n48_qik1" name="n48" src="qik1tm4" fileName="images/pmts_xtk_1.png" xy="29,36" size="167,167" group="n41_r9ri" aspect="true">
+      <gearDisplay controller="c2" pages="3"/>
+    </image>
+    <image id="n49_qik1" name="n49" src="qik1tm5" fileName="images/phbphb_txkk.png" xy="30,38" size="166,166" group="n41_r9ri">
+      <gearDisplay controller="c2" pages="4"/>
     </image>
     <loader id="n37_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>

+ 17 - 0
FGUIProject/assets/CommonGame/components/ComItemIconNew1.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>

+ 14 - 0
FGUIProject/assets/CommonGame/components/ComItemNew1.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="180,180" pivot="0.5,0.5" overflow="hidden" opaque="false">
+  <displayList>
+    <component id="n25_pu55" name="comItemIcon" src="qik1tlz" fileName="components/ComItemIconNew1.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
+    <text id="n26_r9ri" name="txtName" xy="90,206" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">
+      <relation target="n25_pu55" sidePair="bottom-bottom"/>
+    </text>
+    <image id="n27_qik1" name="n27" src="qik1tm0" fileName="imagesNew/dikuang_SkillLevel.png" xy="24,145" size="131,33" group="n28_qik1"/>
+    <text id="n15_ehs9" name="txtCount" xy="89,138" pivot="0.5,0" anchor="true" size="97,44" group="n28_qik1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" align="center" vars="true" text="x00200">
+      <relation target="n25_pu55" sidePair="center-center"/>
+    </text>
+    <group id="n28_qik1" name="n28" xy="24,138" size="131,44"/>
+  </displayList>
+</component>

+ 14 - 0
FGUIProject/assets/CommonGame/componentsBg/ComBg000.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,992">
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1tm6" fileName="componentsBg/tanchuang_2.png" xy="0,0"/>
+    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="896,8"/>
+    <image id="n2_qik1" name="n2" src="qik1tc9" fileName="componentsBg/lm_dt_zsx1.png" xy="220,111" group="n5_qik1"/>
+    <text id="n4_qik1" name="txtTitle" xy="380,92" pivot="0.5,0" size="348,54" group="n5_qik1" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" text="稀有升星材料(自选)"/>
+    <image id="n3_qik1" name="n3" src="qik1tca" fileName="componentsBg/lm_dt_zsx2.png" xy="758,111" group="n5_qik1"/>
+    <group id="n5_qik1" name="n5" xy="220,92" size="668,54" advanced="true" layout="hz" colGap="30" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+  </displayList>
+  <customProperty target="txtTitle" propertyId="0"/>
+</component>

BIN
FGUIProject/assets/CommonGame/componentsBg/lm_dt_zsx1.png


BIN
FGUIProject/assets/CommonGame/componentsBg/lm_dt_zsx2.png


BIN
FGUIProject/assets/CommonGame/componentsBg/tanchuang_2.png


BIN
FGUIProject/assets/CommonGame/images/jjsjs_txk_2.png


BIN
FGUIProject/assets/CommonGame/images/jzsjzs_txktx.png


BIN
FGUIProject/assets/CommonGame/images/phbphb_txkk.png


BIN
FGUIProject/assets/CommonGame/images/pmts_xtk_1.png


BIN
FGUIProject/assets/CommonGame/imagesExport/lm_an__xuanzhong_qifu.png


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


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


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


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

@@ -291,7 +291,7 @@
     <image id="a0cf2h" name="lm_tb.png" path="/imagesNew/" exported="true"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4o" name="lm_an_jujue.png" path="/imagesNew/" exported="true"/>
-    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="47,14,94,28"/>
     <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
     <image id="a0cf2o" name="lm_an_yellow.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="54,15,108,30"/>
     <image id="o9gh4g" name="lm_kuang_icon.png" path="/imagesNew/" exported="true"/>
@@ -301,6 +301,20 @@
     <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/"/>
+    <component id="qik1tly" name="ComItemNew1.xml" path="/components/" exported="true"/>
+    <component id="qik1tlz" name="ComItemIconNew1.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"/>
+    <image id="qik1tm2" name="jzsjzs_txktx.png" path="/images/" scale9grid="30,30,60,60"/>
+    <image id="qik1tm3" name="jjsjs_txk_2.png" path="/images/"/>
+    <image id="qik1tm4" name="pmts_xtk_1.png" path="/images/"/>
+    <image id="qik1tm5" name="phbphb_txkk.png" path="/images/"/>
+    <image id="qik1tm6" name="tanchuang_2.png" path="/componentsBg/"/>
+    <component id="qik1tcb" name="ComBg000.xml" path="/componentsBg/" exported="true"/>
+    <image id="qik1tc9" name="lm_dt_zsx1.png" path="/componentsBg/"/>
+    <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
+    <image id="qik1tm7" name="db_jiajian_1.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 50 - 0
FGUIProject/assets/DailyWelfare/DailySignUI.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1865">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1l" fileName="images/mrqd_db.png" xy="0,0"/>
+    <image id="n1_qik1" name="n1" src="qik1i" fileName="images/wz_yqd.png" xy="48,223"/>
+    <component id="n3_qik1" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="376,324" pivot="0,0.5" anchor="true">
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <image id="n8_qik1" name="n8" src="qik1r" fileName="images/txz_lvl_db.png" xy="305,290"/>
+    <text id="n2_qik1" name="txtMonth" xy="47,254" pivot="1,1" size="148,94" font="ui://eg2y0ldpa0cftkz" fontSize="72" color="#fffdf9" text="时期">
+      <gearFontSize controller="c1" pages="0" values="72" default="50"/>
+    </text>
+    <text id="n4_qik1" name="txtSignCount" xy="346,325" pivot="0.5,0" size="43,54" fontSize="40" color="#643323" text="30"/>
+    <list id="n5_qik1" name="list" xy="60,455" size="967,1276" layout="flow_hz" lineGap="2" colGap="2" defaultItem="ui://t8nwuj7ifqor9" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n9_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="495,1769"/>
+  </displayList>
+</component>

+ 14 - 0
FGUIProject/assets/DailyWelfare/DailySupplyUI.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,837" opaque="false">
+  <displayList>
+    <component id="n10_qik1" name="comSupply0" src="fqora" fileName="components/ComSupply.xml" xy="207,69"/>
+    <component id="n11_qik1" name="comSupply1" src="fqora" fileName="components/ComSupply.xml" xy="577,100" controller="c1,1"/>
+    <image id="n0_qik1" name="n0" src="qik1w" fileName="images/mrbj_shu.png" xy="0,194"/>
+    <image id="n13_qik1" name="n13" src="qik111" fileName="images/wz_mrbj.png" xy="36,168"/>
+    <image id="n14_qik1" name="n14" src="qik1v" fileName="images/wz_mrbj_ms.png" xy="955,161"/>
+    <image id="n15_qik1" name="n15" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="271,806" pivot="0.5,0.5" group="n18_qik1"/>
+    <text id="n16_qik1" name="txtGiftBag" xy="420,792" pivot="0.5,0" size="239,46" group="n18_qik1" fontSize="34" color="#d4d0c9" align="center" vars="true" text="点击空白处关闭"/>
+    <image id="n17_qik1" name="n17" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="678,806" pivot="0.5,0.5" group="n18_qik1" scale="-1,1"/>
+    <group id="n18_qik1" name="n18" xy="271,792" size="537,46" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+  </displayList>
+</component>

+ 5 - 57
FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
     <loader id="n27_fqor" 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"/>
@@ -11,63 +10,12 @@
     <component id="n1_fqor" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,196" group="n3_fqor">
       <Button icon="ui://t8nwuj7ifqor1"/>
     </component>
-    <image id="n2_fqor" name="n2" src="fqor2" fileName="imagesTest/wpbb_xtxt.png" xy="54,312" group="n3_fqor"/>
-    <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,229"/>
-    <component id="n4_fqor" name="n4" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="43,347" group="n7_fqor">
-      <Button checked="true" title="每日签到" controller="c1" page="0"/>
+    <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,191"/>
+    <component id="n4_fqor" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,408">
+      <Button title="每日签到"/>
     </component>
-    <component id="n5_fqor" name="n5" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="333,347" group="n7_fqor">
-      <Button title="每日补给" controller="c1" page="1"/>
+    <component id="n5_fqor" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,911">
+      <Button title="每日补给"/>
     </component>
-    <component id="n6_fqor" name="n6" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="623,347" group="n7_fqor">
-      <Button title="分享好礼" controller="c1" page="2"/>
-    </component>
-    <group id="n7_fqor" name="n7" xy="43,347" size="870,70" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <component id="n8_fqor" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="115,569" pivot="0,0.5" anchor="true" group="n21_fqor">
-      <ProgressBar value="50" max="100"/>
-    </component>
-    <text id="n9_fqor" name="txtSignCount" xy="53,448" pivot="0.5,0" size="20,41" group="n21_fqor" fontSize="30" text="1"/>
-    <list id="n20_fqor" name="list" xy="53,660" size="974,1232" group="n21_fqor" layout="flow_hz" lineGap="30" colGap="60" defaultItem="ui://t8nwuj7ifqor9" align="center" autoClearItems="true">
-      <relation target="" sidePair="bottomext-bottom"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <group id="n21_fqor" name="n21" xy="53,448" size="974,1444" advanced="true">
-      <gearDisplay controller="c1" pages="0"/>
-    </group>
-    <component id="n22_fqor" name="comSupply0" src="fqora" fileName="components/ComSupply.xml" xy="242,827" group="n26_fqor"/>
-    <component id="n25_fqor" name="comSupply1" src="fqora" fileName="components/ComSupply.xml" xy="554,828" group="n26_fqor"/>
-    <group id="n26_fqor" name="n26" xy="242,827" size="534,354" advanced="true">
-      <gearDisplay controller="c1" pages="1"/>
-    </group>
   </displayList>
 </component>

+ 13 - 0
FGUIProject/assets/DailyWelfare/components/Button1.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,328" overflow="hidden" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="qik1l" fileName="images/mrqd_db.png" xy="0,-112" size="1080,1697">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="479,207" size="122,0" fontSize="30" align="center" vAlign="middle" singleLine="true" text="每日签到">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

+ 9 - 5
FGUIProject/assets/DailyWelfare/components/ComProBonus.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="81,200" pivot="0.5,0.5" anchor="true">
+<component size="80,140" pivot="0.5,0.5" anchor="true">
   <displayList>
-    <text id="n12_fqor" name="txtDay" xy="41,0" pivot="0.5,0" anchor="true" size="40,42" group="n13_fqor" fontSize="30" align="center" text=""/>
-    <loader id="n14_fqor" name="loaIcon" xy="0,114" pivot="0.5,0.5" size="80,80" group="n13_fqor" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale" clearOnPublish="true"/>
-    <text id="n15_fqor" name="txtCount" xy="26,157" pivot="1,0" size="53,42" group="n13_fqor" fontSize="30" align="right" autoClearText="true" text="000"/>
-    <group id="n13_fqor" name="n13" xy="0,0" size="80,199"/>
+    <image id="n18_qik1" name="n18" src="qik1g" fileName="images/qrhd_jd_fgx1.png" xy="33,76" group="n13_fqor"/>
+    <image id="n16_qik1" name="n16" src="qik1f" fileName="images/mrrw_jl_db.png" xy="0,0" group="n13_fqor"/>
+    <loader id="n14_fqor" name="loaIcon" xy="11,12" pivot="0.5,0.5" size="58,58" group="n13_fqor" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale" clearOnPublish="true"/>
+    <image id="n17_qik1" name="n17" src="qik1d" fileName="images/mrqd_sz_db.png" xy="34,57" group="n13_fqor"/>
+    <text id="n15_fqor" name="txtCount" xy="35,46" pivot="0.5,0" size="45,39" group="n13_fqor" fontSize="28" color="#ffffff" align="center" autoClearText="true" text="000"/>
+    <text id="n12_fqor" name="txtDay" xy="39,103" pivot="0.5,0" anchor="true" size="35,44" group="n13_fqor" fontSize="32" color="#643323" align="center" text="30"/>
+    <image id="n19_qik1" name="imgGot" src="qik1k" fileName="images/yz_yhd.png" xy="-19,20" pivot="0.5,0" group="n13_fqor" scale="0.7,0.7"/>
+    <group id="n13_fqor" name="n13" xy="-19,0" size="119,147"/>
   </displayList>
 </component>

+ 18 - 5
FGUIProject/assets/DailyWelfare/components/ComSupply.xml

@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="222,422">
+<component size="378,643">
+  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
   <displayList>
-    <text id="n25_fqor" name="txtTime" xy="91,5" pivot="0.5,0" size="40,42" fontSize="30" align="center" text=""/>
-    <component id="n22_fqor" name="comItem" src="j48o98" fileName="components/ComItem.xml" pkg="eg2y0ldp" xy="0,65" size="222,225"/>
-    <component id="n23_fqor" name="btnGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="17,295">
+    <image id="n29_qik1" name="n29" src="qik1z" fileName="images/mrbj_tb1.png" xy="-8,24" group="n27_qik1">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n30_qik1" name="n30" src="qik110" fileName="images/mrbj_wz2.png" xy="-8,24" group="n27_qik1">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n28_qik1" name="n28" src="qik1x" fileName="images/mrbj_sj_db.png" xy="75,17" group="n27_qik1"/>
+    <image id="n31_qik1" name="n31" src="qik1y" fileName="images/mrbj_sz_db.png" xy="204,287" group="n27_qik1"/>
+    <text id="n25_fqor" name="txtTime" xy="102,13" pivot="0.5,0" size="174,46" group="n27_qik1" fontSize="34" color="#fff9f8" align="center" text="11:00-17:00"/>
+    <component id="n23_fqor" name="btnGet" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="87,395" group="n27_qik1">
       <Button title="补领"/>
     </component>
-    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="46,372" pivot="0.5,0" controller="c1,1"/>
+    <component id="n24_fqor" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="144,469" pivot="0.4,0" group="n27_qik1" controller="c1,1,style,2"/>
+    <text id="n32_qik1" name="txtCount" xy="272,281" pivot="0.5,0" size="37,46" group="n27_qik1" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#fffdf3" text="99"/>
+    <text id="n34_qik1" name="n34" xy="250,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="-20" fontSize="29" color="#fffdf3" text="\"/>
+    <text id="n33_qik1" name="n33" xy="251,284" pivot="0.5,0.5" size="17,40" group="n35_qik1" rotation="20" fontSize="29" color="#fffdf3" text="/"/>
+    <group id="n35_qik1" name="n35" xy="250,284" size="18,40" group="n27_qik1"/>
+    <group id="n27_qik1" name="n27" xy="-8,13" size="378,612"/>
   </displayList>
 </component>

+ 11 - 10
FGUIProject/assets/DailyWelfare/components/ListSignItem.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="178,122">
-  <controller name="c1" pages="0,,1,,2," selected="0">
+<component size="155,200">
+  <controller name="c1" pages="0,,1,,2," selected="2">
     <remark page="1" value="金卡"/>
     <remark page="2" value="黑金"/>
   </controller>
   <displayList>
-    <loader id="n15_fqor" name="loaDoubleTag" xy="35,0" size="117,28" group="n20_fqor" autoSize="true">
-      <gearIcon controller="c1" pages="0,2" values="|ui://t8nwuj7ifqorb" default="ui://t8nwuj7ifqorc"/>
+    <image id="n23_qik1" name="n23" src="qik1j" fileName="images/yqd_mr_db.png" xy="-2,0" group="n20_fqor"/>
+    <loader id="n15_fqor" name="loaDoubleTag" xy="8,164" pivot="0.5,0" size="139,29" group="n20_fqor" url="ui://t8nwuj7iqik1h" autoSize="true">
+      <gearIcon controller="c1" pages="0,1,2" values="|ui://t8nwuj7iqik1s|ui://t8nwuj7iqik1h"/>
     </loader>
-    <loader id="n14_fqor" name="loaIcon" xy="24,29" pivot="0.5,0.5" size="92,92" group="n20_fqor" aspect="true" fill="scale"/>
-    <text id="n17_fqor" name="txtCount" xy="121,77" size="40,42" group="n20_fqor" fontSize="30" text=""/>
-    <text id="n16_fqor" name="txtDay" xy="121,30" size="40,42" group="n20_fqor" fontSize="30" text=""/>
-    <image id="n18_fqor" name="imgGot" src="fka77" fileName="imagesExport/cj_yihde.png" pkg="eg2y0ldp" xy="19,60" size="144,32" group="n20_fqor"/>
-    <image id="n19_fqor" name="imgNotGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="0,56" size="178,40" group="n20_fqor"/>
-    <group id="n20_fqor" name="n20" xy="0,0" size="178,121"/>
+    <component id="n21_qik1" name="comItem" src="9jv6tls" fileName="components/ComItemNew.xml" pkg="eg2y0ldp" xy="15,40" group="n20_fqor"/>
+    <text id="n16_fqor" name="txtDay" xy="33,-3" pivot="0.5,0" size="88,39" group="n20_fqor" fontSize="28" color="#8a4e4e" text="三十一"/>
+    <image id="n22_qik1" name="imgMask" src="qik1e" fileName="images/mrqd_zz.png" xy="-2,0" size="159,205" group="n20_fqor"/>
+    <image id="n18_fqor" name="imgGot" src="qik1k" fileName="images/yz_yhd.png" xy="17,64" group="n20_fqor"/>
+    <image id="n19_fqor" name="imgNotGet" src="qik1o" fileName="images/mrqd_kbq.png" xy="-8,45" group="n20_fqor"/>
+    <group id="n20_fqor" name="grpItem" xy="-8,-3" size="205,208" advanced="true"/>
   </displayList>
 </component>

+ 9 - 9
FGUIProject/assets/DailyWelfare/components/ProgressBar1.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="850,139" extention="ProgressBar">
+<component size="620,140" extention="ProgressBar">
   <displayList>
-    <image id="n0_fqor" name="n0" src="fqor6" fileName="images/pro_bk_in.png" xy="-36,0">
+    <image id="n0_fqor" name="n0" src="qik1m" fileName="images/mrqd_jdt_db.png" xy="0,95" size="620,23">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_fqor" name="bar" src="fqor5" fileName="images/pro_activate.png" xy="0,4" fillMethod="hz"/>
-    <component id="n2_fqor" name="comProBonus0" src="fqor8" fileName="components/ComProBonus.xml" xy="0,25" group="n7_fqor"/>
-    <component id="n3_fqor" name="comProBonus1" src="fqor8" fileName="components/ComProBonus.xml" xy="121,25" group="n7_fqor"/>
-    <component id="n4_fqor" name="comProBonus2" src="fqor8" fileName="components/ComProBonus.xml" xy="242,25" group="n7_fqor"/>
-    <component id="n5_fqor" name="comProBonus3" src="fqor8" fileName="components/ComProBonus.xml" xy="363,25" group="n7_fqor"/>
-    <component id="n6_fqor" name="comProBonus4" src="fqor8" fileName="components/ComProBonus.xml" xy="484,25" group="n7_fqor"/>
-    <group id="n7_fqor" name="n7" xy="-40,-75" size="565,200" advanced="true"/>
+    <image id="n1_fqor" name="bar" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,100" fillMethod="hz"/>
+    <component id="n2_fqor" name="comProBonus0" src="fqor8" fileName="components/ComProBonus.xml" xy="95,70" group="n7_fqor"/>
+    <component id="n3_fqor" name="comProBonus1" src="fqor8" fileName="components/ComProBonus.xml" xy="205,70" group="n7_fqor"/>
+    <component id="n4_fqor" name="comProBonus2" src="fqor8" fileName="components/ComProBonus.xml" xy="315,70" group="n7_fqor"/>
+    <component id="n5_fqor" name="comProBonus3" src="fqor8" fileName="components/ComProBonus.xml" xy="425,70" group="n7_fqor"/>
+    <component id="n6_fqor" name="comProBonus4" src="fqor8" fileName="components/ComProBonus.xml" xy="535,70" group="n7_fqor"/>
+    <group id="n7_fqor" name="n7" xy="55,0" size="520,140" advanced="true"/>
   </displayList>
   <ProgressBar/>
 </component>

BIN
FGUIProject/assets/DailyWelfare/images/mrbj_shu.png


BIN
FGUIProject/assets/DailyWelfare/images/mrbj_sj_db.png


BIN
FGUIProject/assets/DailyWelfare/images/mrbj_sz_db.png


BIN
FGUIProject/assets/DailyWelfare/images/mrbj_tb1.png


BIN
FGUIProject/assets/DailyWelfare/images/mrbj_wz2.png


BIN
FGUIProject/assets/DailyWelfare/images/mrqd_db.png


BIN
FGUIProject/assets/DailyWelfare/images/mrqd_jdt_db.png


BIN
FGUIProject/assets/DailyWelfare/images/mrqd_jdt_yellow.png


BIN
FGUIProject/assets/DailyWelfare/images/mrqd_kbq.png


BIN
FGUIProject/assets/DailyWelfare/images/mrqd_sz_db.png


BIN
FGUIProject/assets/DailyWelfare/images/mrqd_zz.png


BIN
FGUIProject/assets/DailyWelfare/images/mrrw_jl_db.png


BIN
FGUIProject/assets/DailyWelfare/images/qrhd_jd_fgx1.png


BIN
FGUIProject/assets/DailyWelfare/images/txz_lvl_db.png


BIN
FGUIProject/assets/DailyWelfare/images/wz_hjksb.png


BIN
FGUIProject/assets/DailyWelfare/images/wz_jksb.png


BIN
FGUIProject/assets/DailyWelfare/images/wz_mrbj.png


BIN
FGUIProject/assets/DailyWelfare/images/wz_mrbj_ms.png


BIN
FGUIProject/assets/DailyWelfare/images/wz_yqd.png


BIN
FGUIProject/assets/DailyWelfare/images/yqd_mr_db.png


BIN
FGUIProject/assets/DailyWelfare/images/yz_yhd.png


BIN
FGUIProject/assets/DailyWelfare/imagesNew/ornamental_title.png


BIN
FGUIProject/assets/DailyWelfare/imagesTest/lm_bq_dcm.png


BIN
FGUIProject/assets/DailyWelfare/imagesTest/lm_bq_xcm.png


BIN
FGUIProject/assets/DailyWelfare/imagesTest/pro_activate.png


BIN
FGUIProject/assets/DailyWelfare/imagesTest/pro_bk_in.png


BIN
FGUIProject/assets/DailyWelfare/imagesTest/wpbb_xtxt.png


BIN
FGUIProject/assets/DailyWelfare/imagesTest/wpbb_zi.png


+ 25 - 6
FGUIProject/assets/DailyWelfare/package.xml

@@ -2,16 +2,35 @@
 <packageDescription id="t8nwuj7i">
   <resources>
     <component id="fqor0" name="DailyWelfareUI.xml" path="/" exported="true"/>
-    <image id="fqor1" name="wpbb_zi.png" path="/imagesTest/"/>
-    <image id="fqor2" name="wpbb_xtxt.png" path="/imagesTest/"/>
-    <image id="fqor5" name="pro_activate.png" path="/imagesTest/"/>
-    <image id="fqor6" name="pro_bk_in.png" path="/imagesTest/"/>
     <component id="fqor7" name="ProgressBar1.xml" path="/components/"/>
     <component id="fqor8" name="ComProBonus.xml" path="/components/" exported="true"/>
     <component id="fqor9" name="ListSignItem.xml" path="/components/"/>
     <component id="fqora" name="ComSupply.xml" path="/components/"/>
-    <image id="fqorb" name="lm_bq_dcm.png" path="/imagesTest/" exported="true"/>
-    <image id="fqorc" name="lm_bq_xcm.png" path="/imagesTest/" exported="true"/>
+    <image id="qik1d" name="mrqd_sz_db.png" path="/images/"/>
+    <image id="qik1e" name="mrqd_zz.png" path="/images/"/>
+    <image id="qik1f" name="mrrw_jl_db.png" path="/images/"/>
+    <image id="qik1g" name="qrhd_jd_fgx1.png" path="/images/"/>
+    <image id="qik1h" name="wz_hjksb.png" path="/images/"/>
+    <image id="qik1i" name="wz_yqd.png" path="/images/"/>
+    <image id="qik1j" name="yqd_mr_db.png" path="/images/"/>
+    <image id="qik1k" name="yz_yhd.png" path="/images/"/>
+    <image id="qik1l" name="mrqd_db.png" path="/images/" scale="9grid" scale9grid="270,453,540,1372"/>
+    <image id="qik1m" name="mrqd_jdt_db.png" path="/images/"/>
+    <image id="qik1n" name="mrqd_jdt_yellow.png" path="/images/"/>
+    <image id="qik1o" name="mrqd_kbq.png" path="/images/"/>
+    <component id="qik1q" name="DailySignUI.xml" path="/" exported="true"/>
+    <image id="qik1r" name="txz_lvl_db.png" path="/images/"/>
+    <image id="qik1s" name="wz_jksb.png" path="/images/"/>
+    <component id="qik1t" name="DailySupplyUI.xml" path="/" exported="true"/>
+    <component id="qik1u" name="Button1.xml" path="/components/"/>
+    <image id="qik1v" name="wz_mrbj_ms.png" path="/images/"/>
+    <image id="qik1w" name="mrbj_shu.png" path="/images/"/>
+    <image id="qik1x" name="mrbj_sj_db.png" path="/images/"/>
+    <image id="qik1y" name="mrbj_sz_db.png" path="/images/"/>
+    <image id="qik1z" name="mrbj_tb1.png" path="/images/"/>
+    <image id="qik110" name="mrbj_wz2.png" path="/images/"/>
+    <image id="qik111" name="wz_mrbj.png" path="/images/"/>
+    <image id="qik112" name="ornamental_title.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

+ 2 - 5
FGUIProject/assets/Friend/FriendUI.xml

@@ -4,13 +4,10 @@
     <loader id="n21_nb1u" 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="n0_jdju" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n0_jdju" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n8_z73e" name="n8" src="z73el" fileName="images/hy_dikuang_2.png" xy="705,101" group="n9_z73e"/>
-    <text id="n2_pdeo" name="txtCount" xy="744,100" pivot="0.5,0" size="238,49" group="n9_z73e" fontSize="36" color="#e4dbcf" align="center" text="好友数:10/50"/>
+    <text id="n2_pdeo" name="txtCount" xy="746,100" pivot="0.5,0" size="234,49" group="n9_z73e" fontSize="36" color="#e4dbcf" align="center" text="好友数:10/50"/>
     <group id="n9_z73e" name="grpCount" xy="705,100" size="317,51"/>
-    <image id="n17_z73e" name="n17" src="q08xs" fileName="imagesExport/hz_xzkuang.png" pkg="eg2y0ldp" xy="200,93" group="n13_z73e"/>
-    <text id="n12_z73e" name="txtName" xy="367,98" pivot="0.5,0" size="76,49" group="n13_z73e" fontSize="36" color="#fbf6e7" strokeColor="#c9a465" strokeSize="2" text="套装"/>
-    <group id="n13_z73e" name="grpName" xy="200,93" size="410,62" advanced="true"/>
     <component id="n15_z73e" name="btnInfo" src="jdju1" fileName="components/BtnModel1.xml" xy="40,1393" group="n16_z73e">
       <Button icon="ui://wez2ujnnz73et"/>
     </component>

BIN
FGUIProject/assets/League/images/lm_db.png


BIN
FGUIProject/assets/League/images/lm_db_2.png


BIN
FGUIProject/assets/League/images/lm_db_duan.png


BIN
FGUIProject/assets/Main/images/zjm_e_6.png


+ 25 - 0
FGUIProject/assets/Store/StoreBlackCardRewardUI.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,992">
+  <displayList>
+    <component id="n0_qik1" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" pkg="eg2y0ldp" xy="0,0">
+      <property target="txtTitle" propertyId="0" value="黑金卡专属"/>
+    </component>
+    <image id="n6_qik1" name="n6" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="132,796"/>
+    <text id="n7_qik1" name="n7" xy="241,822" size="682,86" fontSize="32" color="#a88656" align="center" autoSize="none" text="黑金卡玩家,每月1日5点起,可免费领取黑金卡 专属单品,请注意及时领取,逾期失效。"/>
+    <list id="n14_qik1" name="list" xy="147,176" size="809,590" layout="flow_hz" lineGap="10" colGap="20" defaultItem="ui://p9mtgheoqik1tcj" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+  <customProperty target="" propertyId="0"/>
+</component>

+ 3 - 3
FGUIProject/assets/Store/StoreChargeAddUpUI.xml

@@ -4,9 +4,7 @@
     <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
     <component id="n34_l500" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
     <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
-    <list id="n10_d4iw" name="list" xy="0,793" size="1080,1033" layout="flow_hz" overflow="hidden" colGap="20" defaultItem="ui://p9mtgheohhx91i" align="center" scrollItemToViewOnClick="false">
-      <relation target="" sidePair="bottomext-bottom"/>
-      <item/>
+    <list id="n58_qik1" name="list" xy="0,790" size="1080,1082" layout="pagination" overflow="scroll" scroll="horizontal" scrollBarFlags="8" colGap="60" defaultItem="ui://p9mtgheoqik1tby" align="center">
       <item/>
       <item/>
       <item/>
@@ -17,5 +15,7 @@
     <component id="n29_hhx9" name="n29" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
+    <component id="n61_qik1" name="btnLeft" src="qik1tbz" fileName="components/Button8.xml" xy="20,1130" pivot="0.5,0.5" scale="-1,1"/>
+    <component id="n62_qik1" name="btnRight" src="qik1tbz" fileName="components/Button8.xml" xy="965,1130" pivot="0.5,0.5"/>
   </displayList>
 </component>

+ 54 - 0
FGUIProject/assets/Store/StoreMonthUI.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <displayList>
+    <image id="n1_qik1" name="n1" src="hhx917" fileName="imagesNew/MonthCard_baseboard.png" xy="50,494">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n2_qik1" name="n2" src="hhx918" fileName="imagesNew/MonthCard_bg.png" xy="90,552"/>
+    <component id="n41_qik1" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,10"/>
+    <component id="n3_qik1" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="908,564" size="52,52">
+      <Button icon="ui://p9mtgheofqortar"/>
+    </component>
+    <loader id="n33_qik1" name="loaCard" xy="190,612" size="592,340" url="ui://p9mtgheohhx91a" autoSize="true"/>
+    <text id="n4_qik1" name="txtTime" xy="727,570" pivot="1,0" size="143,39" fontSize="28" color="#675c50" vars="true" text="{value=29}天后到期"/>
+    <image id="n5_qik1" name="n5" src="hhx919" fileName="imagesNew/MonthCard_Devide_baseboard.png" xy="127,1004" size="826,240"/>
+    <component id="n32_qik1" name="btnBuy" src="qik1tc2" fileName="components/Button10.xml" xy="415,864"/>
+    <text id="n6_qik1" name="txtTips" xy="149,954" pivot="0.5,0" size="781,36" fontSize="26" color="#8c8580" vars="true" text="购买/续费可获得{value=300}会员积分(剩余天数超过{day=300}天后无法继续续费)"/>
+    <text id="n7_qik1" name="n7" xy="296,1025" size="182,41" group="n10_qik1" fontSize="30" color="#8c8580" vars="true" text="购买立即获得"/>
+    <loader id="n11_qik1" name="loaMoney" xy="513,1026" size="40,40" group="n15_qik1" aspect="true" url="ui://eg2y0ldpkztethq" fill="scale"/>
+    <text id="n13_qik1" name="n13" xy="554,1026" size="19,41" group="n15_qik1" fontSize="30" color="#8c8580" vars="true" text="*"/>
+    <text id="n14_qik1" name="txtMoneyCount" xy="572,1025" size="47,41" group="n15_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>
+    <group id="n15_qik1" name="n15" xy="513,1025" size="106,43" group="n10_qik1" advanced="true"/>
+    <text id="n20_qik1" name="n20" xy="654,1026" size="63,41" group="n19_qik1" fontSize="30" color="#8c8580" vars="true" text="特权"/>
+    <text id="n17_qik1" name="n17" xy="717,1026" size="19,41" group="n19_qik1" fontSize="30" color="#8c8580" vars="true" text="*"/>
+    <text id="n18_qik1" name="txtPrivilegeCount" xy="736,1025" size="47,41" group="n19_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>
+    <group id="n19_qik1" name="n19" xy="654,1025" size="129,43" group="n10_qik1" advanced="true"/>
+    <group id="n10_qik1" name="n10" xy="296,1025" size="487,43" advanced="true" layout="hz" colGap="35" excludeInvisibles="true"/>
+    <text id="n21_qik1" name="n21" xy="349,1080" size="241,41" group="n30_qik1" fontSize="30" color="#8c8580" vars="true" text="金卡期间每天获得"/>
+    <loader id="n22_qik1" name="loaDailyMoney" xy="625,1081" size="40,40" group="n25_qik1" aspect="true" url="ui://eg2y0ldpkztethq" fill="scale"/>
+    <text id="n23_qik1" name="n23" xy="666,1081" size="19,41" group="n25_qik1" fontSize="30" color="#8c8580" vars="true" text="*"/>
+    <text id="n24_qik1" name="txtDailyMoneyCount" xy="684,1080" size="47,41" group="n25_qik1" fontSize="30" color="#8c8580" vars="true" text="300"/>
+    <group id="n25_qik1" name="n25" xy="625,1080" size="106,42" group="n30_qik1" advanced="true"/>
+    <group id="n30_qik1" name="n30" xy="349,1080" size="382,42" advanced="true" layout="hz" colGap="35" excludeInvisibles="true"/>
+    <component id="n31_qik1" name="btnGet" src="qik1tc1" fileName="components/Button9.xml" xy="428,1145"/>
+    <image id="n34_qik1" name="n34" src="hhx91c" fileName="imagesNew/ornamental_title.png" xy="103,1281" pivot="0.5,0.5" group="n37_qik1" scale="-1,1"/>
+    <text id="n35_qik1" name="txtGiftBag" xy="474,1268" pivot="0.5,0" size="132,44" group="n37_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="特权礼包"/>
+    <image id="n36_qik1" name="n36" src="hhx91c" fileName="imagesNew/ornamental_title.png" xy="625,1281" pivot="0.5,0.5" group="n37_qik1"/>
+    <group id="n37_qik1" name="n37" xy="103,1268" size="874,44" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <list id="n38_qik1" name="list" xy="71,1338" size="920,510" layout="flow_hz" overflow="scroll" lineGap="20" colGap="10" defaultItem="ui://p9mtgheo10not1t">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n40_qik1" name="n40" src="qik1tc3" fileName="imagesNew/sc_yk_dbzz.png" xy="94,1742">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+    <component id="n39_qik1" name="n39" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+    <component id="n42_qik1" name="btnBlackReward" src="qik1tcm" fileName="components/Button11.xml" xy="869,617"/>
+  </displayList>
+</component>

+ 0 - 12
FGUIProject/assets/Store/components/Button1.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="298,152" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
-  <displayList>
-    <image id="n0_nz0t" name="n0" src="d4iwc" fileName="images/sc_yj_anniu_xz.png" xy="0,0" pkg="vlgobc15">
-      <gearDisplay controller="button" pages="1"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_nz0t" name="n1" xy="114,54" size="76,49" fontSize="36" color="#fff4cc" text="充值"/>
-  </displayList>
-  <Button mode="Radio"/>
-</component>

+ 18 - 0
FGUIProject/assets/Store/components/Button10.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="248,74" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n10_qik1" name="n10" src="hhx91d" fileName="imagesNew/bt_buy.png" xy="0,5"/>
+    <text id="n5_l500" name="txtOriginalPrice" xy="33,16" pivot="0.5,0" size="50,44" group="n7_l500" fontSize="32" color="#725e41" align="center" text="999"/>
+    <image id="n6_l500" name="n6" src="fqortas" fileName="imagesNew/sc_jinxiexian.png" xy="28,35" pivot="0.5,0" group="n7_l500">
+      <relation target="n5_l500" sidePair="width-width"/>
+    </image>
+    <group id="n7_l500" name="grpOriginalPrice" xy="28,16" size="60,44" group="n8_l500" advanced="true"/>
+    <text id="n4_l500" name="txtPrice" xy="90,10" size="43,54" group="n8_l500" fontSize="40" color="#5a3e16" text="99"/>
+    <text id="n9_l500" name="title" xy="135,9" size="84,54" group="n8_l500" fontSize="40" color="#5a3e16" align="center" text="购买"/>
+    <group id="n8_l500" name="n8" xy="28,9" size="191,55" advanced="true" layout="hz" colGap="2" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+  </displayList>
+  <Button/>
+</component>

+ 13 - 0
FGUIProject/assets/Store/components/Button11.xml

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

+ 0 - 10
FGUIProject/assets/Store/components/Button2.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="258,70" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
-  <displayList>
-    <loader id="n4_iftf" name="loaMascot" xy="3,-231" size="252,232" url="ui://p9mtgheoiftftac"/>
-    <loader id="n2_10not" name="icon" xy="0,0" size="258,70" url="ui://p9mtgheodmsi17" autoSize="true"/>
-  </displayList>
-  <Button mode="Radio"/>
-  <customProperty target="loaMascot" propertyId="1"/>
-</component>

+ 2 - 2
FGUIProject/assets/Store/components/Button3.xml

@@ -8,14 +8,14 @@
     <image id="n2_fqor" name="n2" src="fqortaq" fileName="imagesNew/sc_tab_xuanzhong.png" xy="0,0">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <loader id="n1_fqor" name="icon" xy="11,11" pivot="0.5,0.5" size="106,106" url="ui://p9mtgheofqortan" autoSize="true"/>
+    <loader id="n1_fqor" name="icon" xy="11,5" pivot="0.5,0.5" size="106,106" url="ui://p9mtgheofqortan" autoSize="true"/>
     <text id="n3_fqor" name="txt0" xy="-9,56" pivot="0.5,0" size="48,59" font="ui://eg2y0ldpa0cftks" fontSize="44" color="#be8c52" align="center" text="充">
       <gearColor controller="button" pages="0" values="#be8c52,#000000" default="#985e2a,#000000"/>
     </text>
     <text id="n4_fqor" name="txt1" xy="31,89" pivot="0.5,0" size="36,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#be8c52" align="center" text="值">
       <gearColor controller="button" pages="0" values="#be8c52,#000000" default="#985e2a,#000000"/>
     </text>
-    <text id="n5_l500" name="txt2" xy="9,22" pivot="0.5,0" size="10,49" font="ui://eg2y0ldpa0cftks" fontSize="36" color="#be8c52" align="center" text="">
+    <text id="n5_l500" name="txt2" xy="7,22" pivot="0.5,0" size="10,49" font="ui://eg2y0ldpa0cftks" fontSize="36" color="#be8c52" align="center" text="">
       <gearColor controller="button" pages="0" values="#be8c52,#000000" default="#985e2a,#000000"/>
     </text>
   </displayList>

+ 10 - 0
FGUIProject/assets/Store/components/Button6.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="52,52" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_qik1" src="hhx9p" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

+ 19 - 0
FGUIProject/assets/Store/components/Button7.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="184,56" extention="Button">
+  <controller name="button" pages="0,up,1,down,5,disable" selected="2"/>
+  <displayList>
+    <image id="n2_qik1" name="n2" src="hhx9o" fileName="imagesNew/bt_lock.png" xy="0,1">
+      <gearDisplay controller="button" pages="5"/>
+    </image>
+    <image id="n0_qik1" name="n0" src="hhx9m" fileName="imagesNew/bt_get.png" xy="0,1">
+      <gearDisplay controller="button" pages="0,1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="184,56" fontSize="36" color="#7e6e56" align="center" vAlign="middle" autoSize="none" singleLine="true" text="已领取">
+      <gearColor controller="button" pages="0,5" values="#5a3e16,#000000|#7e6e56,#000000" default="#5a3e16,#000000"/>
+      <gearText controller="button" pages="5" values="已领取" default="领取"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

+ 13 - 0
FGUIProject/assets/Store/components/Button8.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_qik1" src="hhx9l" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+    <text id="n1_qik1" 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>

+ 13 - 0
FGUIProject/assets/Store/components/Button9.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="224,74" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="hhx91e" fileName="imagesNew/bt_get1.png" xy="0,3">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="224,74" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="领取">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

+ 7 - 7
FGUIProject/assets/Store/components/ComTab.xml

@@ -2,26 +2,26 @@
 <component size="857,129" overflow="scroll" scroll="horizontal">
   <controller name="c1" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <displayList>
-    <component id="n9_fqor" name="n9" src="fqortb1" fileName="components/Button3.xml" xy="0,0" group="n14_fqor">
+    <component id="n9_fqor" name="btn0" src="fqortb1" fileName="components/Button3.xml" xy="0,0" group="n14_fqor">
       <Button icon="ui://p9mtgheofqortao" selectedIcon="ui://p9mtgheofqortan" controller="c1" page="1"/>
     </component>
-    <component id="n10_fqor" name="n10" src="fqortb1" fileName="components/Button3.xml" xy="193,0" group="n14_fqor">
+    <component id="n10_fqor" name="btn1" src="fqortb1" fileName="components/Button3.xml" xy="193,0" group="n14_fqor">
       <Button icon="ui://p9mtgheofqortak" selectedIcon="ui://p9mtgheofqortaj" controller="c1" page="2"/>
       <property target="txt0" propertyId="0" value="月"/>
       <property target="txt1" propertyId="0" value="卡"/>
     </component>
-    <component id="n11_fqor" name="n11" src="fqortb1" fileName="components/Button3.xml" xy="386,0" group="n14_fqor">
+    <component id="n11_fqor" name="btn2" src="fqortb1" fileName="components/Button3.xml" xy="386,0" group="n14_fqor">
       <Button icon="ui://p9mtgheofqortam" selectedIcon="ui://p9mtgheofqortal" controller="c1" page="3"/>
       <property target="txt0" propertyId="0" value="礼"/>
       <property target="txt1" propertyId="0" value="包"/>
     </component>
-    <component id="n12_fqor" name="n12" src="fqortb1" fileName="components/Button3.xml" xy="579,0" group="n14_fqor">
-      <Button icon="ui://p9mtgheofqortam" selectedIcon="ui://p9mtgheofqortal" controller="c1" page="4"/>
+    <component id="n12_fqor" name="btn3" src="fqortb1" fileName="components/Button3.xml" xy="579,0" group="n14_fqor">
+      <Button icon="ui://p9mtgheoqik1tc5" selectedIcon="ui://p9mtgheoqik1tc6" controller="c1" page="4"/>
       <property target="txt0" propertyId="0" value="兑"/>
       <property target="txt1" propertyId="0" value="换"/>
     </component>
-    <component id="n13_fqor" name="n13" src="fqortb1" fileName="components/Button3.xml" xy="772,0" group="n14_fqor">
-      <Button icon="ui://p9mtgheofqortam" selectedIcon="ui://p9mtgheofqortal" controller="c1" page="5"/>
+    <component id="n13_fqor" name="btn4" src="fqortb1" fileName="components/Button3.xml" xy="772,0" group="n14_fqor">
+      <Button icon="ui://p9mtgheoqik1tc7" selectedIcon="ui://p9mtgheoqik1tc4" controller="c1" page="5"/>
       <property target="txt0" propertyId="0" value="花"/>
       <property target="txt1" propertyId="0" value="令"/>
       <property target="txt2" propertyId="0" value="飞"/>

+ 0 - 18
FGUIProject/assets/Store/components/Component1.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="890,70">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
-  <displayList>
-    <component id="n17_10not" name="btn0" src="dmsi1q" fileName="components/Button2.xml" xy="0,0">
-      <Button checked="true" icon="ui://p9mtgheodmsi17" selectedIcon="ui://p9mtgheodmsi16" controller="c1" page="0"/>
-      <property target="loaMascot" propertyId="1" value="ui://p9mtgheoiftftaa"/>
-    </component>
-    <component id="n18_10not" name="btn1" src="dmsi1q" fileName="components/Button2.xml" xy="314,0">
-      <Button icon="ui://p9mtgheodmsi19" selectedIcon="ui://p9mtgheodmsi18" controller="c1" page="1"/>
-      <property target="loaMascot" propertyId="1" value="ui://p9mtgheoiftftab"/>
-    </component>
-    <component id="n19_10not" name="btn2" src="dmsi1q" fileName="components/Button2.xml" xy="628,0">
-      <Button icon="ui://p9mtgheodmsi1b" selectedIcon="ui://p9mtgheodmsi1a" controller="c1" page="2"/>
-      <property target="loaMascot" propertyId="1" value="ui://p9mtgheoiftftac"/>
-    </component>
-  </displayList>
-</component>

+ 16 - 0
FGUIProject/assets/Store/components/ListBlackRewardtem.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="185,182">
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
+  <displayList>
+    <image id="n19_qik1" name="n19" src="qik1tcl" fileName="imagesNew/wp_baseboard1.png" xy="0,2"/>
+    <loader id="n20_qik1" name="loaIcon" xy="96,97" pivot="0.5,0.5" anchor="true" size="122,122" aspect="true" url="ui://xz8kxrecng0i27" fill="scale"/>
+    <image id="n9_qik1" name="n9" src="qik1tci" fileName="imagesNew/yf_db.png" xy="103,0" group="n14_qik1"/>
+    <text id="n10_qik1" name="txtMonth" xy="101,17" pivot="0.5,0" size="84,39" group="n14_qik1" fontSize="28" color="#9a4e16" align="center" letterSpacing="-2" text="十二月"/>
+    <group id="n14_qik1" name="grpMonth" xy="101,0" size="84,79" advanced="true"/>
+    <image id="n11_qik1" name="n11" src="qik1tce" fileName="imagesNew/dydp_db.png" xy="26,135" group="n15_qik1"/>
+    <text id="n12_qik1" name="n12" xy="31,133" pivot="0.5,0" size="126,44" group="n15_qik1" fontSize="32" color="#7c4527" align="center" letterSpacing="-2" text="当月单品"/>
+    <group id="n15_qik1" name="grpName" xy="26,133" size="140,45" advanced="true"/>
+    <image id="n13_qik1" name="imgMask" src="qik1tcd" fileName="imagesNew/dikuang_SkillItem_zz.png" xy="1,1"/>
+    <image id="n16_qik1" name="imggot" src="qik1tck" fileName="imagesNew/mrqd_kbq.png" xy="-14,38"/>
+  </displayList>
+</component>

+ 46 - 0
FGUIProject/assets/Store/components/ListVipItem.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1050" overflow="hidden" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n35_qik1" name="n35" src="hhx9t" fileName="imagesNew/tz_baseboard.png" xy="116,29" group="n58_qik1"/>
+    <graph id="n37_qik1" name="holder" xy="348,461" size="1,1" group="n58_qik1" touchable="false">
+      <gearDisplay controller="button" pages="1"/>
+    </graph>
+    <component id="n38_qik1" name="btnShow" src="qik1tbv" fileName="components/Button6.xml" xy="101,0" group="n58_qik1"/>
+    <image id="n39_qik1" name="n39" src="hhx9u" fileName="imagesNew/tz_name_baseboard.png" xy="80,60" group="n45_qik1"/>
+    <text id="n40_qik1" name="txtName0" xy="100,70" pivot="0.5,0" size="56,69" group="n45_qik1" fontSize="52" color="#915e15" text="梦"/>
+    <text id="n41_qik1" name="txtName1" xy="119,120" pivot="0.5,0" size="38,46" group="n45_qik1" fontSize="34" color="#915e15" text="影"/>
+    <text id="n42_qik1" name="txtName2" xy="103,151" pivot="0.5,0" size="34,41" group="n45_qik1" fontSize="30" color="#915e15" text="画"/>
+    <text id="n43_qik1" name="txtName3" xy="120,176" pivot="0.5,0" size="34,41" group="n45_qik1" fontSize="30" color="#915e15" text="婵"/>
+    <text id="n44_qik1" name="txtName4" xy="116,203" pivot="0.5,0" size="41,122" group="n45_qik1" fontSize="36" color="#915e15" align="center" leading="-12" autoSize="none" text="婵娟"/>
+    <group id="n45_qik1" name="n45" xy="80,60" size="96,265" group="n58_qik1"/>
+    <image id="n46_qik1" name="n46" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,113" pivot="0.5,0.5" group="n49_qik1" scale="-1,1"/>
+    <text id="n48_qik1" name="txtGiftBag" xy="649,100" pivot="0.5,0" size="244,44" group="n49_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级特级礼包"/>
+    <image id="n47_qik1" name="n47" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,113" pivot="0.5,0.5" group="n49_qik1"/>
+    <group id="n49_qik1" name="n49" xy="582,100" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <list id="n50_qik1" name="listGiftBag" xy="574,161" size="601,401" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" lineGap="20" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n56_qik1" name="btnGetGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="673,445" group="n58_qik1"/>
+    <image id="n51_qik1" name="n51" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,565" pivot="0.5,0.5" group="n54_qik1" scale="-1,1"/>
+    <text id="n52_qik1" name="txtWeekGiftBag" xy="649,552" pivot="0.5,0" size="244,44" group="n54_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级每周礼包"/>
+    <image id="n53_qik1" name="n53" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,565" pivot="0.5,0.5" group="n54_qik1"/>
+    <group id="n54_qik1" name="n54" xy="582,552" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <list id="n55_qik1" name="listWeekGiftBag" xy="574,619" size="601,401" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" lineGap="20" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n57_qik1" name="btnGetWeekGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="673,906" group="n58_qik1"/>
+    <group id="n58_qik1" name="n58" xy="80,0" size="1095,1037"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

BIN
FGUIProject/assets/Store/imagesNew/dikuang_SkillItem_zz.png


BIN
FGUIProject/assets/Store/imagesNew/dydp_db.png


BIN
FGUIProject/assets/Store/imagesNew/mrqd_kbq.png


BIN
FGUIProject/assets/Store/imagesNew/sc_tab_duihuan.png


BIN
FGUIProject/assets/Store/imagesNew/sc_tab_duihuan_xuanzhong.png


BIN
FGUIProject/assets/Store/imagesNew/sc_tab_feihualing.png


BIN
FGUIProject/assets/Store/imagesNew/sc_tab_feihualing_xuanzhong.png


BIN
FGUIProject/assets/Store/imagesNew/sc_yk_dbzz.png


BIN
FGUIProject/assets/Store/imagesNew/tb_wenhao.png


BIN
FGUIProject/assets/Store/imagesNew/yf_db.png


BIN
FGUIProject/assets/Store/imagesNew/yk_hjkdp.png


+ 28 - 10
FGUIProject/assets/Store/package.xml

@@ -2,9 +2,6 @@
 <packageDescription id="p9mtgheo">
   <resources>
     <component id="d4iwr" name="StoreListItem.xml" path="/components/" exported="true"/>
-    <component id="nz0t14" name="Button1.xml" path="/components/"/>
-    <component id="dmsi1q" name="Button2.xml" path="/components/"/>
-    <component id="10not1s" name="Component1.xml" path="/components/"/>
     <component id="10not1t" name="ListGiftItem.xml" path="/components/"/>
     <component id="iftftaf" name="Component2.xml" path="/components/"/>
     <component id="fqortb1" name="Button3.xml" path="/components/"/>
@@ -63,7 +60,7 @@
     <image id="fqortb6" name="sc_beijing_hua.png" path="/imagesNew/"/>
     <image id="fqortb7" name="sc_beijing_shang.png" path="/imagesNew/"/>
     <image id="fqortb8" name="sc_yeqian_zhedang.png" path="/imagesNew/"/>
-    <component id="10not1v" name="GiftBagBuyUI.xml" path="/" exported="true"/>
+    <component id="10not1v" name="GiftBagBuyUI.xml" path="/"/>
     <component id="fqor7x" name="StoreUI.xml" path="/" exported="true"/>
     <component id="hhx90" name="ComZhuangShi.xml" path="/components/"/>
     <image id="hhx91" name="VipLevel_baseboard.png" path="/imagesNew/"/>
@@ -84,17 +81,15 @@
     <image id="hhx9g" name="VipLevel_Progress_baseboard.png" path="/imagesNew/" scale="9grid" scale9grid="22,4,44,8"/>
     <image id="hhx9h" name="font_VipLevel_8.png" path="/font/"/>
     <image id="hhx9i" name="font_VipLevel_9.png" path="/font/"/>
-    <image id="hhx9j" name="wp_baseboard1.png" path="/imagesNew/"/>
     <image id="hhx9k" name="wp_baseboard-ornament.png" path="/imagesNew/"/>
     <image id="hhx9l" name="bt_cut.png" path="/imagesNew/"/>
     <image id="hhx9m" name="bt_get.png" path="/imagesNew/"/>
     <image id="hhx9n" name="bt_getted.png" path="/imagesNew/"/>
     <image id="hhx9o" name="bt_lock.png" path="/imagesNew/"/>
     <image id="hhx9p" name="bt_preview.png" path="/imagesNew/"/>
-    <image id="hhx9q" name="bt_to.png" path="/imagesNew/"/>
     <image id="hhx9r" name="ornament_title.png" path="/imagesNew/"/>
     <image id="hhx9s" name="red.png" path="/imagesNew/"/>
-    <image id="hhx9t" name="tz_baseboard.png" path="/imagesNew/"/>
+    <image id="hhx9t" name="tz_baseboard.png" path="/imagesNew/" scale="9grid" scale9grid="214,468,428,101"/>
     <image id="hhx9u" name="tz_name_baseboard.png" path="/imagesNew/"/>
     <image id="hhx9v" name="font_save_baseboard.png" path="/imagesNew/"/>
     <image id="hhx9w" name="GiftBag_baseboard.png" path="/imagesNew/"/>
@@ -108,10 +103,10 @@
     <image id="hhx914" name="font_save_7.png" path="/font/"/>
     <image id="hhx915" name="font_save_8.png" path="/font/"/>
     <image id="hhx916" name="font_save_9.png" path="/font/"/>
-    <image id="hhx917" name="MonthCard_baseboard.png" path="/imagesNew/"/>
+    <image id="hhx917" name="MonthCard_baseboard.png" path="/imagesNew/" scale="9grid" scale9grid="243,346,486,692"/>
     <image id="hhx918" name="MonthCard_bg.png" path="/imagesNew/"/>
-    <image id="hhx919" name="MonthCard_Devide_baseboard.png" path="/imagesNew/"/>
-    <image id="hhx91a" name="MonthCard_Icon.png" path="/imagesNew/"/>
+    <image id="hhx919" name="MonthCard_Devide_baseboard.png" path="/imagesNew/" scale="9grid" scale9grid="25,25,50,50"/>
+    <image id="hhx91a" name="MonthCard_Icon.png" path="/imagesNew/" exported="true"/>
     <image id="hhx91b" name="MonthCard_unopen.png" path="/imagesNew/"/>
     <image id="hhx91c" name="ornamental_title.png" path="/imagesNew/"/>
     <image id="hhx91d" name="bt_buy.png" path="/imagesNew/"/>
@@ -140,6 +135,29 @@
     <image id="l500tbs" name="sc_yk_jsdb.png" path="/imagesNew/"/>
     <image id="l500tbt" name="sc_yk_zz.png" path="/imagesNew/"/>
     <image id="l500tbu" name="sc_yk_zz2.png" path="/imagesNew/"/>
+    <component id="qik1tbv" name="Button6.xml" path="/components/"/>
+    <component id="qik1tbw" name="Button7.xml" path="/components/"/>
+    <image id="qik1tbx" name="bt_to.png" path="/imagesNew/"/>
+    <component id="qik1tby" name="ListVipItem.xml" path="/components/"/>
+    <component id="qik1tbz" name="Button8.xml" path="/components/"/>
+    <component id="qik1tc0" name="StoreMonthUI.xml" path="/" exported="true"/>
+    <component id="qik1tc1" name="Button9.xml" path="/components/"/>
+    <component id="qik1tc2" name="Button10.xml" path="/components/"/>
+    <image id="qik1tc3" name="sc_yk_dbzz.png" path="/imagesNew/"/>
+    <image id="qik1tc4" name="sc_tab_feihualing_xuanzhong.png" path="/imagesNew/"/>
+    <image id="qik1tc5" name="sc_tab_duihuan.png" path="/imagesNew/"/>
+    <image id="qik1tc6" name="sc_tab_duihuan_xuanzhong.png" path="/imagesNew/"/>
+    <image id="qik1tc7" name="sc_tab_feihualing.png" path="/imagesNew/"/>
+    <component id="qik1tc8" name="StoreBlackCardRewardUI.xml" path="/" exported="true"/>
+    <image id="qik1tcc" name="yk_hjkdp.png" path="/imagesNew/"/>
+    <image id="qik1tcd" name="dikuang_SkillItem_zz.png" path="/imagesNew/"/>
+    <image id="qik1tce" name="dydp_db.png" path="/imagesNew/"/>
+    <image id="qik1tcg" name="tb_wenhao.png" path="/imagesNew/"/>
+    <image id="qik1tci" name="yf_db.png" path="/imagesNew/"/>
+    <component id="qik1tcj" name="ListBlackRewardtem.xml" path="/components/"/>
+    <image id="qik1tck" name="mrqd_kbq.png" path="/imagesNew/"/>
+    <image id="qik1tcl" name="wp_baseboard1.png" path="/imagesNew/"/>
+    <component id="qik1tcm" name="Button11.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Task/CombTaskUI.xml

@@ -18,7 +18,7 @@
       <item/>
     </list>
     <image id="n21_ids4" name="n21" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="176,883"/>
-    <text id="n22_ids4" name="n22" xy="438,880" size="215,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" letterSpacing="4" autoSize="none" text="每日5:00刷新"/>
+    <text id="n22_ids4" name="n22" xy="428,880" size="236,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" letterSpacing="4" autoSize="none" text="每日5:00刷新"/>
     <image id="n17_ids4" name="n17" src="uxxstm8" fileName="images/yeqian_db.png" xy="302,804" size="491,72"/>
     <component id="n25_ids4" name="n25" src="ids44e" fileName="components/TabButton.xml" xy="294,805" group="n27_ids4">
       <Button checked="true" controller="c1" page="0"/>

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä