zhaoyang 3 years ago
parent
commit
bebfd594b5
82 changed files with 1097 additions and 57 deletions
  1. 0 0
      FGUIProject/assets/CommonGame/imagesExport/hz_xzkuang.png
  2. 1 0
      FGUIProject/assets/CommonGame/package.xml
  3. 1 1
      FGUIProject/assets/DressUp/components/ComboBoxSuit.xml
  4. 0 1
      FGUIProject/assets/DressUp/package.xml
  5. 56 1
      FGUIProject/assets/Friend/FriendAddUI.xml
  6. 30 1
      FGUIProject/assets/Friend/FriendUI.xml
  7. 10 0
      FGUIProject/assets/Friend/components/BtnClear.xml
  8. 8 0
      FGUIProject/assets/Friend/components/BtnModel.xml
  9. 8 0
      FGUIProject/assets/Friend/components/BtnModel1.xml
  10. 8 0
      FGUIProject/assets/Friend/components/BtnRefresh.xml
  11. 8 0
      FGUIProject/assets/Friend/components/BtnSearch.xml
  12. 8 0
      FGUIProject/assets/Friend/components/BtnTab.xml
  13. 0 19
      FGUIProject/assets/Friend/components/Button1.xml
  14. 7 0
      FGUIProject/assets/Friend/components/CompHead.xml
  15. 8 0
      FGUIProject/assets/Friend/components/CompHeadWithBg.xml
  16. 19 0
      FGUIProject/assets/Friend/components/ListApplyItem.xml
  17. 22 0
      FGUIProject/assets/Friend/components/ListItem.xml
  18. 18 0
      FGUIProject/assets/Friend/components/ListSearchItem.xml
  19. BIN
      FGUIProject/assets/Friend/images/gg_gg_dtpian.png
  20. BIN
      FGUIProject/assets/Friend/images/hy_cwcrcw.png
  21. BIN
      FGUIProject/assets/Friend/images/hy_dikuang_2.png
  22. BIN
      FGUIProject/assets/Friend/images/hy_dikuang_3.png
  23. BIN
      FGUIProject/assets/Friend/images/hy_icon_1.png
  24. BIN
      FGUIProject/assets/Friend/images/hy_icon_2.png
  25. BIN
      FGUIProject/assets/Friend/images/hy_icon_3.png
  26. BIN
      FGUIProject/assets/Friend/images/hy_icon_4.png
  27. BIN
      FGUIProject/assets/Friend/images/hy_scsc_1.png
  28. BIN
      FGUIProject/assets/Friend/images/hy_scsc_2.png
  29. BIN
      FGUIProject/assets/Friend/images/hy_scscs.png
  30. BIN
      FGUIProject/assets/Friend/images/hy_tjhy_dk.png
  31. BIN
      FGUIProject/assets/Friend/images/hy_tjhy_ssk.png
  32. BIN
      FGUIProject/assets/Friend/images/hy_tjtjhy_1.png
  33. BIN
      FGUIProject/assets/Friend/images/hy_tjtjhy_2.png
  34. BIN
      FGUIProject/assets/Friend/images/hy_tjtjhy_3.png
  35. BIN
      FGUIProject/assets/Friend/images/hy_ysqysq.png
  36. BIN
      FGUIProject/assets/Friend/images/hy_ztzt_1.png
  37. BIN
      FGUIProject/assets/Friend/images/hy_ztzt_2.png
  38. BIN
      FGUIProject/assets/Friend/images/hyhy_anniu_1.png
  39. BIN
      FGUIProject/assets/Friend/images/hyhy_anniu_2.png
  40. BIN
      FGUIProject/assets/Friend/images/hyhy_anniu_3.png
  41. BIN
      FGUIProject/assets/Friend/images/hyhy_anniu_4.png
  42. BIN
      FGUIProject/assets/Friend/images/hyhy_hyp.png
  43. BIN
      FGUIProject/assets/Friend/images/hyhy_ssanniu_1.png
  44. BIN
      FGUIProject/assets/Friend/images/hyhy_tjtja.png
  45. BIN
      FGUIProject/assets/Friend/images/line.png
  46. BIN
      FGUIProject/assets/Friend/images/self.png
  47. BIN
      FGUIProject/assets/Friend/images/zjm_dj_1.png
  48. BIN
      FGUIProject/assets/Friend/images/zjm_txkuang.png
  49. BIN
      FGUIProject/assets/Friend/images/zjm_txkuang_1.png
  50. 42 1
      FGUIProject/assets/Friend/package.xml
  51. 17 12
      FGUIProject/assets/Main/RoleInfoUI.xml
  52. 1 1
      FGUIProject/assets/Main/package.xml
  53. 8 7
      GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs
  54. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_CompHead.cs
  55. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_CompHead.cs.meta
  56. 113 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendAddUI.cs
  57. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendAddUI.cs.meta
  58. 18 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendUI.cs
  59. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListApplyItem.cs
  60. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListApplyItem.cs.meta
  61. 86 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListItem.cs
  62. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListItem.cs.meta
  63. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListSearchItem.cs
  64. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListSearchItem.cs.meta
  65. 6 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_RoleInfoUI.cs
  66. 147 0
      GameClient/Assets/Game/HotUpdate/Views/Friend/FriendAddView.cs
  67. 11 0
      GameClient/Assets/Game/HotUpdate/Views/Friend/FriendAddView.cs.meta
  68. 47 7
      GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs
  69. 2 2
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  70. 5 1
      GameClient/Assets/ResIn/Prefab/SceneFriend.prefab
  71. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  72. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  73. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  74. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png
  75. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0.png
  76. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png
  77. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png
  78. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes
  79. BIN
      GameClient/Assets/ResIn/UI/Friend/Friend_atlas0.png
  80. 96 0
      GameClient/Assets/ResIn/UI/Friend/Friend_atlas0.png.meta
  81. BIN
      GameClient/Assets/ResIn/UI/Friend/Friend_fui.bytes
  82. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 0 - 0
FGUIProject/assets/DressUp/images/hz_xzkuang.png → FGUIProject/assets/CommonGame/imagesExport/hz_xzkuang.png


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

@@ -191,6 +191,7 @@
     <component id="pjip15" name="SuitPartsDetailUI.xml" path="/" exported="true"/>
     <image id="gd29ti0" name="jingzhongh_bg.jpg" path="/bgimg/"/>
     <font id="rkrwti1" name="SHUANGYUJUTI.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
+    <image id="q08xs" name="hz_xzkuang.png" path="/imagesExport/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/DressUp/components/ComboBoxSuit.xml

@@ -2,7 +2,7 @@
 <component size="416,66" extention="ComboBox">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_q08x" name="n0" src="q08xs" fileName="images/hz_xzkuang.png" xy="2,2">
+    <image id="n0_q08x" name="n0" src="q08xs" fileName="images/hz_xzkuang.png" xy="2,2" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <text id="n1_q08x" name="title" xy="24,0" pivot="0.5,0" size="396,66" fontSize="34" color="#fff0db" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">

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

@@ -25,7 +25,6 @@
     <image id="q08xn" name="hz_shanchu.png" path="/images/"/>
     <image id="q08xo" name="hz_ssuo.png" path="/images/"/>
     <image id="q08xr" name="hz_xialakuang.png" path="/images/"/>
-    <image id="q08xs" name="hz_xzkuang.png" path="/images/"/>
     <component id="q08x13" name="ComboBoxSuit_item.xml" path="/components/"/>
     <component id="q08x14" name="ComboBoxSuit_popup.xml" path="/components/"/>
     <component id="q08x15" name="ComboBoxSuit.xml" path="/components/"/>

+ 56 - 1
FGUIProject/assets/Friend/FriendAddUI.xml

@@ -1,2 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920"/>
+<component size="1062,1300">
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n0_pdeo" name="n0" src="pdeoa" fileName="images/gg_gg_dtpian.png" xy="0,-72"/>
+    <image id="n26_z73e" name="n26" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" pkg="eg2y0ldp" xy="293,45" group="n28_z73e"/>
+    <text id="n27_z73e" name="txtName" xy="417,45" pivot="0.5,0" size="228,74" group="n28_z73e" fontSize="56" color="#8f6e30" text="添加好友"/>
+    <group id="n28_z73e" name="n28" xy="293,45" size="475,85"/>
+    <component id="n1_pdeo" name="btnTabSearch" src="pdeob" fileName="components/BtnTab.xml" xy="154,1192">
+      <Button icon="ui://wez2ujnnz73e18" selectedIcon="ui://wez2ujnnz73e10" controller="c1" page="0"/>
+    </component>
+    <component id="n2_pdeo" name="btnTabApply" src="pdeob" fileName="components/BtnTab.xml" xy="548,1192">
+      <Button checked="true" icon="ui://wez2ujnnz73e11" selectedIcon="ui://wez2ujnnz73e19" controller="c1" page="1"/>
+    </component>
+    <text id="n32_z73e" name="txtTips" xy="102,289" size="196,64" group="n33_z73e" fontSize="48" color="#998262" text="搜索结果"/>
+    <image id="n30_z73e" name="n30" src="z73ev" fileName="images/line.png" xy="318,324" group="n33_z73e"/>
+    <component id="n7_pdeo" name="btnRefresh" src="pdeoh" fileName="components/BtnRefresh.xml" xy="859,280" group="n33_z73e">
+      <Button icon="ui://wez2ujnnz73e12"/>
+    </component>
+    <group id="n33_z73e" name="n33" xy="102,280" size="845,88" group="n17_pdeo"/>
+    <list id="n16_pdeo" name="listSearch" xy="78,389" size="905,702" group="n17_pdeo" overflow="hidden" lineGap="24" defaultItem="ui://wez2ujnnpdeoi">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <image id="n29_z73e" name="n29" src="z73ey" fileName="images/hy_tjhy_ssk.png" xy="101,176" group="n34_z73e"/>
+    <text id="n5_pdeo" name="txtSearch" xy="126,182" size="478,65" group="n34_z73e" fontSize="44" color="#948364" ubb="true" autoSize="none" autoClearText="true" text="" input="true" prompt="[color=#BCB196]输入玩家名称[/color]"/>
+    <component id="n31_z73e" name="btnClear" src="z73e1a" fileName="components/BtnClear.xml" xy="606,182" group="n34_z73e"/>
+    <component id="n6_pdeo" name="btnSearch" src="pdeog" fileName="components/BtnSearch.xml" xy="697,170" group="n34_z73e">
+      <Button icon="ui://wez2ujnnz73e13"/>
+    </component>
+    <group id="n34_z73e" name="n34" xy="101,170" size="873,90" group="n17_pdeo"/>
+    <group id="n17_pdeo" name="grpSearch" xy="78,170" size="905,921" advanced="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </group>
+    <list id="n22_pdeo" name="listApply" xy="76,183" size="910,762" group="n25_pdeo" overflow="scroll" lineGap="24" defaultItem="ui://wez2ujnnpdeoj">
+      <gearDisplay controller="c1" pages="1"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n23_pdeo" name="btnDeleteAll" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="116,1030" group="n25_pdeo">
+      <Button title="一键拒绝"/>
+    </component>
+    <component id="n24_pdeo" name="btnAddAll" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="558,1030" group="n25_pdeo">
+      <Button title="一键接受"/>
+    </component>
+    <group id="n25_pdeo" name="grpApply" xy="76,183" size="910,952" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
+  </displayList>
+</component>

+ 30 - 1
FGUIProject/assets/Friend/FriendUI.xml

@@ -2,6 +2,35 @@
 <component size="1080,1920">
   <displayList>
     <component id="n0_jdju" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n1_jdju" name="btnAdd" src="jdju1" fileName="components/Button1.xml" xy="120,1686"/>
+    <image id="n8_z73e" name="n8" src="z73el" fileName="images/hy_dikuang_2.png" xy="705,101" group="n9_z73e"/>
+    <text id="n2_pdeo" name="txtCount" xy="734,100" pivot="0.5,0" size="259,49" group="n9_z73e" fontSize="36" color="#e4dbcf" align="center" text="好友数:10/50"/>
+    <group id="n9_z73e" name="grpCount" xy="705,100" size="317,51"/>
+    <image id="n17_z73e" name="n17" src="q08xs" fileName="imagesExport/hz_xzkuang.png" pkg="eg2y0ldp" xy="200,93" group="n13_z73e"/>
+    <text id="n12_z73e" name="txtName" xy="370,98" pivot="0.5,0" size="71,46" group="n13_z73e" fontSize="34" color="#fff0db" text="套装"/>
+    <group id="n13_z73e" name="grpname" xy="200,93" size="412,62"/>
+    <list id="n7_pdeo" name="list" xy="652,220" size="428,1460" overflow="scroll" lineGap="25" defaultItem="ui://wez2ujnnpdeo9">
+      <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n11_z73e" name="btnSendAll" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="672,1750">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+      <Button title="一键领取"/>
+    </component>
+    <component id="n15_z73e" name="btnSolgan" src="jdju1" fileName="components/BtnModel1.xml" xy="40,1393" group="n16_z73e">
+      <Button icon="ui://wez2ujnnz73et"/>
+    </component>
+    <component id="n14_z73e" name="btnDelete" src="jdju1" fileName="components/BtnModel1.xml" xy="40,1530" group="n16_z73e">
+      <Button icon="ui://wez2ujnnz73es"/>
+    </component>
+    <component id="n1_jdju" name="btnAdd" src="jdju1" fileName="components/BtnModel1.xml" xy="40,1667" group="n16_z73e"/>
+    <group id="n16_z73e" name="n16" xy="40,1393" size="112,394" advanced="true" layout="vt" lineGap="17" excludeInvisibles="true">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+    </group>
   </displayList>
 </component>

+ 10 - 0
FGUIProject/assets/Friend/components/BtnClear.xml

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

+ 8 - 0
FGUIProject/assets/Friend/components/BtnModel.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="60,60" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n3_z73e" name="icon" xy="0,0" size="60,60" url="ui://wez2ujnnz73en"/>
+  </displayList>
+  <Button/>
+</component>

+ 8 - 0
FGUIProject/assets/Friend/components/BtnModel1.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="112,120" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n3_z73e" name="icon" xy="0,0" size="112,121" url="ui://wez2ujnnz73er" autoSize="true"/>
+  </displayList>
+  <Button/>
+</component>

+ 8 - 0
FGUIProject/assets/Friend/components/BtnRefresh.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="88,88" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <loader id="n2_kjq3" name="icon" xy="0,0" size="50,50" autoSize="true"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

+ 8 - 0
FGUIProject/assets/Friend/components/BtnSearch.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="277,90" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <loader id="n2_kjq3" name="icon" xy="0,0" size="50,50" autoSize="true"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

+ 8 - 0
FGUIProject/assets/Friend/components/BtnTab.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="341,108" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <loader id="n2_kjq3" name="icon" xy="0,0" size="50,50" autoSize="true"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

+ 0 - 19
FGUIProject/assets/Friend/components/Button1.xml

@@ -1,19 +0,0 @@
-<?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>
-    <graph id="n0_jdju" name="n0" xy="0,0" size="100,100" touchable="false" type="rect" lineSize="0" fillColor="#fff0f0f0">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <graph id="n1_jdju" name="n1" xy="0,0" size="100,100" touchable="false" type="rect" lineSize="0" fillColor="#fffafafa">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <graph id="n2_jdju" name="n2" xy="0,0" size="100,100" touchable="false" type="rect" lineSize="0" fillColor="#ffcccccc">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-  </displayList>
-  <Button/>
-</component>

+ 7 - 0
FGUIProject/assets/Friend/components/CompHead.xml

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

+ 8 - 0
FGUIProject/assets/Friend/components/CompHeadWithBg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="124,124">
+  <displayList>
+    <image id="n2_q08x" name="n2" src="pdeo4" fileName="images/zjm_txkuang.png" xy="0,0" size="124,124"/>
+    <component id="n39_kubi" name="n39" src="pdeo5" fileName="components/CompHead.xml" xy="0,0" size="124,124" scale="0.9,0.9"/>
+    <image id="n40_wg7t" name="n40" src="pdeo7" fileName="images/zjm_txkuang_1.png" xy="0,0" size="124,124"/>
+  </displayList>
+</component>

+ 19 - 0
FGUIProject/assets/Friend/components/ListApplyItem.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="905,147">
+  <displayList>
+    <image id="n22_z73e" name="n22" src="z73ex" fileName="images/hy_tjhy_dk.png" xy="0,0"/>
+    <text id="n19_pdeo" name="txtName" xy="185,44" size="312,59" fontSize="44" color="#bb996c" text="角色名字七个字"/>
+    <component id="n20_pdeo" name="btnAgree" src="jdju1" fileName="components/BtnModel1.xml" xy="770,28" size="94,91">
+      <Button icon="ui://wez2ujnnz73e14"/>
+    </component>
+    <component id="n21_pdeo" name="btnRefuse" src="jdju1" fileName="components/BtnModel1.xml" xy="656,28" size="94,91">
+      <Button icon="ui://wez2ujnnz73e15"/>
+    </component>
+    <component id="n23_z73e" name="n23" src="pdeo3" fileName="components/CompHeadWithBg.xml" xy="40,12" pivot="0.5,0.5" size="124,124"/>
+    <image id="n24_z73e" name="n24" src="z73e17" fileName="images/zjm_dj_1.png" xy="127,91" group="n26_z73e"/>
+    <text id="n25_z73e" name="txtLvl" xy="134,97" size="29,29" group="n26_z73e" fontSize="20" color="#ffffff" align="center" text="99">
+      <relation target="n24_z73e" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n26_z73e" name="n26" xy="127,91" size="42,43"/>
+  </displayList>
+</component>

+ 22 - 0
FGUIProject/assets/Friend/components/ListItem.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="428,150">
+  <controller name="c1" pages="0,可领,1,可送,2,已送,3,已领" selected="0"/>
+  <controller name="c2" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n14_z73e" name="n14" src="z73em" fileName="images/hy_dikuang_3.png" xy="0,0"/>
+    <component id="n3_pdeo" name="n3" src="pdeo3" fileName="components/CompHeadWithBg.xml" xy="27,13" pivot="0.5,0.5" size="124,124"/>
+    <image id="n11_z73e" name="n11" src="z73e17" fileName="images/zjm_dj_1.png" xy="116,93" group="n13_z73e"/>
+    <text id="n12_z73e" name="txtLvl" xy="123,99" size="29,29" group="n13_z73e" fontSize="20" color="#ffffff" align="center" text="99">
+      <relation target="n11_z73e" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n13_z73e" name="n13" xy="116,93" size="42,43"/>
+    <text id="n4_pdeo" name="txtName" xy="165,15" size="230,52" fontSize="38" color="#927a58" text="角色名七个字"/>
+    <component id="n9_pdeo" name="btnSend" src="pdeo8" fileName="components/BtnModel.xml" xy="330,76">
+      <gearIcon controller="c1" pages="0,2,3" values="ui://wez2ujnnz73ep|ui://wez2ujnnz73eo|ui://wez2ujnnz73eq" default="ui://wez2ujnnz73en"/>
+      <Button icon="ui://wez2ujnnz73ep"/>
+    </component>
+    <loader id="n15_z73e" name="loaState" xy="169,95" size="100,28" url="ui://wez2ujnnz73ek" autoSize="true">
+      <gearIcon controller="c2" pages="1" values="ui://wez2ujnnz73ek" default="ui://wez2ujnnz73eu"/>
+    </loader>
+  </displayList>
+</component>

+ 18 - 0
FGUIProject/assets/Friend/components/ListSearchItem.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="905,147">
+  <displayList>
+    <image id="n16_z73e" name="n16" src="z73ex" fileName="images/hy_tjhy_dk.png" xy="0,0"/>
+    <component id="n17_z73e" name="n17" src="pdeo3" fileName="components/CompHeadWithBg.xml" xy="40,11" pivot="0.5,0.5" size="124,124"/>
+    <image id="n18_z73e" name="n18" src="z73e17" fileName="images/zjm_dj_1.png" xy="127,90" group="n20_z73e"/>
+    <text id="n19_z73e" name="txtLvl" xy="134,96" size="29,29" group="n20_z73e" fontSize="20" color="#ffffff" align="center" text="99">
+      <relation target="n18_z73e" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n20_z73e" name="n20" xy="127,90" size="42,43"/>
+    <text id="n9_pdeo" name="txtName" xy="174,10" size="295,56" fontSize="42" color="#bb996c" text="角色名字七个字"/>
+    <text id="n10_pdeo" name="txtSlogan" xy="176,77" size="490,49" fontSize="36" color="#b5a999" autoSize="none" text="暂无简介"/>
+    <component id="n13_pdeo" name="btnAdd" src="jdju1" fileName="components/BtnModel1.xml" xy="738,26" size="94,94">
+      <Button icon="ui://wez2ujnnz73e1b"/>
+    </component>
+    <image id="n21_z73e" name="n21" src="z73ez" fileName="images/hy_ysqysq.png" xy="696,40"/>
+  </displayList>
+</component>

BIN
FGUIProject/assets/Friend/images/gg_gg_dtpian.png


BIN
FGUIProject/assets/Friend/images/hy_cwcrcw.png


BIN
FGUIProject/assets/Friend/images/hy_dikuang_2.png


BIN
FGUIProject/assets/Friend/images/hy_dikuang_3.png


BIN
FGUIProject/assets/Friend/images/hy_icon_1.png


BIN
FGUIProject/assets/Friend/images/hy_icon_2.png


BIN
FGUIProject/assets/Friend/images/hy_icon_3.png


BIN
FGUIProject/assets/Friend/images/hy_icon_4.png


BIN
FGUIProject/assets/Friend/images/hy_scsc_1.png


BIN
FGUIProject/assets/Friend/images/hy_scsc_2.png


BIN
FGUIProject/assets/Friend/images/hy_scscs.png


BIN
FGUIProject/assets/Friend/images/hy_tjhy_dk.png


BIN
FGUIProject/assets/Friend/images/hy_tjhy_ssk.png


BIN
FGUIProject/assets/Friend/images/hy_tjtjhy_1.png


BIN
FGUIProject/assets/Friend/images/hy_tjtjhy_2.png


BIN
FGUIProject/assets/Friend/images/hy_tjtjhy_3.png


BIN
FGUIProject/assets/Friend/images/hy_ysqysq.png


BIN
FGUIProject/assets/Friend/images/hy_ztzt_1.png


BIN
FGUIProject/assets/Friend/images/hy_ztzt_2.png


BIN
FGUIProject/assets/Friend/images/hyhy_anniu_1.png


BIN
FGUIProject/assets/Friend/images/hyhy_anniu_2.png


BIN
FGUIProject/assets/Friend/images/hyhy_anniu_3.png


BIN
FGUIProject/assets/Friend/images/hyhy_anniu_4.png


BIN
FGUIProject/assets/Friend/images/hyhy_hyp.png


BIN
FGUIProject/assets/Friend/images/hyhy_ssanniu_1.png


BIN
FGUIProject/assets/Friend/images/hyhy_tjtja.png


BIN
FGUIProject/assets/Friend/images/line.png


BIN
FGUIProject/assets/Friend/images/self.png


BIN
FGUIProject/assets/Friend/images/zjm_dj_1.png


BIN
FGUIProject/assets/Friend/images/zjm_txkuang.png


BIN
FGUIProject/assets/Friend/images/zjm_txkuang_1.png


+ 42 - 1
FGUIProject/assets/Friend/package.xml

@@ -2,8 +2,49 @@
 <packageDescription id="wez2ujnn">
   <resources>
     <component id="jdju0" name="FriendUI.xml" path="/" exported="true"/>
-    <component id="jdju1" name="Button1.xml" path="/components/"/>
+    <component id="jdju1" name="BtnModel1.xml" path="/components/"/>
     <component id="jdju2" name="FriendAddUI.xml" path="/" exported="true"/>
+    <component id="pdeo3" name="CompHeadWithBg.xml" path="/components/"/>
+    <image id="pdeo4" name="zjm_txkuang.png" path="/images/"/>
+    <component id="pdeo5" name="CompHead.xml" path="/components/"/>
+    <image id="pdeo6" name="self.png" path="/images/"/>
+    <image id="pdeo7" name="zjm_txkuang_1.png" path="/images/" scale="9grid" scale9grid="31,31,62,62"/>
+    <component id="pdeo8" name="BtnModel.xml" path="/components/"/>
+    <component id="pdeo9" name="ListItem.xml" path="/components/"/>
+    <image id="pdeoa" name="gg_gg_dtpian.png" path="/images/"/>
+    <component id="pdeob" name="BtnTab.xml" path="/components/"/>
+    <component id="pdeog" name="BtnSearch.xml" path="/components/"/>
+    <component id="pdeoh" name="BtnRefresh.xml" path="/components/"/>
+    <component id="pdeoi" name="ListSearchItem.xml" path="/components/"/>
+    <component id="pdeoj" name="ListApplyItem.xml" path="/components/"/>
+    <image id="z73ek" name="hy_ztzt_2.png" path="/images/"/>
+    <image id="z73el" name="hy_dikuang_2.png" path="/images/"/>
+    <image id="z73em" name="hy_dikuang_3.png" path="/images/"/>
+    <image id="z73en" name="hy_icon_1.png" path="/images/"/>
+    <image id="z73eo" name="hy_icon_2.png" path="/images/"/>
+    <image id="z73ep" name="hy_icon_3.png" path="/images/"/>
+    <image id="z73eq" name="hy_icon_4.png" path="/images/"/>
+    <image id="z73er" name="hy_tjtjhy_1.png" path="/images/"/>
+    <image id="z73es" name="hy_tjtjhy_2.png" path="/images/"/>
+    <image id="z73et" name="hy_tjtjhy_3.png" path="/images/"/>
+    <image id="z73eu" name="hy_ztzt_1.png" path="/images/"/>
+    <image id="z73ev" name="line.png" path="/images/"/>
+    <image id="z73ew" name="hy_scscs.png" path="/images/"/>
+    <image id="z73ex" name="hy_tjhy_dk.png" path="/images/"/>
+    <image id="z73ey" name="hy_tjhy_ssk.png" path="/images/"/>
+    <image id="z73ez" name="hy_ysqysq.png" path="/images/"/>
+    <image id="z73e10" name="hyhy_anniu_1.png" path="/images/"/>
+    <image id="z73e11" name="hyhy_anniu_2.png" path="/images/"/>
+    <image id="z73e12" name="hyhy_hyp.png" path="/images/"/>
+    <image id="z73e13" name="hyhy_ssanniu_1.png" path="/images/"/>
+    <image id="z73e14" name="hy_scsc_2.png" path="/images/"/>
+    <image id="z73e15" name="hy_scsc_1.png" path="/images/"/>
+    <image id="z73e16" name="hy_cwcrcw.png" path="/images/"/>
+    <image id="z73e17" name="zjm_dj_1.png" path="/images/"/>
+    <image id="z73e18" name="hyhy_anniu_4.png" path="/images/"/>
+    <image id="z73e19" name="hyhy_anniu_3.png" path="/images/"/>
+    <component id="z73e1a" name="BtnClear.xml" path="/components/"/>
+    <image id="z73e1b" name="hyhy_tjtja.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Friend" packageCount="2" genCode="true"/>
 </packageDescription>

+ 17 - 12
FGUIProject/assets/Main/RoleInfoUI.xml

@@ -2,20 +2,25 @@
 <component size="700,1000">
   <displayList>
     <loader id="n0_d4iw" name="bg" xy="-73,0" size="877,1000" touchable="false" url="ui://mfvz4q8kmhyhd5"/>
-    <image id="n23_mhyh" name="n23" src="mhyhd7" fileName="images/grxx_mzk_1.png" xy="214,313"/>
     <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,127" pivot="0.5,0.5" scale="1.6,1.6"/>
-    <text id="n5_d4iw" name="txtRoleName" xy="273,313" pivot="0.5,0" size="186,61" fontSize="46" color="#a37349" align="center" text="角色名五"/>
-    <text id="n6_d4iw" name="n6" xy="57,440" size="71,46" fontSize="34" color="#aa794d" text="等级"/>
-    <text id="n7_d4iw" name="n7" xy="57,500" size="71,46" fontSize="34" color="#aa794d" text="经验"/>
-    <text id="n10_d4iw" name="n10" xy="57,560" size="71,46" fontSize="34" color="#aa794d" text="音效"/>
-    <text id="n12_d4iw" name="n12" xy="447,560" size="71,46" fontSize="34" color="#aa794d" text="音乐"/>
-    <text id="n8_d4iw" name="txtLvl" xy="162,440" size="25,46" fontSize="34" color="#c47a6c" text="1"/>
-    <component id="n9_d4iw" name="proBarExp" src="d4iw6m" fileName="components/ProgressBarExp2.xml" xy="156,508">
+    <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"/>
+    <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,62" fontSize="46" color="#a37349" align="center" text="名称七个字"/>
+    <loader id="n24_mhyh" name="loaChangeName" xy="501,298" size="34,36" url="ui://mfvz4q8kmhyhd8" 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="等级"/>
+    <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,561"/>
-    <component id="n13_d4iw" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="536,565"/>
+    <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>
@@ -28,7 +33,7 @@
     <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>
-    <loader id="n24_mhyh" name="loaChangeName" xy="513,331" size="34,36" url="ui://mfvz4q8kmhyhd8" autoSize="true"/>
     <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>

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

@@ -336,7 +336,7 @@
     <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/"/>
+    <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"/>

+ 8 - 7
GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs

@@ -516,13 +516,6 @@ namespace GFGGame
             checkDefaultItem();
             UpdatePicAction();
         }
-
-        public void PutOnSuitSaved(int index)
-        {
-            TakeOffAll(false);
-            CustomSuitData suitSavedData = CustomSuitDataManager.GetSuitList(index);
-            PutOnSuitMemory(suitSavedData);
-        }
         public CustomSuitData GetCurSuitData(int index)
         {
             CustomSuitData suitSavedData = new CustomSuitData(index);
@@ -532,8 +525,16 @@ namespace GFGGame
             suitSavedData.suitId = EquipDataCache.cacher.suitId;
             return suitSavedData;
         }
+        public void PutOnSuitSaved(int index)
+        {
+
+            CustomSuitData suitSavedData = CustomSuitDataManager.GetSuitList(index);
+            PutOnSuitMemory(suitSavedData);
+        }
+
         public void PutOnSuitMemory(CustomSuitData suitSavedData)
         {
+            TakeOffAll(false);
             if (suitSavedData.bg > 0)
             {
                 AddOrRemove(suitSavedData.bg, false);

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_CompHead.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_CompHead.cs.meta

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

+ 113 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendAddUI.cs

@@ -0,0 +1,113 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Friend
+{
+    public partial class UI_FriendAddUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_txtName;
+        public GButton m_btnTabSearch;
+        public GButton m_btnTabApply;
+        public GTextField m_txtTips;
+        public GButton m_btnRefresh;
+        public GList m_listSearch;
+        public GTextInput m_txtSearch;
+        public GButton m_btnClear;
+        public GButton m_btnSearch;
+        public GGroup m_grpSearch;
+        public GList m_listApply;
+        public GButton m_btnDeleteAll;
+        public GButton m_btnAddAll;
+        public GGroup m_grpApply;
+        public const string URL = "ui://wez2ujnnjdju2";
+        public const string PACKAGE_NAME = "Friend";
+        public const string RES_NAME = "FriendAddUI";
+        private static UI_FriendAddUI _proxy;
+
+        public static UI_FriendAddUI Create(GObject gObject = null)
+        {
+            var ui = new UI_FriendAddUI();
+            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_FriendAddUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_FriendAddUI();
+            }
+            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_txtName = (GTextField)comp.GetChild("txtName");
+            m_btnTabSearch = (GButton)comp.GetChild("btnTabSearch");
+            m_btnTabApply = (GButton)comp.GetChild("btnTabApply");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_btnRefresh = (GButton)comp.GetChild("btnRefresh");
+            m_listSearch = (GList)comp.GetChild("listSearch");
+            m_txtSearch = (GTextInput)comp.GetChild("txtSearch");
+            m_btnClear = (GButton)comp.GetChild("btnClear");
+            m_btnSearch = (GButton)comp.GetChild("btnSearch");
+            m_grpSearch = (GGroup)comp.GetChild("grpSearch");
+            m_listApply = (GList)comp.GetChild("listApply");
+            m_btnDeleteAll = (GButton)comp.GetChild("btnDeleteAll");
+            m_btnAddAll = (GButton)comp.GetChild("btnAddAll");
+            m_grpApply = (GGroup)comp.GetChild("grpApply");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtName = null;
+            m_btnTabSearch = null;
+            m_btnTabApply = null;
+            m_txtTips = null;
+            m_btnRefresh = null;
+            m_listSearch = null;
+            m_txtSearch = null;
+            m_btnClear = null;
+            m_btnSearch = null;
+            m_grpSearch = null;
+            m_listApply = null;
+            m_btnDeleteAll = null;
+            m_btnAddAll = null;
+            m_grpApply = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendAddUI.cs.meta

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

+ 18 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendUI.cs

@@ -8,6 +8,12 @@ namespace UI.Friend
     {
         public GComponent target;
         public GButton m_btnBack;
+        public GTextField m_txtCount;
+        public GTextField m_txtName;
+        public GList m_list;
+        public GButton m_btnSendAll;
+        public GButton m_btnSolgan;
+        public GButton m_btnDelete;
         public GButton m_btnAdd;
         public const string URL = "ui://wez2ujnnjdju0";
         public const string PACKAGE_NAME = "Friend";
@@ -57,11 +63,23 @@ namespace UI.Friend
         private void Init(GComponent comp)
         {
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_txtCount = (GTextField)comp.GetChild("txtCount");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_list = (GList)comp.GetChild("list");
+            m_btnSendAll = (GButton)comp.GetChild("btnSendAll");
+            m_btnSolgan = (GButton)comp.GetChild("btnSolgan");
+            m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_btnBack = null;
+            m_txtCount = null;
+            m_txtName = null;
+            m_list = null;
+            m_btnSendAll = null;
+            m_btnSolgan = null;
+            m_btnDelete = null;
             m_btnAdd = null;
             if(disposeTarget && target != null)
             {

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListApplyItem.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Friend
+{
+    public partial class UI_ListApplyItem
+    {
+        public GComponent target;
+        public GTextField m_txtName;
+        public GButton m_btnAgree;
+        public GButton m_btnRefuse;
+        public GTextField m_txtLvl;
+        public const string URL = "ui://wez2ujnnpdeoj";
+        public const string PACKAGE_NAME = "Friend";
+        public const string RES_NAME = "ListApplyItem";
+        private static UI_ListApplyItem _proxy;
+
+        public static UI_ListApplyItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListApplyItem();
+            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_ListApplyItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListApplyItem();
+            }
+            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_txtName = (GTextField)comp.GetChild("txtName");
+            m_btnAgree = (GButton)comp.GetChild("btnAgree");
+            m_btnRefuse = (GButton)comp.GetChild("btnRefuse");
+            m_txtLvl = (GTextField)comp.GetChild("txtLvl");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtName = null;
+            m_btnAgree = null;
+            m_btnRefuse = null;
+            m_txtLvl = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListApplyItem.cs.meta

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

+ 86 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListItem.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Friend
+{
+    public partial class UI_ListItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GTextField m_txtLvl;
+        public GTextField m_txtName;
+        public GButton m_btnSend;
+        public GLoader m_loaState;
+        public const string URL = "ui://wez2ujnnpdeo9";
+        public const string PACKAGE_NAME = "Friend";
+        public const string RES_NAME = "ListItem";
+        private static UI_ListItem _proxy;
+
+        public static UI_ListItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListItem();
+            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_ListItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListItem();
+            }
+            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_c2 = comp.GetController("c2");
+            m_txtLvl = (GTextField)comp.GetChild("txtLvl");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_btnSend = (GButton)comp.GetChild("btnSend");
+            m_loaState = (GLoader)comp.GetChild("loaState");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_txtLvl = null;
+            m_txtName = null;
+            m_btnSend = null;
+            m_loaState = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListItem.cs.meta

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListSearchItem.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Friend
+{
+    public partial class UI_ListSearchItem
+    {
+        public GComponent target;
+        public GTextField m_txtLvl;
+        public GTextField m_txtName;
+        public GTextField m_txtSlogan;
+        public GButton m_btnAdd;
+        public const string URL = "ui://wez2ujnnpdeoi";
+        public const string PACKAGE_NAME = "Friend";
+        public const string RES_NAME = "ListSearchItem";
+        private static UI_ListSearchItem _proxy;
+
+        public static UI_ListSearchItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListSearchItem();
+            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_ListSearchItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListSearchItem();
+            }
+            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_txtLvl = (GTextField)comp.GetChild("txtLvl");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtSlogan = (GTextField)comp.GetChild("txtSlogan");
+            m_btnAdd = (GButton)comp.GetChild("btnAdd");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtLvl = null;
+            m_txtName = null;
+            m_txtSlogan = null;
+            m_btnAdd = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListSearchItem.cs.meta

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

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

@@ -10,6 +10,7 @@ namespace UI.Main
         public GLoader m_bg;
         public GTextField m_txtTitle;
         public GTextField m_txtRoleName;
+        public GLoader m_loaChangeName;
         public GTextField m_txtLvl;
         public GProgressBar m_proBarExp;
         public GButton m_btnSound;
@@ -18,7 +19,7 @@ namespace UI.Main
         public GButton m_btnExit;
         public GButton m_btnHelp;
         public GTextField m_txtVersion;
-        public GLoader m_loaChangeName;
+        public GTextInput m_txtSlogan;
         public const string URL = "ui://mfvz4q8kd4iw6k";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "RoleInfoUI";
@@ -69,6 +70,7 @@ namespace UI.Main
             m_bg = (GLoader)comp.GetChild("bg");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
+            m_loaChangeName = (GLoader)comp.GetChild("loaChangeName");
             m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_proBarExp = (GProgressBar)comp.GetChild("proBarExp");
             m_btnSound = (GButton)comp.GetChild("btnSound");
@@ -77,13 +79,14 @@ namespace UI.Main
             m_btnExit = (GButton)comp.GetChild("btnExit");
             m_btnHelp = (GButton)comp.GetChild("btnHelp");
             m_txtVersion = (GTextField)comp.GetChild("txtVersion");
-            m_loaChangeName = (GLoader)comp.GetChild("loaChangeName");
+            m_txtSlogan = (GTextInput)comp.GetChild("txtSlogan");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
             m_txtTitle = null;
             m_txtRoleName = null;
+            m_loaChangeName = null;
             m_txtLvl = null;
             m_proBarExp = null;
             m_btnSound = null;
@@ -92,7 +95,7 @@ namespace UI.Main
             m_btnExit = null;
             m_btnHelp = null;
             m_txtVersion = null;
-            m_loaChangeName = null;
+            m_txtSlogan = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 147 - 0
GameClient/Assets/Game/HotUpdate/Views/Friend/FriendAddView.cs

@@ -0,0 +1,147 @@
+using UnityEngine;
+using FairyGUI;
+using UI.Friend;
+
+namespace GFGGame
+{
+    public class FriendAddView : BaseWindow
+    {
+        private UI_FriendAddUI _ui;
+
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+            packageName = UI_FriendAddUI.PACKAGE_NAME;
+            _ui = UI_FriendAddUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_listSearch.itemRenderer = RenderListSearchItem;
+            _ui.m_listApply.itemRenderer = RenderListApplyItem;
+            _ui.m_btnSearch.onClick.Add(OnBtnSearchClick);
+            _ui.m_btnRefresh.onClick.Add(OnBtnRefreshClick);
+
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+
+            _ui.m_c1.onChanged.Add(OnCtrlChange);
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_c1.selectedIndex = 1;
+
+            OnCtrlChange();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+
+        }
+
+        private void OnCtrlChange()
+        {
+            // if (_ui.m_c1.selectedIndex == 0)
+            // {
+            //     UpdateListSearch();
+            // }
+            // else if (_ui.m_c1.selectedIndex == 1)
+            // {
+            //     _ui.m_listApply.numItems = 0;
+            // }
+        }
+
+        private void UpdateListSearch()
+        {
+            if (string.IsNullOrEmpty(_ui.m_txtSearch.text))
+            {
+                _ui.m_listSearch.numItems = 0;
+            }
+            else
+            {
+
+            }
+        }
+
+        private void RenderListSearchItem(int index, GObject obj)
+        {
+            UI_ListSearchItem item = UI_ListSearchItem.Proxy(obj);
+            if (item.m_btnAdd.data == null)
+            {
+                item.m_btnAdd.onClick.Add(OnBtnAddClick);
+            }
+            UI_ListSearchItem.ProxyEnd();
+        }
+        private void RenderListApplyItem(int index, GObject obj)
+        {
+            UI_ListApplyItem item = UI_ListApplyItem.Proxy();
+            if (item.m_btnAgree.data == null)
+            {
+                item.m_btnAgree.onClick.Add(OnBtnAgreeClick);
+            }
+            if (item.m_btnRefuse.data == null)
+            {
+                item.m_btnRefuse.onClick.Add(OnBtnRefuseClick);
+            }
+            UI_ListApplyItem.ProxyEnd();
+        }
+
+        //添加好友
+        private void OnBtnAddClick()
+        {
+
+        }
+
+        //通过好友申请
+        private void OnBtnAgreeClick()
+        {
+
+        }
+
+        //拒绝好友申请
+        private void OnBtnRefuseClick()
+        {
+
+        }
+
+        //搜过好友
+        private void OnBtnSearchClick()
+        {
+
+        }
+
+        //刷新好友列表
+        private void OnBtnRefreshClick()
+        {
+
+        }
+
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/Friend/FriendAddView.cs.meta

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

+ 47 - 7
GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -35,6 +35,10 @@ namespace GFGGame
             viewCom = _ui.target;
             isfullScreen = true;
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFriend"));
+
+            _ui.m_list.SetVirtual();
+            _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_list.onClickItem.Add(OnListItemClick);
         }
 
         protected override void OnInit()
@@ -42,17 +46,22 @@ namespace GFGGame
             base.OnInit();
             _ui.m_btnBack.onClick.Add(OnHide);
         }
-
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
         protected override void OnShown()
         {
             base.OnShown();
-            if (_sceneObject == null)
-            {
-                _sceneObject = GameObject.Instantiate(_scenePrefab);
-                EquipDataCache.cacher.setSceneObj(_sceneObject);
-            }
-            EquipDataCache.cacher.PutOnCurrentSuitSaved();
+            UpdateList();
 
+            CustomSuitData suitSavedData = CustomSuitDataManager.GetCurrentSuitList();
+            // if (_ui.m_list.numItems > 0)
+            // {
+            //     _ui.m_list.selectedIndex = 0;
+            //     suitSavedData = _ui.m_list.GetChildAt(0).asCom.data as CustomSuitData;
+            // }
+            UpdateScene(suitSavedData);
         }
 
         protected override void OnHide()
@@ -64,5 +73,36 @@ namespace GFGGame
             }
             ViewManager.GoBackFrom(typeof(FriendView).FullName);
         }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void UpdateList()
+        {
+            _ui.m_list.numItems = 20;
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            UI_ListItem item = UI_ListItem.Proxy(obj);
+
+            UI_ListItem.ProxyEnd();
+        }
+        private void OnListItemClick(EventContext context)
+        {
+            GObject item = context.data as GObject;
+            CustomSuitData suitSavedData = item.data as CustomSuitData;
+            UpdateScene(suitSavedData);
+        }
+        private void UpdateScene(CustomSuitData suitSavedData)
+        {
+            if (_sceneObject == null)
+            {
+                _sceneObject = GameObject.Instantiate(_scenePrefab);
+                EquipDataCache.cacher.setSceneObj(_sceneObject);
+            }
+            EquipDataCache.cacher.PutOnSuitMemory(suitSavedData);
+        }
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -104,7 +104,7 @@ namespace GFGGame
             _btnField = _ui.m_list.GetChild("btnField").asButton;
 
             // _btnGongGao.visible = false;
-            _btnHaoYou.visible = false;
+            // _btnHaoYou.visible = false;
             // _btnRenWu.visible = false;
             _btnPengYouQuan.visible = false;
             _btnJInShu.visible = false;
@@ -413,7 +413,7 @@ namespace GFGGame
             _ui.m_btnHuanZhuang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
 
             _btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);
-            // _btnHaoYou.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FriendView).Name, false);
+            _btnHaoYou.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FriendView).Name, false);
             _btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);
             _btnStore.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(RechargeStoreView).Name, false);
             _btnTuJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldGuideView).Name, false);

+ 5 - 1
GameClient/Assets/ResIn/Prefab/SceneFriend.prefab

@@ -44,7 +44,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: -2
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.y
@@ -86,6 +86,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Role
       objectReference: {fileID: 0}
+    - target: {fileID: 8605298645814931757, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
 --- !u!4 &6637869762496596875 stripped

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_fui.bytes


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png


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


BIN
GameClient/Assets/ResIn/UI/Friend/Friend_atlas0.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Friend/Friend_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: fb3998677e9d61d49b38c0353695cb58
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/Friend/Friend_fui.bytes


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