Browse Source

换装替换资源

zhaoyang 2 years ago
parent
commit
9353e9b280
92 changed files with 179 additions and 124 deletions
  1. BIN
      FGUIProject/assets/CommonGame/FANGZHENGYANSONG.TTF
  2. BIN
      FGUIProject/assets/CommonGame/imagesExport/hz_tzkuang_1.png
  3. BIN
      FGUIProject/assets/CommonGame/imagesExport/hz_xzkuang.png
  4. 1 0
      FGUIProject/assets/CommonGame/package.xml
  5. 40 38
      FGUIProject/assets/DressUp/DressUpFightUI.xml
  6. 25 19
      FGUIProject/assets/DressUp/DressUpUI.xml
  7. 2 5
      FGUIProject/assets/DressUp/comListType.xml
  8. 9 0
      FGUIProject/assets/DressUp/components/Button13.xml
  9. 2 2
      FGUIProject/assets/DressUp/components/Button6.xml
  10. 3 3
      FGUIProject/assets/DressUp/components/ComboBoxRarity.xml
  11. 4 4
      FGUIProject/assets/DressUp/components/ComboBoxSuit.xml
  12. 2 2
      FGUIProject/assets/DressUp/components/ComboBoxSuit_item.xml
  13. 3 3
      FGUIProject/assets/DressUp/components/ComboBoxSuit_popup.xml
  14. 4 4
      FGUIProject/assets/DressUp/components/Component1.xml
  15. 3 3
      FGUIProject/assets/DressUp/components/PartsList.xml
  16. 12 11
      FGUIProject/assets/DressUp/components/PartsListItem.xml
  17. 8 4
      FGUIProject/assets/DressUp/components/TypeItem.xml
  18. 3 3
      FGUIProject/assets/DressUp/componentsDialog/Button2.xml
  19. BIN
      FGUIProject/assets/DressUp/images/dz_dididcis.png
  20. BIN
      FGUIProject/assets/DressUp/images/dz_hz_anniu_1.png
  21. BIN
      FGUIProject/assets/DressUp/images/dz_hz_anniu_2.png
  22. BIN
      FGUIProject/assets/DressUp/images/dz_hz_bxbx.png
  23. BIN
      FGUIProject/assets/DressUp/images/dz_hz_fsk_1.png
  24. BIN
      FGUIProject/assets/DressUp/images/dz_hz_fsk_2.png
  25. BIN
      FGUIProject/assets/DressUp/images/hz_anniuty.png
  26. BIN
      FGUIProject/assets/DressUp/images/hz_bcbc_1.png
  27. BIN
      FGUIProject/assets/DressUp/images/hz_dakai.png
  28. BIN
      FGUIProject/assets/DressUp/images/hz_dakai_1.png
  29. BIN
      FGUIProject/assets/DressUp/images/hz_fanhuibu.png
  30. BIN
      FGUIProject/assets/DressUp/images/hz_huifubu.png
  31. BIN
      FGUIProject/assets/DressUp/images/hz_minzikuang.png
  32. BIN
      FGUIProject/assets/DressUp/images/hz_paizhao.png
  33. BIN
      FGUIProject/assets/DressUp/images/hz_qhdzqh.png
  34. BIN
      FGUIProject/assets/DressUp/images/hz_shanchu.png
  35. BIN
      FGUIProject/assets/DressUp/images/hz_ssuo.png
  36. BIN
      FGUIProject/assets/DressUp/images/hz_sxkuang.png
  37. BIN
      FGUIProject/assets/DressUp/images/hz_tzkuang.png
  38. BIN
      FGUIProject/assets/DressUp/images/hz_tzkuang_1.png
  39. BIN
      FGUIProject/assets/DressUp/images/hz_xianshi.png
  40. BIN
      FGUIProject/assets/DressUp/images/hz_xzkuang.png
  41. BIN
      FGUIProject/assets/DressUp/images/hz_xzyfxz.png
  42. BIN
      FGUIProject/assets/DressUp/images/hz_yingc.png
  43. BIN
      FGUIProject/assets/DressUp/images/hz_yjmzdi_1.png
  44. BIN
      FGUIProject/assets/DressUp/images/hz_yjmzdi_2.png
  45. BIN
      FGUIProject/assets/DressUp/images/hz_zdzddg_1.png
  46. BIN
      FGUIProject/assets/DressUp/images/hz_zdzddg_2.png
  47. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_1.png
  48. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_10.png
  49. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_11.png
  50. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_12.png
  51. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_2.png
  52. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_3.png
  53. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_4.png
  54. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_5.png
  55. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_6.png
  56. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_7.png
  57. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_8.png
  58. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_9.png
  59. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_1.png
  60. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_10.png
  61. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_11.png
  62. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_12.png
  63. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_2.png
  64. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_3.png
  65. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_4.png
  66. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_5.png
  67. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_6.png
  68. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_7.png
  69. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_8.png
  70. BIN
      FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_9.png
  71. 6 0
      FGUIProject/assets/DressUp/package.xml
  72. 12 12
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpFightUI.cs
  73. 6 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpUI.cs
  74. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PartsListItem.cs
  75. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_TypeItem.cs
  76. 2 0
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs
  77. 3 2
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs
  78. 2 0
      GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs
  79. BIN
      GameClient/Assets/ResIn/Font/FANGZHENGYANSONG.TTF
  80. 21 0
      GameClient/Assets/ResIn/Font/FANGZHENGYANSONG.TTF.meta
  81. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  82. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  83. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  84. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  85. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  86. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png
  87. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0.png
  88. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png
  89. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png
  90. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas1!a.png
  91. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas1.png
  92. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes

BIN
FGUIProject/assets/CommonGame/FANGZHENGYANSONG.TTF


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


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


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

@@ -235,6 +235,7 @@
     <font id="wonotj9" name="YUNJINSONG.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="wonotj9" name="YUNJINSONG.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="wonotja" name="NANSONG.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="wonotja" name="NANSONG.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="wonotjb" name="lyq_yunhubl.png" path="/imgItemIcon/" exported="true"/>
     <image id="wonotjb" name="lyq_yunhubl.png" path="/imgItemIcon/" exported="true"/>
+    <font id="wonotjc" name="FANGZHENGYANSONG.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 40 - 38
FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -3,7 +3,7 @@
   <controller name="c1" pages="0,,1," selected="0"/>
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
   <displayList>
     <graph id="n0_qsvd" name="touchPad" xy="-34,13" size="1080,1920" alpha="0" type="rect"/>
     <graph id="n0_qsvd" name="touchPad" xy="-34,13" size="1080,1920" alpha="0" type="rect"/>
-    <component id="n27_bx8o" name="comboBox" src="q08x15" fileName="components/ComboBoxSuit.xml" xy="230,90" group="n38_8lqj" visible="false">
+    <component id="n27_bx8o" name="comboBox" src="q08x15" fileName="components/ComboBoxSuit.xml" xy="271,66" group="n38_8lqj" visible="false">
       <ComboBox title="套装一" visibleItemCount="10" direction="down" autoClearItems="true">
       <ComboBox title="套装一" visibleItemCount="10" direction="down" autoClearItems="true">
         <item title="1"/>
         <item title="1"/>
         <item title="2"/>
         <item title="2"/>
@@ -12,85 +12,87 @@
         <item title="5"/>
         <item title="5"/>
       </ComboBox>
       </ComboBox>
     </component>
     </component>
-    <component id="n1_qsvd" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80" group="n38_8lqj"/>
-    <component id="n2_qsvd" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220" group="n38_8lqj">
+    <component id="n1_qsvd" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60" group="n38_8lqj">
+      <Button icon="ui://eg2y0ldpuyuxtj4"/>
+    </component>
+    <component id="n2_qsvd" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="34,200" group="n38_8lqj" visible="false">
       <relation target="n1_qsvd" sidePair="left-left,top-top"/>
       <relation target="n1_qsvd" sidePair="left-left,top-top"/>
     </component>
     </component>
-    <image id="n16_8xpg" name="n16" src="j48o3z" fileName="images/dz_hz_fsk_1.png" xy="0,350" group="n33_j48o">
+    <image id="n16_8xpg" name="n16" src="j48o3z" fileName="images/dz_hz_fsk_1.png" xy="22,230" group="n33_j48o">
       <relation target="n2_qsvd" sidePair="left-left,top-top"/>
       <relation target="n2_qsvd" sidePair="left-left,top-top"/>
     </image>
     </image>
-    <loader id="n24_d4iw" name="scoreType" xy="190,359" size="50,50" group="n33_j48o" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n14_vxw5" name="txtScore" xy="4,360" size="183,54" group="n33_j48o" fontSize="28" color="#fff0db" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999">
+    <loader id="n24_d4iw" name="scoreType" xy="0,233" size="50,50" group="n33_j48o" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <text id="n14_vxw5" name="txtScore" xy="68,232" size="183,54" group="n33_j48o" fontSize="28" color="#b08649" vAlign="middle" autoSize="none" autoClearText="true" text="9999">
       <relation target="n16_8xpg" sidePair="center-center,middle-middle"/>
       <relation target="n16_8xpg" sidePair="center-center,middle-middle"/>
     </text>
     </text>
-    <group id="n33_j48o" name="n33" xy="0,350" size="257,72" group="n38_8lqj"/>
-    <component id="n29_pjip" name="compNeed" src="pjip31" fileName="components/Component1.xml" xy="0,440" group="n38_8lqj"/>
-    <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="865,0" group="n38_8lqj">
+    <group id="n33_j48o" name="n33" xy="0,230" size="274,56" group="n38_8lqj"/>
+    <component id="n29_pjip" name="compNeed" src="pjip31" fileName="components/Component1.xml" xy="0,305" group="n38_8lqj"/>
+    <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="864,0" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
       <relation target="" sidePair="height-height"/>
     </component>
     </component>
     <component id="n32_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="1080,0" group="n38_8lqj">
     <component id="n32_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="1080,0" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
       <relation target="" sidePair="height-height"/>
     </component>
     </component>
-    <component id="n10_qsvd" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1081,80" size="222,1828" group="n38_8lqj">
+    <component id="n10_qsvd" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1080,65" size="232,1828" group="n38_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
     </component>
-    <component id="n40_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,80" size="222,1828" group="n38_8lqj">
+    <component id="n40_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,65" size="232,1828" group="n38_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
     </component>
-    <component id="n15_vxw5" name="btnHint" src="f4xv3o" fileName="components/Button6.xml" xy="27,895" size="116,106" group="n38_8lqj">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-      <Button title="任务提示" titleColor="#ffffff" titleFontSize="42" icon="ui://mbo439wb8xpg2q"/>
-    </component>
     <graph id="n20_8xpg" name="btnClose" xy="0,0" size="1080,1920" group="n23_8xpg" alpha="0" type="rect" fillColor="#ffff0000">
     <graph id="n20_8xpg" name="btnClose" xy="0,0" size="1080,1920" group="n23_8xpg" alpha="0" type="rect" fillColor="#ffff0000">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
     </graph>
-    <image id="n21_8xpg" name="n21" src="8xpg2s" fileName="images/dz_hz_rwdh_1.png" xy="33,721" group="n23_8xpg">
+    <image id="n21_8xpg" name="n21" src="8xpg2s" fileName="images/dz_hz_rwdh_1.png" xy="33,978" group="n45_wono">
       <relation target="" sidePair="bottom-bottom"/>
       <relation target="" sidePair="bottom-bottom"/>
     </image>
     </image>
-    <text id="n22_8xpg" name="txtHint" xy="48,720" size="364,107" group="n23_8xpg" fontSize="30" color="#997350" align="center" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="清梦清梦清梦清梦清梦清梦 清梦清梦清梦清梦">
+    <text id="n22_8xpg" name="txtHint" xy="48,977" size="364,107" group="n45_wono" fontSize="30" color="#997350" align="center" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="清梦清梦清梦清梦清梦清梦 清梦清梦清梦清梦">
       <relation target="" sidePair="bottom-bottom"/>
       <relation target="" sidePair="bottom-bottom"/>
     </text>
     </text>
+    <group id="n45_wono" name="n45" xy="33,977" size="394,132" group="n23_8xpg"/>
     <group id="n23_8xpg" name="groupTaskHint" xy="0,0" size="1080,1920" group="n38_8lqj" advanced="true"/>
     <group id="n23_8xpg" name="groupTaskHint" xy="0,0" size="1080,1920" group="n38_8lqj" advanced="true"/>
     <loader id="n42_m1l9" name="btnGuide" xy="455,875" size="170,170" group="n38_8lqj" aspect="true">
     <loader id="n42_m1l9" name="btnGuide" xy="455,875" size="170,170" group="n38_8lqj" aspect="true">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     </loader>
-    <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="27,895" size="116,106" group="n38_8lqj" visible="false">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-      <Button icon="ui://mbo439wb8xpg2n"/>
+    <component id="n8_qsvd" name="btnNext" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="140,1699" size="331,111" group="n38_8lqj">
+      <relation target="" sidePair="bottom-bottom"/>
+      <Button title="下一步"/>
+    </component>
+    <component id="n13_vxw5" name="btnRecommend" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="480,1699" size="331,111" group="n38_8lqj">
+      <relation target="" sidePair="bottom-bottom"/>
+      <Button title="推荐搭配"/>
     </component>
     </component>
-    <component id="n4_qsvd" name="btnRepeal" src="f4xv3o" fileName="components/Button6.xml" xy="29,1141" group="n38_8lqj">
+    <component id="n39_njn2" name="btnAutoPlay" src="jj0mdk" fileName="componentsDialog/Button2.xml" xy="172,1623" group="n38_8lqj">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
     </component>
-    <component id="n5_qsvd" name="btnRenewal" src="f4xv3o" fileName="components/Button6.xml" xy="29,1268" group="n38_8lqj">
+    <component id="n15_vxw5" name="btnHint" src="f4xv3o" fileName="components/Button6.xml" xy="27,1140" size="122,114" group="n44_wono">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
+      <Button title="任务提示" titleColor="#ffffff" titleFontSize="42" icon="ui://mbo439wb8xpg2q"/>
     </component>
     </component>
-    <component id="n6_qsvd" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="29,1397" group="n38_8lqj">
+    <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="47,1267" size="122,114" group="n44_wono" visible="false">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
-      <Button icon="ui://mbo439wbq08xn"/>
+      <Button icon="ui://mbo439wb8xpg2n"/>
     </component>
     </component>
-    <component id="n7_qsvd" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="29,1526" group="n38_8lqj">
+    <component id="n4_qsvd" name="btnRepeal" src="f4xv3o" fileName="components/Button6.xml" xy="47,1286" group="n44_wono">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
-      <Button icon="ui://mbo439wbq08xo"/>
     </component>
     </component>
-    <component id="n8_qsvd" name="btnNext" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="140,1699" size="331,111" group="n38_8lqj">
-      <relation target="" sidePair="bottom-bottom"/>
-      <Button title="下一步"/>
+    <component id="n5_qsvd" name="btnRenewal" src="f4xv3o" fileName="components/Button6.xml" xy="47,1400" group="n44_wono">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
     </component>
-    <component id="n13_vxw5" name="btnRecommend" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="480,1699" size="331,111" group="n38_8lqj">
-      <relation target="" sidePair="bottom-bottom"/>
-      <Button title="推荐搭配"/>
+    <component id="n6_qsvd" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="47,1514" group="n44_wono">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+      <Button icon="ui://mbo439wbq08xn"/>
     </component>
     </component>
-    <component id="n39_njn2" name="btnAutoPlay" src="jj0mdk" fileName="componentsDialog/Button2.xml" xy="172,1623" group="n38_8lqj">
+    <component id="n7_qsvd" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="47,1628" group="n44_wono">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
+      <Button icon="ui://mbo439wbq08xo"/>
     </component>
     </component>
-    <image id="n34_j48o" name="n34" src="j48o40" fileName="images/dz_dididcis.png" xy="153,1838" group="n43_egr1">
+    <group id="n44_wono" name="n44" xy="27,1140" size="122,570" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
       <relation target="" sidePair="bottom-bottom"/>
       <relation target="" sidePair="bottom-bottom"/>
-    </image>
-    <text id="n26_bx8o" name="txtRecommendCount" xy="293,1843" size="327,44" group="n43_egr1" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数:{v1=10}/{v2=10}">
+    </group>
+    <text id="n26_bx8o" name="txtRecommendCount" xy="376,1843" size="327,44" group="n38_8lqj" fontSize="32" color="#b58d8c" align="center" vars="true" text="今日剩余次数:{v1=10}/{v2=10}">
       <relation target="" sidePair="bottom-bottom"/>
       <relation target="" sidePair="bottom-bottom"/>
     </text>
     </text>
-    <group id="n43_egr1" name="n43" xy="153,1838" size="568,56" group="n38_8lqj" visible="false" advanced="true"/>
-    <group id="n38_8lqj" name="graContent" xy="0,0" size="1303,1920" advanced="true">
+    <group id="n38_8lqj" name="graContent" xy="0,0" size="1312,1920" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay controller="c1" pages="0"/>
     </group>
     </group>
   </displayList>
   </displayList>

+ 25 - 19
FGUIProject/assets/DressUp/DressUpUI.xml

@@ -6,15 +6,15 @@
     <loader id="n31_8lqj" name="loaShow" xy="0,0" size="1080,1920" visible="false">
     <loader id="n31_8lqj" name="loaShow" xy="0,0" size="1080,1920" visible="false">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     </loader>
-    <component id="n28_8lqj" name="btnShow" src="f4xv3o" fileName="components/Button6.xml" xy="27,1015" visible="false">
+    <component id="n28_8lqj" name="btnShow" src="f4xv3o" fileName="components/Button6.xml" xy="45,1638" visible="false">
+      <relation target="n34_wono" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wbrc0744"/>
       <Button icon="ui://mbo439wbrc0744"/>
     </component>
     </component>
-    <component id="n29_8lqj" name="btnHide" src="f4xv3o" fileName="components/Button6.xml" xy="27,1015">
-      <Button icon="ui://mbo439wbrc0743"/>
+    <component id="n3_q08x" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60" group="n30_8lqj">
+      <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
     </component>
-    <component id="n3_q08x" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80" group="n30_8lqj"/>
-    <component id="n4_q08x" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220" group="n30_8lqj"/>
-    <component id="n13_q08x" name="comboBox" src="q08x15" fileName="components/ComboBoxSuit.xml" xy="230,90" group="n30_8lqj">
+    <component id="n4_q08x" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220" group="n30_8lqj" visible="false"/>
+    <component id="n13_q08x" name="comboBox" src="q08x15" fileName="components/ComboBoxSuit.xml" xy="271,66" group="n30_8lqj">
       <ComboBox title="套装一" visibleItemCount="10" direction="down" autoClearItems="true">
       <ComboBox title="套装一" visibleItemCount="10" direction="down" autoClearItems="true">
         <item title="1"/>
         <item title="1"/>
         <item title="2"/>
         <item title="2"/>
@@ -23,41 +23,47 @@
         <item title="5"/>
         <item title="5"/>
       </ComboBox>
       </ComboBox>
     </component>
     </component>
-    <component id="n25_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="865,0" group="n30_8lqj">
+    <component id="n25_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="864,0" group="n30_8lqj">
       <relation target="" sidePair="height-height"/>
       <relation target="" sidePair="height-height"/>
     </component>
     </component>
     <component id="n26_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="1080,0" group="n30_8lqj">
     <component id="n26_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="1080,0" group="n30_8lqj">
       <relation target="" sidePair="height-height"/>
       <relation target="" sidePair="height-height"/>
     </component>
     </component>
-    <component id="n17_k6he" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1081,80" size="222,1828" group="n30_8lqj">
+    <component id="n17_k6he" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1080,65" size="232,1828" group="n30_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
     </component>
-    <component id="n32_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1081,80" size="222,1828" group="n30_8lqj">
+    <component id="n32_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,65" size="232,1828" group="n30_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
     </component>
-    <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,735" size="116,106" group="n30_8lqj">
+    <component id="n12_q08x" name="btnSave" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+      <Button title="保存搭配" titleColor="#fdfaed" titleFontSize="54"/>
+    </component>
+    <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,1140" size="122,114" group="n34_wono">
       <Button icon="ui://mbo439wbj48o3x"/>
       <Button icon="ui://mbo439wbj48o3x"/>
     </component>
     </component>
-    <component id="n24_f4xv" name="btnPhoto" src="f4xv3o" fileName="components/Button6.xml" xy="27,861" size="116,106" group="n30_8lqj" aspect="true">
+    <component id="n24_f4xv" name="btnPhoto" src="f4xv3o" fileName="components/Button6.xml" xy="43,1286" size="82,92" group="n34_wono" aspect="true">
       <Button icon="ui://mbo439wbq08xm"/>
       <Button icon="ui://mbo439wbq08xm"/>
     </component>
     </component>
-    <component id="n20_f4xv" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="29,1141" group="n30_8lqj">
+    <component id="n20_f4xv" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="45,1420" group="n34_wono" visible="false">
       <Button icon="ui://mbo439wbq08x6"/>
       <Button icon="ui://mbo439wbq08x6"/>
     </component>
     </component>
-    <component id="n21_f4xv" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="29,1268" group="n30_8lqj">
+    <component id="n21_f4xv" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="45,1534" group="n34_wono" visible="false">
       <Button icon="ui://mbo439wbq08xl"/>
       <Button icon="ui://mbo439wbq08xl"/>
     </component>
     </component>
-    <component id="n22_f4xv" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="29,1397" group="n30_8lqj">
+    <component id="n22_f4xv" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="45,1410" group="n34_wono">
       <Button icon="ui://mbo439wbq08xn"/>
       <Button icon="ui://mbo439wbq08xn"/>
     </component>
     </component>
-    <component id="n23_f4xv" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="29,1526" group="n30_8lqj">
+    <component id="n23_f4xv" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="45,1524" group="n34_wono">
       <Button icon="ui://mbo439wbq08xo"/>
       <Button icon="ui://mbo439wbq08xo"/>
     </component>
     </component>
-    <component id="n12_q08x" name="btnSave" src="q08xu" fileName="components/Button3.xml" pkg="mk0fwx0x" xy="280,1718" size="381,111" group="n30_8lqj">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-      <Button title="保存搭配" titleColor="#fdfaed" titleFontSize="54"/>
+    <component id="n29_8lqj" name="btnHide" src="f4xv3o" fileName="components/Button6.xml" xy="45,1638" group="n34_wono">
+      <Button icon="ui://mbo439wbrc0743"/>
     </component>
     </component>
-    <group id="n30_8lqj" name="grpContent" xy="27,0" size="1276,1920" advanced="true">
+    <group id="n34_wono" name="n34" xy="27,1140" size="122,580" group="n30_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+    </group>
+    <group id="n30_8lqj" name="grpContent" xy="27,0" size="1285,1920" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay controller="c1" pages="0"/>
     </group>
     </group>
   </displayList>
   </displayList>

+ 2 - 5
FGUIProject/assets/DressUp/comListType.xml

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="186,1920">
+<component size="216,1920">
   <displayList>
   <displayList>
-    <image id="n25_f4xv" name="n25" src="f4xv3p" fileName="images/hz_yijidi.png" xy="0,0">
-      <relation target="" sidePair="height-height"/>
-    </image>
-    <list id="n14_k6he" name="listType" xy="19,122" size="148,1753" overflow="scroll" lineGap="30" defaultItem="ui://mbo439wbk6he16" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
+    <list id="n14_k6he" name="listType" xy="0,140" size="216,1753" overflow="scroll" lineGap="30" defaultItem="ui://mbo439wbk6he16" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
       <relation target="" sidePair="bottomext-bottom"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>

+ 9 - 0
FGUIProject/assets/DressUp/components/Button13.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="344,97" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n4_wono" name="icon" xy="0,0" size="344,97" url="ui://mbo439wbwonodw" autoSize="true"/>
+    <text id="n5_wono" name="title" xy="66,10" pivot="0.5,0" size="212,69" font="ui://eg2y0ldpwonotja" fontSize="52" color="#fcf2f2" text="保存搭配"/>
+  </displayList>
+  <Button/>
+</component>

+ 2 - 2
FGUIProject/assets/DressUp/components/Button6.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="116,116" extention="Button">
+<component size="82,82" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
   <displayList>
-    <loader id="n1_f4xv" name="icon" xy="0,0" size="116,116" url="ui://mbo439wbq08xo" autoSize="true"/>
+    <loader id="n1_f4xv" name="icon" xy="0,0" size="82,82" url="ui://mbo439wbq08xo" autoSize="true"/>
   </displayList>
   </displayList>
   <Button/>
   <Button/>
   <relation target="n1_f4xv" sidePair="width-width,height-height"/>
   <relation target="n1_f4xv" sidePair="width-width,height-height"/>

+ 3 - 3
FGUIProject/assets/DressUp/components/ComboBoxRarity.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="214,58" extention="ComboBox">
+<component size="226,62" extention="ComboBox">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
   <displayList>
     <image id="n0_k6he" name="n0" src="k6he21" fileName="images/hz_sxkuang.png" xy="0,0">
     <image id="n0_k6he" name="n0" src="k6he21" fileName="images/hz_sxkuang.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     </image>
-    <text id="n1_k6he" name="title" xy="56,5" pivot="0.5,0" size="132,44" fontSize="32" color="#fff0db" align="center" vAlign="middle" singleLine="true" text="高稀有度">
+    <text id="n1_k6he" name="title" xy="55,9" pivot="0.5,0" size="150,50" font="ui://eg2y0ldpwonotj9" fontSize="34" color="#fbf6e7" align="center" vAlign="middle" strokeColor="#c9a465" strokeSize="2" singleLine="true" text="高稀有度">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </text>
     </text>
-    <image id="n2_k6he" name="n2" src="k6he20" fileName="images/hz_sjxya.png" xy="20,20"/>
+    <image id="n2_k6he" name="n2" src="k6he20" fileName="images/hz_sjxya.png" xy="22,30"/>
   </displayList>
   </displayList>
   <ComboBox dropdown="ui://mbo439wbk6he24"/>
   <ComboBox dropdown="ui://mbo439wbk6he24"/>
 </component>
 </component>

+ 4 - 4
FGUIProject/assets/DressUp/components/ComboBoxSuit.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="416,66" extention="ComboBox">
+<component size="410,62" extention="ComboBox">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
   <displayList>
-    <image id="n0_q08x" name="n0" src="q08xs" fileName="images/hz_xzkuang.png" xy="2,2" pkg="eg2y0ldp">
+    <image id="n0_q08x" name="n0" src="q08xs" fileName="imagesExport/hz_xzkuang.png" pkg="eg2y0ldp" xy="2,2">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     </image>
-    <text id="n1_q08x" name="title" xy="24,0" pivot="0.5,0" size="396,66" fontSize="34" color="#fff0db" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+    <text id="n1_q08x" name="title" xy="160,5" pivot="0.5,0.5" size="112,49" font="ui://eg2y0ldpwonotj9" fontSize="36" color="#fbf6e7" align="center" vAlign="middle" strokeColor="#c9a465" strokeSize="2" singleLine="true" text="套装一">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </text>
     </text>
-    <image id="n2_q08x" name="n2" src="q08x4" fileName="images/hz_dakai.png" xy="361,15" pivot="0.5,0.5">
+    <image id="n2_q08x" name="n2" src="q08x4" fileName="images/hz_dakai.png" xy="350,5" pivot="0.5,0.5">
       <gearLook controller="button" pages="0,1,2" values="1,0,0,0|1,90,0,0|1,0,0,0" default="1,90,0,0"/>
       <gearLook controller="button" pages="0,1,2" values="1,0,0,0|1,90,0,0|1,0,0,0" default="1,90,0,0"/>
     </image>
     </image>
   </displayList>
   </displayList>

+ 2 - 2
FGUIProject/assets/DressUp/components/ComboBoxSuit_item.xml

@@ -2,10 +2,10 @@
 <component size="322,60" extention="Button">
 <component size="322,60" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
   <displayList>
-    <text id="n1_q08x" name="title" xy="103,0" size="116,48" fontSize="28" color="#fddeb6" align="center" vAlign="middle" singleLine="true" text="我的套装">
+    <text id="n1_q08x" name="title" xy="103,0" size="116,39" fontSize="28" color="#b79155" align="center" vAlign="middle" singleLine="true" text="我的套装">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </text>
     </text>
-    <image id="n0_q08x" name="n0" src="q08xp" fileName="images/hz_tzkuang.png" xy="21,53" pkg="eg2y0ldp">
+    <image id="n0_q08x" name="n0" src="q08xp" fileName="imagesExport/hz_tzkuang.png" pkg="eg2y0ldp" xy="21,53" color="#e1cca3">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     </image>
   </displayList>
   </displayList>

+ 3 - 3
FGUIProject/assets/DressUp/components/ComboBoxSuit_popup.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="400,356">
+<component size="400,365">
   <displayList>
   <displayList>
-    <image id="n0_q08x" name="n0" src="q08xq" fileName="images/hz_tzkuang_1.png" xy="35,0" size="346,356" pkg="eg2y0ldp">
+    <image id="n0_q08x" name="n0" src="q08xq" fileName="imagesExport/hz_tzkuang_1.png" pkg="eg2y0ldp" xy="36,13">
       <relation target="" sidePair=""/>
       <relation target="" sidePair=""/>
       <relation target="n1_q08x" sidePair="height-height"/>
       <relation target="n1_q08x" sidePair="height-height"/>
     </image>
     </image>
-    <list id="n1_q08x" name="list" xy="47,10" size="322,325" overflow="scroll" lineGap="12" defaultItem="ui://mbo439wbq08x13">
+    <list id="n1_q08x" name="list" xy="48,27" size="322,325" overflow="scroll" lineGap="12" defaultItem="ui://mbo439wbq08x13" align="center">
       <relation target="" sidePair=""/>
       <relation target="" sidePair=""/>
       <item/>
       <item/>
       <item/>
       <item/>

+ 4 - 4
FGUIProject/assets/DressUp/components/Component1.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="257,72">
+<component size="350,75" overflow="hidden">
   <controller name="c1" pages="0,,1," selected="0"/>
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
   <displayList>
-    <image id="n29_pjip" name="n29" src="j48o3z" fileName="images/dz_hz_fsk_1.png" xy="0,0"/>
-    <image id="n28_pjip" name="n28" src="j48o3y" fileName="images/dz_hz_bxbx.png" xy="185,0">
+    <image id="n29_pjip" name="n29" src="wonodz" fileName="images/dz_hz_fsk_2.png" xy="50,9"/>
+    <image id="n28_pjip" name="n28" src="j48o3y" fileName="images/dz_hz_bxbx.png" xy="0,0">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay controller="c1" pages="0"/>
     </image>
     </image>
-    <text id="n30_pjip" name="txtNeedName" xy="1,16" pivot="0.5,0" size="200,39" fontSize="28" color="#fff0db" align="center" vAlign="middle" autoClearText="true" text="孔雀东南飞·绣">
+    <text id="n30_pjip" name="txtNeedName" xy="76,16" size="188,39" fontSize="28" color="#b08649" vAlign="middle" letterSpacing="-2" autoClearText="true" text="孔雀东南飞·绣">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay controller="c1" pages="0"/>
     </text>
     </text>
     <list id="n31_oixc" name="listTag" xy="18,18" size="220,38" layout="row" lineGap="12" colGap="22" defaultItem="ui://eg2y0ldpih7566" vAlign="middle" autoClearItems="true">
     <list id="n31_oixc" name="listTag" xy="18,18" size="220,38" layout="row" lineGap="12" colGap="22" defaultItem="ui://eg2y0ldpih7566" vAlign="middle" autoClearItems="true">

+ 3 - 3
FGUIProject/assets/DressUp/components/PartsList.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="220,1920" opaque="false">
+<component size="226,1920" opaque="false">
   <displayList>
   <displayList>
-    <component id="n0_k6he" name="comboBoxRarity" src="k6he25" fileName="components/ComboBoxRarity.xml" xy="0,2">
+    <component id="n0_k6he" name="comboBoxRarity" src="k6he25" fileName="components/ComboBoxRarity.xml" xy="0,0" size="226,62">
       <ComboBox visibleItemCount="10" autoClearItems="true">
       <ComboBox visibleItemCount="10" autoClearItems="true">
         <item title="高稀有度"/>
         <item title="高稀有度"/>
         <item title="中稀有度"/>
         <item title="中稀有度"/>
         <item title="低稀有度"/>
         <item title="低稀有度"/>
       </ComboBox>
       </ComboBox>
     </component>
     </component>
-    <list id="n1_k6he" name="list" xy="6,76" size="208,1844" overflow="scroll" lineGap="35" defaultItem="ui://mbo439wbk6he26" autoClearItems="true">
+    <list id="n1_k6he" name="list" xy="-3,76" size="232,1844" overflow="scroll" lineGap="35" defaultItem="ui://mbo439wbk6he26" autoClearItems="true">
       <relation target="" sidePair="top-top"/>
       <relation target="" sidePair="top-top"/>
       <item/>
       <item/>
       <item/>
       <item/>

+ 12 - 11
FGUIProject/assets/DressUp/components/PartsListItem.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="210,235">
+<component size="232,240">
   <displayList>
   <displayList>
-    <loader id="n9_94m1" name="loaBorder" xy="15,0" size="178,178" url="ui://mbo439wb94m1dl" autoSize="true"/>
-    <loader id="n1_k6he" name="icon" xy="50,32" pivot="0.5,0.5" size="110,110" aspect="true" url="ui://mbo439wbk6he1z" align="center" vAlign="middle" fill="scale" clearOnPublish="true">
+    <loader id="n9_94m1" name="loaBorder" xy="39,0" size="178,178" visible="false" url="ui://mbo439wb94m1dl" autoSize="true"/>
+    <loader id="n1_k6he" name="icon" xy="85,34" pivot="0.5,0.5" size="110,110" aspect="true" url="ui://mbo439wbk6he1z" align="center" vAlign="middle" fill="scale" clearOnPublish="true">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     </loader>
-    <image id="n2_k6he" name="n2" src="k6he1y" fileName="images/hz_minzikuang.png" xy="8,186"/>
-    <text id="n3_k6he" name="txtTitle" xy="35,187" pivot="0.5,0" size="144,39" fontSize="28" color="#fff6e9" align="center" leading="0" text="繁星点点啊"/>
-    <image id="n4_qsvd" name="iconSelected" src="qsvd2l" fileName="images/hz_xzyfxz.png" xy="15,0"/>
-    <loader id="n7_d4iw" name="rarity" xy="158,14" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <loader id="n5_8xpg" name="ScoreType" xy="19,125" size="50,50" touchable="false" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n6_8xpg" name="txtScore" xy="66,128" pivot="0.5,0" size="77,41" fontSize="30" color="#fcf7e6" align="center" strokeColor="#a7854a" strokeSize="2" autoClearText="true" text="3500"/>
-    <image id="n8_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="2,63"/>
-    <image id="n10_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="142,107"/>
+    <image id="n4_qsvd" name="iconSelected" src="qsvd2l" fileName="images/hz_xzyfxz.png" xy="33,0"/>
+    <loader id="n7_d4iw" name="rarity" xy="184,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <loader id="n5_8xpg" name="ScoreType" xy="31,141" size="50,50" touchable="false" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <text id="n6_8xpg" name="txtScore" xy="154,160" pivot="0.5,0" size="69,36" font="ui://eg2y0ldpwonotjc" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
+    <image id="n8_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="24,0"/>
+    <image id="n10_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,70"/>
+    <image id="n2_k6he" name="n2" src="k6he1y" fileName="images/hz_minzikuang.png" xy="24,198" group="n11_wono"/>
+    <text id="n3_k6he" name="txtTitle" xy="53,199" pivot="0.5,0" size="152,41" group="n11_wono" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#b58f54" align="center" leading="0" text="繁星点点啊"/>
+    <group id="n11_wono" name="n11" xy="24,198" size="208,43"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 8 - 4
FGUIProject/assets/DressUp/components/TypeItem.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="142,161">
+<component size="216,210">
   <displayList>
   <displayList>
-    <loader id="n0_k6he" name="icon" xy="14,0" size="128,161" url="ui://mbo439wbq08x9" align="center" vAlign="middle" autoSize="true" playing="false" clearOnPublish="true"/>
-    <image id="n3_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="0,0"/>
-    <image id="n4_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="-6,63"/>
+    <image id="n5_wono" name="n5" src="wonodu" fileName="images/hz_yjmzdi_2.png" xy="24,0" group="n8_wono"/>
+    <loader id="n0_k6he" name="icon" xy="120,96" pivot="0.5,0.5" anchor="true" size="102,102" group="n8_wono" url="ui://mbo439wbq08x9" align="center" vAlign="middle" autoSize="true" playing="false" clearOnPublish="true"/>
+    <image id="n3_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="24,0" group="n8_wono"/>
+    <image id="n4_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,63" group="n8_wono"/>
+    <image id="n6_wono" name="n6" src="wonodt" fileName="images/hz_yjmzdi_1.png" xy="42,168" group="n8_wono"/>
+    <text id="n7_wono" name="txtname" xy="86,167" pivot="0.5,0" size="68,44" group="n8_wono" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#bc9456" text="发型"/>
+    <group id="n8_wono" name="n8" xy="0,0" size="216,211"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 3 - 3
FGUIProject/assets/DressUp/componentsDialog/Button2.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="270,48" extention="Button">
+<component size="215,56" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
   <displayList>
-    <image id="n5_jj0m" name="n5" src="jj0m5k" fileName="images/hz_zdzddg_3.png" xy="24,0"/>
     <image id="n3_jj0m" name="n3" src="jj0m5l" fileName="images/hz_zdzddg_1.png" xy="0,0">
     <image id="n3_jj0m" name="n3" src="jj0m5l" fileName="images/hz_zdzddg_1.png" xy="0,0">
       <gearDisplay controller="button" pages="0"/>
       <gearDisplay controller="button" pages="0"/>
     </image>
     </image>
-    <image id="n4_jj0m" name="n4" src="jj0m5j" fileName="images/hz_zdzddg_2.png" xy="-1,0">
+    <image id="n4_jj0m" name="n4" src="jj0m5j" fileName="images/hz_zdzddg_2.png" xy="0,0">
       <gearDisplay controller="button" pages="1"/>
       <gearDisplay controller="button" pages="1"/>
     </image>
     </image>
+    <text id="n6_wono" name="title" xy="77,5" size="132,44" font="ui://eg2y0ldpwonotj9" fontSize="32" color="#fcf2f2" strokeColor="#cea86e" strokeSize="2" text="自动战斗"/>
   </displayList>
   </displayList>
   <Button mode="Check"/>
   <Button mode="Check"/>
 </component>
 </component>

BIN
FGUIProject/assets/DressUp/images/dz_dididcis.png


BIN
FGUIProject/assets/DressUp/images/dz_hz_anniu_1.png


BIN
FGUIProject/assets/DressUp/images/dz_hz_anniu_2.png


BIN
FGUIProject/assets/DressUp/images/dz_hz_bxbx.png


BIN
FGUIProject/assets/DressUp/images/dz_hz_fsk_1.png


BIN
FGUIProject/assets/DressUp/images/dz_hz_fsk_2.png


BIN
FGUIProject/assets/DressUp/images/hz_anniuty.png


BIN
FGUIProject/assets/DressUp/images/hz_bcbc_1.png


BIN
FGUIProject/assets/DressUp/images/hz_dakai.png


BIN
FGUIProject/assets/DressUp/images/hz_dakai_1.png


BIN
FGUIProject/assets/DressUp/images/hz_fanhuibu.png


BIN
FGUIProject/assets/DressUp/images/hz_huifubu.png


BIN
FGUIProject/assets/DressUp/images/hz_minzikuang.png


BIN
FGUIProject/assets/DressUp/images/hz_paizhao.png


BIN
FGUIProject/assets/DressUp/images/hz_qhdzqh.png


BIN
FGUIProject/assets/DressUp/images/hz_shanchu.png


BIN
FGUIProject/assets/DressUp/images/hz_ssuo.png


BIN
FGUIProject/assets/DressUp/images/hz_sxkuang.png


BIN
FGUIProject/assets/DressUp/images/hz_tzkuang.png


BIN
FGUIProject/assets/DressUp/images/hz_tzkuang_1.png


BIN
FGUIProject/assets/DressUp/images/hz_xianshi.png


BIN
FGUIProject/assets/DressUp/images/hz_xzkuang.png


BIN
FGUIProject/assets/DressUp/images/hz_xzyfxz.png


BIN
FGUIProject/assets/DressUp/images/hz_yingc.png


BIN
FGUIProject/assets/DressUp/images/hz_yjmzdi_1.png


BIN
FGUIProject/assets/DressUp/images/hz_yjmzdi_2.png


BIN
FGUIProject/assets/DressUp/images/hz_zdzddg_1.png


BIN
FGUIProject/assets/DressUp/images/hz_zdzddg_2.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_1.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_10.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_11.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_12.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_2.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_3.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_4.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_5.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_6.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_7.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_8.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleitu_9.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_1.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_10.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_11.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_12.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_2.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_3.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_4.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_5.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_6.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_7.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_8.png


BIN
FGUIProject/assets/DressUp/imagesExport/hz_fenleituej_9.png


+ 6 - 0
FGUIProject/assets/DressUp/package.xml

@@ -161,6 +161,12 @@
     <image id="uyuxdq" name="pz_icon_5.png" path="/images/"/>
     <image id="uyuxdq" name="pz_icon_5.png" path="/images/"/>
     <image id="wonodr" name="pz_icon_66.png" path="/images/"/>
     <image id="wonodr" name="pz_icon_66.png" path="/images/"/>
     <image id="wonods" name="pz_icon_55.png" path="/images/"/>
     <image id="wonods" name="pz_icon_55.png" path="/images/"/>
+    <image id="wonodt" name="hz_yjmzdi_1.png" path="/images/"/>
+    <image id="wonodu" name="hz_yjmzdi_2.png" path="/images/"/>
+    <image id="wonodw" name="hz_anniuty.png" path="/images/"/>
+    <image id="wonodx" name="hz_xzkuang.png" path="/images/"/>
+    <component id="wonody" name="Button13.xml" path="/components/"/>
+    <image id="wonodz" name="dz_hz_fsk_2.png" path="/images/"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 12 - 12
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpFightUI.cs

@@ -19,19 +19,19 @@ namespace UI.DressUp
         public UI_comListType m_comListType2;
         public UI_comListType m_comListType2;
         public UI_PartsList m_partsList;
         public UI_PartsList m_partsList;
         public UI_PartsList m_partsList2;
         public UI_PartsList m_partsList2;
-        public GButton m_btnHint;
         public GGraph m_btnClose;
         public GGraph m_btnClose;
         public GTextField m_txtHint;
         public GTextField m_txtHint;
         public GGroup m_groupTaskHint;
         public GGroup m_groupTaskHint;
         public GLoader m_btnGuide;
         public GLoader m_btnGuide;
+        public GButton m_btnNext;
+        public GButton m_btnRecommend;
+        public GButton m_btnAutoPlay;
+        public GButton m_btnHint;
         public GButton m_btnClothingShop;
         public GButton m_btnClothingShop;
         public GButton m_btnRepeal;
         public GButton m_btnRepeal;
         public GButton m_btnRenewal;
         public GButton m_btnRenewal;
         public GButton m_btnDelete;
         public GButton m_btnDelete;
         public GButton m_btnSearch;
         public GButton m_btnSearch;
-        public GButton m_btnNext;
-        public GButton m_btnRecommend;
-        public GButton m_btnAutoPlay;
         public GTextField m_txtRecommendCount;
         public GTextField m_txtRecommendCount;
         public GGroup m_graContent;
         public GGroup m_graContent;
         public const string URL = "ui://mbo439wbqsvd2m";
         public const string URL = "ui://mbo439wbqsvd2m";
@@ -93,19 +93,19 @@ namespace UI.DressUp
             m_comListType2 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType2"));
             m_comListType2 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType2"));
             m_partsList = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList"));
             m_partsList = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList"));
             m_partsList2 = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList2"));
             m_partsList2 = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList2"));
-            m_btnHint = (GButton)comp.GetChild("btnHint");
             m_btnClose = (GGraph)comp.GetChild("btnClose");
             m_btnClose = (GGraph)comp.GetChild("btnClose");
             m_txtHint = (GTextField)comp.GetChild("txtHint");
             m_txtHint = (GTextField)comp.GetChild("txtHint");
             m_groupTaskHint = (GGroup)comp.GetChild("groupTaskHint");
             m_groupTaskHint = (GGroup)comp.GetChild("groupTaskHint");
             m_btnGuide = (GLoader)comp.GetChild("btnGuide");
             m_btnGuide = (GLoader)comp.GetChild("btnGuide");
+            m_btnNext = (GButton)comp.GetChild("btnNext");
+            m_btnRecommend = (GButton)comp.GetChild("btnRecommend");
+            m_btnAutoPlay = (GButton)comp.GetChild("btnAutoPlay");
+            m_btnHint = (GButton)comp.GetChild("btnHint");
             m_btnClothingShop = (GButton)comp.GetChild("btnClothingShop");
             m_btnClothingShop = (GButton)comp.GetChild("btnClothingShop");
             m_btnRepeal = (GButton)comp.GetChild("btnRepeal");
             m_btnRepeal = (GButton)comp.GetChild("btnRepeal");
             m_btnRenewal = (GButton)comp.GetChild("btnRenewal");
             m_btnRenewal = (GButton)comp.GetChild("btnRenewal");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
-            m_btnNext = (GButton)comp.GetChild("btnNext");
-            m_btnRecommend = (GButton)comp.GetChild("btnRecommend");
-            m_btnAutoPlay = (GButton)comp.GetChild("btnAutoPlay");
             m_txtRecommendCount = (GTextField)comp.GetChild("txtRecommendCount");
             m_txtRecommendCount = (GTextField)comp.GetChild("txtRecommendCount");
             m_graContent = (GGroup)comp.GetChild("graContent");
             m_graContent = (GGroup)comp.GetChild("graContent");
         }
         }
@@ -128,19 +128,19 @@ namespace UI.DressUp
             m_partsList = null;
             m_partsList = null;
             m_partsList2.Dispose();
             m_partsList2.Dispose();
             m_partsList2 = null;
             m_partsList2 = null;
-            m_btnHint = null;
             m_btnClose = null;
             m_btnClose = null;
             m_txtHint = null;
             m_txtHint = null;
             m_groupTaskHint = null;
             m_groupTaskHint = null;
             m_btnGuide = null;
             m_btnGuide = null;
+            m_btnNext = null;
+            m_btnRecommend = null;
+            m_btnAutoPlay = null;
+            m_btnHint = null;
             m_btnClothingShop = null;
             m_btnClothingShop = null;
             m_btnRepeal = null;
             m_btnRepeal = null;
             m_btnRenewal = null;
             m_btnRenewal = null;
             m_btnDelete = null;
             m_btnDelete = null;
             m_btnSearch = null;
             m_btnSearch = null;
-            m_btnNext = null;
-            m_btnRecommend = null;
-            m_btnAutoPlay = null;
             m_txtRecommendCount = null;
             m_txtRecommendCount = null;
             m_graContent = null;
             m_graContent = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)

+ 6 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpUI.cs

@@ -11,7 +11,6 @@ namespace UI.DressUp
         public GGraph m_touchPad;
         public GGraph m_touchPad;
         public GLoader m_loaShow;
         public GLoader m_loaShow;
         public GButton m_btnShow;
         public GButton m_btnShow;
-        public GButton m_btnHide;
         public GButton m_btnBack;
         public GButton m_btnBack;
         public GButton m_btnHome;
         public GButton m_btnHome;
         public GComboBox m_comboBox;
         public GComboBox m_comboBox;
@@ -19,13 +18,14 @@ namespace UI.DressUp
         public UI_comListType m_comListType2;
         public UI_comListType m_comListType2;
         public UI_PartsList m_partsList;
         public UI_PartsList m_partsList;
         public UI_PartsList m_partsList2;
         public UI_PartsList m_partsList2;
+        public GButton m_btnSave;
         public GButton m_btnAction;
         public GButton m_btnAction;
         public GButton m_btnPhoto;
         public GButton m_btnPhoto;
         public GButton m_btnLastStep;
         public GButton m_btnLastStep;
         public GButton m_btnNextStep;
         public GButton m_btnNextStep;
         public GButton m_btnDelete;
         public GButton m_btnDelete;
         public GButton m_btnSearch;
         public GButton m_btnSearch;
-        public GButton m_btnSave;
+        public GButton m_btnHide;
         public GGroup m_grpContent;
         public GGroup m_grpContent;
         public const string URL = "ui://mbo439wbq08x0";
         public const string URL = "ui://mbo439wbq08x0";
         public const string PACKAGE_NAME = "DressUp";
         public const string PACKAGE_NAME = "DressUp";
@@ -78,7 +78,6 @@ namespace UI.DressUp
             m_touchPad = (GGraph)comp.GetChild("touchPad");
             m_touchPad = (GGraph)comp.GetChild("touchPad");
             m_loaShow = (GLoader)comp.GetChild("loaShow");
             m_loaShow = (GLoader)comp.GetChild("loaShow");
             m_btnShow = (GButton)comp.GetChild("btnShow");
             m_btnShow = (GButton)comp.GetChild("btnShow");
-            m_btnHide = (GButton)comp.GetChild("btnHide");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnHome = (GButton)comp.GetChild("btnHome");
             m_btnHome = (GButton)comp.GetChild("btnHome");
             m_comboBox = (GComboBox)comp.GetChild("comboBox");
             m_comboBox = (GComboBox)comp.GetChild("comboBox");
@@ -86,13 +85,14 @@ namespace UI.DressUp
             m_comListType2 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType2"));
             m_comListType2 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType2"));
             m_partsList = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList"));
             m_partsList = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList"));
             m_partsList2 = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList2"));
             m_partsList2 = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList2"));
+            m_btnSave = (GButton)comp.GetChild("btnSave");
             m_btnAction = (GButton)comp.GetChild("btnAction");
             m_btnAction = (GButton)comp.GetChild("btnAction");
             m_btnPhoto = (GButton)comp.GetChild("btnPhoto");
             m_btnPhoto = (GButton)comp.GetChild("btnPhoto");
             m_btnLastStep = (GButton)comp.GetChild("btnLastStep");
             m_btnLastStep = (GButton)comp.GetChild("btnLastStep");
             m_btnNextStep = (GButton)comp.GetChild("btnNextStep");
             m_btnNextStep = (GButton)comp.GetChild("btnNextStep");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
-            m_btnSave = (GButton)comp.GetChild("btnSave");
+            m_btnHide = (GButton)comp.GetChild("btnHide");
             m_grpContent = (GGroup)comp.GetChild("grpContent");
             m_grpContent = (GGroup)comp.GetChild("grpContent");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
@@ -101,7 +101,6 @@ namespace UI.DressUp
             m_touchPad = null;
             m_touchPad = null;
             m_loaShow = null;
             m_loaShow = null;
             m_btnShow = null;
             m_btnShow = null;
-            m_btnHide = null;
             m_btnBack = null;
             m_btnBack = null;
             m_btnHome = null;
             m_btnHome = null;
             m_comboBox = null;
             m_comboBox = null;
@@ -113,13 +112,14 @@ namespace UI.DressUp
             m_partsList = null;
             m_partsList = null;
             m_partsList2.Dispose();
             m_partsList2.Dispose();
             m_partsList2 = null;
             m_partsList2 = null;
+            m_btnSave = null;
             m_btnAction = null;
             m_btnAction = null;
             m_btnPhoto = null;
             m_btnPhoto = null;
             m_btnLastStep = null;
             m_btnLastStep = null;
             m_btnNextStep = null;
             m_btnNextStep = null;
             m_btnDelete = null;
             m_btnDelete = null;
             m_btnSearch = null;
             m_btnSearch = null;
-            m_btnSave = null;
+            m_btnHide = null;
             m_grpContent = null;
             m_grpContent = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PartsListItem.cs

@@ -9,13 +9,13 @@ namespace UI.DressUp
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBorder;
         public GLoader m_loaBorder;
         public GLoader m_icon;
         public GLoader m_icon;
-        public GTextField m_txtTitle;
         public GImage m_iconSelected;
         public GImage m_iconSelected;
         public GLoader m_rarity;
         public GLoader m_rarity;
         public GLoader m_ScoreType;
         public GLoader m_ScoreType;
         public GTextField m_txtScore;
         public GTextField m_txtScore;
         public GImage m_imgNeed;
         public GImage m_imgNeed;
         public GImage m_imgNew;
         public GImage m_imgNew;
+        public GTextField m_txtTitle;
         public const string URL = "ui://mbo439wbk6he26";
         public const string URL = "ui://mbo439wbk6he26";
         public const string PACKAGE_NAME = "DressUp";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "PartsListItem";
         public const string RES_NAME = "PartsListItem";
@@ -65,25 +65,25 @@ namespace UI.DressUp
         {
         {
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_icon = (GLoader)comp.GetChild("icon");
             m_icon = (GLoader)comp.GetChild("icon");
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_iconSelected = (GImage)comp.GetChild("iconSelected");
             m_iconSelected = (GImage)comp.GetChild("iconSelected");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_ScoreType = (GLoader)comp.GetChild("ScoreType");
             m_ScoreType = (GLoader)comp.GetChild("ScoreType");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_imgNeed = (GImage)comp.GetChild("imgNeed");
             m_imgNeed = (GImage)comp.GetChild("imgNeed");
             m_imgNew = (GImage)comp.GetChild("imgNew");
             m_imgNew = (GImage)comp.GetChild("imgNew");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_loaBorder = null;
             m_loaBorder = null;
             m_icon = null;
             m_icon = null;
-            m_txtTitle = null;
             m_iconSelected = null;
             m_iconSelected = null;
             m_rarity = null;
             m_rarity = null;
             m_ScoreType = null;
             m_ScoreType = null;
             m_txtScore = null;
             m_txtScore = null;
             m_imgNeed = null;
             m_imgNeed = null;
             m_imgNew = null;
             m_imgNew = null;
+            m_txtTitle = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_TypeItem.cs

@@ -10,6 +10,7 @@ namespace UI.DressUp
         public GLoader m_icon;
         public GLoader m_icon;
         public GImage m_imgNeed;
         public GImage m_imgNeed;
         public GImage m_imgNew;
         public GImage m_imgNew;
+        public GTextField m_txtname;
         public const string URL = "ui://mbo439wbk6he16";
         public const string URL = "ui://mbo439wbk6he16";
         public const string PACKAGE_NAME = "DressUp";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "TypeItem";
         public const string RES_NAME = "TypeItem";
@@ -60,12 +61,14 @@ namespace UI.DressUp
             m_icon = (GLoader)comp.GetChild("icon");
             m_icon = (GLoader)comp.GetChild("icon");
             m_imgNeed = (GImage)comp.GetChild("imgNeed");
             m_imgNeed = (GImage)comp.GetChild("imgNeed");
             m_imgNew = (GImage)comp.GetChild("imgNew");
             m_imgNew = (GImage)comp.GetChild("imgNew");
+            m_txtname = (GTextField)comp.GetChild("txtname");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_icon = null;
             m_icon = null;
             m_imgNeed = null;
             m_imgNeed = null;
             m_imgNew = null;
             m_imgNew = null;
+            m_txtname = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -728,6 +728,7 @@ namespace GFGGame
             UI_TypeItem typeItem = UI_TypeItem.Proxy(item);
             UI_TypeItem typeItem = UI_TypeItem.Proxy(item);
             DressUpMenuItemCfg1 item1 = DressUpMenuItemCfg1Array.Instance.dataArray[index];
             DressUpMenuItemCfg1 item1 = DressUpMenuItemCfg1Array.Instance.dataArray[index];
             typeItem.m_icon.url = "ui://DressUp/hz_fenleitu_" + item1.id;
             typeItem.m_icon.url = "ui://DressUp/hz_fenleitu_" + item1.id;
+            typeItem.m_txtname.text = item1.name;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconzi_" + item1.id;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconzi_" + item1.id;
             typeItem.target.data = item1.id;
             typeItem.target.data = item1.id;
             typeItem.m_imgNeed.visible = ItemUtil.CheckMenuType1(_fightCfg.needItemId, _fightCfg.needSuitId, item1.id);
             typeItem.m_imgNeed.visible = ItemUtil.CheckMenuType1(_fightCfg.needItemId, _fightCfg.needSuitId, item1.id);
@@ -740,6 +741,7 @@ namespace GFGGame
             UI_TypeItem typeItem = UI_TypeItem.Proxy(item);
             UI_TypeItem typeItem = UI_TypeItem.Proxy(item);
             DressUpMenuItemCfg2 item2 = DressUpMenuItemCfg2Array.Instance.dataArray[_currentList2[index] - 1];
             DressUpMenuItemCfg2 item2 = DressUpMenuItemCfg2Array.Instance.dataArray[_currentList2[index] - 1];
             typeItem.m_icon.url = "ui://DressUp/hz_fenleituej_" + item2.id;
             typeItem.m_icon.url = "ui://DressUp/hz_fenleituej_" + item2.id;
+            typeItem.m_txtname.text = item2.name;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconziej_" + item2.id;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconziej_" + item2.id;
             typeItem.target.data = item2.id;
             typeItem.target.data = item2.id;
             var subType = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
             var subType = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);

+ 3 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -547,6 +547,7 @@ namespace GFGGame
             UI_TypeItem typeItem = UI_TypeItem.Proxy(item);
             UI_TypeItem typeItem = UI_TypeItem.Proxy(item);
             DressUpMenuItemCfg1 item1 = DressUpMenuItemCfg1Array.Instance.dataArray[index];
             DressUpMenuItemCfg1 item1 = DressUpMenuItemCfg1Array.Instance.dataArray[index];
             typeItem.m_icon.url = "ui://DressUp/hz_fenleitu_" + item1.id;
             typeItem.m_icon.url = "ui://DressUp/hz_fenleitu_" + item1.id;
+            typeItem.m_txtname.text = item1.name;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconzi_" + item1.id;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconzi_" + item1.id;
             typeItem.target.data = item1.id;
             typeItem.target.data = item1.id;
             typeItem.m_imgNeed.visible = false;
             typeItem.m_imgNeed.visible = false;
@@ -560,6 +561,7 @@ namespace GFGGame
             UI_TypeItem typeItem = UI_TypeItem.Proxy(item);
             UI_TypeItem typeItem = UI_TypeItem.Proxy(item);
             DressUpMenuItemCfg2 item2 = DressUpMenuItemCfg2Array.Instance.dataArray[_currentList2[index] - 1];
             DressUpMenuItemCfg2 item2 = DressUpMenuItemCfg2Array.Instance.dataArray[_currentList2[index] - 1];
             typeItem.m_icon.url = "ui://DressUp/hz_fenleituej_" + item2.id;
             typeItem.m_icon.url = "ui://DressUp/hz_fenleituej_" + item2.id;
+            typeItem.m_txtname.text = item2.name;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconziej_" + item2.id;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconziej_" + item2.id;
             typeItem.target.data = item2.id;
             typeItem.target.data = item2.id;
             typeItem.m_imgNeed.visible = false;
             typeItem.m_imgNeed.visible = false;
@@ -828,9 +830,8 @@ namespace GFGGame
         }
         }
         private void OnClickLoaShow()
         private void OnClickLoaShow()
         {
         {
-            Timers.inst.Remove(SetBtnShowVisable);
             _ui.m_btnShow.alpha = 1;
             _ui.m_btnShow.alpha = 1;
-            Timers.inst.Add(2f, 1, SetBtnShowVisable);
+            // Timers.inst.Add(2f, 1, SetBtnShowVisable);
             _ui.m_btnShow.enabled = true;
             _ui.m_btnShow.enabled = true;
 
 
         }
         }

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -41,6 +41,8 @@ namespace GFGGame
             FontManager.RegisterFont(new DynamicFont("YUNJINSONG", afont4));
             FontManager.RegisterFont(new DynamicFont("YUNJINSONG", afont4));
             Font afont5 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("NANSONG"));
             Font afont5 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("NANSONG"));
             FontManager.RegisterFont(new DynamicFont("NANSONG", afont5));
             FontManager.RegisterFont(new DynamicFont("NANSONG", afont5));
+            Font afont6 = GFGAsset.Load<Font>(ResPathUtil.GetFontPath("FANGZHENGYANSONG"));
+            FontManager.RegisterFont(new DynamicFont("FANGZHENGYANSONG", afont6));
             _viewDic = new Dictionary<string, UIView>();
             _viewDic = new Dictionary<string, UIView>();
             //��ʼ����ͼ������
             //��ʼ����ͼ������
             _bottomLayer = CreateLayer("BottomLayer");
             _bottomLayer = CreateLayer("BottomLayer");

BIN
GameClient/Assets/ResIn/Font/FANGZHENGYANSONG.TTF


+ 21 - 0
GameClient/Assets/ResIn/Font/FANGZHENGYANSONG.TTF.meta

@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: d8be3ad3828ddbd45b28d9d57b5c5fca
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - FZYanSongS-M-GB
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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


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


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


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


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


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas1!a.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas1.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes