zhaoyang 2 жил өмнө
parent
commit
8b651cae80
100 өөрчлөгдсөн 1041 нэмэгдсэн , 136 устгасан
  1. 1 1
      FGUIProject/assets/CommonGame/components/CompHead.xml
  2. 0 0
      FGUIProject/assets/CommonGame/components/CompHeadWithBg.xml
  3. 0 0
      FGUIProject/assets/CommonGame/images/self.png
  4. 0 0
      FGUIProject/assets/CommonGame/images/zjm_txkuang.png
  5. 0 0
      FGUIProject/assets/CommonGame/images/zjm_txkuang_1.png
  6. 5 0
      FGUIProject/assets/CommonGame/package.xml
  7. 1 1
      FGUIProject/assets/LuckyBox/components/ComCard.xml
  8. 3 5
      FGUIProject/assets/Main/MainUI.xml
  9. 2 2
      FGUIProject/assets/Main/components/Button1.xml
  10. 1 1
      FGUIProject/assets/Main/components/ComHead.xml
  11. 1 1
      FGUIProject/assets/Main/components/ComponentHeadBar.xml
  12. BIN
      FGUIProject/assets/Main/images/grxx_txtx.png
  13. 6 28
      FGUIProject/assets/Main/package.xml
  14. 22 0
      FGUIProject/assets/RoleInfo/ChangeHead.xml
  15. 0 0
      FGUIProject/assets/RoleInfo/ChangeNameUI.xml
  16. 0 0
      FGUIProject/assets/RoleInfo/GMPanelUI.xml
  17. 6 0
      FGUIProject/assets/RoleInfo/PersonalPhotoUI.xml
  18. 11 0
      FGUIProject/assets/RoleInfo/PersonalSkillUI.xml
  19. 4 5
      FGUIProject/assets/RoleInfo/RoleInfoUI.xml
  20. 16 0
      FGUIProject/assets/RoleInfo/SettingUI.xml
  21. 11 0
      FGUIProject/assets/RoleInfo/components/Button1.xml
  22. 0 0
      FGUIProject/assets/RoleInfo/components/ButtonGM.xml
  23. 0 0
      FGUIProject/assets/RoleInfo/components/ButtonHelp.xml
  24. 0 0
      FGUIProject/assets/RoleInfo/components/ButtonToggle.xml
  25. 0 0
      FGUIProject/assets/RoleInfo/components/ComBtn.xml
  26. 11 0
      FGUIProject/assets/RoleInfo/components/ListHeadItem.xml
  27. 8 0
      FGUIProject/assets/RoleInfo/components/ListSkillItem.xml
  28. 0 0
      FGUIProject/assets/RoleInfo/components/ProgressBarExp2.xml
  29. 0 0
      FGUIProject/assets/RoleInfo/images/grxx_dikuang.png
  30. 0 0
      FGUIProject/assets/RoleInfo/images/grxx_jyt_1.png
  31. 0 0
      FGUIProject/assets/RoleInfo/images/grxx_jyt_2.png
  32. 0 0
      FGUIProject/assets/RoleInfo/images/grxx_mzk_1.png
  33. 0 0
      FGUIProject/assets/RoleInfo/images/grxx_mzk_2.png
  34. 0 0
      FGUIProject/assets/RoleInfo/images/grxx_yx_dk.png
  35. 0 0
      FGUIProject/assets/RoleInfo/images/grxx_yx_gb.png
  36. BIN
      FGUIProject/assets/RoleInfo/images/hl_wxzzi_1.png
  37. BIN
      FGUIProject/assets/RoleInfo/images/hl_wxzzi_2.png
  38. BIN
      FGUIProject/assets/RoleInfo/images/hl_xzanniu_1.png
  39. BIN
      FGUIProject/assets/RoleInfo/images/hl_xzanniu_2.png
  40. 0 0
      FGUIProject/assets/RoleInfo/images/mc_jlkuang_1.png
  41. BIN
      FGUIProject/assets/RoleInfo/images/pz_xzkuang.png
  42. 34 0
      FGUIProject/assets/RoleInfo/package.xml
  43. 1 1
      FGUIProject/assets/poem/PoemGalleryPreviewUI.xml
  44. 0 0
      FGUIProject/assets/poem/componentsGallery/ComGetReward.xml
  45. 1 1
      FGUIProject/assets/poem/componentsGallery/ComHeadIcon.xml
  46. 0 30
      FGUIProject/assets/poem/componentsGallery/ComRank.xml
  47. 1 2
      FGUIProject/assets/poem/package.xml
  48. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_CompHead.cs
  49. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_CompHead.cs.meta
  50. 8 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo.meta
  51. 89 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeHead.cs
  52. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeHead.cs.meta
  53. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeNameUI.cs
  54. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeNameUI.cs.meta
  55. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComBtn.cs
  56. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComBtn.cs.meta
  57. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_GMPanelUI.cs
  58. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_GMPanelUI.cs.meta
  59. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListHeadItem.cs
  60. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListHeadItem.cs.meta
  61. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListSkillItem.cs
  62. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListSkillItem.cs.meta
  63. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_PersonalPhotoUI.cs
  64. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_PersonalPhotoUI.cs.meta
  65. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_PersonalSkillUI.cs
  66. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_PersonalSkillUI.cs.meta
  67. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs
  68. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs.meta
  69. 83 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_SettingUI.cs
  70. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_SettingUI.cs.meta
  71. 3 3
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  72. 8 0
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo.meta
  73. 58 0
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs
  74. 11 0
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs.meta
  75. 3 6
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeNameView.cs
  76. 1 1
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeNameView.cs.meta
  77. 2 2
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs
  78. 1 1
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs.meta
  79. 55 0
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PersonalPhotoView.cs
  80. 11 0
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PersonalPhotoView.cs.meta
  81. 56 0
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PersonalSkillView.cs
  82. 11 0
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PersonalSkillView.cs.meta
  83. 28 24
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs
  84. 1 1
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs.meta
  85. 79 0
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/SettingView.cs
  86. 11 0
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/SettingView.cs.meta
  87. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  88. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  89. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  90. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  91. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  92. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  93. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  94. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  95. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  96. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  97. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  98. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  99. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  100. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png

+ 1 - 1
FGUIProject/assets/Main/components/CompHead.xml → FGUIProject/assets/CommonGame/components/CompHead.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="125,125" pivot="0.5,0.5" mask="n40_kubi">
   <displayList>
-    <loader id="n39_kubi" name="icon" xy="0,0" size="125,125" aspect="true" url="ui://mfvz4q8kkubi7e" fill="scaleFree"/>
+    <loader id="n39_kubi" name="icon" xy="0,0" size="125,125" aspect="true" url="ui://eg2y0ldpkubi7e" fill="scaleFree"/>
     <image id="n40_kubi" name="n40" src="q08xh" fileName="images/zjm_txkuang.png" xy="2,2" size="120,120" aspect="true"/>
   </displayList>
 </component>

+ 0 - 0
FGUIProject/assets/Main/components/CompHeadWithBg.xml → FGUIProject/assets/CommonGame/components/CompHeadWithBg.xml


+ 0 - 0
FGUIProject/assets/Main/images/self.png → FGUIProject/assets/CommonGame/images/self.png


+ 0 - 0
FGUIProject/assets/Main/images/zjm_txkuang.png → FGUIProject/assets/CommonGame/images/zjm_txkuang.png


+ 0 - 0
FGUIProject/assets/Main/images/zjm_txkuang_1.png → FGUIProject/assets/CommonGame/images/zjm_txkuang_1.png


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

@@ -220,6 +220,11 @@
     <image id="r9ritjl" name="tc_kuangk.png" path="/imgnew/"/>
     <component id="r9ritjq" name="Button19.xml" path="/components/" exported="true"/>
     <image id="r9ritjr" name="anniuty4.png" path="/images/"/>
+    <component id="kubi7h" name="CompHeadWithBg.xml" path="/components/" exported="true"/>
+    <image id="kubi7e" name="self.png" path="/images/"/>
+    <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/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/LuckyBox/components/ComCard.xml

@@ -3,7 +3,7 @@
   <displayList>
     <loader id="n0_qdrt" name="bg" xy="0,0" size="948,970" url="ui://drx9d1usqdrt14" autoSize="true"/>
     <loader id="n1_qdrt" name="loaType" xy="685,237" size="78,306" aspect="true" url="ui://eg2y0ldpqdrt15" fill="scaleMatchWidth"/>
-    <loader id="n2_qdrt" name="loaIcon" xy="287,206" size="374,374" aspect="true" url="ui://mfvz4q8kkubi7e" fill="scaleMatchWidth"/>
+    <loader id="n2_qdrt" name="loaIcon" xy="287,206" size="374,374" aspect="true" url="ui://eg2y0ldpkubi7e" fill="scaleMatchWidth"/>
     <loader id="n3_qdrt" name="loaProperty" xy="248,231" size="60,60" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
     <text id="n4_qdrt" name="txtName" xy="474,75" pivot="0.5,0.5" anchor="true" size="100,64" fontSize="48" color="#feeac2" text="服装"/>
     <text id="n5_qdrt" name="txtDiscribe" xy="474,656" pivot="0.5,0" anchor="true" size="360,235" fontSize="30" color="#c2a773" autoSize="height" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>

+ 3 - 5
FGUIProject/assets/Main/MainUI.xml

@@ -19,9 +19,7 @@
       <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
     </component>
     <group id="n57_oju1" name="grpList" xy="913,308" size="102,271" advanced="true"/>
-    <component id="n2_q08x" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="34,160" group="n52_qqat">
-      <relation target="" sidePair="left-left,top-top"/>
-    </component>
+    <component id="n61_r9ri" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="34,160" group="n52_qqat"/>
     <component id="n46_lh8v" name="btnDailyLogin" src="ox5bf5" fileName="components/Button2.xml" xy="24,305" group="n52_qqat" visible="false">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
@@ -45,7 +43,7 @@
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kv482fq"/>
     </component>
-    <group id="n52_qqat" name="grpLeft" xy="24,160" size="1056,1701" group="n59_oju1" advanced="true"/>
+    <group id="n52_qqat" name="grpLeft" xy="24,160" size="1056,1700" group="n59_oju1" advanced="true"/>
     <component id="n44_n3xh" name="btnStudio" src="q08xu" fileName="components/ButtonModle1.xml" xy="1838,640" size="77,255" group="n58_oju1">
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://mfvz4q8kv482ft"/>
@@ -63,7 +61,7 @@
       <Button icon="ui://mfvz4q8kwonohg"/>
     </component>
     <group id="n58_oju1" name="grpRight" xy="1576,640" size="506,1187" group="n59_oju1" advanced="true"/>
-    <group id="n59_oju1" name="grpMove" xy="24,160" size="2058,1701" advanced="true"/>
+    <group id="n59_oju1" name="grpMove" xy="24,160" size="2058,1700" advanced="true"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n57_oju1" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>

+ 2 - 2
FGUIProject/assets/Main/components/Button1.xml

@@ -3,11 +3,11 @@
   <Button mode="Check"/>
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
   <displayList>
-    <image id="n0_d4iw" src="d4iw6j" name="n0" xy="0,0">
+    <image id="n0_d4iw" src="d4iw6j" name="n0" xy="0,0" pkg="374k3dwv">
       <gearDisplay controller="button" pages="0,2"/>
       <relation target="" sidePair="width,height"/>
     </image>
-    <image id="n1_d4iw" src="d4iw6i" name="n1" xy="0,0">
+    <image id="n1_d4iw" src="d4iw6i" name="n1" xy="0,0" pkg="374k3dwv">
       <gearDisplay controller="button" pages="1,3"/>
       <relation target="" sidePair="width,height"/>
     </image>

+ 1 - 1
FGUIProject/assets/Main/components/ComHead.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="163,163" mask="n10_wono">
   <displayList>
-    <image id="n12_wono" name="n12" src="kubi7e" fileName="images/self.png" xy="8,8">
+    <image id="n12_wono" name="n12" src="kubi7e" fileName="images/self.png" xy="8,8" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n10_wono" name="n10" src="wonogj" fileName="imagesFight/zjm_txkuang_1.png" xy="13,13">

+ 1 - 1
FGUIProject/assets/Main/components/ComponentHeadBar.xml

@@ -2,7 +2,7 @@
 <component size="125,125">
   <displayList>
     <image id="n19_q08x" name="n19" src="q08xc" fileName="images/zjm_mzkuang.png" xy="60,71"/>
-    <component id="n2_q08x" name="n2" src="kubi7h" fileName="components/CompHeadWithBg.xml" xy="0,0"/>
+    <component id="n42_r9ri" name="n42" src="kubi7h" fileName="components/CompHeadWithBg.xml" pkg="eg2y0ldp" xy="0,0"/>
     <text id="n20_q08x" name="txtName" xy="141,74" size="156,39" fontSize="28" color="#fdf2df" align="center" autoSize="none" text="名字五个字">
       <relation target="n19_q08x" sidePair="left-left,top-top"/>
     </text>

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


+ 6 - 28
FGUIProject/assets/Main/package.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="mfvz4q8k">
   <resources>
-    <component id="q08x0" name="MainUI.xml" path="/" exported="true"/>
     <image id="q08x2" name="huodongkuang.png" path="/images/"/>
     <image id="q08x9" name="zjm_gongg.png" path="/images/"/>
     <image id="q08xa" name="zjm_haoy.png" path="/images/"/>
@@ -11,12 +10,11 @@
     <image id="q08xe" name="zjm_renwu.png" path="/images/"/>
     <image id="q08xf" name="zjm_tiangong.png" path="/images/"/>
     <image id="q08xg" name="zjm_tujian.png" path="/images/"/>
-    <image id="q08xh" name="zjm_txkuang.png" path="/images/"/>
     <image id="q08xj" name="zjm_yjian.png" path="/images/"/>
     <image id="q08xk" name="zjm_yying.png" path="/images/"/>
     <component id="q08xt" name="ButtonZhaiXing.xml" path="/components/"/>
     <component id="q08xu" name="ButtonModle1.xml" path="/components/"/>
-    <component id="slb416" name="ComponentHeadBar.xml" path="/components/" exported="true"/>
+    <component id="slb416" name="ComponentHeadBar.xml" path="/components/"/>
     <component id="slb419" name="StoryChapterListUI.xml" path="/" exported="true"/>
     <image id="slb41e" name="zhuxian_anniu_jy.png" path="/imagesStory/"/>
     <image id="slb41f" name="zhuxian_anniu_pt.png" path="/imagesStory/"/>
@@ -136,26 +134,13 @@
     <component id="s2cc5o" name="CompFlower3.xml" path="/components/"/>
     <component id="s2cc5p" name="CompChapter10003.xml" path="/componentsLevel/" exported="true"/>
     <component id="s2cc5q" name="CompChapter10004.xml" path="/componentsLevel/" exported="true"/>
-    <image id="d4iw6g" name="grxx_jyt_1.png" path="/images/" scale="9grid" scale9grid="19,0,410,26"/>
-    <image id="d4iw6h" name="grxx_jyt_2.png" path="/images/" scale="9grid" scale9grid="12,0,420,21"/>
-    <image id="d4iw6i" name="grxx_yx_dk.png" path="/images/"/>
-    <image id="d4iw6j" name="grxx_yx_gb.png" path="/images/"/>
-    <component id="d4iw6k" name="RoleInfoUI.xml" path="/" exported="true"/>
-    <component id="d4iw6m" name="ProgressBarExp2.xml" path="/components/"/>
     <component id="d4iw6n" name="Button1.xml" path="/components/"/>
-    <component id="d4iw6o" name="ButtonToggle.xml" path="/components/"/>
-    <component id="d4iw6p" name="ButtonHelp.xml" path="/components/"/>
-    <component id="d4iw6q" name="GMPanelUI.xml" path="/" exported="true"/>
     <component id="ga166s" name="CompChapter10005.xml" path="/componentsLevel/" exported="true"/>
     <image id="tu966t" name="zx_zhez.png" path="/images/" scale="9grid" scale9grid="17,19,4,2"/>
     <component id="tu966u" name="ComponentChapterPic.xml" path="/components/"/>
     <image id="tu967b" name="zhuxian_diban_1.png" path="/imagesStory/"/>
     <image id="tu967c" name="zhuxian_diban_2.png" path="/imagesStory/"/>
     <image id="tu967d" name="zhuxian_diban_3.png" path="/imagesStory/"/>
-    <image id="kubi7e" name="self.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/"/>
-    <component id="kubi7h" name="CompHeadWithBg.xml" path="/components/" exported="true"/>
     <image id="ndrd7i" name="default.png" path="/imagesDialog/"/>
     <component id="ndrd7j" name="Component1.xml" path="/componentsDialog/"/>
     <image id="ndrd7k" name="zjm_shangc.png" path="/images/"/>
@@ -190,7 +175,6 @@
     <component id="kpb08k" name="CompChapter20003.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08l" name="CompChapter20004.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08m" name="CompChapter20005.xml" path="/componentsLevel/" exported="true"/>
-    <component id="c5sc8h" name="ButtonGM.xml" path="/components/"/>
     <image id="wg7t8n" name="zhuxian_zj_pic_1.jpg" path="/imagesExport/"/>
     <image id="wg7t8o" name="zhuxian_zj_pic_2.jpg" path="/imagesExport/"/>
     <image id="wg7t8p" name="zhuxian_zj_pic_3.jpg" path="/imagesExport/"/>
@@ -303,10 +287,10 @@
     <component id="v3k9c7" name="ProgressBarTargetScore.xml" path="/components/"/>
     <image id="v3k9c9" name="zd_daoshu_1.png" path="/imagesStory/"/>
     <image id="v3k9ca" name="zd_daoshu_2.png" path="/imagesStory/"/>
-    <image id="v3k9cc" name="zd_jineng_1.png" path="/imagesStory/"/>
-    <image id="v3k9cd" name="zd_jineng_2.png" path="/imagesStory/"/>
-    <image id="v3k9ce" name="zd_jineng_3.png" path="/imagesStory/"/>
-    <image id="v3k9cf" name="zd_jineng_4.png" path="/imagesStory/"/>
+    <image id="v3k9cc" name="zd_jineng_1.png" path="/imagesStory/" exported="true"/>
+    <image id="v3k9cd" name="zd_jineng_2.png" path="/imagesStory/" exported="true"/>
+    <image id="v3k9ce" name="zd_jineng_3.png" path="/imagesStory/" exported="true"/>
+    <image id="v3k9cf" name="zd_jineng_4.png" path="/imagesStory/" exported="true"/>
     <image id="v3k9cq" name="zd_zdjdt_1.png" path="/imagesStory/"/>
     <image id="v3k9cr" name="zd_zdjdt_2.png" path="/imagesStory/"/>
     <image id="v3k9cs" name="zd_zdjdt_3.png" path="/imagesStory/"/>
@@ -320,17 +304,12 @@
     <image id="v3k9d2" name="zd_zijia.png" path="/imagesStory/"/>
     <image id="v3k9d3" name="zd_zijian.png" path="/imagesStory/"/>
     <component id="mhyhd4" name="ProgressBar2.xml" path="/components/"/>
-    <image id="mhyhd5" name="grxx_dikuang.png" path="/images/"/>
-    <image id="mhyhd6" name="grxx_txtx.png" path="/images/"/>
-    <image id="mhyhd7" name="grxx_mzk_1.png" path="/images/" scale="9grid" scale9grid="75,16,150,32"/>
-    <image id="mhyhd8" name="grxx_mzk_2.png" path="/images/"/>
     <component id="lki4db" name="ComRoleSkill1.xml" path="/components/"/>
     <component id="txgzdc" name="CompChapter10002.xml" path="/componentsLevel/" exported="true"/>
     <component id="txgzdd" name="CompChapter10001.xml" path="/componentsLevel/" exported="true"/>
     <image id="jj0mdf" name="zd_jsjs_2.png" path="/images/"/>
     <image id="jj0mdg" name="zd_jsjs_1.png" path="/images/"/>
     <component id="jj0mdl" name="ButtonSpeedUp1.xml" path="/componentsDialog/"/>
-    <component id="lqp0dm" name="ComBtn.xml" path="/components/"/>
     <image id="k1khdp" name="zd_zdjdt_liang.png" path="/imagesStory/"/>
     <image id="k1khdq" name="zdsz_0.png" path="/Font5/"/>
     <image id="k1khdr" name="zdsz_1.png" path="/Font5/"/>
@@ -385,8 +364,6 @@
     <image id="v482fw" name="zjm_2.jpg" path="/"/>
     <image id="v482fx" name="zjm_1.jpg" path="/" atlas="alone_npot"/>
     <image id="qqatfy" name="zjm_hdhd_2.png" path="/images/"/>
-    <component id="njmnfz" name="ChangeNameUI.xml" path="/" exported="true"/>
-    <image id="njmng0" name="mc_jlkuang_1.png" path="/images/"/>
     <image id="wonog1" name="zd_jsjm_jszi_0.png" path="/imagesFight/"/>
     <image id="wonog2" name="jz_ejd_yz.png" path="/imagesFight/"/>
     <image id="wonog3" name="jz_sanjd_xs.png" path="/imagesFight/"/>
@@ -437,6 +414,7 @@
     <image id="r9rihj" name="zd_tzhddi_2.png" path="/images/" scale="9grid" scale9grid="219,154,440,119"/>
     <image id="r9rihk" name="zd_tzhdkua_1.png" path="/images/"/>
     <image id="r9rihl" name="zd_wctsxs.png" path="/images/"/>
+    <component id="q08x0" name="MainUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 22 - 0
FGUIProject/assets/RoleInfo/ChangeHead.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="962,1200">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <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">
+      <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="头像描述"/>
+  </displayList>
+</component>

+ 0 - 0
FGUIProject/assets/Main/ChangeNameUI.xml → FGUIProject/assets/RoleInfo/ChangeNameUI.xml


+ 0 - 0
FGUIProject/assets/Main/GMPanelUI.xml → FGUIProject/assets/RoleInfo/GMPanelUI.xml


+ 6 - 0
FGUIProject/assets/RoleInfo/PersonalPhotoUI.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="962,703">
+  <displayList>
+    <list id="n0_r9ri" name="list" xy="212,78" size="200,300" overflow="scroll"/>
+  </displayList>
+</component>

+ 11 - 0
FGUIProject/assets/RoleInfo/PersonalSkillUI.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="962,703">
+  <displayList>
+    <list id="n0_r9ri" name="list" xy="159,64" size="584,562" defaultItem="ui://374k3dwvr9ri5" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

+ 4 - 5
FGUIProject/assets/Main/RoleInfoUI.xml → FGUIProject/assets/RoleInfo/RoleInfoUI.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="700,1000">
   <displayList>
-    <loader id="n0_d4iw" name="bg" xy="-73,0" size="877,1000" touchable="false" url="ui://mfvz4q8kmhyhd5"/>
-    <text id="n2_d4iw" name="txtTitle" xy="-13,22" 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" xy="288,110" pivot="0.5,0.5" scale="1.6,1.6"/>
+    <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://mfvz4q8kmhyhd8" autoSize="true">
+    <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>
     <text id="n6_d4iw" name="n6" xy="57,480" size="71,46" fontSize="34" color="#aa794d" text="等级"/>
@@ -33,7 +33,6 @@
     <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">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
-    <image id="n25_mhyh" name="n25" src="mhyhd6" fileName="images/grxx_txtx.png" xy="247,86" visible="false"/>
     <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"/>
   </displayList>
 </component>

+ 16 - 0
FGUIProject/assets/RoleInfo/SettingUI.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="700,1000">
+  <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">
+      <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>
+  </displayList>
+</component>

+ 11 - 0
FGUIProject/assets/RoleInfo/components/Button1.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="251,83" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n3_uyux" name="icon" xy="125,41" pivot="0.5,0.5" anchor="true" size="251,83" url="ui://374k3dwvr9ri7" autoSize="true"/>
+    <text id="n4_r9ri" name="title" xy="0,0" size="251,83" fontSize="40" align="center" vAlign="middle" autoSize="none" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

+ 0 - 0
FGUIProject/assets/Main/components/ButtonGM.xml → FGUIProject/assets/RoleInfo/components/ButtonGM.xml


+ 0 - 0
FGUIProject/assets/Main/components/ButtonHelp.xml → FGUIProject/assets/RoleInfo/components/ButtonHelp.xml


+ 0 - 0
FGUIProject/assets/Main/components/ButtonToggle.xml → FGUIProject/assets/RoleInfo/components/ButtonToggle.xml


+ 0 - 0
FGUIProject/assets/Main/components/ComBtn.xml → FGUIProject/assets/RoleInfo/components/ComBtn.xml


+ 11 - 0
FGUIProject/assets/RoleInfo/components/ListHeadItem.xml

@@ -0,0 +1,11 @@
+<?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"/>
+  <displayList>
+    <image id="n5_r9ri" name="n5" src="r9ria" fileName="images/pz_xzkuang.png" xy="-25,-25">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <loader id="n4_r9ri" name="loaIcon" xy="0,0" size="200,200" url="ui://374k3dwvmhyhd8" fill="scale"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

+ 8 - 0
FGUIProject/assets/RoleInfo/components/ListSkillItem.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="249,128">
+  <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="技能"/>
+  </displayList>
+</component>

+ 0 - 0
FGUIProject/assets/Main/components/ProgressBarExp2.xml → FGUIProject/assets/RoleInfo/components/ProgressBarExp2.xml


+ 0 - 0
FGUIProject/assets/Main/images/grxx_dikuang.png → FGUIProject/assets/RoleInfo/images/grxx_dikuang.png


+ 0 - 0
FGUIProject/assets/Main/images/grxx_jyt_1.png → FGUIProject/assets/RoleInfo/images/grxx_jyt_1.png


+ 0 - 0
FGUIProject/assets/Main/images/grxx_jyt_2.png → FGUIProject/assets/RoleInfo/images/grxx_jyt_2.png


+ 0 - 0
FGUIProject/assets/Main/images/grxx_mzk_1.png → FGUIProject/assets/RoleInfo/images/grxx_mzk_1.png


+ 0 - 0
FGUIProject/assets/Main/images/grxx_mzk_2.png → FGUIProject/assets/RoleInfo/images/grxx_mzk_2.png


+ 0 - 0
FGUIProject/assets/Main/images/grxx_yx_dk.png → FGUIProject/assets/RoleInfo/images/grxx_yx_dk.png


+ 0 - 0
FGUIProject/assets/Main/images/grxx_yx_gb.png → FGUIProject/assets/RoleInfo/images/grxx_yx_gb.png


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


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


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


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


+ 0 - 0
FGUIProject/assets/Main/images/mc_jlkuang_1.png → FGUIProject/assets/RoleInfo/images/mc_jlkuang_1.png


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


+ 34 - 0
FGUIProject/assets/RoleInfo/package.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="374k3dwv">
+  <resources>
+    <component id="d4iw6k" name="RoleInfoUI.xml" path="/" exported="true"/>
+    <image id="mhyhd7" name="grxx_mzk_1.png" path="/images/" scale="9grid" scale9grid="75,16,150,32"/>
+    <image id="mhyhd8" name="grxx_mzk_2.png" path="/images/"/>
+    <component id="d4iw6m" name="ProgressBarExp2.xml" path="/components/"/>
+    <component id="d4iw6p" name="ButtonHelp.xml" path="/components/"/>
+    <component id="d4iw6o" name="ButtonToggle.xml" path="/components/"/>
+    <component id="njmnfz" name="ChangeNameUI.xml" path="/" exported="true"/>
+    <component id="d4iw6q" name="GMPanelUI.xml" path="/" exported="true"/>
+    <component id="lqp0dm" name="ComBtn.xml" path="/components/"/>
+    <component id="c5sc8h" name="ButtonGM.xml" path="/components/"/>
+    <image id="mhyhd5" name="grxx_dikuang.png" path="/images/"/>
+    <image id="d4iw6g" name="grxx_jyt_1.png" path="/images/" scale="9grid" scale9grid="19,0,410,26"/>
+    <image id="d4iw6h" name="grxx_jyt_2.png" path="/images/" scale="9grid" scale9grid="12,0,420,21"/>
+    <image id="d4iw6i" name="grxx_yx_dk.png" path="/images/"/>
+    <image id="d4iw6j" name="grxx_yx_gb.png" path="/images/"/>
+    <image id="njmng0" name="mc_jlkuang_1.png" path="/images/"/>
+    <component id="r9ri1" name="SettingUI.xml" path="/" exported="true"/>
+    <component id="r9ri2" name="ChangeHead.xml" path="/" exported="true"/>
+    <component id="r9ri3" name="PersonalSkillUI.xml" path="/" exported="true"/>
+    <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/"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleInfo" packageCount="2" genCode="true"/>
+</packageDescription>

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

@@ -11,7 +11,7 @@
     <graph id="n17_r9ri" name="n17" xy="0,0" size="1080,1920" alpha="0.8" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <loader id="n1_r9ri" name="loaPicture" xy="0,-240" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchHeight">
+    <loader id="n1_r9ri" name="loaPicture" xy="0,0" size="1080,1920" align="center" vAlign="middle" fill="scaleMatchHeight">
       <relation target="" sidePair="height-height"/>
     </loader>
     <component id="n0_r9ri" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">

+ 0 - 0
FGUIProject/assets/poem/ComGetReward.xml → FGUIProject/assets/poem/componentsGallery/ComGetReward.xml


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

@@ -2,6 +2,6 @@
 <component size="124,125" mask="n9_r9ri">
   <displayList>
     <image id="n9_r9ri" name="n9" src="r9ri122" fileName="imagesGallery/hl_txkuang.png" xy="6,6" size="111,111" aspect="true"/>
-    <loader id="n10_r9ri" name="loaicon" xy="12,13" size="99,99" aspect="true" url="ui://mfvz4q8kkubi7e" fill="scale"/>
+    <loader id="n10_r9ri" name="loaicon" xy="12,13" size="99,99" aspect="true" url="ui://eg2y0ldpkubi7e" fill="scale"/>
   </displayList>
 </component>

+ 0 - 30
FGUIProject/assets/poem/componentsGallery/ComRank.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="0"/>
-  <displayList>
-    <loader id="n0_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="n1_r9ri" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="38,80" controller="c1,1">
-      <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://iyz778gkuyux10a"/>
-    </component>
-    <text id="n2_r9ri" name="txtTheme" xy="405,259" pivot="0.5,0" size="270,41" fontSize="30" text="本期主题:风花雪月"/>
-    <list id="n7_r9ri" name="list" xy="73,462" size="933,1064" layout="flow_hz" overflow="scroll" defaultItem="ui://iyz778gkr9ri10y">
-      <gearDisplay controller="c1" pages="0"/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n8_r9ri" name="comHead" src="kubi7h" fileName="components/CompHeadWithBg.xml" pkg="mfvz4q8k" xy="207,1672" pivot="0.5,0.5" scale="1.6,1.6"/>
-    <text id="n9_r9ri" name="txtName" xy="408,1747" size="63,41" fontSize="30" text="老六"/>
-    <text id="n11_r9ri" name="txtRank" xy="543,1746" size="37,41" fontSize="30" text="- -"/>
-    <component id="n10_r9ri" name="n10" src="r9ri10v" fileName="componentsGallery/Button9.xml" xy="742,1729" size="77,76">
-      <Button icon="ui://iyz778gkuyuxzp"/>
-    </component>
-    <text id="n12_r9ri" name="n12" xy="316,939" size="448,41" fontSize="30" text="排行榜数据正在结算,请稍后再来">
-      <gearDisplay controller="c1" pages="1"/>
-    </text>
-  </displayList>
-</component>

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

@@ -53,7 +53,6 @@
     <component id="r9ri10u" name="PoemGalleryUI.xml" path="/" exported="true"/>
     <component id="r9ri10v" name="Button9.xml" path="/componentsGallery/"/>
     <component id="r9ri10w" name="ListItem.xml" path="/componentsGallery/"/>
-    <component id="r9ri10x" name="ComRank.xml" path="/componentsGallery/"/>
     <component id="r9ri10y" name="ListRankItem.xml" path="/componentsGallery/"/>
     <component id="r9ri114" name="ComNormal.xml" path="/componentsGallery/"/>
     <component id="r9ri115" name="ComFavorites.xml" path="/componentsGallery/"/>
@@ -134,7 +133,7 @@
     <image id="r9ri13f" name="hl_phb_4.png" path="/imagesGallery/" scale="9grid" scale9grid="249,23,498,1120"/>
     <image id="r9ri13g" name="hl_phb_b_4.png" path="/imagesGallery/"/>
     <image id="r9ri13h" name="xc_hl.png" path="/images/"/>
-    <component id="r9ri13i" name="ComGetReward.xml" path="/"/>
+    <component id="r9ri13i" name="ComGetReward.xml" path="/componentsGallery/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompHead.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_CompHead.cs

@@ -2,14 +2,14 @@
 
 using FairyGUI;
 
-namespace UI.Main
+namespace UI.CommonGame
 {
     public partial class UI_CompHead
     {
         public GComponent target;
         public GLoader m_icon;
-        public const string URL = "ui://mfvz4q8kkubi7g";
-        public const string PACKAGE_NAME = "Main";
+        public const string URL = "ui://eg2y0ldpkubi7g";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "CompHead";
         private static UI_CompHead _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompHead.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_CompHead.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7d2e4c2893e832d4e8f9d8ca042c232f
+guid: 634488a4a6fcec44ba30741593808a03
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 8 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aee16a85445e9114c8a13bb94476a0d7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 89 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeHead.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_ChangeHead
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GButton m_btnTab0;
+        public GButton m_btnTab1;
+        public GList m_list;
+        public GComponent m_comHead;
+        public GTextField m_txtName;
+        public GTextField m_txtDesc;
+        public const string URL = "ui://374k3dwvr9ri2";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "ChangeHead";
+        private static UI_ChangeHead _proxy;
+
+        public static UI_ChangeHead Create(GObject gObject = null)
+        {
+            var ui = new UI_ChangeHead();
+            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_ChangeHead Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ChangeHead();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_btnTab0 = (GButton)comp.GetChild("btnTab0");
+            m_btnTab1 = (GButton)comp.GetChild("btnTab1");
+            m_list = (GList)comp.GetChild("list");
+            m_comHead = (GComponent)comp.GetChild("comHead");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_btnTab0 = null;
+            m_btnTab1 = null;
+            m_list = null;
+            m_comHead = null;
+            m_txtName = null;
+            m_txtDesc = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Main
+namespace UI.RoleInfo
 {
     public partial class UI_ChangeNameUI
     {
@@ -10,8 +10,8 @@ namespace UI.Main
         public GImage m_bg;
         public GButton m_btnSure;
         public GTextInput m_inputName;
-        public const string URL = "ui://mfvz4q8knjmnfz";
-        public const string PACKAGE_NAME = "Main";
+        public const string URL = "ui://374k3dwvnjmnfz";
+        public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ChangeNameUI";
         private static UI_ChangeNameUI _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ChangeNameUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeNameUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2428fe27673010547b64b9824be70e87
+guid: c750e6a1b0ded1a40ae4fa1d346b40a5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComBtn.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComBtn.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Main
+namespace UI.RoleInfo
 {
     public partial class UI_ComBtn
     {
@@ -16,8 +16,8 @@ namespace UI.Main
         public GTextInput m_txtChapterLv;
         public GButton m_btnAll;
         public GButton m_btnSkipCheckOpen;
-        public const string URL = "ui://mfvz4q8klqp0dm";
-        public const string PACKAGE_NAME = "Main";
+        public const string URL = "ui://374k3dwvlqp0dm";
+        public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ComBtn";
         private static UI_ComBtn _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComBtn.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComBtn.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2cbf43cc35a4cb945b9be1dfd19eefff
+guid: 2674847ecfc93654b99cccccabc4973c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_GMPanelUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_GMPanelUI.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Main
+namespace UI.RoleInfo
 {
     public partial class UI_GMPanelUI
     {
@@ -13,8 +13,8 @@ namespace UI.Main
         public GButton m_btnAddItem;
         public GTextInput m_inputGM;
         public GButton m_btnGM;
-        public const string URL = "ui://mfvz4q8kd4iw6q";
-        public const string PACKAGE_NAME = "Main";
+        public const string URL = "ui://374k3dwvd4iw6q";
+        public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "GMPanelUI";
         private static UI_GMPanelUI _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_GMPanelUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_GMPanelUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ac45a20b421e10e4ebc82226616e5a03
+guid: 1cdd0786a0696c948ab11f0fa17b1606
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListHeadItem.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_ListHeadItem
+    {
+        public GButton target;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://374k3dwvr9ri9";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "ListHeadItem";
+        private static UI_ListHeadItem _proxy;
+
+        public static UI_ListHeadItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListHeadItem();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListHeadItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListHeadItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_ListHeadItem.cs.meta

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

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListSkillItem.cs

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

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

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_PersonalPhotoUI.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_PersonalPhotoUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://374k3dwvr9ri4";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "PersonalPhotoUI";
+        private static UI_PersonalPhotoUI _proxy;
+
+        public static UI_PersonalPhotoUI Create(GObject gObject = null)
+        {
+            var ui = new UI_PersonalPhotoUI();
+            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_PersonalPhotoUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_PersonalPhotoUI();
+            }
+            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_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_PersonalSkillUI.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_PersonalSkillUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://374k3dwvr9ri3";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "PersonalSkillUI";
+        private static UI_PersonalSkillUI _proxy;
+
+        public static UI_PersonalSkillUI Create(GObject gObject = null)
+        {
+            var ui = new UI_PersonalSkillUI();
+            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_PersonalSkillUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_PersonalSkillUI();
+            }
+            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_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_RoleInfoUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Main
+namespace UI.RoleInfo
 {
     public partial class UI_RoleInfoUI
     {
@@ -20,8 +20,8 @@ namespace UI.Main
         public GButton m_btnHelp;
         public GTextField m_txtVersion;
         public GTextInput m_txtSlogan;
-        public const string URL = "ui://mfvz4q8kd4iw6k";
-        public const string PACKAGE_NAME = "Main";
+        public const string URL = "ui://374k3dwvd4iw6k";
+        public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "RoleInfoUI";
         private static UI_RoleInfoUI _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_RoleInfoUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 489827ce0be73574f81c1b652e8568cd
+guid: 5052c4fd099d8114395ea902984f89b6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 83 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_SettingUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_SettingUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GButton m_btnSound;
+        public GButton m_btnMusic;
+        public GButton m_btnLogout;
+        public GButton m_btnExit;
+        public const string URL = "ui://374k3dwvr9ri1";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "SettingUI";
+        private static UI_SettingUI _proxy;
+
+        public static UI_SettingUI Create(GObject gObject = null)
+        {
+            var ui = new UI_SettingUI();
+            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_SettingUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SettingUI();
+            }
+            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_bg = (GLoader)comp.GetChild("bg");
+            m_btnSound = (GButton)comp.GetChild("btnSound");
+            m_btnMusic = (GButton)comp.GetChild("btnMusic");
+            m_btnLogout = (GButton)comp.GetChild("btnLogout");
+            m_btnExit = (GButton)comp.GetChild("btnExit");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_btnSound = null;
+            m_btnMusic = null;
+            m_btnLogout = null;
+            m_btnExit = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -480,13 +480,13 @@ namespace GFGGame
             SetCdState(obj, cfg.cd);
             SetSkillValue(cfg, SkillDataManager.MINE);
         }
-        private void SetCdState(GComponent obj, float time)
+        private void SetCdState(GComponent obj, int time)
         {
             UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(obj);
             GProgressBar bar = item.m_proCD;
             bar.visible = true;
             bar.value = 100;
-            bar.TweenValue(0, time / _speed).OnComplete((GTweener tweener) =>
+            bar.TweenValue(0, (float)time / 100 / _speed).OnComplete((GTweener tweener) =>
               {
                   GProgressBar bar1 = (GProgressBar)tweener.target;
                   UI_ComBtnSkill item1 = UI_ComBtnSkill.Proxy(bar1.parent);
@@ -635,7 +635,7 @@ namespace GFGGame
             comSkillShield.m_holder.visible = true;
             comSkillShield.m_holder1.visible = false;
 
-            Timers.inst.Add(cfg.duration / _speed, 1, (param) =>
+            Timers.inst.Add((float)cfg.duration / 100 / _speed, 1, (param) =>
               {
                   // comSkillShield.target.visible = false;
                   comSkillShield.m_holder.visible = false;

+ 8 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleInfo.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7118401420d719b4cbc6a402c1d581ef
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 58 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs

@@ -0,0 +1,58 @@
+using UI.RoleInfo;
+using System.Text.RegularExpressions;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class ChangeHeadView : BaseWindow
+    {
+        private UI_ChangeHead _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ChangeHead.PACKAGE_NAME;
+            _ui = UI_ChangeHead.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+            _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_list.onClickItem.Add(UpdateView);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_list.numItems = 0;
+            _ui.m_list.selectedIndex = 0;
+            UpdateView();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            UI_ListHeadItem item = UI_ListHeadItem.Proxy(obj);
+
+            UI_ListHeadItem.ProxyEnd();
+        }
+        private void UpdateView()
+        {
+
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs.meta

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

+ 3 - 6
GameClient/Assets/Game/HotUpdate/Views/MainUI/ChangeNameView.cs → GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeNameView.cs

@@ -1,9 +1,6 @@
-using FairyGUI;
-using UI.Main;
-using System;
+using UI.RoleInfo;
 using System.Text.RegularExpressions;
-using ET;
-using System.Threading.Tasks;
+
 
 namespace GFGGame
 {
@@ -68,7 +65,7 @@ namespace GFGGame
             string costName = ItemUtil.GetItemName(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
             int count = GlobalCfgArray.globalCfg.changeNameCostArr[1];
 
-            AlertUI.Show( string .Format("是否花费{0}个{1}改名1次?",count,costName))
+            AlertUI.Show(string.Format("是否花费{0}个{1}改名1次?", count, costName))
                 .SetLeftButton(true).SetRightButton(true, "确定", async (object data) =>
                 {
                     bool result = await RoleInfoSProxy.ReqModifyRoleName(roleName);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/ChangeNameView.cs.meta → GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeNameView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0a9b7a6dc73307d4e8062873a6f5e2b8
+guid: f6c858945826a0444ac562d1b88de7a1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/MainUI/GMPanelView.cs → GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -1,7 +1,6 @@
 using FairyGUI;
-using System.Text;
 using System.Text.RegularExpressions;
-using UI.Main;
+using UI.RoleInfo;
 
 namespace GFGGame
 {
@@ -22,6 +21,7 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
+            packageName = UI_GMPanelUI.PACKAGE_NAME;
             _ui = UI_GMPanelUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/GMPanelView.cs.meta → GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bb254ee3541e7c942a04855ae662a4fa
+guid: c42d862eeac14b541a6852b203df9c13
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 55 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PersonalPhotoView.cs

@@ -0,0 +1,55 @@
+using UI.RoleInfo;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class PersonalPhotoView : BaseWindow
+    {
+        private UI_PersonalPhotoUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_PersonalPhotoUI.PACKAGE_NAME;
+            _ui = UI_PersonalPhotoUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+            _ui.m_list.itemRenderer = RenderListItem;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_list.numItems = RoleSkillCfgArray.Instance.dataArray.Length;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            RoleSkillCfg cfg = RoleSkillCfgArray.Instance.dataArray[index];
+            UI_ListSkillItem item = UI_ListSkillItem.Proxy(obj);
+
+            item.m_loaIcon.url = string.Format("ui://Main/{0}", cfg.res);
+            item.m_txtname.text = cfg.name;
+            item.m_txtDesc.text = cfg.desc;
+            UI_ListSkillItem.ProxyEnd();
+
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PersonalPhotoView.cs.meta

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

+ 56 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PersonalSkillView.cs

@@ -0,0 +1,56 @@
+using UI.RoleInfo;
+using System.Text.RegularExpressions;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class PersonalSkillView : BaseWindow
+    {
+        private UI_PersonalSkillUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_PersonalSkillUI.PACKAGE_NAME;
+            _ui = UI_PersonalSkillUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+            _ui.m_list.itemRenderer = RenderListItem;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_list.numItems = RoleSkillCfgArray.Instance.dataArray.Length;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            RoleSkillCfg cfg = RoleSkillCfgArray.Instance.dataArray[index];
+            UI_ListSkillItem item = UI_ListSkillItem.Proxy(obj);
+
+            item.m_loaIcon.url = string.Format("ui://Main/{0}", cfg.res);
+            item.m_txtname.text = cfg.name;
+            item.m_txtDesc.text = cfg.desc;
+            UI_ListSkillItem.ProxyEnd();
+
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PersonalSkillView.cs.meta

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

+ 28 - 24
GameClient/Assets/Game/HotUpdate/Views/MainUI/RoleInfoView.cs → GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -1,6 +1,5 @@
 using ET;
-using UI.Main;
-using static GFGGame.LauncherConfig;
+using UI.RoleInfo;
 
 namespace GFGGame
 {
@@ -21,6 +20,7 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
+            packageName = UI_RoleInfoUI.PACKAGE_NAME;
             _ui = UI_RoleInfoUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();
@@ -76,6 +76,31 @@ namespace GFGGame
         {
             _ui.m_txtRoleName.text = RoleDataManager.roleName;
         }
+
+
+
+        private void OnClickBtnHelp()
+        {
+            if (GameConfig.showGM >= 1)
+            {
+                ViewManager.Show(ViewName.GM_PANEL_VIEW);
+            }
+            else
+            {
+                ViewManager.Show(ViewName.LOG_VIEW);
+            }
+        }
+
+        private async void OnFocuseOut()
+        {
+            _ui.m_txtSlogan.text = await RoleInfoSProxy.ReqModifySlogan(_ui.m_txtSlogan.text);
+        }
+
+        private void OnClickLoaChangeName()
+        {
+            ViewManager.Show<ChangeNameView>(null, new object[] { typeof(RoleInfoView).FullName, this.viewData });
+        }
+
         private void OnClickBtnExit()
         {
             AlertSystem.Show("确认返回登录页吗?")
@@ -86,6 +111,7 @@ namespace GFGGame
                 });
         }
 
+
         private void OnClickBtnLogout()
         {
             AlertSystem.Show("确认注销当前账号吗?")
@@ -107,27 +133,5 @@ namespace GFGGame
             MusicManager.Instance.isOn = _ui.m_btnMusic.selected;
 
         }
-
-        private void OnClickBtnHelp()
-        {
-            if (GameConfig.showGM >= 1)
-            {
-                ViewManager.Show(ViewName.GM_PANEL_VIEW);
-            }
-            else
-            {
-                ViewManager.Show(ViewName.LOG_VIEW);
-            }
-        }
-
-        private async void OnFocuseOut()
-        {
-            _ui.m_txtSlogan.text = await RoleInfoSProxy.ReqModifySlogan(_ui.m_txtSlogan.text);
-        }
-
-        private void OnClickLoaChangeName()
-        {
-            ViewManager.Show<ChangeNameView>(null, new object[] { typeof(RoleInfoView).FullName, this.viewData });
-        }
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/RoleInfoView.cs.meta → GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 100c4072ad501a34d85e7f0a17acda9c
+guid: bd15b71f4fe79804f94cc05ab7a06f39
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 79 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/SettingView.cs

@@ -0,0 +1,79 @@
+using UI.RoleInfo;
+using System.Text.RegularExpressions;
+
+
+namespace GFGGame
+{
+    public class SettingView : BaseWindow
+    {
+        private UI_SettingUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_SettingUI.PACKAGE_NAME;
+            _ui = UI_SettingUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+            _ui.m_btnExit.onClick.Add(OnClickBtnExit);
+            _ui.m_btnLogout.onClick.Add(OnClickBtnLogout);
+            _ui.m_btnSound.onClick.Add(OnClickBtnSound);
+            _ui.m_btnMusic.onClick.Add(OnClickBtnMusic);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void OnClickBtnExit()
+        {
+            AlertSystem.Show("횅훰럿쀼되쩌女찐?")
+                .SetLeftButton(true)
+                .SetRightButton(true, "횅훰", (object data) =>
+                {
+                    GameController.QuitToLoginView(false);
+                });
+        }
+
+
+        private void OnClickBtnLogout()
+        {
+            AlertSystem.Show("횅훰鬧饋뎠품瑯뵀찐?")
+                .SetLeftButton(true)
+                .SetRightButton(true, "횅훰", (object data) =>
+                {
+                    GameController.QuitToLoginView(true);
+                });
+        }
+
+        private void OnClickBtnSound()
+        {
+            SoundManager.Instance.isOn = _ui.m_btnSound.selected;
+
+        }
+
+        private void OnClickBtnMusic()
+        {
+            MusicManager.Instance.isOn = _ui.m_btnMusic.selected;
+
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/SettingView.cs.meta

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

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.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/Main/Main_atlas0!a.png


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


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


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


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


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


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


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


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно