zhaoyang 2 år sedan
förälder
incheckning
821bd56ad3
27 ändrade filer med 115 tillägg och 93 borttagningar
  1. 1 1
      FGUIProject/assets/CommonGame/components/ComHead.xml
  2. 1 0
      FGUIProject/assets/CommonGame/package.xml
  3. 1 8
      FGUIProject/assets/Friend/FriendUI.xml
  4. 5 5
      FGUIProject/assets/Friend/components/ListItem.xml
  5. 1 1
      FGUIProject/assets/RoleInfo/ChangeHead.xml
  6. 1 1
      FGUIProject/assets/RoleInfo/OtherRoleInfoUI.xml
  7. 1 1
      FGUIProject/assets/RoleInfo/RoleInfoUI.xml
  8. 0 7
      FGUIProject/assets/RoleInfo/components/ComHeadIcon.xml
  9. 0 2
      FGUIProject/assets/RoleInfo/package.xml
  10. 10 8
      GameClient/Assets/Game/HotUpdate/Data/FriendDataManager.cs
  11. 1 0
      GameClient/Assets/Game/HotUpdate/Data/VO/FriendInfoData.cs
  12. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead.cs
  13. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead.cs.meta
  14. 3 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendUI.cs
  15. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListItem.cs
  16. 2 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeHead.cs
  17. 2 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_OtherRoleInfoUI.cs
  18. 2 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs
  19. 33 11
      GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs
  20. 6 3
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs
  21. 31 19
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs
  22. 7 4
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs
  23. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  24. BIN
      GameClient/Assets/ResIn/UI/Friend/Friend_atlas0.png
  25. BIN
      GameClient/Assets/ResIn/UI/Friend/Friend_fui.bytes
  26. BIN
      GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0.png
  27. BIN
      GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_fui.bytes

+ 1 - 1
FGUIProject/assets/RoleInfo/components/ComHead.xml → FGUIProject/assets/CommonGame/components/ComHead.xml

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

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

@@ -230,6 +230,7 @@
     <image id="r9ri12o" name="hl_ddandik.png" path="/images/" exported="true"/>
     <component id="wonody" name="Button20.xml" path="/components/" exported="true"/>
     <component id="oqa1tjt" name="Button21.xml" path="/components/" exported="true"/>
+    <component id="r9ri1h" name="ComHead.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -11,14 +11,7 @@
     <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" advanced="true"/>
-    <image id="n18_z73e" name="n18" src="z73e1c" fileName="images/dz_hz_rwdh_1.png" xy="89,1243" size="409,153" group="n20_z73e">
-      <relation target="" sidePair="bottom-bottom"/>
-    </image>
-    <text id="n19_z73e" name="txtSlogan" xy="105,1247" size="378,116" group="n20_z73e" fontSize="28" color="#997350" ubb="true" autoSize="none" autoClearText="true" text="采菊东篱下,悠然见南山。山气日夕佳,飞鸟相与还。此中有真意,欲辨已忘言。">
-      <relation target="" sidePair="bottom-bottom"/>
-    </text>
-    <group id="n20_z73e" name="grpSlogan" xy="89,1243" size="409,153" advanced="true"/>
-    <component id="n15_z73e" name="btnSolgan" src="jdju1" fileName="components/BtnModel1.xml" xy="40,1393" group="n16_z73e">
+    <component id="n15_z73e" name="btnInfo" 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">

+ 5 - 5
FGUIProject/assets/Friend/components/ListItem.xml

@@ -2,18 +2,18 @@
 <component size="440,184" extention="Button">
   <controller name="c1" pages="0,可领,1,可送,2,已送,3,已领" selected="0"/>
   <controller name="c2" pages="0,在线,1,离线" selected="0"/>
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n14_z73e" name="n14" src="z73em" fileName="images/hy_dikuang_3.png" xy="12,17"/>
     <image id="n16_gmjo" name="n16" src="gmjo1d" fileName="images/hy_dikuang_4.png" xy="0,0">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <component id="n3_pdeo" name="n3" src="pdeo3" fileName="components/CompHeadWithBg.xml" xy="39,30" pivot="0.5,0.5" size="124,124"/>
-    <image id="n11_z73e" name="n11" src="z73e17" fileName="images/zjm_dj_1.png" xy="128,110" group="n13_z73e"/>
-    <text id="n12_z73e" name="txtLvl" xy="135,116" size="29,29" group="n13_z73e" fontSize="20" color="#ffffff" align="center" text="99">
+    <component id="n3_pdeo" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-13,-23" pivot="0.5,0.5" scale="0.7,0.7"/>
+    <image id="n11_z73e" name="n11" src="z73e17" fileName="images/zjm_dj_1.png" xy="119,106" group="n13_z73e"/>
+    <text id="n12_z73e" name="txtLvl" xy="126,112" 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="128,110" size="42,43"/>
+    <group id="n13_z73e" name="n13" xy="119,106" size="42,43"/>
     <text id="n4_pdeo" name="txtName" xy="177,32" size="230,51" fontSize="38" color="#927a58" text="角色名七个字"/>
     <component id="n9_pdeo" name="btnSend" src="pdeo8" fileName="components/BtnModel.xml" xy="342,93">
       <gearIcon controller="c1" pages="0,2,3" values="ui://wez2ujnnz73ep|ui://wez2ujnnz73eo|ui://wez2ujnnz73eq" default="ui://wez2ujnnz73en"/>

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

@@ -42,7 +42,7 @@
     </component>
     <group id="n10_r9ri" name="n10" xy="205,93" size="585,84"/>
     <image id="n11_r9ri" name="n11" src="r9rim" fileName="images/grxx_xtxtx.png" xy="381,330" size="520,6" group="n12_r9ri"/>
-    <component id="n4_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" xy="105,187" size="236,238" group="n12_r9ri" scale="1.2,1.2"/>
+    <component id="n4_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" xy="105,187" size="236,238" group="n12_r9ri" scale="1.2,1.2" pkg="eg2y0ldp"/>
     <text id="n5_r9ri" name="txtName" xy="394,263" size="129,56" group="n12_r9ri" font="ui://eg2y0ldpwonotja" fontSize="42" color="#ab8759" text="头像名"/>
     <text id="n6_r9ri" name="txtDesc" xy="394,345" size="138,46" group="n12_r9ri" fontSize="34" color="#ceb599" text="头像描述"/>
     <group id="n12_r9ri" name="n12" xy="105,187" size="796,238"/>

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

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n52_r9ri" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,90"/>
-    <component id="n33_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" xy="96,147" group="n53_oqa1" scale="1.3,1.3"/>
+    <component id="n33_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" xy="96,147" group="n53_oqa1" scale="1.3,1.3" pkg="eg2y0ldp"/>
     <image id="n29_r9ri" name="n29" src="r9ri24" fileName="images/zjm_dj_1.png" xy="295,317" group="n53_oqa1"/>
     <text id="n30_r9ri" name="txtLvl" xy="304,324" size="34,34" group="n53_oqa1" fontSize="24" color="#ffffff" align="center" text="99">
       <relation target="n29_r9ri" sidePair="center-center,middle-middle"/>

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

@@ -11,7 +11,7 @@
       <Button title="?" titleColor="#000000"/>
     </component>
     <component id="n52_r9ri" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,90"/>
-    <component id="n33_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" xy="96,147" group="n53_oqa1" scale="1.3,1.3"/>
+    <component id="n33_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" xy="96,147" group="n53_oqa1" scale="1.3,1.3" pkg="eg2y0ldp"/>
     <image id="n29_r9ri" name="n29" src="r9ri24" fileName="images/zjm_dj_1.png" xy="295,317" group="n53_oqa1"/>
     <text id="n30_r9ri" name="txtLvl" xy="304,324" size="34,34" group="n53_oqa1" fontSize="24" color="#ffffff" align="center" text="99">
       <relation target="n29_r9ri" sidePair="center-center,middle-middle"/>

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

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

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

@@ -56,8 +56,6 @@
     <image id="r9ri1d" name="zjm_txkuang.png" path="/images/"/>
     <image id="r9ri1f" name="self.png" path="/images/"/>
     <image id="r9ri1g" name="zjm_txkuang_1.png" path="/images/" scale="9grid" scale9grid="31,31,62,62"/>
-    <component id="r9ri1h" name="ComHead.xml" path="/components/"/>
-    <component id="r9ri1i" name="ComHeadIcon.xml" path="/components/"/>
     <component id="r9ri1j" name="Button2.xml" path="/components/"/>
     <component id="r9ri1k" name="Button3.xml" path="/components/"/>
     <component id="r9ri1l" name="Button4.xml" path="/components/"/>

+ 10 - 8
GameClient/Assets/Game/HotUpdate/Data/FriendDataManager.cs

@@ -50,6 +50,16 @@ namespace GFGGame
                 UpdateFriendList(true);
             }
         }
+
+        public FriendInfoData GetFriendDataById(long roleId)
+        {
+            if (_friendDic.ContainsKey(roleId))
+            {
+                return _friendDic[roleId];
+            }
+            return null;
+        }
+
         public void ChangeFriendInfo(OtherRoleInfoData roleInfo)
         {
             if (_friendDic.ContainsKey(roleInfo.roleId))
@@ -178,14 +188,6 @@ namespace GFGGame
             return 3;
         }
 
-        public FriendInfoData GetFriendDataById(long roleId)
-        {
-            if (_friendDic.ContainsKey(roleId))
-            {
-                return _friendDic[roleId];
-            }
-            return null;
-        }
 
     }
 }

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Data/VO/FriendInfoData.cs

@@ -3,6 +3,7 @@ namespace GFGGame
     public class FriendInfoData
     {
         public OtherRoleInfoData roleInfo;
+        public OtherRoleInfoDetailData roleDetailInfo;
         public int type;//好友关系类型,由FriendType枚举
         public int giveGiftState;//赠送状态,由ConstGiveGiftStatus枚举
         public int takeGiftState;//领取赠送状态,由ConstBonusStatus枚举

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComHead.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead.cs

@@ -2,15 +2,15 @@
 
 using FairyGUI;
 
-namespace UI.RoleInfo
+namespace UI.CommonGame
 {
     public partial class UI_ComHead
     {
         public GComponent target;
         public GLoader m_loaIcon;
         public GLoader m_loaBorder;
-        public const string URL = "ui://374k3dwvr9ri1h";
-        public const string PACKAGE_NAME = "RoleInfo";
+        public const string URL = "ui://eg2y0ldpr9ri1h";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ComHead";
         private static UI_ComHead _proxy;
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComHead.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e21c4eba6a76e1c4e94fa1d3ebf6ee52
+guid: f6576491b1d633a42b9463374855bd5b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendUI.cs

@@ -12,9 +12,7 @@ namespace UI.Friend
         public GTextField m_txtCount;
         public GTextField m_txtName;
         public GGroup m_grpName;
-        public GTextField m_txtSlogan;
-        public GGroup m_grpSlogan;
-        public GButton m_btnSolgan;
+        public GButton m_btnInfo;
         public GButton m_btnDelete;
         public GButton m_btnAdd;
         public GList m_list;
@@ -71,9 +69,7 @@ namespace UI.Friend
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_grpName = (GGroup)comp.GetChild("grpName");
-            m_txtSlogan = (GTextField)comp.GetChild("txtSlogan");
-            m_grpSlogan = (GGroup)comp.GetChild("grpSlogan");
-            m_btnSolgan = (GButton)comp.GetChild("btnSolgan");
+            m_btnInfo = (GButton)comp.GetChild("btnInfo");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
             m_list = (GList)comp.GetChild("list");
@@ -86,9 +82,7 @@ namespace UI.Friend
             m_txtCount = null;
             m_txtName = null;
             m_grpName = null;
-            m_txtSlogan = null;
-            m_grpSlogan = null;
-            m_btnSolgan = null;
+            m_btnInfo = null;
             m_btnDelete = null;
             m_btnAdd = null;
             m_list = null;

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

@@ -9,6 +9,7 @@ namespace UI.Friend
         public GButton target;
         public Controller m_c1;
         public Controller m_c2;
+        public GComponent m_comHead;
         public GTextField m_txtLvl;
         public GTextField m_txtName;
         public GButton m_btnSend;
@@ -62,6 +63,7 @@ namespace UI.Friend
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
+            m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnSend = (GButton)comp.GetChild("btnSend");
@@ -71,6 +73,7 @@ namespace UI.Friend
         {
             m_c1 = null;
             m_c2 = null;
+            m_comHead = null;
             m_txtLvl = null;
             m_txtName = null;
             m_btnSend = null;

+ 2 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ChangeHead.cs

@@ -12,7 +12,7 @@ namespace UI.RoleInfo
         public GList m_listBorder;
         public GButton m_btnTab0;
         public GButton m_btnTab1;
-        public UI_ComHead m_comHead;
+        public GComponent m_comHead;
         public GTextField m_txtName;
         public GTextField m_txtDesc;
         public GButton m_btnSure;
@@ -68,7 +68,7 @@ namespace UI.RoleInfo
             m_listBorder = (GList)comp.GetChild("listBorder");
             m_btnTab0 = (GButton)comp.GetChild("btnTab0");
             m_btnTab1 = (GButton)comp.GetChild("btnTab1");
-            m_comHead = (UI_ComHead)UI_ComHead.Create(comp.GetChild("comHead"));
+            m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_btnSure = (GButton)comp.GetChild("btnSure");
@@ -80,7 +80,6 @@ namespace UI.RoleInfo
             m_listBorder = null;
             m_btnTab0 = null;
             m_btnTab1 = null;
-            m_comHead.Dispose();
             m_comHead = null;
             m_txtName = null;
             m_txtDesc = null;

+ 2 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_OtherRoleInfoUI.cs

@@ -9,7 +9,7 @@ namespace UI.RoleInfo
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnBack;
-        public UI_ComHead m_comHead;
+        public GComponent m_comHead;
         public GTextField m_txtLvl;
         public GTextField m_txtExp;
         public GTextField m_txtRoleName;
@@ -66,7 +66,7 @@ namespace UI.RoleInfo
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_comHead = (UI_ComHead)UI_ComHead.Create(comp.GetChild("comHead"));
+            m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_txtExp = (GTextField)comp.GetChild("txtExp");
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
@@ -79,7 +79,6 @@ namespace UI.RoleInfo
         {
             m_loaBg = null;
             m_btnBack = null;
-            m_comHead.Dispose();
             m_comHead = null;
             m_txtLvl = null;
             m_txtExp = null;

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

@@ -11,7 +11,7 @@ namespace UI.RoleInfo
         public GTextField m_txtVersion;
         public GButton m_btnHelp;
         public GButton m_btnBack;
-        public UI_ComHead m_comHead;
+        public GComponent m_comHead;
         public GTextField m_txtLvl;
         public GTextField m_txtExp;
         public GTextField m_txtRoleName;
@@ -73,7 +73,7 @@ namespace UI.RoleInfo
             m_txtVersion = (GTextField)comp.GetChild("txtVersion");
             m_btnHelp = (GButton)comp.GetChild("btnHelp");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_comHead = (UI_ComHead)UI_ComHead.Create(comp.GetChild("comHead"));
+            m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_txtExp = (GTextField)comp.GetChild("txtExp");
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
@@ -91,7 +91,6 @@ namespace UI.RoleInfo
             m_txtVersion = null;
             m_btnHelp = null;
             m_btnBack = null;
-            m_comHead.Dispose();
             m_comHead = null;
             m_txtLvl = null;
             m_txtExp = null;

+ 33 - 11
GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -11,7 +11,7 @@ namespace GFGGame
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
 
-        private FriendInfoData _curSelectedInfo;
+        private long _friendRoleId;
 
         public override void Dispose()
         {
@@ -42,7 +42,7 @@ namespace GFGGame
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.onClickItem.Add(OnListItemClick);
 
-            _ui.m_btnSolgan.onClick.Add(OnBtnSloganClick);
+            _ui.m_btnInfo.onClick.Add(OnBtnInfoClick);
             _ui.m_btnDelete.onClick.Add(OnBtnDeleteClick);
             _ui.m_btnAdd.onClick.Add(OnBtnAddClick);
             _ui.m_btnSendAll.onClick.Add(OnBtnSendAllClick);
@@ -65,6 +65,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _friendRoleId = this.viewData == null ? 0 : (long)this.viewData;
             if (_sceneObject == null)
             {
                 CustomSuitData customSuit = CustomSuitDataManager.GetSuitList(CustomSuitDataManager.currentIndex);
@@ -72,14 +73,28 @@ namespace GFGGame
                 EquipDataCache.cacher.setSceneObj(_sceneObject);
                 EquipDataCache.cacher.AddOrRemove(customSuit.bg, true);
             }
-            _ui.m_grpSlogan.visible = false;
             FriendDataManager.Instance.UpdateFriendList(true);
             _ui.m_list.numItems = FriendDataManager.Instance.FriendDatas.Count;
 
             if (_ui.m_list.numItems > 0)
             {
-                _ui.m_list.selectedIndex = 0;
-                ReqFriendDetialInfo(0);
+                if (_friendRoleId > 0)
+                {
+                    for (int i = 0; i < FriendDataManager.Instance.FriendDatas.Count; i++)
+                    {
+                        if (_friendRoleId == FriendDataManager.Instance.FriendDatas[i].roleInfo.roleId)
+                        {
+                            _ui.m_list.selectedIndex = i;
+                            _ui.m_list.ScrollToView(i);
+                            ReqFriendDetialInfo(i);
+                        }
+                    }
+                }
+                else
+                {
+                    _ui.m_list.selectedIndex = 0;
+                    ReqFriendDetialInfo(0);
+                }
             }
             else
             {
@@ -235,19 +250,18 @@ namespace GFGGame
         {
             if (index >= 0)
             {
-                long roleId = FriendDataManager.Instance.FriendDatas[index].roleInfo.roleId;
-                OtherRoleInfoDetailData roleInfoDetail = await RoleInfoSProxy.ReqOtherRoleDetailInfo(roleId);
+                _friendRoleId = FriendDataManager.Instance.FriendDatas[index].roleInfo.roleId;
+
+                OtherRoleInfoDetailData roleInfoDetail = await RoleInfoSProxy.ReqOtherRoleDetailInfo(_friendRoleId);
                 if (roleInfoDetail != null)
                 {
                     UpdateScene(roleInfoDetail.customSuitData);
-                    _ui.m_txtSlogan.text = string.IsNullOrEmpty(roleInfoDetail.slogan) ? "暂无简介" : roleInfoDetail.slogan;
                 }
             }
             else
             {
                 CustomSuitData customSuit = CustomSuitDataManager.GetSuitList(CustomSuitDataManager.currentIndex);
                 UpdateScene(customSuit);
-                _ui.m_txtSlogan.text = string.IsNullOrEmpty(RoleDataManager.slogan) ? "暂无简介" : RoleDataManager.slogan;
             }
         }
         private void UpdateScene(CustomSuitData suitSavedData)
@@ -268,9 +282,17 @@ namespace GFGGame
         }
 
 
-        private void OnBtnSloganClick()
+        private void OnBtnInfoClick()
         {
-            _ui.m_grpSlogan.visible = !_ui.m_grpSlogan.visible;
+            if (_friendRoleId == 0)
+            {
+                ViewManager.Show<RoleInfoView>(null, new object[] { typeof(FriendView).FullName, _friendRoleId });
+            }
+            else
+            {
+                FriendInfoData friendInfoData = FriendDataManager.Instance.GetFriendDataById(_friendRoleId);
+                ViewManager.Show<OtherRoleInfoView>(new object[] { friendInfoData.roleInfo }, new object[] { typeof(FriendView).FullName, _friendRoleId });
+            }
         }
         private void OnBtnAddClick()
         {

+ 6 - 3
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs

@@ -1,6 +1,7 @@
 using UI.RoleInfo;
 using System.Text.RegularExpressions;
 using FairyGUI;
+using UI.CommonGame;
 
 namespace GFGGame
 {
@@ -119,10 +120,12 @@ namespace GFGGame
         private void UpdateView()
         {
             ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(_selectHeadId);
-            _ui.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
-
             ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(_selectHeadBorderId);
-            _ui.m_comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
+
+            UI_ComHead comHead = UI_ComHead.Proxy(_ui.m_comHead);
+            comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
+            comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
+            UI_ComHead.ProxyEnd();
 
             if (_ui.m_c1.selectedIndex == 0)
             {

+ 31 - 19
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs

@@ -1,5 +1,6 @@
 using ET;
 using FairyGUI;
+using UI.CommonGame;
 using UI.RoleInfo;
 
 namespace GFGGame
@@ -39,8 +40,9 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateView);
         }
-        protected override void OnShown()
+        protected override async void OnShown()
         {
             base.OnShown();
             _roleInfo = (this.viewData as object[])[0] as OtherRoleInfoData;
@@ -48,20 +50,19 @@ namespace GFGGame
 
             _ui.m_txtRoleName.text = _roleInfo.roleName;
             _ui.m_txtLvl.text = _roleInfo.roleLv.ToString();
-            RoleLevelCfg roleLevelCfg = RoleLevelCfgArray.Instance.GetCfg(_roleInfo.roleLv);
-            if (roleLevelCfg.exp > 0)
-            {
-                _ui.m_txtExp.text = string.Format("{0}/{1}", _roleDetailInfo.RoleExp, roleLevelCfg.exp);
-            }
-            else
+            ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(_roleInfo.roleHead);
+            ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(_roleInfo.roleHeadBorder);
+
+            UI_ComHead comHead = UI_ComHead.Proxy(_ui.m_comHead);
+            comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
+            comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
+            UI_ComHead.ProxyEnd();
+
+            OtherRoleInfoDetailData roleInfoDetail = await RoleInfoSProxy.ReqOtherRoleDetailInfo(_roleInfo.roleId);
+            if (roleInfoDetail != null)
             {
-                _ui.m_txtExp.text = "已满级";
+                Timers.inst.StartCoroutine(PictureStorageHelper.Download(roleInfoDetail.showPhotoList));
             }
-
-            _ui.m_txtSlogan.text = _roleDetailInfo.slogan;
-            _ui.m_btnFieldGuide.title = string.Format("套装收集度:{0}", _roleDetailInfo.SuitCollectPer);
-            _ui.m_list.numItems = _roleDetailInfo.showPhotoList.Count;
-            UpdateHead();
         }
 
         protected override void OnHide()
@@ -70,21 +71,32 @@ namespace GFGGame
         }
         private void OnBtnBackClick()
         {
-            ViewManager.GoBackFrom(typeof(RoleInfoView).FullName);
+            ViewManager.GoBackFrom(typeof(OtherRoleInfoData).FullName);
         }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateView);
         }
 
-        private void UpdateHead()
+        private void UpdateView()
         {
-            ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(_roleInfo.roleHead);
-            _ui.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
+            RoleLevelCfg roleLevelCfg = RoleLevelCfgArray.Instance.GetCfg(_roleInfo.roleLv);
+            if (roleLevelCfg.exp > 0)
+            {
+                _ui.m_txtExp.text = string.Format("{0}/{1}", _roleDetailInfo.RoleExp, roleLevelCfg.exp);
+            }
+            else
+            {
+                _ui.m_txtExp.text = "已满级";
+            }
 
-            ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(_roleInfo.roleHeadBorder);
-            _ui.m_comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
+            _ui.m_txtSlogan.text = _roleDetailInfo.slogan;
+            _ui.m_btnFieldGuide.title = string.Format("套装收集度:{0}", _roleDetailInfo.SuitCollectPer);
+            _ui.m_list.numItems = _roleDetailInfo.showPhotoList.Count;
         }
+
+
         private void RenderListItem(int index, GObject obj)
         {
             PoemPhotoData poemPhotoData = _roleDetailInfo.showPhotoList[index];

+ 7 - 4
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -1,5 +1,6 @@
 using ET;
 using FairyGUI;
+using UI.CommonGame;
 using UI.RoleInfo;
 
 namespace GFGGame
@@ -37,7 +38,7 @@ namespace GFGGame
             _ui.m_btnFieldGuide.onClick.Add(OnBtnFieldGuideClick);
             _ui.m_btnSkill.onClick.Add(OnBtnSkillClick);
             _ui.m_btnSetting.onClick.Add(OnBtnSettingClick);
-            _ui.m_comHead.target.onClick.Add(OnComHeadClick);
+            _ui.m_comHead.onClick.Add(OnComHeadClick);
 
 
             _ui.m_list.itemRenderer = RenderListItem;
@@ -95,10 +96,12 @@ namespace GFGGame
         private void UpdateHead()
         {
             ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(RoleDataManager.headId);
-            _ui.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
-
             ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(RoleDataManager.headBorderId);
-            _ui.m_comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
+
+            UI_ComHead comHead = UI_ComHead.Proxy(_ui.m_comHead);
+            comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
+            comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
+            UI_ComHead.ProxyEnd();
         }
         private void RenderListItem(int index, GObject obj)
         {

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


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


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


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


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