zhaoyang hace 2 años
padre
commit
eae4578220
Se han modificado 78 ficheros con 137 adiciones y 301 borrados
  1. 3 1
      FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml
  2. 3 1
      FGUIProject/assets/ClothingFoster/ClothingFosterUI.xml
  3. 1 1
      FGUIProject/assets/ClothingShop/GalleryShopUI.xml
  4. 1 1
      FGUIProject/assets/ClothingShop/components/CompItemInfo.xml
  5. 1 1
      FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml
  6. 5 8
      FGUIProject/assets/Common/AlertUI.xml
  7. 0 12
      FGUIProject/assets/Common/components/BtnLog.xml
  8. 0 13
      FGUIProject/assets/Common/components/Button1.xml
  9. 0 13
      FGUIProject/assets/Common/components/Button12.xml
  10. 2 2
      FGUIProject/assets/Common/components/Button15.xml
  11. 1 1
      FGUIProject/assets/Common/components/Button17.xml
  12. 2 3
      FGUIProject/assets/Common/components/Button18.xml
  13. 2 2
      FGUIProject/assets/Common/components/Button19.xml
  14. 1 1
      FGUIProject/assets/Common/components/Button21.xml
  15. 0 0
      FGUIProject/assets/Common/components/Button22.xml
  16. 0 13
      FGUIProject/assets/Common/components/Button3.xml
  17. 0 0
      FGUIProject/assets/Common/imagesExport/anniuty.png
  18. 0 0
      FGUIProject/assets/Common/imagesExport/anniuty2.png
  19. 0 0
      FGUIProject/assets/Common/imagesExport/anniuty3.png
  20. 0 0
      FGUIProject/assets/Common/imagesExport/anniuty4.png
  21. 0 0
      FGUIProject/assets/Common/imagesExport/anniuty5.png
  22. 0 0
      FGUIProject/assets/Common/imagesExport/anniuty_1.png
  23. 12 4
      FGUIProject/assets/Common/package.xml
  24. 4 5
      FGUIProject/assets/CommonGame/BonusBoxDetailUI.xml
  25. 3 3
      FGUIProject/assets/CommonGame/BuyConfirmUI.xml
  26. 5 5
      FGUIProject/assets/CommonGame/BuyCountUI.xml
  27. 2 2
      FGUIProject/assets/CommonGame/BuyTipsUI.xml
  28. 0 13
      FGUIProject/assets/CommonGame/components/Button4.xml
  29. 0 10
      FGUIProject/assets/CommonGame/components/Button6.xml
  30. 0 14
      FGUIProject/assets/CommonGame/package.xml
  31. 1 1
      FGUIProject/assets/CreateRole/CreateRoleUI.xml
  32. 9 7
      FGUIProject/assets/DressUp/DressFilterUI.xml
  33. 1 1
      FGUIProject/assets/DressUp/DressUpFightUI.xml
  34. 2 2
      FGUIProject/assets/DressUp/DressUpUI.xml
  35. 2 2
      FGUIProject/assets/DressUp/PhotographUI.xml
  36. 1 1
      FGUIProject/assets/Field/FieldFightEndUI.xml
  37. 1 1
      FGUIProject/assets/Field/FieldFightInfoUI.xml
  38. 6 6
      FGUIProject/assets/Login/LoginInputUI.xml
  39. 1 1
      FGUIProject/assets/Mail/MailContentUI.xml
  40. 6 6
      FGUIProject/assets/Mail/MailUI.xml
  41. 4 2
      FGUIProject/assets/Main/StoryCardChooseUI.xml
  42. 3 3
      FGUIProject/assets/Main/StoryFightQuicklyUI.xml
  43. 2 2
      FGUIProject/assets/Main/StoryLevelInfoUI.xml
  44. 2 1
      FGUIProject/assets/RechargeStore/GiftBagBuyUI.xml
  45. 1 1
      FGUIProject/assets/RoleInfo/ChangeHead.xml
  46. 1 1
      FGUIProject/assets/RoleInfo/ChangeNameUI.xml
  47. 2 2
      FGUIProject/assets/RoleInfo/SettingUI.xml
  48. 6 6
      FGUIProject/assets/Studio/StudioBuyNumUI.xml
  49. 2 2
      FGUIProject/assets/Travel/TravelUI.xml
  50. 18 18
      GameClient/Assets/Game/HotUpdate/Controller/LogController.cs
  51. 0 77
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_BtnLog.cs
  52. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_BtnLog.cs.meta
  53. 6 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyCountUI.cs
  54. 6 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Mail/UI_MailUI.cs
  55. 6 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioBuyNumUI.cs
  56. BIN
      GameClient/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_fui.bytes
  57. BIN
      GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes
  58. BIN
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_fui.bytes
  59. BIN
      GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_fui.bytes
  60. BIN
      GameClient/Assets/ResIn/UI/Common/Common_atlas0!a.png
  61. BIN
      GameClient/Assets/ResIn/UI/Common/Common_atlas0.png
  62. BIN
      GameClient/Assets/ResIn/UI/Common/Common_fui.bytes
  63. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  64. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  65. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  66. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  67. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  68. BIN
      GameClient/Assets/ResIn/UI/CreateRole/CreateRole_fui.bytes
  69. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes
  70. BIN
      GameClient/Assets/ResIn/UI/Field/Field_fui.bytes
  71. BIN
      GameClient/Assets/ResIn/UI/Login/Login_atlas0.png
  72. BIN
      GameClient/Assets/ResIn/UI/Login/Login_fui.bytes
  73. BIN
      GameClient/Assets/ResIn/UI/Mail/Mail_fui.bytes
  74. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes
  75. BIN
      GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_fui.bytes
  76. BIN
      GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_fui.bytes
  77. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes
  78. BIN
      GameClient/Assets/ResIn/UI/Travel/Travel_fui.bytes

+ 3 - 1
FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml

@@ -32,7 +32,9 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <component id="n16_wlc2" name="btnDecompose" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="350,1553"/>
+    <component id="n16_wlc2" name="btnDecompose" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="368,1553">
+      <Button title="分解"/>
+    </component>
     <text id="n17_wlc2" name="txtConsume" xy="440,1506" pivot="0.5,0" size="199,41" fontSize="30" color="#da826e" align="center" text="消耗金币X200">
     <text id="n17_wlc2" name="txtConsume" xy="440,1506" pivot="0.5,0" size="199,41" fontSize="30" color="#da826e" align="center" text="消耗金币X200">
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>
     </text>
     </text>

+ 3 - 1
FGUIProject/assets/ClothingFoster/ClothingFosterUI.xml

@@ -16,7 +16,9 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <component id="n9_py5g" name="btnFoster" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="291,849"/>
+    <component id="n9_py5g" name="btnFoster" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,849">
+      <Button title="确定"/>
+    </component>
     <component id="n10_j5a5" name="ComConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="341,778"/>
     <component id="n10_j5a5" name="ComConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="341,778"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 1 - 1
FGUIProject/assets/ClothingShop/GalleryShopUI.xml

@@ -11,7 +11,7 @@
     <component id="n26_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="17,105" controller="c1,9"/>
     <component id="n26_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="17,105" controller="c1,9"/>
     <image id="n19_r9ri" name="n19" src="r9rieh" fileName="images/jfsc_dik.png" xy="625,0"/>
     <image id="n19_r9ri" name="n19" src="r9rieh" fileName="images/jfsc_dik.png" xy="625,0"/>
     <image id="n22_r9ri" name="n22" src="r9ri6r" fileName="images/jfsc_xiantiao_1.png" xy="665,371" group="n21_r9ri"/>
     <image id="n22_r9ri" name="n22" src="r9ri6r" fileName="images/jfsc_xiantiao_1.png" xy="665,371" group="n21_r9ri"/>
-    <component id="n20_r9ri" name="btnBuy" src="r9ritjq" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="706,636" group="n21_r9ri">
+    <component id="n20_r9ri" name="btnBuy" src="r9ritjq" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="706,636" group="n21_r9ri">
       <Button title="兑换"/>
       <Button title="兑换"/>
     </component>
     </component>
     <text id="n23_r9ri" name="txtName" xy="680,310" size="216,59" group="n21_r9ri" font="ui://eg2y0ldpwonotja" fontSize="44" color="#b0884e" letterSpacing="-2" text="孔雀东南飞"/>
     <text id="n23_r9ri" name="txtName" xy="680,310" size="216,59" group="n21_r9ri" font="ui://eg2y0ldpwonotja" fontSize="44" color="#b0884e" letterSpacing="-2" text="孔雀东南飞"/>

+ 1 - 1
FGUIProject/assets/ClothingShop/components/CompItemInfo.xml

@@ -12,7 +12,7 @@
     <text id="n30_hinb" name="txtDesc" xy="64,143" size="336,39" fontSize="28" color="#af9a7d" autoSize="height" autoClearText="true" text="赵钱孙李周吴郑王"/>
     <text id="n30_hinb" name="txtDesc" xy="64,143" size="336,39" fontSize="28" color="#af9a7d" autoSize="height" autoClearText="true" text="赵钱孙李周吴郑王"/>
     <loader id="n43_hinb" name="rarity" xy="360,23" size="44,94" visible="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n43_hinb" name="rarity" xy="360,23" size="44,94" visible="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <text id="n32_hinb" name="txtOwned" xy="170,610" size="122,36" fontSize="26" color="#c97f7a" align="center" ubb="true" vars="true" text="[color=#B39B75]已拥有:[/color]{v1=0}"/>
     <text id="n32_hinb" name="txtOwned" xy="170,610" size="122,36" fontSize="26" color="#c97f7a" align="center" ubb="true" vars="true" text="[color=#B39B75]已拥有:[/color]{v1=0}"/>
-    <component id="n20_hinb" name="btnBuy" src="r9ritjq" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="83,652">
+    <component id="n20_hinb" name="btnBuy" src="r9ritjq" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="83,652">
       <Button title=" "/>
       <Button title=" "/>
     </component>
     </component>
     <loader id="n47_ugdz" name="iconPrice" xy="182,674" size="34,34" group="n46_hinb" touchable="false" url="ui://eg2y0ldpq08x3" fill="scale">
     <loader id="n47_ugdz" name="iconPrice" xy="182,674" size="34,34" group="n46_hinb" touchable="false" url="ui://eg2y0ldpq08x3" fill="scale">

+ 1 - 1
FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -45,7 +45,7 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <component id="n21_j539" name="btnProduction" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="368,1435" group="n59_v95q">
+    <component id="n21_j539" name="btnProduction" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="368,1435" group="n59_v95q">
       <Button title="制作"/>
       <Button title="制作"/>
     </component>
     </component>
     <component id="n48_v95q" name="comCostCurrency" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="418,1369" group="n59_v95q"/>
     <component id="n48_v95q" name="comCostCurrency" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="418,1369" group="n59_v95q"/>

+ 5 - 8
FGUIProject/assets/Common/AlertUI.xml

@@ -4,24 +4,21 @@
     <graph id="n6_a8jv" name="graphBg" xy="0,0" size="1080,1920" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
     <graph id="n6_a8jv" name="graphBg" xy="0,0" size="1080,1920" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
     </graph>
-    <component id="n0_l55o" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="59,766" size="962,388" group="n8_a8jv">
+    <component id="n0_l55o" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="59,766" size="962,388">
       <relation target="n5_l55o" sidePair="height-height"/>
       <relation target="n5_l55o" sidePair="height-height"/>
     </component>
     </component>
-    <text id="n5_l55o" name="txtContent" xy="170,853" size="740,49" group="n8_a8jv" fontSize="36" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="解锁后的照片可随意删除"/>
-    <text id="n9_uyux" name="txtTips" xy="170,912" size="740,41" group="n8_a8jv" fontSize="30" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="(解锁后的照片可随意删除)">
+    <text id="n5_l55o" name="txtContent" xy="170,853" size="740,49" fontSize="36" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="解锁后的照片可随意删除"/>
+    <text id="n9_uyux" name="txtTips" xy="170,912" size="740,41" fontSize="30" color="#876e54" align="center" vAlign="middle" autoSize="height" autoClearText="true" text="(解锁后的照片可随意删除)">
       <relation target="n5_l55o" sidePair="top-bottom"/>
       <relation target="n5_l55o" sidePair="top-bottom"/>
     </text>
     </text>
-    <component id="n3_l55o" name="btnLeft" src="q08x6" fileName="components/Button1.xml" xy="113,1004" size="406,111" group="n8_a8jv">
+    <component id="n3_l55o" name="btnLeft" src="r9ritjh" fileName="components/Button18.xml" xy="147,1019">
       <relation target="n0_l55o" sidePair="bottom-bottom"/>
       <relation target="n0_l55o" sidePair="bottom-bottom"/>
       <Button title="取消"/>
       <Button title="取消"/>
     </component>
     </component>
-    <component id="n4_l55o" name="btnRight" src="q08x7" fileName="components/Button2.xml" xy="555,1004" size="406,111" group="n8_a8jv">
+    <component id="n4_l55o" name="btnRight" src="wonody" fileName="components/Button20.xml" xy="589,1019" size="344,97">
       <relation target="n3_l55o" sidePair="top-top"/>
       <relation target="n3_l55o" sidePair="top-top"/>
       <Button title="确认"/>
       <Button title="确认"/>
     </component>
     </component>
-    <group id="n8_a8jv" name="n8" xy="59,766" size="962,388" advanced="true">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </group>
   </displayList>
   </displayList>
   <relation target="n0_l55o" sidePair="height-height"/>
   <relation target="n0_l55o" sidePair="height-height"/>
 </component>
 </component>

+ 0 - 12
FGUIProject/assets/Common/components/BtnLog.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="270,111">
-  <controller name="c1" pages="0,,1," selected="1"/>
-  <displayList>
-    <component id="n6_g926" name="btnLog" src="q08x6" fileName="components/Button1.xml" xy="0,11" size="270,100">
-      <Button title="日志"/>
-    </component>
-    <image id="n7_g926" name="imgRed" src="q08x3" fileName="imagesExport/ANNIU_2.png" xy="225,0" size="119,111" scale="0.4,0.4" color="#ff0033">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-  </displayList>
-</component>

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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="380,111" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_q08x" name="n0" src="q08x2" fileName="imagesExport/ANNIU_1.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_q08x" name="title" xy="0,-5" size="380,111" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="666">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button/>
-</component>

+ 0 - 13
FGUIProject/assets/Common/components/Button12.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="324,105" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_ih75" name="icon" src="ih7592" fileName="imagesExport/tctc_anniu_1.png" xy="0,0" size="324,105">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_ih75" name="title" xy="0,0" size="324,105" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#ac904e" singleLine="true" text="确定">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button/>
-</component>

+ 2 - 2
FGUIProject/assets/CommonGame/components/Button19.xml → FGUIProject/assets/Common/components/Button15.xml

@@ -2,8 +2,8 @@
 <component size="284,81" extention="Button">
 <component size="284,81" 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>
-    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="284,81" url="ui://eg2y0ldpr9ritjr" autoSize="true"/>
-    <text id="n1_r9ri" name="title" xy="0,-2" size="284,81" font="ui://eg2y0ldpwonotjc" fontSize="44" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#d89291" strokeSize="2" singleLine="true" text="挑战十次">
+    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="284,81" url="ui://mk0fwx0xr9ritjr" autoSize="true"/>
+    <text id="n1_r9ri" name="title" xy="0,-2" size="284,81" font="ui://eg2y0ldpwonotjc" fontSize="44" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#d89291" strokeSize="2" singleLine="true" text="">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </text>
     </text>
   </displayList>
   </displayList>

+ 1 - 1
FGUIProject/assets/CommonGame/components/Button17.xml → FGUIProject/assets/Common/components/Button17.xml

@@ -2,7 +2,7 @@
 <component size="342,96" extention="Button">
 <component size="342,96" 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>
-    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="342,96" url="ui://eg2y0ldpr9ritjd" autoSize="true"/>
+    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="342,96" url="ui://mk0fwx0xr9ritjd" autoSize="true"/>
     <text id="n1_r9ri" name="title" xy="0,0" size="342,96" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf8f2" align="center" vAlign="middle" autoSize="none" singleLine="true" text="挑战十次"/>
     <text id="n1_r9ri" name="title" xy="0,0" size="342,96" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf8f2" align="center" vAlign="middle" autoSize="none" singleLine="true" text="挑战十次"/>
   </displayList>
   </displayList>
   <Button/>
   <Button/>

+ 2 - 3
FGUIProject/assets/CommonGame/components/Button18.xml → FGUIProject/assets/Common/components/Button18.xml

@@ -2,11 +2,10 @@
 <component size="342,96" extention="Button">
 <component size="342,96" 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>
-    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="342,96" url="ui://eg2y0ldpr9ritji" autoSize="true"/>
-    <text id="n1_r9ri" name="title" xy="0,0" size="342,96" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#f8eae5" align="center" vAlign="middle" autoSize="none" strokeColor="#c79a89" strokeSize="2" shadowColor="#bc9e91" shadowOffset="1,1" singleLine="true" text="挑战十次">
+    <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="342,96" url="ui://mk0fwx0xr9ritji" autoSize="true"/>
+    <text id="n1_r9ri" name="title" xy="0,0" size="342,96" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#f8eae5" align="center" vAlign="middle" autoSize="none" strokeColor="#c79a89" strokeSize="2" shadowColor="#bc9e91" shadowOffset="1,1" singleLine="true" text="">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </text>
     </text>
   </displayList>
   </displayList>
   <Button/>
   <Button/>
-  <relation target="n2_r9ri" sidePair="width-width,height-height"/>
 </component>
 </component>

+ 2 - 2
FGUIProject/assets/CommonGame/components/Button20.xml → FGUIProject/assets/Common/components/Button19.xml

@@ -2,8 +2,8 @@
 <component size="344,97" extention="Button">
 <component size="344,97" 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>
-    <loader id="n4_wono" name="icon" xy="0,0" size="344,97" url="ui://eg2y0ldpr9ritjf" autoSize="true"/>
-    <text id="n5_wono" name="title" xy="0,0" pivot="0.5,0" size="344,97" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#cc8584" strokeSize="2" shadowColor="#c68686" shadowOffset="1,1" text="保存搭配">
+    <loader id="n4_wono" name="icon" xy="0,0" size="344,97" url="ui://mk0fwx0xr9ritjf" autoSize="true"/>
+    <text id="n5_wono" name="title" xy="0,0" pivot="0.5,0" size="344,97" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#cc8584" strokeSize="2" shadowColor="#c68686" shadowOffset="1,1" text="">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </text>
     </text>
   </displayList>
   </displayList>

+ 1 - 1
FGUIProject/assets/CommonGame/components/Button21.xml → FGUIProject/assets/Common/components/Button21.xml

@@ -2,7 +2,7 @@
 <component size="344,97" extention="Button">
 <component size="344,97" 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>
-    <loader id="n4_wono" name="icon" xy="0,0" size="344,97" url="ui://eg2y0ldpr9ritjf" autoSize="true"/>
+    <loader id="n4_wono" name="icon" xy="0,0" size="344,97" url="ui://mk0fwx0xr9ritjf" autoSize="true"/>
     <text id="n5_wono" name="title" xy="0,-2" pivot="0.5,0" size="344,97" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#dc9392" strokeSize="2" shadowColor="#dd8e8e" shadowOffset="1,1" text="保存搭配">
     <text id="n5_wono" name="title" xy="0,-2" pivot="0.5,0" size="344,97" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf2f2" align="center" vAlign="middle" autoSize="none" strokeColor="#dc9392" strokeSize="2" shadowColor="#dd8e8e" shadowOffset="1,1" text="保存搭配">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </text>
     </text>

+ 0 - 0
FGUIProject/assets/CommonGame/components/Button22.xml → FGUIProject/assets/Common/components/Button22.xml


+ 0 - 13
FGUIProject/assets/Common/components/Button3.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="412,105" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_q08x" name="n0" src="q08xo" fileName="imagesExport/ANNIU_3.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_q08x" name="title" xy="0,-5" size="412,105" fontSize="54" color="#fdfaed" align="center" vAlign="middle" autoSize="none" strokeColor="#ac904e" strokeSize="2" singleLine="true" text="保存搭配">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button/>
-</component>

+ 0 - 0
FGUIProject/assets/CommonGame/images/anniuty.png → FGUIProject/assets/Common/imagesExport/anniuty.png


+ 0 - 0
FGUIProject/assets/CommonGame/images/anniuty2.png → FGUIProject/assets/Common/imagesExport/anniuty2.png


+ 0 - 0
FGUIProject/assets/CommonGame/images/anniuty3.png → FGUIProject/assets/Common/imagesExport/anniuty3.png


+ 0 - 0
FGUIProject/assets/CommonGame/images/anniuty4.png → FGUIProject/assets/Common/imagesExport/anniuty4.png


+ 0 - 0
FGUIProject/assets/CommonGame/images/anniuty5.png → FGUIProject/assets/Common/imagesExport/anniuty5.png


+ 0 - 0
FGUIProject/assets/CommonGame/images/anniuty_1.png → FGUIProject/assets/Common/imagesExport/anniuty_1.png


+ 12 - 4
FGUIProject/assets/Common/package.xml

@@ -2,12 +2,10 @@
 <packageDescription id="mk0fwx0x">
 <packageDescription id="mk0fwx0x">
   <resources>
   <resources>
     <component id="q08x7" name="Button2.xml" path="/components/" exported="true"/>
     <component id="q08x7" name="Button2.xml" path="/components/" exported="true"/>
-    <component id="q08x6" name="Button1.xml" path="/components/" exported="true"/>
     <component id="s2cc4k" name="FloatingTextPromptErrUI.xml" path="/" exported="true"/>
     <component id="s2cc4k" name="FloatingTextPromptErrUI.xml" path="/" exported="true"/>
     <image id="s2cc4l" name="zx_jq_rwbszik.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="153,7,76,19"/>
     <image id="s2cc4l" name="zx_jq_rwbszik.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="153,7,76,19"/>
     <component id="d4iw4m" name="ModalStatusUI.xml" path="/" exported="true"/>
     <component id="d4iw4m" name="ModalStatusUI.xml" path="/" exported="true"/>
     <image id="q08xo" name="ANNIU_3.png" path="/imagesExport/" exported="true"/>
     <image id="q08xo" name="ANNIU_3.png" path="/imagesExport/" exported="true"/>
-    <component id="q08xu" name="Button3.xml" path="/components/" exported="true"/>
     <sound id="qp4l4p" name="click.mp3" path="/sound/" exported="true"/>
     <sound id="qp4l4p" name="click.mp3" path="/sound/" exported="true"/>
     <image id="qp4l4q" name="zx_jq_rwbszik_normal.png" path="/imagesExport/" exported="true"/>
     <image id="qp4l4q" name="zx_jq_rwbszik_normal.png" path="/imagesExport/" exported="true"/>
     <image id="qp4l4r" name="zx_jq_rwbszik_success.png" path="/imagesExport/"/>
     <image id="qp4l4r" name="zx_jq_rwbszik_success.png" path="/imagesExport/"/>
@@ -17,7 +15,6 @@
     <component id="qp4l4v" name="FloatingTextPromptSuccessUI.xml" path="/" exported="true"/>
     <component id="qp4l4v" name="FloatingTextPromptSuccessUI.xml" path="/" exported="true"/>
     <component id="g9264w" name="LogUI.xml" path="/" exported="true"/>
     <component id="g9264w" name="LogUI.xml" path="/" exported="true"/>
     <component id="g9264x" name="ListLogItem.xml" path="/components/"/>
     <component id="g9264x" name="ListLogItem.xml" path="/components/"/>
-    <component id="g9264y" name="BtnLog.xml" path="/components/" exported="true"/>
     <component id="g9264z" name="Button7.xml" path="/components/" exported="true"/>
     <component id="g9264z" name="Button7.xml" path="/components/" exported="true"/>
     <image id="g92650" name="kp_anniu_3.png" path="/imagesExport/"/>
     <image id="g92650" name="kp_anniu_3.png" path="/imagesExport/"/>
     <image id="g92651" name="kp_anniu_4.png" path="/imagesExport/"/>
     <image id="g92651" name="kp_anniu_4.png" path="/imagesExport/"/>
@@ -35,9 +32,20 @@
     <image id="ih7592" name="tctc_anniu_1.png" path="/imagesExport/"/>
     <image id="ih7592" name="tctc_anniu_1.png" path="/imagesExport/"/>
     <image id="ih7591" name="tctc_anniu_2.png" path="/imagesExport/"/>
     <image id="ih7591" name="tctc_anniu_2.png" path="/imagesExport/"/>
     <component id="pf2696" name="ComHolder.xml" path="/components/" exported="true"/>
     <component id="pf2696" name="ComHolder.xml" path="/components/" exported="true"/>
-    <component id="axdi97" name="Button12.xml" path="/components/" exported="true"/>
     <image id="axdi98" name="grxx_anniu_2.png" path="/imagesExport/"/>
     <image id="axdi98" name="grxx_anniu_2.png" path="/imagesExport/"/>
     <image id="axdi99" name="grxx_anniu_1.png" path="/imagesExport/"/>
     <image id="axdi99" name="grxx_anniu_1.png" path="/imagesExport/"/>
+    <component id="r9ritjh" name="Button18.xml" path="/components/" exported="true"/>
+    <component id="wonody" name="Button19.xml" path="/components/" exported="true"/>
+    <image id="r9ritjf" name="anniuty.png" path="/imagesExport/" exported="true"/>
+    <image id="r9ritji" name="anniuty3.png" path="/imagesExport/" exported="true"/>
+    <component id="r9ritjg" name="Button17.xml" path="/components/" exported="true"/>
+    <image id="r9ritjd" name="anniuty2.png" path="/imagesExport/" exported="true"/>
+    <component id="r9ritjq" name="Button15.xml" path="/components/" exported="true"/>
+    <image id="r9ritjr" name="anniuty4.png" path="/imagesExport/"/>
+    <component id="oqa1tjt" name="Button21.xml" path="/components/" exported="true"/>
+    <component id="v95qtjw" name="Button22.xml" path="/components/" exported="true"/>
+    <image id="v95qtjv" name="anniuty5.png" path="/imagesExport/"/>
+    <image id="r9ritje" name="anniuty_1.png" path="/imagesExport/" exported="true"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Common" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Common" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 4 - 5
FGUIProject/assets/CommonGame/BonusBoxDetailUI.xml

@@ -4,9 +4,9 @@
     <component id="n0_pjip" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,717">
     <component id="n0_pjip" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,717">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     </component>
-    <text id="n2_pjip" name="txtTitle" xy="118,56" size="726,66" group="n6_dhoa" fontSize="50" color="#9b7853" align="center" autoSize="none" text="礼盒内容"/>
-    <image id="n5_qr4e" name="n5" src="9cth8y" fileName="imagesExport/tctc_xiant_1.png" xy="57,128" group="n6_dhoa"/>
-    <list id="n3_pjip" name="listBonus" xy="57,195" size="841,340" group="n6_dhoa" layout="flow_hz" overflow="scroll" colGap="40" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
+    <text id="n2_pjip" name="txtTitle" xy="118,56" size="726,66" fontSize="50" color="#9b7853" align="center" autoSize="none" text="礼盒内容"/>
+    <image id="n5_qr4e" name="n5" src="9cth8y" fileName="imagesExport/tctc_xiant_1.png" xy="57,128"/>
+    <list id="n3_pjip" name="listBonus" xy="57,195" size="841,340" layout="flow_hz" overflow="scroll" colGap="40" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
@@ -14,11 +14,10 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <component id="n4_pjip" name="btnSure" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="279,594" group="n6_dhoa">
+    <component id="n4_pjip" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,588">
       <relation target="" sidePair="bottom-bottom"/>
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="确认"/>
       <Button title="确认"/>
     </component>
     </component>
-    <group id="n6_dhoa" name="n6" xy="57,56" size="848,643"/>
   </displayList>
   </displayList>
   <relation target="n3_pjip" sidePair="height-height"/>
   <relation target="n3_pjip" sidePair="height-height"/>
 </component>
 </component>

+ 3 - 3
FGUIProject/assets/CommonGame/BuyConfirmUI.xml

@@ -3,13 +3,13 @@
   <displayList>
   <displayList>
     <component id="n0_ds62" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,536"/>
     <component id="n0_ds62" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,536"/>
     <text id="n3_ds62" name="txtNeed" xy="344,124" pivot="0.5,0" size="279,56" fontSize="42" color="#876e54" text="还需要购买7个"/>
     <text id="n3_ds62" name="txtNeed" xy="344,124" pivot="0.5,0" size="279,56" fontSize="42" color="#876e54" text="还需要购买7个"/>
-    <text id="n4_ds62" name="txtNum" xy="299,294" pivot="0.5,0" size="369,46" fontSize="34" color="#a0845c" text="是否花费700鲛绡购买?">
+    <text id="n4_ds62" name="txtNum" xy="299,299" pivot="0.5,0" size="369,46" fontSize="34" color="#a0845c" text="是否花费700鲛绡购买?">
       <relation target="n1_ds62" sidePair="bottom-top"/>
       <relation target="n1_ds62" sidePair="bottom-top"/>
     </text>
     </text>
-    <component id="n2_ds62" name="btnCancel" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="70,360">
+    <component id="n2_ds62" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,379">
       <Button title="取消"/>
       <Button title="取消"/>
     </component>
     </component>
-    <component id="n1_ds62" name="btnSure" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="512,360">
+    <component id="n1_ds62" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,379">
       <Button title="确认"/>
       <Button title="确认"/>
     </component>
     </component>
   </displayList>
   </displayList>

+ 5 - 5
FGUIProject/assets/CommonGame/BuyCountUI.xml

@@ -18,13 +18,13 @@
     <loader id="n14_ugdz" name="iconPrice" xy="418,298" size="32,32" group="n16_ugdz" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
     <loader id="n14_ugdz" name="iconPrice" xy="418,298" size="32,32" group="n16_ugdz" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
     <text id="n15_ugdz" name="txtPrice" xy="475,288" pivot="0.5,0" size="93,49" group="n16_ugdz" fontSize="36" color="#fdf3d7" autoClearText="true" text="9999"/>
     <text id="n15_ugdz" name="txtPrice" xy="475,288" pivot="0.5,0" size="93,49" group="n16_ugdz" fontSize="36" color="#fdf3d7" autoClearText="true" text="9999"/>
     <group id="n16_ugdz" name="n16" xy="347,288" size="273,49" advanced="true"/>
     <group id="n16_ugdz" name="n16" xy="347,288" size="273,49" advanced="true"/>
-    <component id="n6_hinb" name="btnSure" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="512,354">
-      <Button title="确认"/>
-    </component>
-    <component id="n7_hinb" name="btnCancel" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="70,354">
+    <text id="n24_ai2z" name="txtBuyTips" xy="317,471" pivot="0.5,0" size="333,36" fontSize="26" color="#a0845c" text="消耗1珍珠,可兑换10马蹄金"/>
+    <component id="n7_hinb" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,354">
       <Button title="取消"/>
       <Button title="取消"/>
     </component>
     </component>
-    <text id="n24_ai2z" name="txtBuyTips" xy="317,471" pivot="0.5,0" size="333,36" fontSize="26" color="#a0845c" text="消耗1珍珠,可兑换10马蹄金"/>
+    <component id="n6_hinb" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,354">
+      <Button title="确认"/>
+    </component>
   </displayList>
   </displayList>
   <relation target="n0_hinb" sidePair="height-height"/>
   <relation target="n0_hinb" sidePair="height-height"/>
 </component>
 </component>

+ 2 - 2
FGUIProject/assets/CommonGame/BuyTipsUI.xml

@@ -7,10 +7,10 @@
     <loader id="n5_ds62" name="loaNeed" xy="559,114" size="74,74" aspect="true" url="ui://eg2y0ldply9g8m" fill="scaleFree">
     <loader id="n5_ds62" name="loaNeed" xy="559,114" size="74,74" aspect="true" url="ui://eg2y0ldply9g8m" fill="scaleFree">
       <relation target="n3_ds62" sidePair="left-right"/>
       <relation target="n3_ds62" sidePair="left-right"/>
     </loader>
     </loader>
-    <component id="n2_ds62" name="btnCancel" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="70,360">
+    <component id="n2_ds62" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,360">
       <Button title="取消"/>
       <Button title="取消"/>
     </component>
     </component>
-    <component id="n1_ds62" name="btnSure" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="512,360">
+    <component id="n1_ds62" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,360">
       <Button title="确认"/>
       <Button title="确认"/>
     </component>
     </component>
   </displayList>
   </displayList>

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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="314,105" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_pal5" name="n0" src="pal5v" fileName="imagesExport/zx_anniutz_1.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_pal5" name="title" xy="0,-4" size="314,105" fontSize="46" color="#fff7e4" align="center" vAlign="middle" autoSize="none" strokeColor="#ac904e" strokeSize="2" singleLine="true" autoClearText="true" text="button">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button/>
-</component>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="310,83" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_hinb" name="n0" src="hinb5p" fileName="imagesExport/fzd_anniu_1.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-  </displayList>
-  <Button/>
-</component>

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

@@ -23,7 +23,6 @@
     <component id="ki9637" name="ButtonPlus1.xml" path="/components/" exported="true"/>
     <component id="ki9637" name="ButtonPlus1.xml" path="/components/" exported="true"/>
     <component id="v3541v" name="ComponentValueBar.xml" path="/components/" exported="true"/>
     <component id="v3541v" name="ComponentValueBar.xml" path="/components/" exported="true"/>
     <image id="d4iwj" name="sc_anniu_1.png" path="/imagesExport/" exported="true"/>
     <image id="d4iwj" name="sc_anniu_1.png" path="/imagesExport/" exported="true"/>
-    <component id="pal5w" name="Button4.xml" path="/components/" exported="true"/>
     <image id="pal5v" name="zx_anniutz_1.png" path="/imagesExport/" exported="true"/>
     <image id="pal5v" name="zx_anniutz_1.png" path="/imagesExport/" exported="true"/>
     <image id="ga165a" name="hz_ssuo.png" path="/imagesExport/" exported="true"/>
     <image id="ga165a" name="hz_ssuo.png" path="/imagesExport/" exported="true"/>
     <image id="ga165b" name="hz_ssuodikuang.png" path="/imagesExport/" exported="true"/>
     <image id="ga165b" name="hz_ssuodikuang.png" path="/imagesExport/" exported="true"/>
@@ -42,7 +41,6 @@
     <image id="fka73" name="cj_dikuang.png" path="/imagesExport/" exported="true"/>
     <image id="fka73" name="cj_dikuang.png" path="/imagesExport/" exported="true"/>
     <image id="u67n5n" name="cj_tskuang_2.png" path="/images/"/>
     <image id="u67n5n" name="cj_tskuang_2.png" path="/images/"/>
     <image id="hinb5p" name="fzd_anniu_1.png" path="/imagesExport/" exported="true"/>
     <image id="hinb5p" name="fzd_anniu_1.png" path="/imagesExport/" exported="true"/>
-    <component id="hinb5q" name="Button6.xml" path="/components/" exported="true"/>
     <component id="hinb5r" name="BuyCountUI.xml" path="/" exported="true"/>
     <component id="hinb5r" name="BuyCountUI.xml" path="/" exported="true"/>
     <image id="hinb9" name="fzd_mzkuang.png" path="/imagesExport/" exported="true"/>
     <image id="hinb9" name="fzd_mzkuang.png" path="/imagesExport/" exported="true"/>
     <image id="hinb6" name="fzd_gmkuang.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="54,11,108,22"/>
     <image id="hinb6" name="fzd_gmkuang.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="54,11,108,22"/>
@@ -204,16 +202,8 @@
     <font id="wonotja" name="NANSONG.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="wonotja" name="NANSONG.TTF" path="/Font/" 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="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="wonotjc" name="FANGZHENGYANSONG.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
-    <image id="r9ritjd" name="anniuty2.png" path="/images/" exported="true"/>
-    <image id="r9ritje" name="anniuty_1.png" path="/images/" exported="true"/>
-    <image id="r9ritjf" name="anniuty.png" path="/images/" exported="true"/>
-    <component id="r9ritjg" name="Button17.xml" path="/components/" exported="true"/>
-    <component id="r9ritjh" name="Button18.xml" path="/components/" exported="true"/>
-    <image id="r9ritji" name="anniuty3.png" path="/images/" exported="true"/>
     <component id="r9ritjj" name="ButtonApproach.xml" path="/components/"/>
     <component id="r9ritjj" name="ButtonApproach.xml" path="/components/"/>
     <image id="r9ritjl" name="tc_kuangk.png" path="/imgnew/"/>
     <image id="r9ritjl" name="tc_kuangk.png" path="/imgnew/"/>
-    <component id="r9ritjq" name="Button19.xml" path="/components/" exported="true"/>
-    <image id="r9ritjr" name="anniuty4.png" path="/images/"/>
     <component id="kubi7h" name="CompHeadWithBg.xml" path="/components/" exported="true"/>
     <component id="kubi7h" name="CompHeadWithBg.xml" path="/components/" exported="true"/>
     <image id="kubi7e" name="self.png" path="/images/"/>
     <image id="kubi7e" name="self.png" path="/images/"/>
     <image id="q08xh" name="zjm_txkuang.png" path="/images/"/>
     <image id="q08xh" name="zjm_txkuang.png" path="/images/"/>
@@ -222,12 +212,8 @@
     <image id="r9ritjs" name="grxx_zytxtx.png" path="/images/"/>
     <image id="r9ritjs" name="grxx_zytxtx.png" path="/images/"/>
     <image id="r9ri12k" name="hl_xz_ddik_1.png" path="/images/" exported="true"/>
     <image id="r9ri12k" name="hl_xz_ddik_1.png" path="/images/" exported="true"/>
     <image id="r9ri12o" name="hl_ddandik.png" path="/images/" exported="true"/>
     <image id="r9ri12o" name="hl_ddandik.png" path="/images/" exported="true"/>
-    <component id="wonody" name="Button20.xml" path="/components/" exported="true"/>
-    <component id="oqa1tjt" name="Button21.xml" path="/components/" exported="true"/>
     <component id="r9ri1h" name="ComHead.xml" path="/components/" exported="true"/>
     <component id="r9ri1h" name="ComHead.xml" path="/components/" exported="true"/>
     <image id="v95qtju" name="hc_yyy.png" path="/images/" exported="true"/>
     <image id="v95qtju" name="hc_yyy.png" path="/images/" exported="true"/>
-    <image id="v95qtjv" name="anniuty5.png" path="/images/"/>
-    <component id="v95qtjw" name="Button22.xml" path="/components/" exported="true"/>
     <component id="v95qtjx" name="ComTopTitle.xml" path="/components/" exported="true"/>
     <component id="v95qtjx" name="ComTopTitle.xml" path="/components/" exported="true"/>
     <image id="v95qtjy" name="xgnc_dik_1.png" path="/images/"/>
     <image id="v95qtjy" name="xgnc_dik_1.png" path="/images/"/>
     <image id="v95qtjz" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>
     <image id="v95qtjz" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>

+ 1 - 1
FGUIProject/assets/CreateRole/CreateRoleUI.xml

@@ -3,7 +3,7 @@
   <displayList>
   <displayList>
     <component id="n4_xt5s" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,476"/>
     <component id="n4_xt5s" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,476"/>
     <image id="n11_hpgr" name="n11" src="hpgr5" fileName="images/mc_jlkuang_1.png" xy="114,112"/>
     <image id="n11_hpgr" name="n11" src="hpgr5" fileName="images/mc_jlkuang_1.png" xy="114,112"/>
-    <component id="n5_xt5s" name="btnSure" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="284,304">
+    <component id="n5_xt5s" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,304">
       <Button title="确认" titleColor="#ffffff" titleFontSize="42"/>
       <Button title="确认" titleColor="#ffffff" titleFontSize="42"/>
     </component>
     </component>
     <component id="n8_xt5s" name="btnDice" src="xt5s4" fileName="components/ButtonDice.xml" xy="719,84"/>
     <component id="n8_xt5s" name="btnDice" src="xt5s4" fileName="components/ButtonDice.xml" xy="719,84"/>

+ 9 - 7
FGUIProject/assets/DressUp/DressFilterUI.xml

@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1092">
 <component size="962,1092">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
   <displayList>
     <component id="n0_ih75" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1092"/>
     <component id="n0_ih75" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,1092"/>
     <image id="n17_ih75" name="n17" src="ih753l" fileName="images/sxsx_ssdi.png" xy="97,68" size="644,66"/>
     <image id="n17_ih75" name="n17" src="ih753l" fileName="images/sxsx_ssdi.png" xy="97,68" size="644,66"/>
     <text id="n16_ih75" name="txtInput" xy="147,74" size="437,49" fontSize="36" color="#b6a688" autoSize="none" text="" input="true" prompt="请输入搜索关键词"/>
     <text id="n16_ih75" name="txtInput" xy="147,74" size="437,49" fontSize="36" color="#b6a688" autoSize="none" text="" input="true" prompt="请输入搜索关键词"/>
     <component id="n2_ih75" name="btnSearch" src="ih753h" fileName="components/Button1.xml" xy="769,57"/>
     <component id="n2_ih75" name="btnSearch" src="ih753h" fileName="components/Button1.xml" xy="769,57"/>
     <component id="n18_ih75" name="btnClose" src="ih753n" fileName="components/Button5.xml" xy="898,-36"/>
     <component id="n18_ih75" name="btnClose" src="ih753n" fileName="components/Button5.xml" xy="898,-36"/>
-    <component id="n13_ih75" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="508,941">
+    <component id="n13_ih75" name="btnConfirm" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,941">
       <Button title="确认"/>
       <Button title="确认"/>
     </component>
     </component>
-    <component id="n14_ih75" name="btnReset" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="66,941"/>
+    <component id="n14_ih75" name="btnReset" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,941">
+      <Button title="重置"/>
+    </component>
     <component id="n5_ih75" name="n5" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="68,204" group="n6_ih75">
     <component id="n5_ih75" name="n5" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="68,204" group="n6_ih75">
       <property target="txtName" propertyId="0" value="品质筛选"/>
       <property target="txtName" propertyId="0" value="品质筛选"/>
     </component>
     </component>
@@ -33,10 +35,10 @@
     <group id="n10_ih75" name="grpScore" xy="68,449" size="846,200" group="n19_n0js" advanced="true">
     <group id="n10_ih75" name="grpScore" xy="68,449" size="846,200" group="n19_n0js" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay controller="c1" pages="0"/>
     </group>
     </group>
-    <component id="n9_ih75" name="n9" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="68,694" group="n12_ih75">
+    <component id="n9_ih75" name="n9" src="ih7596" fileName="components/ComFilterType.xml" pkg="eg2y0ldp" xy="68,449" group="n12_ih75">
       <property target="txtName" propertyId="0" value="风格筛选"/>
       <property target="txtName" propertyId="0" value="风格筛选"/>
     </component>
     </component>
-    <list id="n11_ih75" name="listTag" xy="72,752" size="854,124" group="n12_ih75" layout="flow_hz" selectionMode="multipleSingleClick" overflow="scroll" lineGap="27" colGap="60" defaultItem="ui://mbo439wbih753k" autoClearItems="true">
+    <list id="n11_ih75" name="listTag" xy="72,507" size="854,272" group="n12_ih75" layout="flow_hz" selectionMode="multipleSingleClick" overflow="scroll" lineGap="27" colGap="60" defaultItem="ui://mbo439wbih753k" autoClearItems="true">
       <gearSize controller="c1" pages="0" values="854,124,1,1" default="854,272,1,1"/>
       <gearSize controller="c1" pages="0" values="854,124,1,1" default="854,272,1,1"/>
       <item/>
       <item/>
       <item/>
       <item/>
@@ -54,7 +56,7 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <group id="n12_ih75" name="grpTags" xy="68,694" size="858,182" group="n19_n0js" advanced="true"/>
-    <group id="n19_n0js" name="n19" xy="68,204" size="858,672" advanced="true" layout="vt" lineGap="45" excludeInvisibles="true"/>
+    <group id="n12_ih75" name="grpTags" xy="68,449" size="858,330" group="n19_n0js" advanced="true"/>
+    <group id="n19_n0js" name="n19" xy="68,204" size="858,575" advanced="true" layout="vt" lineGap="45" excludeInvisibles="true"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 1 - 1
FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -69,7 +69,7 @@
       <relation target="" sidePair="bottom-bottom"/>
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="下一步"/>
       <Button title="下一步"/>
     </component>
     </component>
-    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button20.xml" pkg="eg2y0ldp" xy="480,1728" group="n47_v95q">
+    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button20.xml" pkg="mk0fwx0x" xy="480,1728" group="n47_v95q">
       <relation target="" sidePair="bottom-bottom"/>
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="推荐搭配"/>
       <Button title="推荐搭配"/>
     </component>
     </component>

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

@@ -45,11 +45,11 @@
     <component id="n32_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" 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"/>
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
     </component>
-    <component id="n12_q08x" name="btnSave" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj" pkg="eg2y0ldp">
+    <component id="n12_q08x" name="btnSave" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj" pkg="mk0fwx0x">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="保存搭配" titleColor="#fdfaed" titleFontSize="54"/>
       <Button title="保存搭配" titleColor="#fdfaed" titleFontSize="54"/>
     </component>
     </component>
-    <component id="n35_r9ri" name="btnNext" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj" pkg="eg2y0ldp">
+    <component id="n35_r9ri" name="btnNext" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj" pkg="mk0fwx0x">
       <gearDisplay controller="c2" pages="1"/>
       <gearDisplay controller="c2" pages="1"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="下一步" titleColor="#fdfaed" titleFontSize="54"/>
       <Button title="下一步" titleColor="#fdfaed" titleFontSize="54"/>

+ 2 - 2
FGUIProject/assets/DressUp/PhotographUI.xml

@@ -23,10 +23,10 @@
     <group id="n16_9ico" name="n16" xy="940,409" size="125,415" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true">
     <group id="n16_9ico" name="n16" xy="940,409" size="125,415" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true">
       <relation target="" sidePair="right-right,top-top"/>
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     </group>
-    <component id="n18_r9ri" name="btnGalleryJoin" src="r9ritjg" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="369,1728">
+    <component id="n18_r9ri" name="btnGalleryJoin" src="r9ritjg" fileName="components/Button17.xml" pkg="mk0fwx0x" xy="369,1728">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottom-bottom"/>
       <relation target="" sidePair="bottom-bottom"/>
-      <Button title="确认上传" icon="ui://eg2y0ldpr9ritjd"/>
+      <Button title="确认上传" icon="ui://mk0fwx0xr9ritjd"/>
     </component>
     </component>
     <image id="n19_r9ri" name="n19" src="r9riek" fileName="images/hl_ciskuang.png" xy="480,1834" group="n21_r9ri"/>
     <image id="n19_r9ri" name="n19" src="r9riek" fileName="images/hl_ciskuang.png" xy="480,1834" group="n21_r9ri"/>
     <text id="n20_r9ri" name="txtCount" xy="501,1831" pivot="0.5,0" size="77,41" group="n21_r9ri" fontSize="30" color="#e3d3ae" text="3/10"/>
     <text id="n20_r9ri" name="txtCount" xy="501,1831" pivot="0.5,0" size="77,41" group="n21_r9ri" fontSize="30" color="#e3d3ae" text="3/10"/>

+ 1 - 1
FGUIProject/assets/Field/FieldFightEndUI.xml

@@ -6,7 +6,7 @@
       <item/>
       <item/>
     </list>
     </list>
     <text id="n3_ohun" name="txtTitle" xy="383,40" size="196,64" fontSize="48" color="#9b7853" text="挑战完成"/>
     <text id="n3_ohun" name="txtTitle" xy="383,40" size="196,64" fontSize="48" color="#9b7853" text="挑战完成"/>
-    <component id="n0_s20j" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="291,535">
+    <component id="n0_s20j" name="btnConfirm" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,545">
       <Button title="确定"/>
       <Button title="确定"/>
     </component>
     </component>
     <text id="n4_ohun" name="txtNum" xy="393,140" pivot="0.5,0" size="175,46" fontSize="34" color="#a17d5f" ubb="true" text="第20/20轮"/>
     <text id="n4_ohun" name="txtNum" xy="393,140" pivot="0.5,0" size="175,46" fontSize="34" color="#a17d5f" ubb="true" text="第20/20轮"/>

+ 1 - 1
FGUIProject/assets/Field/FieldFightInfoUI.xml

@@ -4,7 +4,7 @@
     <component id="n1_ohun" name="n1" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,915"/>
     <component id="n1_ohun" name="n1" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,915"/>
     <image id="n4_ohun" name="n4" src="ohunw" fileName="images/tydc_npckuang.png" xy="341,408"/>
     <image id="n4_ohun" name="n4" src="ohunw" fileName="images/tydc_npckuang.png" xy="341,408"/>
     <image id="n3_ohun" name="n3" src="ohunx" fileName="images/tydc_npcdik.png" xy="58,500"/>
     <image id="n3_ohun" name="n3" src="ohunx" fileName="images/tydc_npcdik.png" xy="58,500"/>
-    <component id="n0_s20j" name="btnStop" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="291,726">
+    <component id="n0_s20j" name="btnStop" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,726">
       <Button title="中止挑战"/>
       <Button title="中止挑战"/>
     </component>
     </component>
     <loader id="n5_ohun" name="loaNpc" xy="456,400" pivot="0.5,1" size="50,50" autoSize="true"/>
     <loader id="n5_ohun" name="loaNpc" xy="456,400" pivot="0.5,1" size="50,50" autoSize="true"/>

+ 6 - 6
FGUIProject/assets/Login/LoginInputUI.xml

@@ -3,15 +3,15 @@
   <displayList>
   <displayList>
     <component id="n1_q08x" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,732"/>
     <component id="n1_q08x" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,732"/>
     <component id="n4_q08x" name="btnRegister" src="q08xj" fileName="components/ButtonRegister.xml" xy="803,668"/>
     <component id="n4_q08x" name="btnRegister" src="q08xj" fileName="components/ButtonRegister.xml" xy="803,668"/>
-    <image id="n17_ozsv" name="n17" src="ozsv4u" fileName="images/dl_kuang_1.png" xy="114,124"/>
-    <image id="n18_ozsv" name="n18" src="ozsv4u" fileName="images/dl_kuang_1.png" xy="114,284"/>
-    <text id="n8_q08x" name="inputAccount" xy="160,132" size="709,49" fontSize="36" color="#b08864" autoSize="none" text="" input="true" prompt="[color=#B8A492]请输入账号[/color]"/>
-    <text id="n10_q08x" name="inputPassword" xy="160,291" size="707,49" fontSize="36" color="#b08864" autoSize="none" text="" input="true" prompt="[color=#B8A492]请输入密码[/color]" password="true"/>
     <image id="n19_ozsv" name="n19" src="ozsv4z" fileName="images/dl_ziti_1.png" xy="0,-130"/>
     <image id="n19_ozsv" name="n19" src="ozsv4z" fileName="images/dl_ziti_1.png" xy="0,-130"/>
-    <component id="n20_ozsv" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="90,520">
+    <image id="n17_ozsv" name="n17" src="ozsv4u" fileName="images/dl_kuang_1.png" xy="90,124"/>
+    <image id="n18_ozsv" name="n18" src="ozsv4u" fileName="images/dl_kuang_1.png" xy="90,284"/>
+    <text id="n8_q08x" name="inputAccount" xy="136,132" size="709,49" fontSize="36" color="#b08864" autoSize="none" text="" input="true" prompt="[color=#B8A492]请输入账号[/color]"/>
+    <text id="n10_q08x" name="inputPassword" xy="136,291" size="707,49" fontSize="36" color="#b08864" autoSize="none" text="" input="true" prompt="[color=#B8A492]请输入密码[/color]" password="true"/>
+    <component id="n20_ozsv" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,520">
       <Button title="取消"/>
       <Button title="取消"/>
     </component>
     </component>
-    <component id="n21_ozsv" name="btnSure" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="532,520">
+    <component id="n21_ozsv" name="btnSure" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,520">
       <Button title="确认"/>
       <Button title="确认"/>
     </component>
     </component>
   </displayList>
   </displayList>

+ 1 - 1
FGUIProject/assets/Mail/MailContentUI.xml

@@ -17,7 +17,7 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <component id="n16_ehs9" name="btnGet" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="278,1097">
+    <component id="n16_ehs9" name="btnGet" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="291,1097">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay controller="c1" pages="1"/>
       <Button title="领取"/>
       <Button title="领取"/>
     </component>
     </component>

+ 6 - 6
FGUIProject/assets/Mail/MailUI.xml

@@ -12,16 +12,16 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <component id="n9_ehs9" name="btnDelete" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="69,1059">
-      <Button title="一键删除"/>
-    </component>
-    <component id="n8_ehs9" name="btnGet" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="511,1059">
-      <Button title="一键领取"/>
-    </component>
     <text id="n10_kxic" name="txtTips" xy="401,559" size="164,54" fontSize="40" color="#736b64" text="暂无邮件"/>
     <text id="n10_kxic" name="txtTips" xy="401,559" size="164,54" fontSize="40" color="#736b64" text="暂无邮件"/>
     <text id="n11_j8b3" name="txtCount" xy="930,113" pivot="1,0" anchor="true" size="243,36" fontSize="26" color="#b19977" ubb="true" text="当前邮件:100/300">
     <text id="n11_j8b3" name="txtCount" xy="930,113" pivot="1,0" anchor="true" size="243,36" fontSize="26" color="#b19977" ubb="true" text="当前邮件:100/300">
       <relation target="" sidePair="right-right"/>
       <relation target="" sidePair="right-right"/>
     </text>
     </text>
     <text id="n12_j8b3" name="txtMaxCount" xy="246,1170" pivot="0.5,0" size="473,41" fontSize="30" color="#c1aa8f" text="最高可储存300封邮箱,请及时查看"/>
     <text id="n12_j8b3" name="txtMaxCount" xy="246,1170" pivot="0.5,0" size="473,41" fontSize="30" color="#c1aa8f" text="最高可储存300封邮箱,请及时查看"/>
+    <component id="n9_ehs9" name="btnDelete" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,1059">
+      <Button title="一键删除"/>
+    </component>
+    <component id="n8_ehs9" name="btnGet" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,1059">
+      <Button title="一键领取"/>
+    </component>
   </displayList>
   </displayList>
 </component>
 </component>

+ 4 - 2
FGUIProject/assets/Main/StoryCardChooseUI.xml

@@ -20,9 +20,11 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <component id="n2_r1a9" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="79,1105">
+    <component id="n2_r1a9" name="btnCancel" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="95,1113">
       <Button title="取消"/>
       <Button title="取消"/>
     </component>
     </component>
-    <component id="n3_r1a9" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="521,1105"/>
+    <component id="n3_r1a9" name="btnConfirm" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="537,1113">
+      <Button title="确认"/>
+    </component>
   </displayList>
   </displayList>
 </component>
 </component>

+ 3 - 3
FGUIProject/assets/Main/StoryFightQuicklyUI.xml

@@ -17,10 +17,10 @@
       <gearSize controller="c1" pages="0,1" values="895,870,1,1|895,793,1,1"/>
       <gearSize controller="c1" pages="0,1" values="895,870,1,1|895,793,1,1"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <relation target="" sidePair="bottomext-bottom"/>
     </list>
     </list>
-    <component id="n6_s2cc" name="btnExit" src="r9ritjh" fileName="components/Button18.xml" pkg="eg2y0ldp" xy="148,1110" size="342,96" group="n16_nzmy">
-      <Button title="结束挑战" icon="ui://eg2y0ldpr9ritji"/>
+    <component id="n6_s2cc" name="btnExit" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="148,1110" size="342,96" group="n16_nzmy">
+      <Button title="结束挑战" icon="ui://mk0fwx0xr9ritji"/>
     </component>
     </component>
-    <component id="n5_s2cc" name="btnFightTimes" src="r9ritjg" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="580,1110" group="n16_nzmy">
+    <component id="n5_s2cc" name="btnFightTimes" src="r9ritjg" fileName="components/Button17.xml" pkg="mk0fwx0x" xy="580,1110" group="n16_nzmy">
       <Button title="挑战十次"/>
       <Button title="挑战十次"/>
     </component>
     </component>
     <group id="n16_nzmy" name="n16" xy="148,1110" size="774,96" group="n19_mueb" advanced="true" layout="hz" colGap="90" excludeInvisibles="true">
     <group id="n16_nzmy" name="n16" xy="148,1110" size="774,96" group="n19_mueb" advanced="true" layout="hz" colGap="90" excludeInvisibles="true">

+ 2 - 2
FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -57,10 +57,10 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <component id="n19_t8o1" name="btnFightOnce" src="v95qtjw" fileName="components/Button22.xml" pkg="eg2y0ldp" xy="102,1046" group="n23_t8o1">
+    <component id="n19_t8o1" name="btnFightOnce" src="v95qtjw" fileName="components/Button22.xml" pkg="mk0fwx0x" xy="102,1046" group="n23_t8o1">
       <Button title="挑战一次"/>
       <Button title="挑战一次"/>
     </component>
     </component>
-    <component id="n20_t8o1" name="btnFightTimes" src="v95qtjw" fileName="components/Button22.xml" pkg="eg2y0ldp" xy="425,1046" group="n23_t8o1">
+    <component id="n20_t8o1" name="btnFightTimes" src="v95qtjw" fileName="components/Button22.xml" pkg="mk0fwx0x" xy="425,1046" group="n23_t8o1">
       <Button title="挑战十次"/>
       <Button title="挑战十次"/>
     </component>
     </component>
     <group id="n23_t8o1" name="groupPass" xy="102,1046" size="596,78" advanced="true" layout="hz" colGap="50" excludeInvisibles="true">
     <group id="n23_t8o1" name="groupPass" xy="102,1046" size="596,78" advanced="true" layout="hz" colGap="50" excludeInvisibles="true">

+ 2 - 1
FGUIProject/assets/RechargeStore/GiftBagBuyUI.xml

@@ -16,8 +16,9 @@
     <image id="n5_10not" name="n5" src="dmsi1l" fileName="images/sc_kuangsjsj.png" xy="729,107" group="n7_10not"/>
     <image id="n5_10not" name="n5" src="dmsi1l" fileName="images/sc_kuangsjsj.png" xy="729,107" group="n7_10not"/>
     <text id="n6_10not" name="txtEndTime" xy="756,105" pivot="0.5,0" size="94,41" group="n7_10not" fontSize="30" color="#ffffff" align="center" leading="-5" letterSpacing="-2" strokeColor="#b98653" strokeSize="2" text="12小时"/>
     <text id="n6_10not" name="txtEndTime" xy="756,105" pivot="0.5,0" size="94,41" group="n7_10not" fontSize="30" color="#ffffff" align="center" leading="-5" letterSpacing="-2" strokeColor="#b98653" strokeSize="2" text="12小时"/>
     <group id="n7_10not" name="grpEndTime" xy="729,105" size="155,42" advanced="true"/>
     <group id="n7_10not" name="grpEndTime" xy="729,105" size="155,42" advanced="true"/>
-    <component id="n16_10not" name="btnBuy" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="291,566">
+    <component id="n16_10not" name="btnBuy" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="309,576">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay controller="c1" pages="0"/>
+      <Button title="购买"/>
     </component>
     </component>
     <text id="n17_oeuo" name="txtLock" xy="316,540" pivot="0.5,0" size="304,64" fontSize="48" color="#aa946b" text="通关2-10解锁">
     <text id="n17_oeuo" name="txtLock" xy="316,540" pivot="0.5,0" size="304,64" fontSize="48" color="#aa946b" text="通关2-10解锁">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay controller="c1" pages="1"/>

+ 1 - 1
FGUIProject/assets/RoleInfo/ChangeHead.xml

@@ -40,7 +40,7 @@
     <text id="n6_r9ri" name="txtDesc" xy="394,345" size="138,46" group="n12_r9ri" fontSize="34" color="#ceb599" text="头像描述"/>
     <text id="n6_r9ri" name="txtDesc" xy="394,345" size="138,46" group="n12_r9ri" fontSize="34" color="#ceb599" text="头像描述"/>
     <group id="n12_r9ri" name="n12" xy="105,187" size="796,238"/>
     <group id="n12_r9ri" name="n12" xy="105,187" size="796,238"/>
     <image id="n13_r9ri" name="n13" src="r9rim" fileName="images/grxx_xtxtx.png" xy="88,957"/>
     <image id="n13_r9ri" name="n13" src="r9rim" fileName="images/grxx_xtxtx.png" xy="88,957"/>
-    <component id="n14_r9ri" name="btnSure" src="r9ritjq" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="356,1003">
+    <component id="n14_r9ri" name="btnSure" src="r9ritjq" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="356,1003">
       <Button title="保存" titleColor="#ffffff" titleFontSize="42"/>
       <Button title="保存" titleColor="#ffffff" titleFontSize="42"/>
     </component>
     </component>
   </displayList>
   </displayList>

+ 1 - 1
FGUIProject/assets/RoleInfo/ChangeNameUI.xml

@@ -6,7 +6,7 @@
     <text id="n12_r9ri" name="n12" xy="387,87" size="186,61" font="ui://eg2y0ldpwonotja" fontSize="46" color="#a98151" text="修改昵称"/>
     <text id="n12_r9ri" name="n12" xy="387,87" size="186,61" font="ui://eg2y0ldpwonotja" fontSize="46" color="#a98151" text="修改昵称"/>
     <image id="n13_r9ri" name="n13" src="r9rix" fileName="images/xgnc_dik_2.png" xy="200,238"/>
     <image id="n13_r9ri" name="n13" src="r9rix" fileName="images/xgnc_dik_2.png" xy="200,238"/>
     <text id="n10_xt5s" name="inputName" xy="217,248" size="526,56" fontSize="38" color="#ac8450" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]请输入新角色名称[/color]" maxLength="7"/>
     <text id="n10_xt5s" name="inputName" xy="217,248" size="526,56" fontSize="38" color="#ac8450" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]请输入新角色名称[/color]" maxLength="7"/>
-    <component id="n5_xt5s" name="btnSure" src="r9ritjq" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="338,490">
+    <component id="n5_xt5s" name="btnSure" src="r9ritjq" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="338,490">
       <Button title="确定" titleColor="#ffffff" titleFontSize="42"/>
       <Button title="确定" titleColor="#ffffff" titleFontSize="42"/>
     </component>
     </component>
     <text id="n15_r9ri" name="txtNeed" xy="357,422" size="191,44" group="n17_v95q" fontSize="32" color="#b99f7b" text="改名卡:0/1"/>
     <text id="n15_r9ri" name="txtNeed" xy="357,422" size="191,44" group="n17_v95q" fontSize="32" color="#b99f7b" text="改名卡:0/1"/>

+ 2 - 2
FGUIProject/assets/RoleInfo/SettingUI.xml

@@ -5,10 +5,10 @@
     <image id="n14_oqa1" name="n14" src="r9riv" fileName="images/xgnc_btkuang.png" xy="309,83" size="342,68" group="n16_oqa1"/>
     <image id="n14_oqa1" name="n14" src="r9riv" fileName="images/xgnc_btkuang.png" xy="309,83" size="342,68" group="n16_oqa1"/>
     <text id="n15_oqa1" name="n15" xy="432,87" size="95,62" group="n16_oqa1" font="ui://eg2y0ldpwonotja" fontSize="46" color="#a98151" text="设置"/>
     <text id="n15_oqa1" name="n15" xy="432,87" size="95,62" group="n16_oqa1" font="ui://eg2y0ldpwonotja" fontSize="46" color="#a98151" text="设置"/>
     <group id="n16_oqa1" name="n16" xy="309,83" size="342,68"/>
     <group id="n16_oqa1" name="n16" xy="309,83" size="342,68"/>
-    <component id="n9_r9ri" name="btnLogout" src="r9ritjh" fileName="components/Button18.xml" pkg="eg2y0ldp" xy="511,488" aspect="true">
+    <component id="n9_r9ri" name="btnLogout" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="511,488" aspect="true">
       <Button title="注销账户"/>
       <Button title="注销账户"/>
     </component>
     </component>
-    <component id="n13_oqa1" name="btnExit" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="112,488" aspect="true">
+    <component id="n13_oqa1" name="btnExit" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="112,488" aspect="true">
       <Button title="返回登录"/>
       <Button title="返回登录"/>
     </component>
     </component>
     <text id="n6_r9ri" name="n6" xy="144,273" size="87,56" group="n12_r9ri" font="ui://eg2y0ldpwonotja" fontSize="42" color="#c58c88" text="音乐"/>
     <text id="n6_r9ri" name="n6" xy="144,273" size="87,56" group="n12_r9ri" font="ui://eg2y0ldpwonotja" fontSize="42" color="#c58c88" text="音乐"/>

+ 6 - 6
FGUIProject/assets/Studio/StudioBuyNumUI.xml

@@ -3,16 +3,16 @@
   <displayList>
   <displayList>
     <component id="n26_eiwu" name="loaBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,574"/>
     <component id="n26_eiwu" name="loaBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mgs5yrnj" xy="0,0" size="962,574"/>
     <image id="n32_kqhd" name="n32" src="9cth8y" fileName="imagesExport/tctc_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
     <image id="n32_kqhd" name="n32" src="9cth8y" fileName="imagesExport/tctc_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
-    <component id="n6_hinb" name="btnBuy" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="509,419">
-      <Button title="购买"/>
-    </component>
-    <component id="n7_hinb" name="btnExchange" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="68,420">
-      <Button title="兑换"/>
-    </component>
     <component id="n27_n3xh" name="comCostItem" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="113,364"/>
     <component id="n27_n3xh" name="comCostItem" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="113,364"/>
     <component id="n28_n3xh" name="comCostCurrent" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="553,364"/>
     <component id="n28_n3xh" name="comCostCurrent" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="553,364"/>
     <text id="n30_n3xh" name="txtTitle" xy="431,30" pivot="0.5,0" size="100,64" fontSize="48" color="#9b7853" text="提示"/>
     <text id="n30_n3xh" name="txtTitle" xy="431,30" pivot="0.5,0" size="100,64" fontSize="48" color="#9b7853" text="提示"/>
     <text id="n29_n3xh" name="txtTips" xy="310,150" pivot="0.5,0" size="342,51" fontSize="38" color="#917961" text="请选择获取次数方式"/>
     <text id="n29_n3xh" name="txtTips" xy="310,150" pivot="0.5,0" size="342,51" fontSize="38" color="#917961" text="请选择获取次数方式"/>
     <text id="n31_n3xh" name="txtNum" xy="334,220" pivot="0.5,0" size="294,44" fontSize="32" color="#917961" text="(今日已兑换0/10次)"/>
     <text id="n31_n3xh" name="txtNum" xy="334,220" pivot="0.5,0" size="294,44" fontSize="32" color="#917961" text="(今日已兑换0/10次)"/>
+    <component id="n7_hinb" name="btnExchange" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,420">
+      <Button title="兑换"/>
+    </component>
+    <component id="n6_hinb" name="btnBuy" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="529,420">
+      <Button title="购买"/>
+    </component>
   </displayList>
   </displayList>
 </component>
 </component>

+ 2 - 2
FGUIProject/assets/Travel/TravelUI.xml

@@ -41,10 +41,10 @@
       <gearDisplay controller="c1" pages="2"/>
       <gearDisplay controller="c1" pages="2"/>
       <Button title="游历结束"/>
       <Button title="游历结束"/>
     </component>
     </component>
-    <component id="n5_wono" name="btnPhoto" src="r9ritjg" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="190,1496" group="n16_wono">
+    <component id="n5_wono" name="btnPhoto" src="r9ritjg" fileName="components/Button17.xml" pkg="mk0fwx0x" xy="190,1496" group="n16_wono">
       <Button title="相册"/>
       <Button title="相册"/>
     </component>
     </component>
-    <component id="n19_v95q" name="btnFieldGuide" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="583,1496" group="n16_wono">
+    <component id="n19_v95q" name="btnFieldGuide" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="583,1496" group="n16_wono">
       <Button title="图鉴"/>
       <Button title="图鉴"/>
     </component>
     </component>
     <group id="n16_wono" name="n16" xy="2,220" size="1076,1471" advanced="true">
     <group id="n16_wono" name="n16" xy="2,220" size="1076,1471" advanced="true">

+ 18 - 18
GameClient/Assets/Game/HotUpdate/Controller/LogController.cs

@@ -14,7 +14,7 @@ namespace GFGGame
 
 
         public Dictionary<string, List<string>> msgDic = new Dictionary<string, List<string>>();
         public Dictionary<string, List<string>> msgDic = new Dictionary<string, List<string>>();
 
 
-        private UI_BtnLog _btnLog;
+        // private UI_BtnLog _btnLog;
 
 
         public void Init()
         public void Init()
         {
         {
@@ -64,11 +64,11 @@ namespace GFGGame
                     msgDic[_all].Add(msg);
                     msgDic[_all].Add(msg);
                     msgDic[_error].Add(msg);
                     msgDic[_error].Add(msg);
 
 
-                    if (_btnLog != null)
-                    {
-                        _btnLog.m_c1.selectedIndex = 1;
-                        _btnLog.target.alpha = 1;
-                    }
+                    // if (_btnLog != null)
+                    // {
+                    //     _btnLog.m_c1.selectedIndex = 1;
+                    //     _btnLog.target.alpha = 1;
+                    // }
                     if (LauncherConfig.onDebug >= 0)
                     if (LauncherConfig.onDebug >= 0)
                     {
                     {
                         ViewManager.Show(ViewName.LOG_VIEW);
                         ViewManager.Show(ViewName.LOG_VIEW);
@@ -97,26 +97,26 @@ namespace GFGGame
 
 
         private void CreatBtnLog()
         private void CreatBtnLog()
         {
         {
-            if (_btnLog == null)
-            {
-                _btnLog = UI_BtnLog.Create();
-                ViewManager.AddChildToDebugLayer(_btnLog.target);
-                this.SetBtnLogVisable(false);
-                _btnLog.target.x = 50;
-                _btnLog.target.y = 1880;
-                _btnLog.target.onClick.Add(this.OnBtnLogClick);
-            }
+            // if (_btnLog == null)
+            // {
+            //     _btnLog = UI_BtnLog.Create();
+            //     ViewManager.AddChildToDebugLayer(_btnLog.target);
+            //     this.SetBtnLogVisable(false);
+            //     _btnLog.target.x = 50;
+            //     _btnLog.target.y = 1880;
+            //     _btnLog.target.onClick.Add(this.OnBtnLogClick);
+            // }
         }
         }
         private void OnBtnLogClick()
         private void OnBtnLogClick()
         {
         {
             ViewManager.Show(ViewName.LOG_VIEW);
             ViewManager.Show(ViewName.LOG_VIEW);
-            _btnLog.m_c1.selectedIndex = 0;
-            _btnLog.target.alpha = 0;
+            // _btnLog.m_c1.selectedIndex = 0;
+            // _btnLog.target.alpha = 0;
         }
         }
 
 
         public void SetBtnLogVisable(bool visable)
         public void SetBtnLogVisable(bool visable)
         {
         {
-            _btnLog.target.visible = visable;
+            // _btnLog.target.visible = visable;
         }
         }
     }
     }
 }
 }

+ 0 - 77
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_BtnLog.cs

@@ -1,77 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Common
-{
-    public partial class UI_BtnLog
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public GButton m_btnLog;
-        public GImage m_imgRed;
-        public const string URL = "ui://mk0fwx0xg9264y";
-        public const string PACKAGE_NAME = "Common";
-        public const string RES_NAME = "BtnLog";
-        private static UI_BtnLog _proxy;
-
-        public static UI_BtnLog Create(GObject gObject = null)
-        {
-            var ui = new UI_BtnLog();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_BtnLog Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_BtnLog();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_c1 = comp.GetController("c1");
-            m_btnLog = (GButton)comp.GetChild("btnLog");
-            m_imgRed = (GImage)comp.GetChild("imgRed");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_btnLog = null;
-            m_imgRed = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_BtnLog.cs.meta

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

+ 6 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyCountUI.cs

@@ -17,9 +17,9 @@ namespace UI.CommonGame
         public GTextField m_txtCount;
         public GTextField m_txtCount;
         public GLoader m_iconPrice;
         public GLoader m_iconPrice;
         public GTextField m_txtPrice;
         public GTextField m_txtPrice;
-        public GButton m_btnSure;
-        public GButton m_btnCancel;
         public GTextField m_txtBuyTips;
         public GTextField m_txtBuyTips;
+        public GButton m_btnCancel;
+        public GButton m_btnSure;
         public const string URL = "ui://eg2y0ldphinb5r";
         public const string URL = "ui://eg2y0ldphinb5r";
         public const string PACKAGE_NAME = "CommonGame";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "BuyCountUI";
         public const string RES_NAME = "BuyCountUI";
@@ -77,9 +77,9 @@ namespace UI.CommonGame
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_iconPrice = (GLoader)comp.GetChild("iconPrice");
             m_iconPrice = (GLoader)comp.GetChild("iconPrice");
             m_txtPrice = (GTextField)comp.GetChild("txtPrice");
             m_txtPrice = (GTextField)comp.GetChild("txtPrice");
-            m_btnSure = (GButton)comp.GetChild("btnSure");
-            m_btnCancel = (GButton)comp.GetChild("btnCancel");
             m_txtBuyTips = (GTextField)comp.GetChild("txtBuyTips");
             m_txtBuyTips = (GTextField)comp.GetChild("txtBuyTips");
+            m_btnCancel = (GButton)comp.GetChild("btnCancel");
+            m_btnSure = (GButton)comp.GetChild("btnSure");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
@@ -93,9 +93,9 @@ namespace UI.CommonGame
             m_txtCount = null;
             m_txtCount = null;
             m_iconPrice = null;
             m_iconPrice = null;
             m_txtPrice = null;
             m_txtPrice = null;
-            m_btnSure = null;
-            m_btnCancel = null;
             m_txtBuyTips = null;
             m_txtBuyTips = null;
+            m_btnCancel = null;
+            m_btnSure = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 6 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Mail/UI_MailUI.cs

@@ -9,11 +9,11 @@ namespace UI.Mail
         public GComponent target;
         public GComponent target;
         public GComponent m_bg;
         public GComponent m_bg;
         public GList m_list;
         public GList m_list;
-        public GButton m_btnDelete;
-        public GButton m_btnGet;
         public GTextField m_txtTips;
         public GTextField m_txtTips;
         public GTextField m_txtCount;
         public GTextField m_txtCount;
         public GTextField m_txtMaxCount;
         public GTextField m_txtMaxCount;
+        public GButton m_btnDelete;
+        public GButton m_btnGet;
         public const string URL = "ui://y44a413eehs9c";
         public const string URL = "ui://y44a413eehs9c";
         public const string PACKAGE_NAME = "Mail";
         public const string PACKAGE_NAME = "Mail";
         public const string RES_NAME = "MailUI";
         public const string RES_NAME = "MailUI";
@@ -63,21 +63,21 @@ namespace UI.Mail
         {
         {
             m_bg = (GComponent)comp.GetChild("bg");
             m_bg = (GComponent)comp.GetChild("bg");
             m_list = (GList)comp.GetChild("list");
             m_list = (GList)comp.GetChild("list");
-            m_btnDelete = (GButton)comp.GetChild("btnDelete");
-            m_btnGet = (GButton)comp.GetChild("btnGet");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtMaxCount = (GTextField)comp.GetChild("txtMaxCount");
             m_txtMaxCount = (GTextField)comp.GetChild("txtMaxCount");
+            m_btnDelete = (GButton)comp.GetChild("btnDelete");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_bg = null;
             m_bg = null;
             m_list = null;
             m_list = null;
-            m_btnDelete = null;
-            m_btnGet = null;
             m_txtTips = null;
             m_txtTips = null;
             m_txtCount = null;
             m_txtCount = null;
             m_txtMaxCount = null;
             m_txtMaxCount = null;
+            m_btnDelete = null;
+            m_btnGet = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 6 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioBuyNumUI.cs

@@ -8,13 +8,13 @@ namespace UI.Studio
     {
     {
         public GComponent target;
         public GComponent target;
         public GComponent m_loaBg;
         public GComponent m_loaBg;
-        public GButton m_btnBuy;
-        public GButton m_btnExchange;
         public GComponent m_comCostItem;
         public GComponent m_comCostItem;
         public GComponent m_comCostCurrent;
         public GComponent m_comCostCurrent;
         public GTextField m_txtTitle;
         public GTextField m_txtTitle;
         public GTextField m_txtTips;
         public GTextField m_txtTips;
         public GTextField m_txtNum;
         public GTextField m_txtNum;
+        public GButton m_btnExchange;
+        public GButton m_btnBuy;
         public const string URL = "ui://xz8kxrecn3xhh";
         public const string URL = "ui://xz8kxrecn3xhh";
         public const string PACKAGE_NAME = "Studio";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioBuyNumUI";
         public const string RES_NAME = "StudioBuyNumUI";
@@ -63,24 +63,24 @@ namespace UI.Studio
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GComponent)comp.GetChild("loaBg");
             m_loaBg = (GComponent)comp.GetChild("loaBg");
-            m_btnBuy = (GButton)comp.GetChild("btnBuy");
-            m_btnExchange = (GButton)comp.GetChild("btnExchange");
             m_comCostItem = (GComponent)comp.GetChild("comCostItem");
             m_comCostItem = (GComponent)comp.GetChild("comCostItem");
             m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
             m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_btnExchange = (GButton)comp.GetChild("btnExchange");
+            m_btnBuy = (GButton)comp.GetChild("btnBuy");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_loaBg = null;
             m_loaBg = null;
-            m_btnBuy = null;
-            m_btnExchange = null;
             m_comCostItem = null;
             m_comCostItem = null;
             m_comCostCurrent = null;
             m_comCostCurrent = null;
             m_txtTitle = null;
             m_txtTitle = null;
             m_txtTips = null;
             m_txtTips = null;
             m_txtNum = null;
             m_txtNum = null;
+            m_btnExchange = null;
+            m_btnBuy = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

BIN
GameClient/Assets/ResIn/UI/ClothingDecompose/ClothingDecompose_fui.bytes


BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes


BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_fui.bytes


BIN
GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Common/Common_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Common/Common_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Common/Common_fui.bytes


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/CreateRole/CreateRole_fui.bytes


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


BIN
GameClient/Assets/ResIn/UI/Field/Field_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Login/Login_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Login/Login_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Mail/Mail_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes


BIN
GameClient/Assets/ResIn/UI/RechargeStore/RechargeStore_fui.bytes


BIN
GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Travel/Travel_fui.bytes