浏览代码

换装替换资源

zhaoyang 2 年之前
父节点
当前提交
e5c9556e74
共有 41 个文件被更改,包括 130 次插入95 次删除
  1. 35 33
      FGUIProject/assets/DressUp/DressUpFightUI.xml
  2. 14 14
      FGUIProject/assets/DressUp/DressUpUI.xml
  3. 6 2
      FGUIProject/assets/DressUp/comListType.xml
  4. 13 0
      FGUIProject/assets/DressUp/components/Button14.xml
  5. 2 2
      FGUIProject/assets/DressUp/components/ComboBoxRarity_item.xml
  6. 3 3
      FGUIProject/assets/DressUp/components/ComboBoxRarity_popup.xml
  7. 2 2
      FGUIProject/assets/DressUp/components/Component1.xml
  8. 10 3
      FGUIProject/assets/DressUp/components/PartsList.xml
  9. 9 9
      FGUIProject/assets/DressUp/components/PartsListItem.xml
  10. 8 7
      FGUIProject/assets/DressUp/components/TypeItem.xml
  11. 5 4
      FGUIProject/assets/DressUp/componentsDialog/Button2.xml
  12. 二进制
      FGUIProject/assets/DressUp/images/dz_dididcis.png
  13. 二进制
      FGUIProject/assets/DressUp/images/dz_dididcis_1.png
  14. 二进制
      FGUIProject/assets/DressUp/images/dz_hz_fsk_1.png
  15. 二进制
      FGUIProject/assets/DressUp/images/dz_hz_fsk_2.png
  16. 二进制
      FGUIProject/assets/DressUp/images/hz_anniuty_1.png
  17. 二进制
      FGUIProject/assets/DressUp/images/hz_fanhuibu.png
  18. 二进制
      FGUIProject/assets/DressUp/images/hz_fzd.png
  19. 二进制
      FGUIProject/assets/DressUp/images/hz_huifubu.png
  20. 二进制
      FGUIProject/assets/DressUp/images/hz_paizhao.png
  21. 二进制
      FGUIProject/assets/DressUp/images/hz_qhdzqh.png
  22. 二进制
      FGUIProject/assets/DressUp/images/hz_rwts.png
  23. 二进制
      FGUIProject/assets/DressUp/images/hz_shanchu.png
  24. 二进制
      FGUIProject/assets/DressUp/images/hz_ssuo.png
  25. 二进制
      FGUIProject/assets/DressUp/images/hz_xianshi.png
  26. 二进制
      FGUIProject/assets/DressUp/images/hz_yingc.png
  27. 二进制
      FGUIProject/assets/DressUp/images/hz_zdikuang_1.png
  28. 二进制
      FGUIProject/assets/DressUp/images/hz_zdikuang_2.png
  29. 二进制
      FGUIProject/assets/DressUp/images/hz_zdzddg_1.png
  30. 二进制
      FGUIProject/assets/DressUp/images/hz_zdzddg_2.png
  31. 二进制
      FGUIProject/assets/DressUp/images/hz_zdzddg_3.png
  32. 7 0
      FGUIProject/assets/DressUp/package.xml
  33. 12 12
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpFightUI.cs
  34. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PartsListItem.cs
  35. 1 1
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs
  36. 二进制
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  37. 二进制
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png
  38. 二进制
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0.png
  39. 二进制
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png
  40. 二进制
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png
  41. 二进制
      GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes

+ 35 - 33
FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -18,81 +18,83 @@
     <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"/>
     </component>
-    <image id="n16_8xpg" name="n16" src="j48o3z" fileName="images/dz_hz_fsk_1.png" xy="22,230" group="n33_j48o">
+    <image id="n16_8xpg" name="n16" src="j48o3z" fileName="images/dz_hz_fsk_1.png" xy="23,230" group="n33_j48o">
       <relation target="n2_qsvd" sidePair="left-left,top-top"/>
     </image>
-    <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">
+    <loader id="n24_d4iw" name="scoreType" xy="18,233" size="50,50" group="n33_j48o" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <text id="n14_vxw5" name="txtScore" xy="84,232" size="143,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"/>
     </text>
-    <group id="n33_j48o" name="n33" xy="0,230" size="274,56" group="n38_8lqj"/>
+    <group id="n33_j48o" name="n33" xy="18,230" size="209,57" 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">
+    <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="830,0" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
     <component id="n32_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="1080,0" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
-    <component id="n10_qsvd" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1080,65" size="232,1828" group="n38_8lqj">
+    <component id="n10_qsvd" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n38_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
-    <component id="n40_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,65" size="232,1828" group="n38_8lqj">
+    <component id="n40_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n38_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
     <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"/>
     </graph>
-    <image id="n21_8xpg" name="n21" src="8xpg2s" fileName="images/dz_hz_rwdh_1.png" xy="33,978" group="n45_wono">
+    <image id="n21_8xpg" name="n21" src="8xpg2s" fileName="images/dz_hz_rwdh_1.png" xy="33,978" group="n46_wono">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
-    <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="清梦清梦清梦清梦清梦清梦 清梦清梦清梦清梦">
+    <text id="n22_8xpg" name="txtHint" xy="48,977" size="364,107" group="n46_wono" fontSize="30" color="#997350" align="center" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="清梦清梦清梦清梦清梦清梦 清梦清梦清梦清梦">
       <relation target="" sidePair="bottom-bottom"/>
     </text>
-    <group id="n45_wono" name="n45" xy="33,977" size="394,132" group="n23_8xpg"/>
+    <group id="n46_wono" name="n46" xy="33,977" size="394,132" group="n23_8xpg" advanced="true">
+      <relation target="n44_wono" sidePair="top-bottom"/>
+    </group>
     <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">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
-    <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 id="n39_njn2" name="btnAutoPlay" src="jj0mdk" fileName="componentsDialog/Button2.xml" xy="172,1623" group="n38_8lqj">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-    </component>
-    <component id="n15_vxw5" name="btnHint" src="f4xv3o" fileName="components/Button6.xml" xy="27,1140" size="122,114" group="n44_wono">
+    <component id="n15_vxw5" name="btnHint" src="f4xv3o" fileName="components/Button6.xml" xy="27,1120" size="122,114" group="n44_wono">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="任务提示" titleColor="#ffffff" titleFontSize="42" icon="ui://mbo439wb8xpg2q"/>
     </component>
-    <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="47,1267" size="122,114" group="n44_wono" visible="false">
+    <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="46,1247" size="122,114" group="n44_wono" visible="false">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wb8xpg2n"/>
     </component>
-    <component id="n4_qsvd" name="btnRepeal" src="f4xv3o" fileName="components/Button6.xml" xy="47,1286" group="n44_wono">
+    <component id="n4_qsvd" name="btnRepeal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1266" size="84,87" group="n44_wono">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n5_qsvd" name="btnRenewal" src="f4xv3o" fileName="components/Button6.xml" xy="47,1400" group="n44_wono">
+    <component id="n5_qsvd" name="btnRenewal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1385" size="84,87" group="n44_wono">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n6_qsvd" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="47,1514" group="n44_wono">
+    <component id="n6_qsvd" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="46,1504" size="84,87" group="n44_wono">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wbq08xn"/>
     </component>
-    <component id="n7_qsvd" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="47,1628" group="n44_wono">
+    <component id="n7_qsvd" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="46,1623" size="84,87" group="n44_wono">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wbq08xo"/>
     </component>
-    <group id="n44_wono" name="n44" xy="27,1140" size="122,570" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
+    <group id="n44_wono" name="n44" xy="27,1120" size="122,590" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
       <relation target="" sidePair="bottom-bottom"/>
     </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}">
+    <loader id="n42_m1l9" name="btnGuide" xy="455,875" size="170,170" group="n38_8lqj" aspect="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <component id="n8_qsvd" name="btnNext" src="wonoe5" fileName="components/Button14.xml" xy="140,1728" group="n38_8lqj">
+      <relation target="" sidePair="bottom-bottom"/>
+      <Button title="下一步"/>
+    </component>
+    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button13.xml" xy="480,1728" group="n38_8lqj">
+      <relation target="" sidePair="bottom-bottom"/>
+      <Button title="推荐搭配"/>
+    </component>
+    <component id="n39_njn2" name="btnAutoPlay" src="jj0mdk" fileName="componentsDialog/Button2.xml" xy="355,1642" group="n38_8lqj">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+    </component>
+    <text id="n26_bx8o" name="txtRecommendCount" xy="305,1843" size="327,44" group="n38_8lqj" fontSize="32" color="#f0eeee" align="center" vars="true" text="今日剩余次数:{v1=10}/{v2=10}">
       <relation target="" sidePair="bottom-bottom"/>
     </text>
-    <group id="n38_8lqj" name="graContent" xy="0,0" size="1312,1920" advanced="true">
+    <group id="n38_8lqj" name="graContent" xy="0,0" size="1330,1920" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
   </displayList>

+ 14 - 14
FGUIProject/assets/DressUp/DressUpUI.xml

@@ -6,7 +6,7 @@
     <loader id="n31_8lqj" name="loaShow" xy="0,0" size="1080,1920" visible="false">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <component id="n28_8lqj" name="btnShow" src="f4xv3o" fileName="components/Button6.xml" xy="45,1638" visible="false">
+    <component id="n28_8lqj" name="btnShow" src="f4xv3o" fileName="components/Button6.xml" xy="56,1633" size="84,87" visible="false">
       <relation target="n34_wono" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wbrc0744"/>
     </component>
@@ -23,47 +23,47 @@
         <item title="5"/>
       </ComboBox>
     </component>
-    <component id="n25_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="864,0" group="n30_8lqj">
+    <component id="n25_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="830,0" group="n30_8lqj">
       <relation target="" sidePair="height-height"/>
     </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="830,0" group="n30_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
-    <component id="n17_k6he" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1080,65" size="232,1828" group="n30_8lqj">
+    <component id="n17_k6he" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n30_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
-    <component id="n32_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,65" size="232,1828" group="n30_8lqj">
+    <component id="n32_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n30_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
     <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">
+    <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,1156" size="101,88" group="n34_wono">
       <Button icon="ui://mbo439wbj48o3x"/>
     </component>
-    <component id="n24_f4xv" name="btnPhoto" src="f4xv3o" fileName="components/Button6.xml" xy="43,1286" size="82,92" group="n34_wono" aspect="true">
+    <component id="n24_f4xv" name="btnPhoto" src="f4xv3o" fileName="components/Button6.xml" xy="56,1276" size="84,87" group="n34_wono" aspect="true">
       <Button icon="ui://mbo439wbq08xm"/>
     </component>
-    <component id="n20_f4xv" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="45,1420" group="n34_wono" visible="false">
+    <component id="n20_f4xv" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1436" size="84,87" group="n34_wono" visible="false">
       <Button icon="ui://mbo439wbq08x6"/>
     </component>
-    <component id="n21_f4xv" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="45,1534" group="n34_wono" visible="false">
+    <component id="n21_f4xv" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1550" size="84,87" group="n34_wono" visible="false">
       <Button icon="ui://mbo439wbq08xl"/>
     </component>
-    <component id="n22_f4xv" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="45,1410" group="n34_wono">
+    <component id="n22_f4xv" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="56,1395" size="84,87" group="n34_wono">
       <Button icon="ui://mbo439wbq08xn"/>
     </component>
-    <component id="n23_f4xv" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="45,1524" group="n34_wono">
+    <component id="n23_f4xv" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="56,1514" size="84,87" group="n34_wono">
       <Button icon="ui://mbo439wbq08xo"/>
     </component>
-    <component id="n29_8lqj" name="btnHide" src="f4xv3o" fileName="components/Button6.xml" xy="45,1638" group="n34_wono">
+    <component id="n29_8lqj" name="btnHide" src="f4xv3o" fileName="components/Button6.xml" xy="56,1633" size="84,87" group="n34_wono">
       <Button icon="ui://mbo439wbrc0743"/>
     </component>
-    <group id="n34_wono" name="n34" xy="27,1140" size="122,580" group="n30_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
+    <group id="n34_wono" name="n34" xy="27,1156" size="145,564" 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">
+    <group id="n30_8lqj" name="grpContent" xy="27,0" size="1303,1920" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
   </displayList>

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

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="216,1920">
+<component size="250,1920">
   <displayList>
-    <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">
+    <image id="n15_wono" name="n15" src="wonoe4" fileName="images/hz_zdikuang_1.png" xy="0,94" size="226,1826">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <list id="n14_k6he" name="listType" xy="0,164" size="216,1757" overflow="scroll" lineGap="40" defaultItem="ui://mbo439wbk6he16" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
     </list>
+    <image id="n16_wono" name="n16" src="wonoe6" fileName="images/hz_zdikuang_2.png" xy="-13,72"/>
   </displayList>
 </component>

+ 13 - 0
FGUIProject/assets/DressUp/components/Button14.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="314,97" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_wono" name="n0" src="wonoe1" fileName="images/hz_anniuty_1.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_wono" name="title" xy="0,-5" size="314,97" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf8f2" align="center" vAlign="middle" autoSize="none" singleLine="true" text="下一步">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

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

@@ -2,10 +2,10 @@
 <component size="140,65" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <text id="n2_k6he" name="title" xy="0,0" size="140,61" fontSize="28" color="#fddeb6" align="center" vAlign="middle" autoSize="none" singleLine="true" text="高稀有度">
+    <text id="n2_k6he" name="title" xy="0,0" size="140,61" fontSize="28" color="#b79155" align="center" vAlign="middle" autoSize="none" singleLine="true" text="高稀有度">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <image id="n3_f4xv" name="n3" src="q08xp" fileName="images/hz_tzkuang.png" xy="0,63" size="140,2" pkg="eg2y0ldp">
+    <image id="n3_f4xv" name="n3" src="q08xp" fileName="imagesExport/hz_tzkuang.png" pkg="eg2y0ldp" xy="0,63" size="140,2" color="#e1cca3">
       <relation target="" sidePair="width-width"/>
     </image>
   </displayList>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="214,230">
+<component size="220,230">
   <displayList>
-    <image id="n0_k6he" name="n0" src="q08xq" fileName="imagesExport/hz_tzkuang_1.png" pkg="eg2y0ldp" xy="1,0" size="212,164">
+    <image id="n0_k6he" name="n0" src="q08xq" fileName="imagesExport/hz_tzkuang_1.png" pkg="eg2y0ldp" xy="8,0" size="212,164">
       <relation target="" sidePair=""/>
       <relation target="n1_k6he" sidePair="height-height"/>
     </image>
-    <list id="n1_k6he" name="list" xy="37,17" size="139,132" overflow="scroll" defaultItem="ui://mbo439wbk6he23">
+    <list id="n1_k6he" name="list" xy="44,17" size="139,132" overflow="scroll" defaultItem="ui://mbo439wbk6he23">
       <relation target="n0_k6he" sidePair="left-left,top-top"/>
       <item title="1"/>
       <item title="2"/>

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

@@ -2,11 +2,11 @@
 <component size="350,75" overflow="hidden">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n29_pjip" name="n29" src="wonodz" fileName="images/dz_hz_fsk_2.png" xy="50,9"/>
+    <image id="n29_pjip" name="n29" src="wonodz" fileName="images/dz_hz_fsk_2.png" xy="31,9"/>
     <image id="n28_pjip" name="n28" src="j48o3y" fileName="images/dz_hz_bxbx.png" xy="0,0">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <text id="n30_pjip" name="txtNeedName" xy="76,16" size="188,39" fontSize="28" color="#b08649" vAlign="middle" letterSpacing="-2" autoClearText="true" text="孔雀东南飞·绣">
+    <text id="n30_pjip" name="txtNeedName" xy="80,16" size="188,39" fontSize="28" color="#b08649" vAlign="middle" letterSpacing="-2" autoClearText="true" text="孔雀东南飞·绣">
       <gearDisplay controller="c1" pages="0"/>
     </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">

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

@@ -1,18 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="226,1920" opaque="false">
+<component size="250,1920" opaque="false">
   <displayList>
-    <component id="n0_k6he" name="comboBoxRarity" src="k6he25" fileName="components/ComboBoxRarity.xml" xy="0,0" size="226,62">
+    <image id="n2_wono" name="n2" src="wonoe4" fileName="images/hz_zdikuang_1.png" xy="0,109" size="226,1811">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <component id="n0_k6he" name="comboBoxRarity" src="k6he25" fileName="components/ComboBoxRarity.xml" xy="0,80" size="226,62">
       <ComboBox visibleItemCount="10" autoClearItems="true">
         <item title="高稀有度"/>
         <item title="中稀有度"/>
         <item title="低稀有度"/>
       </ComboBox>
     </component>
-    <list id="n1_k6he" name="list" xy="-3,76" size="232,1844" overflow="scroll" lineGap="35" defaultItem="ui://mbo439wbk6he26" autoClearItems="true">
+    <list id="n1_k6he" name="list" xy="-3,156" size="232,1764" overflow="scroll" lineGap="55" defaultItem="ui://mbo439wbk6he26" autoClearItems="true">
       <relation target="" sidePair="top-top"/>
       <item/>
       <item/>
       <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
   </displayList>
 </component>

+ 9 - 9
FGUIProject/assets/DressUp/components/PartsListItem.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="232,240">
   <displayList>
-    <image id="n4_qsvd" name="iconSelected" src="qsvd2l" fileName="images/hz_xzyfxz.png" xy="33,0"/>
     <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="68,35" pivot="0.5,0.5" size="122,122" aspect="true" url="ui://mbo439wbk6he1z" align="center" vAlign="middle" fill="scale" clearOnPublish="true">
+    <image id="n4_qsvd" name="iconSelected" src="qsvd2l" fileName="images/hz_xzyfxz.png" xy="22,0"/>
+    <loader id="n1_k6he" name="icon" xy="35,13" pivot="0.5,0.5" size="166,166" aspect="true" url="ui://mbo439wbk6he1z" align="center" vAlign="middle" fill="scale" clearOnPublish="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <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"/>
+    <loader id="n7_d4iw" name="rarity" xy="173,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <loader id="n5_8xpg" name="ScoreType" xy="24,142" size="50,50" touchable="false" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <text id="n6_8xpg" name="txtScore" xy="143,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="13,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"/>
+    <image id="n2_k6he" name="n2" src="k6he1y" fileName="images/hz_minzikuang.png" xy="13,198" group="n11_wono"/>
+    <text id="n3_k6he" name="txtTitle" xy="42,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="13,198" size="208,43"/>
   </displayList>
 </component>

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

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="216,210">
+<component size="211,211">
   <displayList>
-    <image id="n5_wono" name="n5" src="wonodu" fileName="images/hz_yjmzdi_2.png" xy="24,0"/>
-    <loader id="n0_k6he" name="icon" xy="120,96" pivot="0.5,0.5" anchor="true" size="102,102" 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"/>
-    <image id="n4_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,63"/>
-    <image id="n6_wono" name="n6" src="wonodt" fileName="images/hz_yjmzdi_1.png" xy="42,168"/>
-    <text id="n7_wono" name="txtname" xy="86,167" pivot="0.5,0" size="68,44" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#bc9456" text="发型"/>
+    <image id="n5_wono" name="n5" src="wonodu" fileName="images/hz_yjmzdi_2.png" xy="19,0" group="n9_wono"/>
+    <loader id="n0_k6he" name="icon" xy="115,96" pivot="0.5,0.5" anchor="true" size="102,102" group="n9_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="19,0" group="n9_wono"/>
+    <image id="n4_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,69" group="n9_wono"/>
+    <image id="n6_wono" name="n6" src="wonodt" fileName="images/hz_yjmzdi_1.png" xy="37,168" group="n9_wono"/>
+    <text id="n7_wono" name="txtname" xy="81,167" pivot="0.5,0" size="68,44" group="n9_wono" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#bc9456" text="发型"/>
+    <group id="n9_wono" name="n9" xy="0,0" size="211,211"/>
   </displayList>
 </component>

+ 5 - 4
FGUIProject/assets/DressUp/componentsDialog/Button2.xml

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

二进制
FGUIProject/assets/DressUp/images/dz_dididcis.png


二进制
FGUIProject/assets/DressUp/images/dz_dididcis_1.png


二进制
FGUIProject/assets/DressUp/images/dz_hz_fsk_1.png


二进制
FGUIProject/assets/DressUp/images/dz_hz_fsk_2.png


二进制
FGUIProject/assets/DressUp/images/hz_anniuty_1.png


二进制
FGUIProject/assets/DressUp/images/hz_fanhuibu.png


二进制
FGUIProject/assets/DressUp/images/hz_fzd.png


二进制
FGUIProject/assets/DressUp/images/hz_huifubu.png


二进制
FGUIProject/assets/DressUp/images/hz_paizhao.png


二进制
FGUIProject/assets/DressUp/images/hz_qhdzqh.png


二进制
FGUIProject/assets/DressUp/images/hz_rwts.png


二进制
FGUIProject/assets/DressUp/images/hz_shanchu.png


二进制
FGUIProject/assets/DressUp/images/hz_ssuo.png


二进制
FGUIProject/assets/DressUp/images/hz_xianshi.png


二进制
FGUIProject/assets/DressUp/images/hz_yingc.png


二进制
FGUIProject/assets/DressUp/images/hz_zdikuang_1.png


二进制
FGUIProject/assets/DressUp/images/hz_zdikuang_2.png


二进制
FGUIProject/assets/DressUp/images/hz_zdzddg_1.png


二进制
FGUIProject/assets/DressUp/images/hz_zdzddg_2.png


二进制
FGUIProject/assets/DressUp/images/hz_zdzddg_3.png


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

@@ -167,6 +167,13 @@
     <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/"/>
+    <image id="wonoe0" name="dz_dididcis_1.png" path="/images/"/>
+    <image id="wonoe1" name="hz_anniuty_1.png" path="/images/"/>
+    <image id="wonoe2" name="hz_fzd.png" path="/images/"/>
+    <image id="wonoe3" name="hz_rwts.png" path="/images/"/>
+    <image id="wonoe4" name="hz_zdikuang_1.png" path="/images/" scale="9grid" scale9grid="56,23,112,46"/>
+    <component id="wonoe5" name="Button14.xml" path="/components/"/>
+    <image id="wonoe6" name="hz_zdikuang_2.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -22,16 +22,16 @@ namespace UI.DressUp
         public GGraph m_btnClose;
         public GTextField m_txtHint;
         public GGroup m_groupTaskHint;
-        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_btnRepeal;
         public GButton m_btnRenewal;
         public GButton m_btnDelete;
         public GButton m_btnSearch;
+        public GLoader m_btnGuide;
+        public GButton m_btnNext;
+        public GButton m_btnRecommend;
+        public GButton m_btnAutoPlay;
         public GTextField m_txtRecommendCount;
         public GGroup m_graContent;
         public const string URL = "ui://mbo439wbqsvd2m";
@@ -96,16 +96,16 @@ namespace UI.DressUp
             m_btnClose = (GGraph)comp.GetChild("btnClose");
             m_txtHint = (GTextField)comp.GetChild("txtHint");
             m_groupTaskHint = (GGroup)comp.GetChild("groupTaskHint");
-            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_btnRepeal = (GButton)comp.GetChild("btnRepeal");
             m_btnRenewal = (GButton)comp.GetChild("btnRenewal");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
+            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_txtRecommendCount = (GTextField)comp.GetChild("txtRecommendCount");
             m_graContent = (GGroup)comp.GetChild("graContent");
         }
@@ -131,16 +131,16 @@ namespace UI.DressUp
             m_btnClose = null;
             m_txtHint = null;
             m_groupTaskHint = null;
-            m_btnGuide = null;
-            m_btnNext = null;
-            m_btnRecommend = null;
-            m_btnAutoPlay = null;
             m_btnHint = null;
             m_btnClothingShop = null;
             m_btnRepeal = null;
             m_btnRenewal = null;
             m_btnDelete = null;
             m_btnSearch = null;
+            m_btnGuide = null;
+            m_btnNext = null;
+            m_btnRecommend = null;
+            m_btnAutoPlay = null;
             m_txtRecommendCount = null;
             m_graContent = null;
             if(disposeTarget && target != null)

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

@@ -7,8 +7,8 @@ namespace UI.DressUp
     public partial class UI_PartsListItem
     {
         public GComponent target;
-        public GImage m_iconSelected;
         public GLoader m_loaBorder;
+        public GImage m_iconSelected;
         public GLoader m_icon;
         public GLoader m_rarity;
         public GLoader m_ScoreType;
@@ -63,8 +63,8 @@ namespace UI.DressUp
 
         private void Init(GComponent comp)
         {
-            m_iconSelected = (GImage)comp.GetChild("iconSelected");
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
+            m_iconSelected = (GImage)comp.GetChild("iconSelected");
             m_icon = (GLoader)comp.GetChild("icon");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_ScoreType = (GLoader)comp.GetChild("ScoreType");
@@ -75,8 +75,8 @@ namespace UI.DressUp
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_iconSelected = null;
             m_loaBorder = null;
+            m_iconSelected = null;
             m_icon = null;
             m_rarity = null;
             m_ScoreType = null;

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

@@ -372,7 +372,7 @@ namespace GFGGame
             _ui.m_partsList.m_list.itemRenderer = ListPartsItem;
             _ui.m_partsList2.m_list.itemRenderer = ListParts2Item;
             listType1X = _ui.m_comListType1.target.x;
-            partsListX = _ui.m_partsList.target.x - _ui.m_partsList.target.width - DressUpView.RIGHT_BLANK;
+            partsListX = _ui.m_partsList.target.x - _ui.m_partsList.target.width;// - DressUpView.RIGHT_BLANK;
             //一级菜单
             _ui.m_comListType1.m_listType.itemRenderer = ListType1Item;
             _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length;

二进制
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


二进制
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png


二进制
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0.png


二进制
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png


二进制
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png


二进制
GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes