Browse Source

返回资源

zhaoyang 2 years ago
parent
commit
b67b17d1e7
83 changed files with 48 additions and 50 deletions
  1. 3 2
      FGUIProject/assets/Bag/BagUI.xml
  2. BIN
      FGUIProject/assets/Bag/images/wpbb_zi.png
  3. 1 0
      FGUIProject/assets/Card/CardDetailUI.xml
  4. BIN
      FGUIProject/assets/Card/images/cpcp_ziti.png
  5. 1 0
      FGUIProject/assets/Card/package.xml
  6. 2 3
      FGUIProject/assets/ClothingShop/GalleryShopUI.xml
  7. BIN
      FGUIProject/assets/ClothingShop/images/hl_jfscibt.png
  8. 0 1
      FGUIProject/assets/ClothingSynthetic/ClothingSyntheticListUI.xml
  9. 3 7
      FGUIProject/assets/CommonGame/components/ButtonBack.xml
  10. BIN
      FGUIProject/assets/CommonGame/images/xz_wss.png
  11. BIN
      FGUIProject/assets/CommonGame/imagesExport/hz_fanhuizjm.png
  12. BIN
      FGUIProject/assets/CommonGame/imagesExport/xc_bto_1.png
  13. BIN
      FGUIProject/assets/CommonGame/imagesExport/xcpz_fhfh.png
  14. 1 1
      FGUIProject/assets/CommonGame/package.xml
  15. 2 2
      FGUIProject/assets/FieldGuide/ChapterItemGuideUI.xml
  16. 3 1
      FGUIProject/assets/FieldGuide/FieldGuideUI.xml
  17. 3 1
      FGUIProject/assets/FieldGuide/SuitGuideUI.xml
  18. 1 2
      FGUIProject/assets/FieldGuide/TravelGuideUI.xml
  19. 1 3
      FGUIProject/assets/FieldGuide/TravelShowUI.xml
  20. BIN
      FGUIProject/assets/FieldGuide/images/bwtj_bti.png
  21. BIN
      FGUIProject/assets/FieldGuide/images/tjtj_tj.png
  22. BIN
      FGUIProject/assets/FieldGuide/images/tztj_tztj.png
  23. BIN
      FGUIProject/assets/FieldGuide/images/xz_ddtj.png
  24. BIN
      FGUIProject/assets/FieldGuide/images/xz_qsws.png
  25. BIN
      FGUIProject/assets/FieldGuide/images/xz_wss.png
  26. BIN
      FGUIProject/assets/FieldGuide/images/xz_xqfs.png
  27. 4 2
      FGUIProject/assets/FieldGuide/package.xml
  28. 3 1
      FGUIProject/assets/Main/StoryChapterListUI.xml
  29. BIN
      FGUIProject/assets/Main/images/fzl_fzl.png
  30. 1 0
      FGUIProject/assets/Main/package.xml
  31. 2 3
      FGUIProject/assets/RoleInfo/PersonalPhotoUI.xml
  32. BIN
      FGUIProject/assets/RoleInfo/images/xc_xczi.png
  33. 3 1
      FGUIProject/assets/Studio/StudioUI.xml
  34. BIN
      FGUIProject/assets/Studio/images/gzs_gzs.png
  35. 1 0
      FGUIProject/assets/Studio/package.xml
  36. 3 4
      FGUIProject/assets/Travel/TravelUI.xml
  37. BIN
      FGUIProject/assets/Travel/images/xz_wss.png
  38. 3 2
      FGUIProject/assets/XiuFang/XiuFangUI.xml
  39. BIN
      FGUIProject/assets/XiuFang/images/tzhc_ziti.png
  40. 2 3
      FGUIProject/assets/poem/PoemGalleryUI.xml
  41. 2 3
      FGUIProject/assets/poem/PoemPhotoUI.xml
  42. 2 2
      FGUIProject/assets/poem/PoemUI.xml
  43. BIN
      FGUIProject/assets/poem/imagesPhoto/hl_hlzibt.png
  44. BIN
      FGUIProject/assets/poem/imagesPhoto/xc_xczi.png
  45. 1 0
      FGUIProject/assets/poem/package.xml
  46. 0 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonBack.cs
  47. BIN
      GameClient/Assets/ResIn/UI/Bag/Bag_atlas0.png
  48. BIN
      GameClient/Assets/ResIn/UI/Bag/Bag_fui.bytes
  49. BIN
      GameClient/Assets/ResIn/UI/Card/Card_atlas0.png
  50. BIN
      GameClient/Assets/ResIn/UI/Card/Card_fui.bytes
  51. BIN
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0!a.png
  52. BIN
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0.png
  53. BIN
      GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_fui.bytes
  54. BIN
      GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_atlas0!a.png
  55. BIN
      GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_atlas0.png
  56. BIN
      GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_fui.bytes
  57. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  58. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  59. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  60. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  61. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  62. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0!a.png
  63. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0.png
  64. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png
  65. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png
  66. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2!a.png
  67. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2.png
  68. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_fui.bytes
  69. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  70. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  71. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes
  72. BIN
      GameClient/Assets/ResIn/UI/Poem/Poem_atlas0.png
  73. BIN
      GameClient/Assets/ResIn/UI/Poem/Poem_fui.bytes
  74. BIN
      GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0.png
  75. BIN
      GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_fui.bytes
  76. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png
  77. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_1.png
  78. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes
  79. BIN
      GameClient/Assets/ResIn/UI/Travel/Travel_atlas0.png
  80. BIN
      GameClient/Assets/ResIn/UI/Travel/Travel_fui.bytes
  81. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0!a.png
  82. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0.png
  83. BIN
      GameClient/Assets/ResIn/UI/XiuFang/XiuFang_fui.bytes

+ 3 - 2
FGUIProject/assets/Bag/BagUI.xml

@@ -7,8 +7,9 @@
     <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" group="n17_si5z">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,196" group="n17_si5z"/>
-    <image id="n16_si5z" name="n16" src="si5zti3" fileName="images/wpbb_zi.png" xy="189,216" group="n17_si5z"/>
+    <component id="n6_wet2" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,196" group="n17_si5z">
+      <Button icon="ui://2bsz6nelsi5zti3"/>
+    </component>
     <image id="n14_si5z" name="n14" src="si5zti6" fileName="images/wpbb_xtxt.png" xy="54,312" group="n17_si5z"/>
     <group id="n17_si5z" name="grpTop" xy="0,90" size="1080,234"/>
     <list id="n0_lh8v" name="list" xy="33,390" size="1013,1530" layout="flow_hz" overflow="scroll" lineGap="82" colGap="43" defaultItem="ui://2bsz6nelsi5zti7" autoClearItems="true">

BIN
FGUIProject/assets/Bag/images/wpbb_zi.png


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

@@ -12,6 +12,7 @@
     </image>
     <component id="n1_ojlz" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
+      <Button icon="ui://7l6lvkayysx99y"/>
     </component>
     <component id="n5_ojlz" name="btnFilter" src="ojlzd" fileName="components/btnFilter.xml" xy="854,96">
       <relation target="" sidePair="right-right,top-top"/>

BIN
FGUIProject/assets/Card/images/cpcp_ziti.png


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

@@ -97,6 +97,7 @@
     <image id="94m19v" name="kp_kuang_1.png" path="/images/" exported="true"/>
     <image id="94m19w" name="kp_kuang_4.png" path="/images/" exported="true"/>
     <image id="r9ri9x" name="kp_mudan.jpg" path="/images/"/>
+    <image id="ysx99y" name="cpcp_ziti.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Card" packageCount="2" genCode="true"/>
 </packageDescription>

+ 2 - 3
FGUIProject/assets/ClothingShop/GalleryShopUI.xml

@@ -5,13 +5,12 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n1_yd72" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://e5hnfx8ar9rieg"/>
+      <Button icon="ui://e5hnfx8ar9rieg"/>
     </component>
     <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="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="mk0fwx0x" xy="706,636" group="n21_r9ri">
+    <component id="n20_r9ri" name="btnBuy" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="706,636" group="n21_r9ri">
       <Button title="兑换"/>
     </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="孔雀东南飞"/>

BIN
FGUIProject/assets/ClothingShop/images/hl_jfscibt.png


+ 0 - 1
FGUIProject/assets/ClothingSynthetic/ClothingSyntheticListUI.xml

@@ -5,7 +5,6 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n0_j539" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <image id="n12_j539" name="n12" src="j5394" fileName="images/jbhc_bti.png" xy="164,102"/>
     <list id="n4_j539" name="listMenu" xy="31,218" size="1017,80" layout="flow_hz" colGap="-18" autoItemSize="true" align="center" foldInvisibleItems="true">
       <relation target="" sidePair="center-center"/>
       <item url="ui://4f294tdkj539f"/>

+ 3 - 7
FGUIProject/assets/CommonGame/components/ButtonBack.xml

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="90,90" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="c1" exported="true" pages="0,浅色底,1,深色底" selected="0"/>
   <displayList>
-    <loader id="n4_uyux" name="loaBg" xy="-35,6" size="578,116" visible="false" touchable="false" autoSize="true">
-      <gearIcon controller="c1" pages="0,1" values="|ui://eg2y0ldpuyuxtj8"/>
-    </loader>
-    <loader id="n3_uyux" name="icon" xy="0,0" size="90,90" url="ui://eg2y0ldpuyuxtj4" autoSize="true"/>
-    <loader id="n5_uyux" name="loaTitle" xy="118,18" size="161,54" autoSize="true"/>
+    <loader id="n4_uyux" name="loaBg" xy="50,9" size="429,76" touchable="false" url="ui://eg2y0ldpysx9tk6" autoSize="true"/>
+    <loader id="n3_uyux" name="n3" xy="0,0" size="92,94" url="ui://eg2y0ldpuyuxtj4" autoSize="true"/>
+    <loader id="n5_uyux" name="icon" xy="125,18" pivot="0.5,0" size="161,54" autoSize="true"/>
   </displayList>
   <Button/>
-  <customProperty target="loaTitle" propertyId="1"/>
 </component>

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


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


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


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


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

@@ -193,7 +193,6 @@
     <image id="uyuxtj3" name="tujian_zkanniu.png" path="/images/" exported="true"/>
     <image id="uyuxtj4" name="xcpz_fhfh.png" path="/imagesExport/" exported="true"/>
     <component id="uyuxtj5" name="ButtonBack.xml" path="/components/" exported="true"/>
-    <image id="uyuxtj6" name="xz_wss.png" path="/images/"/>
     <image id="uyuxtj7" name="xc_bto_1.png" path="/images/"/>
     <image id="uyuxtj8" name="xc_bto.png" path="/images/"/>
     <font id="wonotj9" name="YUNJINSONG.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
@@ -221,6 +220,7 @@
     <image id="dhoatk3" name="shalou.png" path="/imgItemIcon/" exported="true"/>
     <image id="ysx9tk4" name="hqtjtbtb.png" path="/images/"/>
     <image id="ysx9tk5" name="lianyiqun_ys.png" path="/imgItemIcon/" exported="true"/>
+    <image id="ysx9tk6" name="xc_bto_1.png" path="/imagesExport/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 2 - 2
FGUIProject/assets/FieldGuide/ChapterItemGuideUI.xml

@@ -7,10 +7,10 @@
     <image id="n1_s61p" name="n1" src="pq5x5z" fileName="images/kp_bejing_di.png" pkg="eg2y0ldp" xy="28,264" size="1024,1586">
       <relation target="" sidePair="width-width,height-height,center-center"/>
     </image>
-    <component id="n2_s61p" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n2_s61p" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
+      <Button icon="ui://vqq9h9h4s61p24"/>
     </component>
-    <image id="n3_s61p" name="n3" src="s61p24" fileName="images/bwtj_bti.png" xy="162,96"/>
     <list id="n9_s61p" name="list" xy="56,281" size="967,1536" layout="flow_hz" overflow="scroll" lineGap="40" colGap="50" defaultItem="ui://vqq9h9h4s61p29">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>

+ 3 - 1
FGUIProject/assets/FieldGuide/FieldGuideUI.xml

@@ -5,7 +5,9 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n2_pjip" name="compBanner" src="pjipg" fileName="components/CompBanner.xml" xy="0,0"/>
-    <component id="n1_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://vqq9h9h4ysx93f"/>
+    </component>
     <list id="n13_pjip" name="listGuide" xy="43,407" size="994,1513" overflow="scroll" lineGap="50" defaultItem="ui://vqq9h9h4pjipe" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>

+ 3 - 1
FGUIProject/assets/FieldGuide/SuitGuideUI.xml

@@ -5,7 +5,9 @@
     <loader id="n18_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://vqq9h9h4ysx93g"/>
+    </component>
     <image id="n7_pjip" name="n7" src="pjipk" fileName="images/tujian_diban_2.png" xy="48,376">
       <gearDisplay controller="c1" pages="0"/>
     </image>

+ 1 - 2
FGUIProject/assets/FieldGuide/TravelGuideUI.xml

@@ -6,8 +6,7 @@
     </loader>
     <component id="n2_s61p" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://vqq9h9h4wono3b"/>
+      <Button icon="ui://vqq9h9h4ysx93e"/>
     </component>
     <list id="n9_s61p" name="list" xy="50,264" size="980,1656" layout="flow_hz" overflow="scroll" lineGap="45" colGap="22" defaultItem="ui://vqq9h9h4wono2l" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>

+ 1 - 3
FGUIProject/assets/FieldGuide/TravelShowUI.xml

@@ -4,9 +4,7 @@
     <loader id="n15_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n9_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
-      <property target="loaTitle" propertyId="1" value="ui://vqq9h9h4wono3c"/>
-    </component>
+    <component id="n9_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <list id="n20_wono" name="list" xy="52,264" size="976,1656" overflow="scroll" lineGap="50" defaultItem="ui://vqq9h9h4wono2m" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>

BIN
FGUIProject/assets/FieldGuide/images/bwtj_bti.png


BIN
FGUIProject/assets/FieldGuide/images/tjtj_tj.png


BIN
FGUIProject/assets/FieldGuide/images/tztj_tztj.png


BIN
FGUIProject/assets/FieldGuide/images/xz_ddtj.png


BIN
FGUIProject/assets/FieldGuide/images/xz_qsws.png


BIN
FGUIProject/assets/FieldGuide/images/xz_wss.png


BIN
FGUIProject/assets/FieldGuide/images/xz_xqfs.png


+ 4 - 2
FGUIProject/assets/FieldGuide/package.xml

@@ -89,8 +89,10 @@
     <image id="wono36" name="tujian_taoz_3.png" path="/imagesExport/" exported="true"/>
     <image id="wono37" name="tujian_tup_3.png" path="/imagesExport/" exported="true"/>
     <image id="wono3a" name="xqfs_wddw.png" path="/components/"/>
-    <image id="wono3b" name="xz_wss.png" path="/images/"/>
-    <image id="wono3c" name="xz_qsws.png" path="/images/"/>
+    <image id="ysx93d" name="xz_xqfs.png" path="/images/"/>
+    <image id="ysx93e" name="xz_ddtj.png" path="/images/"/>
+    <image id="ysx93f" name="tjtj_tj.png" path="/images/"/>
+    <image id="ysx93g" name="tztj_tztj.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 3 - 1
FGUIProject/assets/Main/StoryChapterListUI.xml

@@ -11,7 +11,9 @@
       <item/>
       <item/>
     </list>
-    <component id="n1_slb4" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_slb4" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://mfvz4q8kysx9ig"/>
+    </component>
     <component id="n2_slb4" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
     <image id="n7_slb4" name="bgTitle" src="slb41l" fileName="imagesStory/zhuxian_mengban.png" xy="199,90" size="764,70" visible="false"/>
     <list id="n16_ed2z" name="listTab" xy="199,90" size="764,71" visible="false" layout="row" colGap="10">

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


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

@@ -437,6 +437,7 @@
     <image id="v95qid" name="zd_zdjnsm_1.png" path="/imagesFight/"/>
     <component id="v95qie" name="ComSkillTips.xml" path="/"/>
     <image id="dhoaif" name="zjm_bbbb.png" path="/images/"/>
+    <image id="ysx9ig" name="fzl_fzl.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 2 - 3
FGUIProject/assets/RoleInfo/PersonalPhotoUI.xml

@@ -4,9 +4,8 @@
     <loader id="n6_r9ri" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n7_r9ri" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80" controller="c1,1">
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://374k3dwvr9ri1w"/>
+    <component id="n7_r9ri" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://374k3dwvr9ri1w"/>
     </component>
     <image id="n5_r9ri" name="n5" src="r9ri18" fileName="images/grxx_grxcxc.png" xy="327,195"/>
     <list id="n0_r9ri" name="list" xy="22,345" size="1035,1575" layout="flow_hz" overflow="scroll" lineGap="40" colGap="10" defaultItem="ui://374k3dwvr9ri1v" autoClearItems="true">

BIN
FGUIProject/assets/RoleInfo/images/xc_xczi.png


+ 3 - 1
FGUIProject/assets/Studio/StudioUI.xml

@@ -4,7 +4,9 @@
     <loader id="n8_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_rbxq" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_rbxq" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://xz8kxrecysx92u"/>
+    </component>
     <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="340,1014">
       <relation target="" sidePair="left-left,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1e"/>

BIN
FGUIProject/assets/Studio/images/gzs_gzs.png


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

@@ -72,6 +72,7 @@
     <image id="wono2r" name="songhuizong.png" path="/imgExpot/" exported="true"/>
     <image id="wono2s" name="xingcijing.png" path="/imgExpot/" exported="true"/>
     <image id="wono2t" name="yizugongzhu.png" path="/imgExpot/" exported="true"/>
+    <image id="ysx92u" name="gzs_gzs.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true"/>
 </packageDescription>

+ 3 - 4
FGUIProject/assets/Travel/TravelUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2," selected="2">
+  <controller name="c1" pages="0,,1,,2," selected="0">
     <remark page="0" value="准备"/>
     <remark page="1" value="游历中"/>
     <remark page="2" value="游历结束"/>
@@ -13,11 +13,10 @@
     <component id="n15_wono" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,8"/>
     <component id="n7_wono" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://jitclg1gwono1a"/>
+      <Button icon="ui://jitclg1gwono1a"/>
     </component>
     <image id="n8_wono" name="n8" src="wonoo" fileName="images/xqfs_yldik_1.png" xy="2,280" group="n16_wono"/>
-    <loader id="n17_r9ri" name="n17" xy="299,520" size="532,739" group="n16_wono" scale="0.9,0.9" url="ui://jitclg1gwonoa" autoSize="true">
+    <loader id="n17_r9ri" name="n17" xy="299,520" size="495,749" group="n16_wono" scale="0.9,0.9" url="ui://jitclg1gwono9" autoSize="true">
       <gearIcon controller="c1" pages="0,1" values="ui://jitclg1gwono9|ui://jitclg1gwonob" default="ui://jitclg1gwonoa"/>
     </loader>
     <component id="n1_wono" name="btnTips" src="wono3" fileName="components/Button1.xml" xy="926,372" group="n16_wono">

BIN
FGUIProject/assets/Travel/images/xz_wss.png


+ 3 - 2
FGUIProject/assets/XiuFang/XiuFangUI.xml

@@ -4,8 +4,9 @@
     <loader id="n0_9xlo" name="bg" xy="0,-240" size="1080,2400" url="ui://kv0ad4wy9xlo1">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <component id="n1_9xlo" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <image id="n3_9xlo" name="n3" src="9xlo7" fileName="images/tzhc_ziti.png" xy="160,102"/>
+    <component id="n1_9xlo" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://kv0ad4wy9xlo7"/>
+    </component>
     <component id="n4_9xlo" name="component" src="wlc28" fileName="components/Component.xml" xy="74,337" size="932,1246"/>
     <image id="n2_9xlo" name="n2" src="9xlo5" fileName="images/tzhc_jiazidi.png" xy="9,589">
       <relation target="n4_9xlo" sidePair="bottom-bottom"/>

BIN
FGUIProject/assets/XiuFang/images/tzhc_ziti.png


+ 2 - 3
FGUIProject/assets/poem/PoemGalleryUI.xml

@@ -7,8 +7,7 @@
     </loader>
     <component id="n1_r9ri" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://iyz778gkr9ri12i"/>
+      <Button icon="ui://iyz778gkysx9tju"/>
     </component>
     <component id="n11_r9ri" name="comNormal" src="r9ri114" fileName="componentsGallery/ComNormal.xml" xy="0,0" size="1080,1736">
       <gearDisplay controller="c1" pages="1"/>
@@ -18,7 +17,7 @@
       <gearDisplay controller="c1" pages="4"/>
       <relation target="" sidePair="height-height"/>
     </component>
-    <image id="n24_r9ri" name="n24" src="r9ri12k" fileName="imagesGallery/hl_xz_ddik_1.png" xy="0,1736" group="n25_r9ri" pkg="eg2y0ldp"/>
+    <image id="n24_r9ri" name="n24" src="r9ri12k" fileName="images/hl_xz_ddik_1.png" pkg="eg2y0ldp" xy="0,1736" group="n25_r9ri"/>
     <component id="n2_r9ri" name="btnRecover" src="r9ri12l" fileName="componentsGallery/Button11.xml" xy="0,1710" group="n25_r9ri">
       <Button checked="true" title="首页" icon="ui://iyz778gkr9ri11l" selectedIcon="ui://iyz778gkr9ri11c" controller="c1" page="1"/>
     </component>

+ 2 - 3
FGUIProject/assets/poem/PoemPhotoUI.xml

@@ -6,10 +6,9 @@
     <loader id="n0_v482" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n21_uyux" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80" controller="c1,1">
+    <component id="n21_uyux" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://iyz778gkuyux10a"/>
+      <Button icon="ui://iyz778gkuyux10a"/>
     </component>
     <image id="n13_uyux" name="n13" src="uyuxzx" fileName="imagesPhoto/xc_xzdik.png" xy="266,212" group="n14_uyux"/>
     <component id="n11_11rzz" name="btnTab0" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="260,210" group="n14_uyux">

+ 2 - 2
FGUIProject/assets/poem/PoemUI.xml

@@ -4,9 +4,9 @@
     <loader id="n0_v482" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_v482" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n1_v482" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
+      <Button icon="ui://iyz778gkysx9tju"/>
     </component>
     <component id="n4_v482" name="comphoto" src="v4822" fileName="components/ComEctype.xml" xy="112,299" group="n6_ysx9"/>
     <component id="n5_r9ri" name="comGallery" src="v4822" fileName="components/ComEctype.xml" xy="586,299" group="n6_ysx9">

BIN
FGUIProject/assets/poem/imagesPhoto/hl_hlzibt.png


BIN
FGUIProject/assets/poem/imagesPhoto/xc_xczi.png


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

@@ -138,6 +138,7 @@
     <image id="dhoatjr" name="hl_dz_22.png" path="/imagesGallery/"/>
     <image id="dhoatjs" name="hl_sc_11.png" path="/imagesGallery/"/>
     <component id="dhoatjt" name="Button14.xml" path="/componentsGallery/"/>
+    <image id="ysx9tju" name="hl_hlzibt.png" path="/imagesPhoto/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -7,9 +7,7 @@ namespace UI.CommonGame
     public partial class UI_ButtonBack
     {
         public GButton target;
-        public Controller m_c1;
         public GLoader m_loaBg;
-        public GLoader m_loaTitle;
         public const string URL = "ui://eg2y0ldpuyuxtj5";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ButtonBack";
@@ -57,15 +55,11 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
             m_loaBg = null;
-            m_loaTitle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

BIN
GameClient/Assets/ResIn/UI/Bag/Bag_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Bag/Bag_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Card/Card_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Card/Card_fui.bytes


BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_atlas0.png


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


BIN
GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_atlas0.png


BIN
GameClient/Assets/ResIn/UI/ClothingSynthetic/ClothingSynthetic_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/FieldGuide/FieldGuide_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


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


BIN
GameClient/Assets/ResIn/UI/Poem/Poem_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Poem/Poem_fui.bytes


BIN
GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0.png


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


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_1.png


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


BIN
GameClient/Assets/ResIn/UI/Travel/Travel_atlas0.png


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


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas0.png


BIN
GameClient/Assets/ResIn/UI/XiuFang/XiuFang_fui.bytes