瀏覽代碼

个人信息

zhaoyang 2 年之前
父節點
當前提交
253fbc33de
共有 100 個文件被更改,包括 793 次插入114 次删除
  1. 1 1
      FGUIProject/assets/CommonGame/components/Button17.xml
  2. 3 3
      FGUIProject/assets/CommonGame/components/Button18.xml
  3. 11 0
      FGUIProject/assets/CommonGame/components/Button20.xml
  4. 11 0
      FGUIProject/assets/CommonGame/components/Button21.xml
  5. 二進制
      FGUIProject/assets/CommonGame/images/grxx_zytxtx.png
  6. 0 0
      FGUIProject/assets/CommonGame/images/hl_ddandik.png
  7. 0 0
      FGUIProject/assets/CommonGame/images/hl_xz_ddik_1.png
  8. 5 0
      FGUIProject/assets/CommonGame/package.xml
  9. 1 1
      FGUIProject/assets/DressUp/DressUpFightUI.xml
  10. 2 2
      FGUIProject/assets/DressUp/DressUpUI.xml
  11. 0 9
      FGUIProject/assets/DressUp/components/Button13.xml
  12. 二進制
      FGUIProject/assets/DressUp/images/hz_anniuty.png
  13. 0 2
      FGUIProject/assets/DressUp/package.xml
  14. 44 12
      FGUIProject/assets/RoleInfo/ChangeHead.xml
  15. 11 6
      FGUIProject/assets/RoleInfo/ChangeNameUI.xml
  16. 20 2
      FGUIProject/assets/RoleInfo/PersonalPhotoUI.xml
  17. 6 2
      FGUIProject/assets/RoleInfo/PersonalSkillUI.xml
  18. 45 31
      FGUIProject/assets/RoleInfo/RoleInfoUI.xml
  19. 14 9
      FGUIProject/assets/RoleInfo/SettingUI.xml
  20. 13 0
      FGUIProject/assets/RoleInfo/components/Button2.xml
  21. 13 0
      FGUIProject/assets/RoleInfo/components/Button3.xml
  22. 13 0
      FGUIProject/assets/RoleInfo/components/Button4.xml
  23. 13 0
      FGUIProject/assets/RoleInfo/components/Button5.xml
  24. 1 1
      FGUIProject/assets/RoleInfo/components/ButtonHelp.xml
  25. 7 7
      FGUIProject/assets/RoleInfo/components/ButtonToggle.xml
  26. 10 0
      FGUIProject/assets/RoleInfo/components/ComHead.xml
  27. 7 0
      FGUIProject/assets/RoleInfo/components/ComHeadIcon.xml
  28. 9 0
      FGUIProject/assets/RoleInfo/components/ComIcon.xml
  29. 6 0
      FGUIProject/assets/RoleInfo/components/ComPhoto.xml
  30. 7 0
      FGUIProject/assets/RoleInfo/components/Component1.xml
  31. 13 0
      FGUIProject/assets/RoleInfo/components/ListHeadBorderItem.xml
  32. 5 3
      FGUIProject/assets/RoleInfo/components/ListHeadItem.xml
  33. 7 0
      FGUIProject/assets/RoleInfo/components/ListPhotoItem.xml
  34. 9 0
      FGUIProject/assets/RoleInfo/components/ListPhotoItem1.xml
  35. 7 4
      FGUIProject/assets/RoleInfo/components/ListSkillItem.xml
  36. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_bjbj.png
  37. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_ditup.png
  38. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_grxcxc.png
  39. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_jnsm.png
  40. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_szsz.png
  41. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_txkuang.png
  42. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_txtxczy.png
  43. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_txtxya_1.png
  44. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_txxzlx.png
  45. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_xinxin.png
  46. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_xtkk_1.png
  47. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_xtkk_2.png
  48. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_xtxtx.png
  49. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_xztxtx_1.png
  50. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_xztxtx_2.png
  51. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_yx_dk.png
  52. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_yx_gb.png
  53. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_zyddt.png
  54. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_zydik.png
  55. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_zygrxc.png
  56. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_zyjiah.png
  57. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_zyshul.png
  58. 二進制
      FGUIProject/assets/RoleInfo/images/grxx_zytxtx.png
  59. 二進制
      FGUIProject/assets/RoleInfo/images/hl_sczpxzdik.png
  60. 二進制
      FGUIProject/assets/RoleInfo/images/hl_sczpxzi_1.png
  61. 二進制
      FGUIProject/assets/RoleInfo/images/hl_sczpxzi_2.png
  62. 二進制
      FGUIProject/assets/RoleInfo/images/hl_wxzzi_1.png
  63. 二進制
      FGUIProject/assets/RoleInfo/images/hl_wxzzi_2.png
  64. 二進制
      FGUIProject/assets/RoleInfo/images/hl_xzanniu_1.png
  65. 二進制
      FGUIProject/assets/RoleInfo/images/hl_xzanniu_2.png
  66. 二進制
      FGUIProject/assets/RoleInfo/images/jnsm_1.png
  67. 二進制
      FGUIProject/assets/RoleInfo/images/jnsm_2.png
  68. 二進制
      FGUIProject/assets/RoleInfo/images/jnsm_3.png
  69. 二進制
      FGUIProject/assets/RoleInfo/images/jnsm_4.png
  70. 二進制
      FGUIProject/assets/RoleInfo/images/kp_mudan.jpg
  71. 二進制
      FGUIProject/assets/RoleInfo/images/self.png
  72. 二進制
      FGUIProject/assets/RoleInfo/images/xc_kuangdi.png
  73. 二進制
      FGUIProject/assets/RoleInfo/images/xc_xczi.png
  74. 二進制
      FGUIProject/assets/RoleInfo/images/xc_xzxd.png
  75. 二進制
      FGUIProject/assets/RoleInfo/images/xgnc_btkuang.png
  76. 二進制
      FGUIProject/assets/RoleInfo/images/xgnc_dik_1.png
  77. 二進制
      FGUIProject/assets/RoleInfo/images/xgnc_dik_2.png
  78. 二進制
      FGUIProject/assets/RoleInfo/images/xgnc_sjsjan.png
  79. 二進制
      FGUIProject/assets/RoleInfo/images/xgxx_zytjtb.png
  80. 二進制
      FGUIProject/assets/RoleInfo/images/zjm_dj_1.png
  81. 二進制
      FGUIProject/assets/RoleInfo/images/zjm_txkuang.png
  82. 二進制
      FGUIProject/assets/RoleInfo/images/zjm_txkuang_1.png
  83. 53 4
      FGUIProject/assets/RoleInfo/package.xml
  84. 1 1
      FGUIProject/assets/poem/PoemGalleryUI.xml
  85. 1 1
      FGUIProject/assets/poem/componentsGallery/ComNormal.xml
  86. 0 2
      FGUIProject/assets/poem/package.xml
  87. 16 2
      GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs
  88. 5 1
      GameClient/Assets/Editor/ToolsMenu.cs
  89. 1 0
      GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs
  90. 9 0
      GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs
  91. 18 0
      GameClient/Assets/Game/HotUpdate/Data/RoleDataManager.cs
  92. 102 0
      GameClient/Assets/Game/HotUpdate/Data/RoleInfoManager.cs
  93. 11 0
      GameClient/Assets/Game/HotUpdate/Data/RoleInfoManager.cs.meta
  94. 12 5
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeHead.cs
  95. 12 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeNameUI.cs
  96. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComHead.cs
  97. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComHead.cs.meta
  98. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComIcon.cs
  99. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComIcon.cs.meta
  100. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComPhoto.cs

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

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="342,96" url="ui://eg2y0ldpr9ritjd" autoSize="true"/>
-    <text id="n1_r9ri" name="title" xy="70,10" size="212,69" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf8f2" align="center" vAlign="middle" 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>
   <Button/>
   <relation target="n2_r9ri" sidePair="width-width,height-height"/>

+ 3 - 3
FGUIProject/assets/CommonGame/components/Button18.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="344,97" extention="Button">
+<component size="342,96" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n2_r9ri" name="icon" xy="-1,0" pivot="0.5,0.5" size="344,97" url="ui://eg2y0ldpr9ritjf" autoSize="true"/>
-    <text id="n1_r9ri" name="title" xy="0,-2" size="344,97" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#f8eae5" align="center" vAlign="middle" autoSize="none" strokeColor="#c79a89" strokeSize="2" singleLine="true" text="挑战十次">
+    <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="挑战十次">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

+ 11 - 0
FGUIProject/assets/CommonGame/components/Button20.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="344,97" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n4_wono" name="icon" xy="0,0" size="344,97" url="ui://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="保存搭配">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

+ 11 - 0
FGUIProject/assets/CommonGame/components/Button21.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="344,97" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n4_wono" name="icon" xy="0,0" size="344,97" url="ui://eg2y0ldpr9ritjf" 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="保存搭配">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

二進制
FGUIProject/assets/CommonGame/images/grxx_zytxtx.png


+ 0 - 0
FGUIProject/assets/poem/imagesGallery/hl_ddandik.png → FGUIProject/assets/CommonGame/images/hl_ddandik.png


+ 0 - 0
FGUIProject/assets/poem/imagesGallery/hl_xz_ddik_1.png → FGUIProject/assets/CommonGame/images/hl_xz_ddik_1.png


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

@@ -225,6 +225,11 @@
     <image id="q08xh" name="zjm_txkuang.png" path="/images/"/>
     <image id="kubi7f" name="zjm_txkuang_1.png" path="/images/" scale="9grid" scale9grid="31,31,62,62"/>
     <component id="kubi7g" name="CompHead.xml" path="/components/"/>
+    <image id="r9ritjs" name="grxx_zytxtx.png" path="/images/"/>
+    <image id="r9ri12k" name="hl_xz_ddik_1.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"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -69,7 +69,7 @@
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="下一步"/>
     </component>
-    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button13.xml" xy="480,1728" group="n38_8lqj">
+    <component id="n13_vxw5" name="btnRecommend" src="wonody" fileName="components/Button13.xml" xy="480,1728" group="n38_8lqj" pkg="eg2y0ldp">
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="推荐搭配"/>
     </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">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
-    <component id="n12_q08x" name="btnSave" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj">
+    <component id="n12_q08x" name="btnSave" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj" pkg="eg2y0ldp">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="保存搭配" titleColor="#fdfaed" titleFontSize="54"/>
     </component>
-    <component id="n35_r9ri" name="btnNext" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj">
+    <component id="n35_r9ri" name="btnNext" src="wonody" fileName="components/Button13.xml" xy="300,1730" group="n30_8lqj" pkg="eg2y0ldp">
       <gearDisplay controller="c2" pages="1"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="下一步" titleColor="#fdfaed" titleFontSize="54"/>

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

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

二進制
FGUIProject/assets/DressUp/images/hz_anniuty.png


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

@@ -163,9 +163,7 @@
     <image id="wonods" name="pz_icon_55.png" path="/images/"/>
     <image id="wonodt" name="hz_yjmzdi_1.png" path="/images/"/>
     <image id="wonodu" name="hz_yjmzdi_2.png" path="/images/"/>
-    <image id="wonodw" name="hz_anniuty.png" path="/images/"/>
     <image id="wonodx" name="hz_xzkuang.png" path="/images/"/>
-    <component id="wonody" name="Button13.xml" path="/components/"/>
     <image id="wonodz" name="dz_hz_fsk_2.png" path="/images/"/>
     <image id="wonoe0" name="dz_dididcis_1.png" path="/images/"/>
     <image id="wonoe1" name="hz_anniuty_1.png" path="/images/"/>

+ 44 - 12
FGUIProject/assets/RoleInfo/ChangeHead.xml

@@ -1,22 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1200">
-  <controller name="c1" pages="0,,1," selected="0"/>
+<component size="996,1180">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <component id="n0_r9ri" name="btnTab0" src="r9ri6" fileName="components/Button1.xml" xy="202,38">
-      <Button checked="true" icon="ui://374k3dwvr9rib" selectedIcon="ui://374k3dwvr9rig" controller="c1" page="0"/>
-    </component>
-    <component id="n1_r9ri" name="btnTab1" src="r9ri6" fileName="components/Button1.xml" xy="449,39">
-      <Button icon="ui://374k3dwvr9ric" selectedIcon="ui://374k3dwvr9ri7" controller="c1" page="1"/>
-    </component>
-    <list id="n3_r9ri" name="list" xy="69,445" size="824,747" layout="flow_hz" overflow="scroll" defaultItem="ui://374k3dwvr9ri9" autoClearItems="true">
+    <image id="n9_r9ri" name="n9" src="r9rii" fileName="images/grxx_ditup.png" xy="0,0"/>
+    <list id="n3_r9ri" name="list" xy="93,464" size="809,462" layout="flow_hz" overflow="scroll" defaultItem="ui://374k3dwvr9ri9" autoClearItems="true">
+      <gearDisplay controller="c1" pages="0"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n4_r9ri" name="comHead" src="kubi7h" fileName="components/CompHeadWithBg.xml" pkg="eg2y0ldp" xy="229,187"/>
-    <text id="n5_r9ri" name="txtName" xy="407,205" size="93,42" fontSize="30" text="头像名"/>
-    <text id="n6_r9ri" name="txtDesc" xy="405,266" size="122,42" fontSize="30" text="头像描述"/>
+    <list id="n15_r9ri" name="listBorder" xy="73,464" size="861,462" layout="flow_hz" overflow="scroll" lineGap="-20" colGap="-20" defaultItem="ui://374k3dwvr9ri22" autoClearItems="true">
+      <gearDisplay controller="c1" pages="1"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n8_r9ri" name="n8" src="r9ri1x" fileName="images/hl_sczpxzdik.png" xy="205,96" size="585,76" group="n10_r9ri"/>
+    <component id="n0_r9ri" name="btnTab0" src="r9ri6" fileName="components/Button1.xml" xy="225,93" group="n10_r9ri">
+      <Button icon="ui://374k3dwvr9rip" selectedIcon="ui://374k3dwvr9rin" controller="c1" page="0"/>
+    </component>
+    <component id="n1_r9ri" name="btnTab1" src="r9ri6" fileName="components/Button1.xml" xy="520,94" group="n10_r9ri">
+      <Button checked="true" icon="ui://374k3dwvr9riq" selectedIcon="ui://374k3dwvr9rio" controller="c1" page="1"/>
+    </component>
+    <group id="n10_r9ri" name="n10" xy="205,93" size="585,84"/>
+    <image id="n11_r9ri" name="n11" src="r9rim" fileName="images/grxx_xtxtx.png" xy="381,330" size="520,6" group="n12_r9ri"/>
+    <component id="n4_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" xy="105,187" size="236,238" group="n12_r9ri" scale="1.2,1.2"/>
+    <text id="n5_r9ri" name="txtName" xy="394,263" size="129,56" group="n12_r9ri" font="ui://eg2y0ldpwonotja" fontSize="42" color="#ab8759" 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"/>
+    <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">
+      <Button title="保存" titleColor="#ffffff" titleFontSize="42"/>
+    </component>
   </displayList>
 </component>

+ 11 - 6
FGUIProject/assets/RoleInfo/ChangeNameUI.xml

@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,476" bgColor="#000000">
+<component size="960,665" bgColor="#000000">
   <displayList>
-    <image id="n4_xt5s" name="bg" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,476"/>
-    <image id="n11_hpgr" name="n11" src="njmng0" fileName="images/mc_jlkuang_1.png" xy="108,112"/>
-    <component id="n5_xt5s" name="btnSure" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,304">
-      <Button title="确认" titleColor="#ffffff" titleFontSize="42"/>
+    <image id="n4_xt5s" name="bg" src="r9riw" fileName="images/xgnc_dik_1.png" xy="0,0"/>
+    <image id="n11_hpgr" name="n11" src="r9riv" fileName="images/xgnc_btkuang.png" xy="282,83"/>
+    <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="99,238"/>
+    <text id="n10_xt5s" name="inputName" xy="128,248" size="526,56" fontSize="38" color="#ac8450" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]请输入新角色名称[/color]" maxLength="7"/>
+    <component id="n14_r9ri" name="btnDice" src="r9ri1p" fileName="components/Button5.xml" xy="678,234"/>
+    <text id="n15_r9ri" name="txtNeed" xy="357,422" size="191,44" fontSize="32" color="#b99f7b" text="改名卡:0/1"/>
+    <loader id="n16_r9ri" name="loaIcon" xy="561,414" size="60,60" url="ui://eg2y0ldpkztethq" autoSize="true"/>
+    <component id="n5_xt5s" name="btnSure" src="r9ritjq" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="338,490">
+      <Button title="确定" titleColor="#ffffff" titleFontSize="42"/>
     </component>
-    <text id="n10_xt5s" name="inputName" xy="162,125" size="560,56" fontSize="42" color="#9e8056" autoSize="none" text="" input="true" prompt="[color=#B6A688]请输入新角色名称[/color]" maxLength="7"/>
   </displayList>
 </component>

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

@@ -1,6 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,703">
+<component size="1080,1920">
   <displayList>
-    <list id="n0_r9ri" name="list" xy="212,78" size="200,300" overflow="scroll"/>
+    <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">
+      <relation target="" sidePair="left-left,top-top"/>
+      <Button icon="ui://eg2y0ldpuyuxtj4"/>
+      <property target="loaTitle" propertyId="1" value="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">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n8_r9ri" name="n8" src="r9ri12o" fileName="images/hl_ddandik.png" pkg="eg2y0ldp" xy="391,811" group="n10_r9ri"/>
+    <text id="n9_r9ri" name="n9" xy="387,934" size="305,52" group="n10_r9ri" fontSize="38" color="#ac9b7f" text="暂未添加任何作品"/>
+    <group id="n10_r9ri" name="grpNothing" xy="387,811" size="305,298"/>
   </displayList>
 </component>

+ 6 - 2
FGUIProject/assets/RoleInfo/PersonalSkillUI.xml

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,703">
+<component size="962,1087">
   <displayList>
-    <list id="n0_r9ri" name="list" xy="159,64" size="584,562" defaultItem="ui://374k3dwvr9ri5" autoClearItems="true">
+    <component id="n4_r9ri" name="n4" src="si5ztih" fileName="components/ComBg.xml" pkg="eg2y0ldp" xy="0,0" size="962,1087"/>
+    <list id="n0_r9ri" name="list" xy="59,212" size="843,785" lineGap="90" defaultItem="ui://374k3dwvr9ri5" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <image id="n5_r9ri" name="n5" src="r9riv" fileName="images/xgnc_btkuang.png" xy="252,55" size="458,68" group="n7_r9ri"/>
+    <text id="n6_r9ri" name="n6" xy="388,59" size="186,62" group="n7_r9ri" font="ui://eg2y0ldpwonotja" fontSize="46" color="#a98151" text="技能说明"/>
+    <group id="n7_r9ri" name="n7" xy="252,55" size="458,68"/>
   </displayList>
 </component>

+ 45 - 31
FGUIProject/assets/RoleInfo/RoleInfoUI.xml

@@ -1,38 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="700,1000">
+<component size="1080,1920">
   <displayList>
-    <loader id="n0_d4iw" name="bg" xy="-73,0" size="877,1000" touchable="false" url="ui://374k3dwvmhyhd5"/>
-    <text id="n2_d4iw" name="txtTitle" xy="-13,23" size="726,56" visible="false" fontSize="42" color="#ffffff" align="center" autoSize="none" text="个人信息"/>
-    <component id="n4_d4iw" name="n4" src="kubi7h" fileName="components/CompHeadWithBg.xml" pkg="eg2y0ldp" xy="288,110" pivot="0.5,0.5" scale="1.6,1.6"/>
-    <image id="n23_mhyh" name="n23" src="mhyhd7" fileName="images/grxx_mzk_1.png" xy="200,280" pivot="0.5,0" size="303,67">
-      <relation target="n5_d4iw" sidePair="width-width"/>
-    </image>
-    <text id="n5_d4iw" name="txtRoleName" xy="238,280" pivot="0.5,0" size="232,61" fontSize="46" color="#a37349" align="center" text="名称七个字"/>
-    <loader id="n24_mhyh" name="loaChangeName" xy="501,298" size="34,36" url="ui://374k3dwvmhyhd8" autoSize="true">
-      <relation target="n23_mhyh" sidePair="left-right"/>
+    <loader id="n27_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>
-    <text id="n6_d4iw" name="n6" xy="57,480" size="71,46" fontSize="34" color="#aa794d" text="等级"/>
-    <text id="n7_d4iw" name="n7" xy="57,540" size="71,46" fontSize="34" color="#aa794d" text="经验"/>
-    <text id="n10_d4iw" name="n10" xy="57,600" size="71,46" fontSize="34" color="#aa794d" text="音效"/>
-    <text id="n12_d4iw" name="n12" xy="447,600" size="71,46" fontSize="34" color="#aa794d" text="音乐"/>
-    <text id="n8_d4iw" name="txtLvl" xy="162,480" size="25,46" fontSize="34" color="#c47a6c" text="1"/>
-    <component id="n9_d4iw" name="proBarExp" src="d4iw6m" fileName="components/ProgressBarExp2.xml" xy="156,548">
-      <ProgressBar value="100" max="100"/>
-    </component>
-    <component id="n11_d4iw" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="156,601"/>
-    <component id="n13_d4iw" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="536,605"/>
-    <component id="n19_ga16" name="btnLogout" src="axdi97" fileName="components/Button12.xml" pkg="mk0fwx0x" xy="204,786" aspect="true">
-      <Button title="注销账户"/>
-    </component>
-    <component id="n14_d4iw" name="btnExit" src="axdi97" fileName="components/Button12.xml" pkg="mk0fwx0x" xy="204,668" aspect="true">
-      <Button title="返回登录" icon="ui://mk0fwx0xaxdi98"/>
-    </component>
-    <component id="n18_d4iw" name="btnHelp" src="d4iw6p" fileName="components/ButtonHelp.xml" xy="631,884">
-      <Button title="?"/>
-    </component>
-    <text id="n21_bx8o" name="txtVersion" xy="466,824" size="200,42" fontSize="30" color="#cccccc" align="right" autoSize="none" autoClearText="true" text="v 1.0.0">
+    <text id="n21_bx8o" name="txtVersion" xy="818,69" size="200,42" fontSize="30" align="right" autoSize="none" autoClearText="true" text="v 1.0.0">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
-    <text id="n26_pdeo" name="txtSlogan" xy="55,370" size="612,89" fontSize="34" color="#aa794d" autoSize="none" autoClearText="true" text="采菊东篱下,悠然见南山。山气日夕佳,飞鸟相与还。此中有真意,欲辨已忘言。" input="true" prompt="[color=#BDA893]输入个人简介[/color]" maxLength="30"/>
+    <component id="n18_d4iw" name="btnHelp" src="d4iw6p" fileName="components/ButtonHelp.xml" xy="983,129">
+      <Button title="?" titleColor="#000000"/>
+    </component>
+    <component id="n52_r9ri" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,90"/>
+    <component id="n33_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" xy="96,147" group="n53_oqa1" scale="1.3,1.3"/>
+    <image id="n29_r9ri" name="n29" src="r9ri24" fileName="images/zjm_dj_1.png" xy="295,317" group="n53_oqa1"/>
+    <text id="n30_r9ri" name="txtLvl" xy="304,324" size="34,34" group="n53_oqa1" fontSize="24" color="#ffffff" align="center" text="99">
+      <relation target="n29_r9ri" sidePair="center-center,middle-middle"/>
+    </text>
+    <image id="n32_r9ri" name="n32" src="r9ri16" fileName="images/grxx_zyshul.png" xy="158,375" group="n53_oqa1"/>
+    <text id="n36_r9ri" name="txtExp" xy="215,373" pivot="0.5,0" size="44,34" group="n53_oqa1" fontSize="24" color="#fbedda" letterSpacing="-2" text="0/1"/>
+    <group id="n53_oqa1" name="n53" xy="96,147" size="249,260" group="n37_r9ri"/>
+    <image id="n50_r9ri" name="n50" src="r9rim" fileName="images/grxx_xtxtx.png" xy="417,297" size="576,6" group="n54_oqa1"/>
+    <text id="n5_d4iw" name="txtRoleName" xy="428,214" size="328,64" group="n54_oqa1" font="ui://eg2y0ldpwonotja" fontSize="48" color="#927346" align="center" letterSpacing="-2" text="玩家名称七个字"/>
+    <loader id="n24_mhyh" name="loaChangeName" xy="779,232" size="39,36" group="n54_oqa1" url="ui://374k3dwvr9riz" autoSize="true">
+      <relation target="n5_d4iw" sidePair="right-left"/>
+    </loader>
+    <text id="n26_pdeo" name="txtSlogan" xy="431,318" size="549,89" group="n54_oqa1" fontSize="30" color="#a6967c" autoSize="none" autoClearText="true" text="采菊东篱下,悠然见南山。山气日夕佳,飞鸟相与还。此中有真意,欲辨已忘言。" input="true" prompt="[color=#BDA893]输入个人简介[/color]" maxLength="30"/>
+    <group id="n54_oqa1" name="n54" xy="417,214" size="576,193" group="n37_r9ri"/>
+    <group id="n37_r9ri" name="grpHead" xy="96,147" size="897,260" advanced="true"/>
+    <component id="n38_r9ri" name="btnFieldGuide" src="r9ri1j" fileName="components/Button2.xml" xy="36,476"/>
+    <image id="n41_r9ri" name="n41" src="r9ri12" fileName="images/grxx_zyddt.png" xy="9,573" size="1070,1347" group="n49_r9ri">
+      <relation target="" sidePair="height-height"/>
+    </image>
+    <image id="n43_r9ri" name="n43" src="r9ri18" fileName="images/grxx_grxcxc.png" xy="327,640" group="n49_r9ri"/>
+    <list id="n47_r9ri" name="list" xy="44,791" size="994,974" group="n49_r9ri" layout="flow_hz" overflow="scroll" lineGap="42" colGap="28" defaultItem="ui://374k3dwvr9ri1m" autoClearItems="true">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n49_r9ri" name="n49" xy="9,573" size="1070,1347" advanced="true">
+      <relation target="" sidePair="top-top"/>
+    </group>
+    <image id="n42_r9ri" name="n42" src="r9ri13" fileName="images/grxx_zydik.png" xy="0,1780" group="n46_r9ri"/>
+    <component id="n44_r9ri" name="btnSkill" src="r9ri1k" fileName="components/Button3.xml" xy="805,1807" group="n46_r9ri"/>
+    <component id="n45_r9ri" name="btnSetting" src="r9ri1l" fileName="components/Button4.xml" xy="935,1807" group="n46_r9ri"/>
+    <group id="n46_r9ri" name="n46" xy="0,1780" size="1080,140" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
   </displayList>
 </component>

+ 14 - 9
FGUIProject/assets/RoleInfo/SettingUI.xml

@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="700,1000">
+<component size="960,665">
   <displayList>
-    <loader id="n0_r9ri" name="bg" xy="-73,0" size="877,1000" touchable="false" url="ui://374k3dwvmhyhd5"/>
-    <text id="n5_r9ri" name="n5" xy="54,371" size="71,46" fontSize="34" color="#aa794d" text="音效"/>
-    <text id="n6_r9ri" name="n6" xy="444,371" size="71,46" fontSize="34" color="#aa794d" text="音乐"/>
-    <component id="n7_r9ri" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="153,372"/>
-    <component id="n8_r9ri" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="533,376"/>
-    <component id="n9_r9ri" name="btnLogout" src="axdi97" fileName="components/Button12.xml" pkg="mk0fwx0x" xy="201,557" aspect="true">
+    <loader id="n0_r9ri" name="bg" xy="0,0" size="960,665" touchable="false" url="ui://374k3dwvr9riw" autoSize="true"/>
+    <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="设置"/>
+    <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">
       <Button title="注销账户"/>
     </component>
-    <component id="n10_r9ri" name="btnExit" src="axdi97" fileName="components/Button12.xml" pkg="mk0fwx0x" xy="201,439" aspect="true">
-      <Button title="返回登录" icon="ui://mk0fwx0xaxdi98"/>
+    <component id="n13_oqa1" name="btnExit" src="oqa1tjt" fileName="components/Button21.xml" pkg="eg2y0ldp" xy="112,488" aspect="true">
+      <Button title="返回登录"/>
     </component>
+    <text id="n6_r9ri" name="n6" xy="144,273" size="87,56" group="n12_r9ri" font="ui://eg2y0ldpwonotja" fontSize="42" color="#c58c88" text="音乐"/>
+    <component id="n8_r9ri" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="258,276" group="n12_r9ri"/>
+    <group id="n12_r9ri" name="n12" xy="144,273" size="244,61"/>
+    <text id="n5_r9ri" name="n5" xy="572,272" size="87,56" group="n11_r9ri" font="ui://eg2y0ldpwonotja" fontSize="42" color="#c58c88" text="音效"/>
+    <component id="n7_r9ri" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="685,273" group="n11_r9ri"/>
+    <group id="n11_r9ri" name="n11" xy="572,272" size="243,59"/>
   </displayList>
 </component>

+ 13 - 0
FGUIProject/assets/RoleInfo/components/Button2.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,100" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_r9ri" name="n0" src="r9riy" fileName="images/xgxx_zytjtb.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_r9ri" name="title" xy="113,29" size="227,42" fontSize="30" color="#a68659" align="center" vAlign="middle" singleLine="true" text="图鉴收集度:0%">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

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

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

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

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

+ 13 - 0
FGUIProject/assets/RoleInfo/components/Button5.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="190,75" extention="Button">
+  <Button mode="Radio"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_r9ri" src="r9riu" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+    <text id="n1_r9ri" name="title" xy="0,0" size="190,75" fontSize="12" autoSize="none" align="center" vAlign="middle" singleLine="true">
+      <relation target="" sidePair="width,height"/>
+    </text>
+  </displayList>
+</component>

+ 1 - 1
FGUIProject/assets/RoleInfo/components/ButtonHelp.xml

@@ -5,7 +5,7 @@
     <image id="n0_d4iw" name="n0" src="d4iw6g" fileName="images/grxx_jyt_1.png" xy="0,0" size="36,36">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_d4iw" name="title" xy="0,0" size="36,36" fontSize="26" color="#999999" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+    <text id="n1_d4iw" name="title" xy="0,0" size="36,36" fontSize="26" color="#ff9900" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

+ 7 - 7
FGUIProject/assets/RoleInfo/components/ButtonToggle.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,40" extention="Button">
-  <Button mode="Check"/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="130,58" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_d4iw" src="d4iw6i" name="n0" xy="0,0">
+    <image id="n0_d4iw" name="n0" src="d4iw6i" fileName="images/grxx_yx_dk.png" xy="0,0">
       <gearDisplay controller="button" pages="0,2"/>
-      <relation target="" sidePair="width,height"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_d4iw" src="d4iw6j" name="n1" xy="0,0">
+    <image id="n1_d4iw" name="n1" src="d4iw6j" fileName="images/grxx_yx_gb.png" xy="0,0" size="160,76">
       <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width,height"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
+  <Button mode="Check"/>
 </component>

+ 10 - 0
FGUIProject/assets/RoleInfo/components/ComHead.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="230,230" overflow="hidden">
+  <displayList>
+    <graph id="n39_r9ri" name="n39" xy="23,33" pivot="0.5,0.5" size="166,166" group="n41_r9ri" aspect="true" type="eclipse" lineSize="0" fillColor="#ffeed5be"/>
+    <loader id="n40_r9ri" name="loaIcon" xy="24,34" size="166,164" group="n41_r9ri" url="ui://374k3dwvr9ri1z" fill="scale"/>
+    <image id="n35_r9ri" name="n35" src="r9ri17" fileName="images/grxx_zytxtx.png" xy="21,31" size="170,171" group="n41_r9ri" aspect="true"/>
+    <loader id="n37_r9ri" name="loaBorder" xy="0,11" pivot="0.5,0.5" size="230,203" group="n41_r9ri" url="ui://374k3dwvr9ri20"/>
+    <group id="n41_r9ri" name="n41" xy="0,11" size="230,203"/>
+  </displayList>
+</component>

+ 7 - 0
FGUIProject/assets/RoleInfo/components/ComHeadIcon.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="225,225" mask="n33_r9ri">
+  <displayList>
+    <image id="n33_r9ri" name="n33" src="r9ri1d" fileName="images/zjm_txkuang.png" xy="0,0" size="225,225" aspect="true"/>
+    <loader id="n36_r9ri" name="loaHead" xy="0,0" size="225,225" aspect="true" url="ui://374k3dwvr9ri1f" fill="scaleFree"/>
+  </displayList>
+</component>

+ 9 - 0
FGUIProject/assets/RoleInfo/components/ComIcon.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="512,694" mask="n13_uyux">
+  <displayList>
+    <loader id="n4_v482" name="loaIcon" xy="19,-10" size="474,841" aspect="true" url="ui://374k3dwvr9ri1n" align="center" vAlign="middle" fill="scaleMatchWidth">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <image id="n13_uyux" name="n13" src="r9ri1s" fileName="imagesPhoto/xc_xzxd.png" xy="0,0"/>
+  </displayList>
+</component>

+ 6 - 0
FGUIProject/assets/RoleInfo/components/ComPhoto.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="482,432" overflow="hidden">
+  <displayList>
+    <loader id="n49_r9ri" name="loaPhoto" xy="0,48" pivot="0.5,0.5" size="482,432" url="ui://374k3dwvr9ri1n" align="center" vAlign="middle" fill="scaleNoBorder"/>
+  </displayList>
+</component>

+ 7 - 0
FGUIProject/assets/RoleInfo/components/Component1.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="166,166" mask="n7_r9ri">
+  <displayList>
+    <graph id="n6_r9ri" name="n6" xy="0,0" pivot="0.5,0.5" size="166,166" aspect="true" type="rect" lineSize="0" fillColor="#ffeed5be"/>
+    <image id="n7_r9ri" name="n7" src="r9ri1z" fileName="images/grxx_txtxya_1.png" xy="0,0" size="165,165" aspect="true"/>
+  </displayList>
+</component>

+ 13 - 0
FGUIProject/assets/RoleInfo/components/ListHeadBorderItem.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="230,230">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <graph id="n6_r9ri" name="n6" xy="34,38" pivot="0.5,0.5" size="157,157" group="n10_r9ri" aspect="true" type="eclipse" lineSize="0" fillColor="#ffeed5be"/>
+    <loader id="n4_r9ri" name="loaIcon" xy="34,38" size="155,157" group="n10_r9ri" url="ui://374k3dwvr9ri1z" fill="scale"/>
+    <image id="n5_r9ri" name="n5" src="r9ri1y" fileName="images/grxx_txtxczy.png" xy="33,37" group="n10_r9ri">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <loader id="n7_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n10_r9ri" aspect="true" url="ui://374k3dwvr9ri23" autoSize="true"/>
+    <group id="n10_r9ri" name="n10" xy="0,13" size="230,203"/>
+  </displayList>
+</component>

+ 5 - 3
FGUIProject/assets/RoleInfo/components/ListHeadItem.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="200,200" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n5_r9ri" name="n5" src="r9ria" fileName="images/pz_xzkuang.png" xy="-25,-25">
+    <graph id="n6_r9ri" name="n6" xy="16,17" pivot="0.5,0.5" size="166,166" aspect="true" type="eclipse" lineSize="0" fillColor="#ffeed5be"/>
+    <loader id="n4_r9ri" name="loaIcon" xy="17,18" size="166,164" url="ui://374k3dwvr9ri1z" fill="scale"/>
+    <image id="n5_r9ri" name="n5" src="r9rik" fileName="images/grxx_txxzlx.png" xy="2,2">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <loader id="n4_r9ri" name="loaIcon" xy="0,0" size="200,200" url="ui://374k3dwvmhyhd8" fill="scale"/>
+    <image id="n7_r9ri" name="imgNew" src="r9ril" fileName="images/grxx_xinxin.png" xy="140,18"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

+ 7 - 0
FGUIProject/assets/RoleInfo/components/ListPhotoItem.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="482,596">
+  <displayList>
+    <image id="n48_r9ri" name="n48" src="r9ri15" fileName="images/grxx_zyjiah.png" xy="0,0"/>
+    <component id="n49_r9ri" name="comPhoto" src="r9ri1o" fileName="ComPhoto.xml" xy="5,5" size="472,586"/>
+  </displayList>
+</component>

+ 9 - 0
FGUIProject/assets/RoleInfo/components/ListPhotoItem1.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="512,740">
+  <displayList>
+    <component id="n1_r9ri" name="comIcon" src="r9ri1q" fileName="componentsPhoto/ComIcon.xml" xy="0,0"/>
+    <image id="n2_r9ri" name="n2" src="r9ri1t" fileName="imagesPhoto/xc_kuangdi.png" xy="0,0"/>
+    <text id="n3_r9ri" name="txtTime" xy="88,691" pivot="0.5,0" size="335,49" fontSize="36" color="#aa8c61" align="center" text="2022-1-8 17:14:30"/>
+    <image id="n4_r9ri" name="imgSelect" src="r9ri1s" fileName="imagesPhoto/xc_xzxd.png" xy="0,0"/>
+  </displayList>
+</component>

+ 7 - 4
FGUIProject/assets/RoleInfo/components/ListSkillItem.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="249,128">
+<component size="839,120">
   <displayList>
-    <loader id="n1_r9ri" name="loaIcon" xy="0,0" size="50,50"/>
-    <text id="n2_r9ri" name="txtname" xy="173,9" size="76,49" fontSize="36" text="天工"/>
-    <text id="n3_r9ri" name="txtDesc" xy="176,86" size="63,42" fontSize="30" text="技能"/>
+    <loader id="n1_r9ri" name="loaIcon" xy="0,0" size="120,120" url="ui://374k3dwvr9rir" autoSize="true"/>
+    <text id="n2_r9ri" name="txtname" xy="167,-16" size="87,56" group="n4_r9ri" font="ui://eg2y0ldprkrwti1" fontSize="42" color="#9f815f" text="天工"/>
+    <text id="n3_r9ri" name="txtDesc" xy="167,49" size="671,86" group="n4_r9ri" fontSize="32" color="#9f815f" autoSize="height" text="立即增加己方主属性25%评分,冷却时间4.5秒立即增加己方主属性25%评分,冷却时间4.5秒"/>
+    <group id="n4_r9ri" name="n4" xy="167,-16" size="671,152" advanced="true" layout="vt" lineGap="10">
+      <relation target="" sidePair="middle-middle"/>
+    </group>
   </displayList>
 </component>

二進制
FGUIProject/assets/RoleInfo/images/grxx_bjbj.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_ditup.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_grxcxc.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_jnsm.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_szsz.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_txkuang.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_txtxczy.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_txtxya_1.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_txxzlx.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_xinxin.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_xtkk_1.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_xtkk_2.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_xtxtx.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_xztxtx_1.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_xztxtx_2.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_yx_dk.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_yx_gb.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_zyddt.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_zydik.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_zygrxc.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_zyjiah.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_zyshul.png


二進制
FGUIProject/assets/RoleInfo/images/grxx_zytxtx.png


二進制
FGUIProject/assets/RoleInfo/images/hl_sczpxzdik.png


二進制
FGUIProject/assets/RoleInfo/images/hl_sczpxzi_1.png


二進制
FGUIProject/assets/RoleInfo/images/hl_sczpxzi_2.png


二進制
FGUIProject/assets/RoleInfo/images/hl_wxzzi_1.png


二進制
FGUIProject/assets/RoleInfo/images/hl_wxzzi_2.png


二進制
FGUIProject/assets/RoleInfo/images/hl_xzanniu_1.png


二進制
FGUIProject/assets/RoleInfo/images/hl_xzanniu_2.png


二進制
FGUIProject/assets/RoleInfo/images/jnsm_1.png


二進制
FGUIProject/assets/RoleInfo/images/jnsm_2.png


二進制
FGUIProject/assets/RoleInfo/images/jnsm_3.png


二進制
FGUIProject/assets/RoleInfo/images/jnsm_4.png


二進制
FGUIProject/assets/RoleInfo/images/kp_mudan.jpg


二進制
FGUIProject/assets/RoleInfo/images/self.png


二進制
FGUIProject/assets/RoleInfo/images/xc_kuangdi.png


二進制
FGUIProject/assets/RoleInfo/images/xc_xczi.png


二進制
FGUIProject/assets/RoleInfo/images/xc_xzxd.png


二進制
FGUIProject/assets/RoleInfo/images/xgnc_btkuang.png


二進制
FGUIProject/assets/RoleInfo/images/xgnc_dik_1.png


二進制
FGUIProject/assets/RoleInfo/images/xgnc_dik_2.png


二進制
FGUIProject/assets/RoleInfo/images/xgnc_sjsjan.png


二進制
FGUIProject/assets/RoleInfo/images/xgxx_zytjtb.png


二進制
FGUIProject/assets/RoleInfo/images/zjm_dj_1.png


二進制
FGUIProject/assets/RoleInfo/images/zjm_txkuang.png


二進制
FGUIProject/assets/RoleInfo/images/zjm_txkuang_1.png


+ 53 - 4
FGUIProject/assets/RoleInfo/package.xml

@@ -23,12 +23,61 @@
     <component id="r9ri4" name="PersonalPhotoUI.xml" path="/" exported="true"/>
     <component id="r9ri5" name="ListSkillItem.xml" path="/components/"/>
     <component id="r9ri6" name="Button1.xml" path="/components/"/>
-    <image id="r9ri7" name="hl_xzanniu_2.png" path="/images/"/>
     <component id="r9ri9" name="ListHeadItem.xml" path="/components/"/>
     <image id="r9ria" name="pz_xzkuang.png" path="/images/"/>
-    <image id="r9rib" name="hl_wxzzi_1.png" path="/images/"/>
-    <image id="r9ric" name="hl_wxzzi_2.png" path="/images/"/>
-    <image id="r9rig" name="hl_xzanniu_1.png" path="/images/"/>
+    <image id="r9rih" name="jnsm_4.png" path="/images/" exported="true"/>
+    <image id="r9rii" name="grxx_ditup.png" path="/images/"/>
+    <image id="r9rij" name="grxx_txkuang.png" path="/images/"/>
+    <image id="r9rik" name="grxx_txxzlx.png" path="/images/"/>
+    <image id="r9ril" name="grxx_xinxin.png" path="/images/"/>
+    <image id="r9rim" name="grxx_xtxtx.png" path="/images/" scale="9grid" scale9grid="204,1,408,2"/>
+    <image id="r9rin" name="grxx_xztxtx_1.png" path="/images/"/>
+    <image id="r9rio" name="grxx_xztxtx_2.png" path="/images/"/>
+    <image id="r9rip" name="hl_sczpxzi_1.png" path="/images/"/>
+    <image id="r9riq" name="hl_sczpxzi_2.png" path="/images/"/>
+    <image id="r9rir" name="jnsm_1.png" path="/images/" exported="true"/>
+    <image id="r9ris" name="jnsm_2.png" path="/images/" exported="true"/>
+    <image id="r9rit" name="jnsm_3.png" path="/images/" exported="true"/>
+    <image id="r9riu" name="xgnc_sjsjan.png" path="/images/"/>
+    <image id="r9riv" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>
+    <image id="r9riw" name="xgnc_dik_1.png" path="/images/"/>
+    <image id="r9rix" name="xgnc_dik_2.png" path="/images/"/>
+    <image id="r9riy" name="xgxx_zytjtb.png" path="/images/"/>
+    <image id="r9riz" name="grxx_bjbj.png" path="/images/"/>
+    <image id="r9ri10" name="grxx_jnsm.png" path="/images/"/>
+    <image id="r9ri11" name="grxx_szsz.png" path="/images/"/>
+    <image id="r9ri12" name="grxx_zyddt.png" path="/images/" scale="9grid" scale9grid="267,350,534,700"/>
+    <image id="r9ri13" name="grxx_zydik.png" path="/images/"/>
+    <image id="r9ri14" name="grxx_zygrxc.png" path="/images/"/>
+    <image id="r9ri15" name="grxx_zyjiah.png" path="/images/"/>
+    <image id="r9ri16" name="grxx_zyshul.png" path="/images/"/>
+    <image id="r9ri17" name="grxx_zytxtx.png" path="/images/"/>
+    <image id="r9ri18" name="grxx_grxcxc.png" path="/images/"/>
+    <image id="r9ri1d" name="zjm_txkuang.png" path="/images/"/>
+    <image id="r9ri1f" name="self.png" path="/images/"/>
+    <image id="r9ri1g" name="zjm_txkuang_1.png" path="/images/" scale="9grid" scale9grid="31,31,62,62"/>
+    <component id="r9ri1h" name="ComHead.xml" path="/components/"/>
+    <component id="r9ri1i" name="ComHeadIcon.xml" path="/components/"/>
+    <component id="r9ri1j" name="Button2.xml" path="/components/"/>
+    <component id="r9ri1k" name="Button3.xml" path="/components/"/>
+    <component id="r9ri1l" name="Button4.xml" path="/components/"/>
+    <component id="r9ri1m" name="ListPhotoItem.xml" path="/components/"/>
+    <image id="r9ri1n" name="kp_mudan.jpg" path="/images/"/>
+    <component id="r9ri1o" name="ComPhoto.xml" path="/components/"/>
+    <component id="r9ri1p" name="Button5.xml" path="/components/"/>
+    <component id="r9ri1q" name="ComIcon.xml" path="/components/"/>
+    <image id="r9ri1s" name="xc_xzxd.png" path="/images/"/>
+    <image id="r9ri1t" name="xc_kuangdi.png" path="/images/"/>
+    <component id="r9ri1v" name="ListPhotoItem1.xml" path="/components/"/>
+    <image id="r9ri1w" name="xc_xczi.png" path="/images/"/>
+    <image id="r9ri1x" name="hl_sczpxzdik.png" path="/images/" scale="9grid" scale9grid="146,20,292,40"/>
+    <image id="r9ri1y" name="grxx_txtxczy.png" path="/images/"/>
+    <image id="r9ri1z" name="grxx_txtxya_1.png" path="/images/"/>
+    <image id="r9ri20" name="grxx_xtkk_1.png" path="/images/"/>
+    <component id="r9ri21" name="Component1.xml" path="/components/"/>
+    <component id="r9ri22" name="ListHeadBorderItem.xml" path="/components/"/>
+    <image id="r9ri23" name="grxx_xtkk_2.png" path="/images/"/>
+    <image id="r9ri24" name="zjm_dj_1.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleInfo" packageCount="2" genCode="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/poem/PoemGalleryUI.xml

@@ -18,7 +18,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"/>
+    <image id="n24_r9ri" name="n24" src="r9ri12k" fileName="imagesGallery/hl_xz_ddik_1.png" xy="0,1736" group="n25_r9ri" pkg="eg2y0ldp"/>
     <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>

+ 1 - 1
FGUIProject/assets/poem/componentsGallery/ComNormal.xml

@@ -49,7 +49,7 @@
     <text id="n29_r9ri" name="txtRank" xy="830,427" pivot="1,0" size="169,41" fontSize="30" color="#c58383" text="我的排名:20">
       <gearDisplay controller="c1" pages="2"/>
     </text>
-    <image id="n30_r9ri" name="n30" src="r9ri12o" fileName="imagesGallery/hl_ddandik.png" xy="391,660" group="n32_r9ri"/>
+    <image id="n30_r9ri" name="n30" src="r9ri12o" fileName="imagesGallery/hl_ddandik.png" xy="391,660" group="n32_r9ri" pkg="eg2y0ldp"/>
     <text id="n31_r9ri" name="n31" xy="231,783" size="617,51" group="n32_r9ri" fontSize="38" color="#ac9b7f" text="排行榜数据正在结算中,请稍后再来!"/>
     <group id="n32_r9ri" name="grpResult" xy="231,660" size="617,298" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>

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

@@ -99,11 +99,9 @@
     <image id="r9ri12h" name="hl_cjkuangdi.png" path="/imagesGallery/" scale="9grid" scale9grid="124,13,250,774"/>
     <image id="r9ri12i" name="hl_hlzibt.png" path="/imagesGallery/"/>
     <component id="r9ri12j" name="Button10.xml" path="/componentsGallery/"/>
-    <image id="r9ri12k" name="hl_xz_ddik_1.png" path="/imagesGallery/"/>
     <component id="r9ri12l" name="Button11.xml" path="/componentsGallery/"/>
     <component id="r9ri12m" name="ComRoleHead.xml" path="/componentsGallery/"/>
     <component id="r9ri12n" name="ComHeadIcon.xml" path="/componentsGallery/"/>
-    <image id="r9ri12o" name="hl_ddandik.png" path="/imagesGallery/"/>
     <component id="r9ri12p" name="ComHead.xml" path="/componentsGallery/"/>
     <image id="r9ri12q" name="hl_gthgt.png" path="/imagesGallery/"/>
     <image id="r9ri12r" name="hl_txkuang1.png" path="/imagesGallery/"/>

+ 16 - 2
GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -42,7 +42,7 @@ namespace GFGEditor
 
         private static string[] NpcHeadSrcPaths { get { return new string[] { ResRootPath + "npc/对战头像/" }; } }
         public static string NpcHeadTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Npc/Head/";
-        public static string HeadMd5FileSaveName = "HeadMd5";
+        public static string NPCHeadMd5FileSaveName = "NpcHeadMd5";
 
 
         private static string[] NpcPicSrcPaths { get { return new string[] { ResRootPath + "npc/对战立绘/" }; } }
@@ -115,6 +115,14 @@ namespace GFGEditor
         public static string TravelRoleTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Travel/Role/";
         public static string TravelRoleMd5FileSaveName = "TravelRoleMd5";
 
+        private static string[] HeadPaths { get { return new string[] { ResRootPath + "头像/头像/" }; } }
+        public static string HeadTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Head/Head/";
+        public static string HeadMd5FileSaveName = "HeadMd5";
+
+        private static string[] HeadBorderPaths { get { return new string[] { ResRootPath + "头像/头像框/" }; } }
+        public static string HeadBorderTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Head/HeadBorder/";
+        public static string HeadBorderMd5FileSaveName = "HeadBorderMd5";
+
         public static void Import()
         {
             var md5Path = ImportArtResTool.Md5FilePath;
@@ -140,7 +148,7 @@ namespace GFGEditor
             ImportClipImage();
             //NPC头像
             EditorUtility.DisplayProgressBar("进度", "正在导入NPC头像", 1);
-            ImportRes(NpcHeadSrcPaths, NpcHeadTargetPath, HeadMd5FileSaveName);
+            ImportRes(NpcHeadSrcPaths, NpcHeadTargetPath, NPCHeadMd5FileSaveName);
             //背景
             EditorUtility.DisplayProgressBar("进度", "正在导入背景图", 1);
             ImportRes(BgSrcPaths, BgTargetPath, BgMd5FileSaveName);
@@ -174,6 +182,12 @@ namespace GFGEditor
             EditorUtility.DisplayProgressBar("进度", "正在导入千山万水角色资源", 1);
             ImportRes(TravelRolePaths, TravelRoleTargetPath, TravelRoleMd5FileSaveName);
 
+            EditorUtility.DisplayProgressBar("进度", "正在导入玩家头像资源", 1);
+            ImportRes(HeadPaths, HeadTargetPath, HeadMd5FileSaveName);
+
+            EditorUtility.DisplayProgressBar("进度", "正在导入玩家头像框资源", 1);
+            ImportRes(HeadBorderPaths, HeadBorderTargetPath, HeadBorderMd5FileSaveName);
+
             //清除冗余动画
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.DressUpAnimationTargetPath, ImportArtResTool.DressUpAnimationSrcPaths[0]);
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.EffectTargetPath, ImportArtResTool.EffectSrcPaths[0]);

+ 5 - 1
GameClient/Assets/Editor/ToolsMenu.cs

@@ -209,7 +209,7 @@ namespace GFGEditor
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.DressUpTargetPath, new string[] { ImportArtResTool.BgMd5FileSaveName, ImportArtResTool.DressUpMd5FileSaveName });
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcHeadTargetPath, new string[] { ImportArtResTool.HeadMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcHeadTargetPath, new string[] { ImportArtResTool.NPCHeadMd5FileSaveName });
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcPicTargetPath, new string[] { ImportArtResTool.PicFMd5FileSaveName });
 
@@ -225,6 +225,10 @@ namespace GFGEditor
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.PhotoGraphBorderTargetPath, new string[] { ImportArtResTool.PhotoGraphBorderMd5FileSaveName });
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.UIBgTargetPath, new string[] { ImportArtResTool.UIBgMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TravelBgTargetPath, new string[] { ImportArtResTool.TravelBgMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TravelRoleTargetPath, new string[] { ImportArtResTool.TravelRoleMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.HeadTargetPath, new string[] { ImportArtResTool.HeadMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.HeadBorderTargetPath, new string[] { ImportArtResTool.HeadBorderMd5FileSaveName });
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityShow2TargetPath, new string[] { ImportArtResTool.ActivityShow2Md5FileSaveName });
 

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -83,6 +83,7 @@ namespace GFGGame
         public const string POEM_PHOTO_INFOS_CHANGE = "POEM_PHOTO_INFOS_CHANGE";//相册数据变化
 
         public const string CHANGE_ROLE_NAME = "CHANGE_ROLE_NAME";//修改玩家名称
+        public const string CHANGE_ROLE_HEAD = "CHANGE_ROLE_HEAD";//修改玩家头像、头像框
 
         public const string TRAVEL_STATE_CHANGE = "TRAVEL_STATE_CHANGE";//游历状态变化
 

+ 9 - 0
GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

@@ -58,6 +58,11 @@ namespace GFGGame
             {
                 BagDataManager.Instance.Add(itemData);
             }
+
+            if (itemCfg.itemType == ConstItemType.HEAD)
+            {
+                RoleInfoManager.Instance.Add(itemID);
+            }
             PhotographDataManager.Instance.Add(itemID);
             EventAgent.DispatchEvent(ConstMessage.ITEM_CHANGED, itemID);
         }
@@ -83,6 +88,10 @@ namespace GFGGame
                     {
                         BagDataManager.Instance.Remove(itemID);
                     }
+                    if (itemCfg.itemType == ConstItemType.HEAD)
+                    {
+                        RoleInfoManager.Instance.Remove(itemID);
+                    }
                 }
 
                 if (itemCfg.itemType == ConstItemType.DRESS_UP && !DressUpMenuItemDataManager.CheckIsSceneType(itemID))

+ 18 - 0
GameClient/Assets/Game/HotUpdate/Data/RoleDataManager.cs

@@ -1,5 +1,6 @@
 using FairyGUI;
 using ET;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
@@ -16,6 +17,20 @@ namespace GFGGame
             }
         }
         public static string slogan = "";
+        public static int headId
+        {
+            get
+            {
+                return 5000001;
+            }
+        }
+        public static int headBorderId
+        {
+            get
+            {
+                return 5005001;
+            }
+        }
 
         public static int power
         {
@@ -32,6 +47,7 @@ namespace GFGGame
                 return ItemDataManager.GetItemNum(ConstItemID.GOLD); //GameGlobal.myNumericComponent.GetAsInt(NumericType.Gold);
             }
         }
+
         public static int exp
         {
             get
@@ -63,6 +79,7 @@ namespace GFGGame
                 return ItemDataManager.GetItemNum(ConstItemID.DIAMOND_RED); //GameGlobal.myNumericComponent.GetAsInt(NumericType.DiamondR);
             }
         }
+
         public static int Liveness
         {
             get
@@ -71,6 +88,7 @@ namespace GFGGame
             }
         }
 
+
         public static bool CheckPowerFull()
         {
             return RoleDataManager.power >= GameGlobal.myNumericComponent.GetAsInt(NumericType.PowerLimit);

+ 102 - 0
GameClient/Assets/Game/HotUpdate/Data/RoleInfoManager.cs

@@ -0,0 +1,102 @@
+using FairyGUI;
+using ET;
+using System.Collections.Generic;
+using System;
+
+namespace GFGGame
+{
+    public class RoleInfoManager : SingletonBase<RoleInfoManager>
+    {
+
+        private List<int> _headDatas = new List<int>() { 5000001, 5000002, 5000003 };
+        public List<int> headDatas
+        {
+            get
+            {
+                SortHeadDatas();
+                return _headDatas;
+            }
+        }
+
+        private List<int> _headBorderDatas = new List<int>() { 5005001, 5005002, 5005003, 5005001, 5005002, 5005003, 5005001, 5005002, 5005003, 5005001, 5005002, 5005003 };
+        public List<int> headBorderDatas
+        {
+            get
+            {
+                SortHeadBorderDatas();
+                return _headBorderDatas;
+            }
+        }
+
+        public void Clear()
+        {
+            _headDatas.Clear();
+            _headBorderDatas.Clear();
+        }
+        public void Add(int itemId)
+        {
+            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if (cfg.subType == 0)
+            {
+                if (_headDatas.IndexOf(itemId) < 0) _headDatas.Add(itemId);
+            }
+            else if (cfg.subType == 1)
+            {
+                if (_headBorderDatas.IndexOf(itemId) < 0) _headBorderDatas.Add(itemId);
+            }
+        }
+
+        public void Remove(int itemId)
+        {
+            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if (cfg.subType == 0)
+            {
+                if (_headDatas.IndexOf(itemId) >= 0) _headDatas.Remove(itemId);
+            }
+            else if (cfg.subType == 1)
+            {
+                if (_headBorderDatas.IndexOf(itemId) >= 0) _headBorderDatas.Remove(itemId);
+            }
+
+        }
+
+
+        private void SortHeadDatas()
+        {
+            _headDatas.Sort((int a, int b) =>
+            {
+                return b - a;
+            });
+        }
+
+        private void SortHeadBorderDatas()
+        {
+            _headBorderDatas.Sort((int a, int b) =>
+            {
+                return b - a;
+            });
+        }
+
+
+        public decimal GetGuideProgress()
+        {
+
+            int suitHaveCount = 0;
+            int suitTotalCount = 1;
+            DressUpMenuSuitDataManager.GetTotalProgress(out suitHaveCount, out suitTotalCount);
+            int chapterItemHaveCount = 0;
+            int chapterItemTotalCount = 1;
+            InstanceZonesDataManager.GetTotalProgress(out chapterItemHaveCount, out chapterItemTotalCount);
+            int travelHaveCount = 0;
+            int travelTotalCount = 1;
+            TravelDataManager.Instance.GetTotalTravelProgress(out travelHaveCount, out travelTotalCount);
+
+            int haveCount = suitHaveCount + chapterItemHaveCount + travelHaveCount;
+            int totalCount = suitTotalCount + chapterItemTotalCount + travelTotalCount;
+
+            decimal value = Math.Floor((decimal)100 * haveCount / totalCount);
+            return value;
+
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Data/RoleInfoManager.cs.meta

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

+ 12 - 5
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeHead.cs

@@ -8,12 +8,14 @@ namespace UI.RoleInfo
     {
         public GComponent target;
         public Controller m_c1;
+        public GList m_list;
+        public GList m_listBorder;
         public GButton m_btnTab0;
         public GButton m_btnTab1;
-        public GList m_list;
-        public GComponent m_comHead;
+        public UI_ComHead m_comHead;
         public GTextField m_txtName;
         public GTextField m_txtDesc;
+        public GButton m_btnSure;
         public const string URL = "ui://374k3dwvr9ri2";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ChangeHead";
@@ -62,22 +64,27 @@ namespace UI.RoleInfo
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_list = (GList)comp.GetChild("list");
+            m_listBorder = (GList)comp.GetChild("listBorder");
             m_btnTab0 = (GButton)comp.GetChild("btnTab0");
             m_btnTab1 = (GButton)comp.GetChild("btnTab1");
-            m_list = (GList)comp.GetChild("list");
-            m_comHead = (GComponent)comp.GetChild("comHead");
+            m_comHead = (UI_ComHead)UI_ComHead.Create(comp.GetChild("comHead"));
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_btnSure = (GButton)comp.GetChild("btnSure");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_list = null;
+            m_listBorder = null;
             m_btnTab0 = null;
             m_btnTab1 = null;
-            m_list = null;
+            m_comHead.Dispose();
             m_comHead = null;
             m_txtName = null;
             m_txtDesc = null;
+            m_btnSure = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 12 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeNameUI.cs

@@ -8,8 +8,11 @@ namespace UI.RoleInfo
     {
         public GComponent target;
         public GImage m_bg;
-        public GButton m_btnSure;
         public GTextInput m_inputName;
+        public GButton m_btnDice;
+        public GTextField m_txtNeed;
+        public GLoader m_loaIcon;
+        public GButton m_btnSure;
         public const string URL = "ui://374k3dwvnjmnfz";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ChangeNameUI";
@@ -58,14 +61,20 @@ namespace UI.RoleInfo
         private void Init(GComponent comp)
         {
             m_bg = (GImage)comp.GetChild("bg");
-            m_btnSure = (GButton)comp.GetChild("btnSure");
             m_inputName = (GTextInput)comp.GetChild("inputName");
+            m_btnDice = (GButton)comp.GetChild("btnDice");
+            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_btnSure = (GButton)comp.GetChild("btnSure");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
-            m_btnSure = null;
             m_inputName = null;
+            m_btnDice = null;
+            m_txtNeed = null;
+            m_loaIcon = null;
+            m_btnSure = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComHead.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_ComHead
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GLoader m_loaBorder;
+        public const string URL = "ui://374k3dwvr9ri1h";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "ComHead";
+        private static UI_ComHead _proxy;
+
+        public static UI_ComHead Create(GObject gObject = null)
+        {
+            var ui = new UI_ComHead();
+            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_ComHead Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComHead();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_loaBorder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComHead.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComIcon.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_ComIcon
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://374k3dwvr9ri1q";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "ComIcon";
+        private static UI_ComIcon _proxy;
+
+        public static UI_ComIcon Create(GObject gObject = null)
+        {
+            var ui = new UI_ComIcon();
+            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_ComIcon Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComIcon();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComIcon.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComPhoto.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_ComPhoto
+    {
+        public GComponent target;
+        public GLoader m_loaPhoto;
+        public const string URL = "ui://374k3dwvr9ri1o";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "ComPhoto";
+        private static UI_ComPhoto _proxy;
+
+        public static UI_ComPhoto Create(GObject gObject = null)
+        {
+            var ui = new UI_ComPhoto();
+            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_ComPhoto Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComPhoto();
+            }
+            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_loaPhoto = (GLoader)comp.GetChild("loaPhoto");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaPhoto = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

部分文件因文件數量過多而無法顯示