zhaoyang 2 lat temu
rodzic
commit
041afd35cd
27 zmienionych plików z 93 dodań i 242 usunięć
  1. 9 4
      FGUIProject/assets/poem/PoemGalleryPreviewUI.xml
  2. 0 0
      FGUIProject/assets/poem/componentsGallery/ComPullFooter.xml
  3. 0 0
      FGUIProject/assets/poem/componentsGallery/ComPullHead.xml
  4. BIN
      FGUIProject/assets/poem/images/zjm_dj_1.png
  5. 3 2
      FGUIProject/assets/poem/package.xml
  6. 14 0
      GameClient/Assets/Game/HotUpdate/Data/RoleInfoManager.cs
  7. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComFooter.cs.meta
  8. 0 71
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComHeadIcon.cs
  9. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPullFooter.cs
  10. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPullFooter.cs.meta
  11. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPullHead.cs
  12. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPullHead.cs.meta
  13. 0 71
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComRoleHead.cs
  14. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComRoleHead.cs.meta
  15. 5 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemGalleryPreviewUI.cs
  16. 1 7
      GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs
  17. 4 1
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryPreviewView.cs
  18. 38 26
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs
  19. 1 5
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs
  20. 1 7
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs
  21. 1 7
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs
  22. BIN
      GameClient/Assets/ResIn/UI/Poem/Poem_atlas0.png
  23. BIN
      GameClient/Assets/ResIn/UI/Poem/Poem_atlas0_1.png
  24. BIN
      GameClient/Assets/ResIn/UI/Poem/Poem_atlas0_2.png
  25. BIN
      GameClient/Assets/ResIn/UI/Poem/Poem_atlas0_3.png
  26. BIN
      GameClient/Assets/ResIn/UI/Poem/Poem_atlas0_4.png
  27. BIN
      GameClient/Assets/ResIn/UI/Poem/Poem_fui.bytes

+ 9 - 4
FGUIProject/assets/poem/PoemGalleryPreviewUI.xml

@@ -19,9 +19,9 @@
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
     <image id="n10_r9ri" name="n10" src="r9ri126" fileName="imagesGallery/hl_hyxxk.png" xy="165,35" group="n12_r9ri"/>
-    <component id="n9_r9ri" name="comHead" src="r9ri12m" fileName="componentsGallery/ComRoleHead.xml" xy="200,62" group="n12_r9ri"/>
-    <text id="n4_r9ri" name="txtName" xy="361,103" size="71,46" group="n12_r9ri" fontSize="34" color="#9d7f5c" text="老六"/>
-    <component id="n7_r9ri" name="btnAddFriend" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="787,95" size="198,59" group="n12_r9ri">
+    <component id="n20_v95q" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="182,41" group="n12_r9ri" scale="0.75,0.75"/>
+    <text id="n4_r9ri" name="txtName" xy="361,99" size="71,46" group="n12_r9ri" fontSize="34" color="#9d7f5c" text="老六"/>
+    <component id="n7_r9ri" name="btnAddFriend" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="787,101" size="198,59" group="n12_r9ri">
       <gearDisplay controller="c1" pages="0,1,3"/>
       <Button icon="ui://iyz778gkr9ri129" selectedIcon="ui://iyz778gkr9ri12u"/>
     </component>
@@ -29,7 +29,12 @@
       <gearDisplay controller="c1" pages="5"/>
       <Button icon="ui://iyz778gkr9ri12a"/>
     </component>
-    <group id="n12_r9ri" name="n12" xy="165,35" size="902,195"/>
+    <image id="n21_v95q" name="n21" src="wg7t8w" fileName="images/zjm_dj_1.png" pkg="mfvz4q8k" xy="288,143" group="n23_v95q"/>
+    <text id="n22_v95q" name="txtLvl" xy="295,149" size="29,29" group="n23_v95q" fontSize="20" color="#ffffff" align="center" text="99">
+      <relation target="n21_v95q" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n23_v95q" name="n23" xy="288,143" size="42,43" group="n12_r9ri"/>
+    <group id="n12_r9ri" name="n12" xy="165,35" size="902,236"/>
     <image id="n11_r9ri" name="n11" src="r9ri125" fileName="imagesGallery/hl_grxxdi.png" xy="0,1813" group="n16_r9ri"/>
     <text id="n15_r9ri" name="txtTheme" xy="52,1845" size="417,46" group="n16_r9ri" fontSize="34" color="#ac9370" text="11/11至11/12主题名称xx"/>
     <component id="n13_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="774,1853" group="n16_r9ri">

+ 0 - 0
FGUIProject/assets/poem/componentsGallery/ComFooter.xml → FGUIProject/assets/poem/componentsGallery/ComPullFooter.xml


+ 0 - 0
FGUIProject/assets/poem/componentsGallery/ComHead.xml → FGUIProject/assets/poem/componentsGallery/ComPullHead.xml


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


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

@@ -102,7 +102,7 @@
     <component id="r9ri12l" name="Button11.xml" path="/componentsGallery/"/>
     <component id="r9ri12m" name="ComRoleHead.xml" path="/componentsGallery/"/>
     <component id="r9ri12n" name="ComHeadIcon.xml" path="/componentsGallery/"/>
-    <component id="r9ri12p" name="ComHead.xml" path="/componentsGallery/"/>
+    <component id="r9ri12p" name="ComPullHead.xml" path="/componentsGallery/"/>
     <image id="r9ri12q" name="hl_gthgt.png" path="/imagesGallery/"/>
     <image id="r9ri12r" name="hl_txkuang1.png" path="/imagesGallery/"/>
     <image id="r9ri12s" name="hl_jzhjz_1.png" path="/imagesGallery/"/>
@@ -121,7 +121,7 @@
     <image id="r9ri135" name="hl_phjlk_1.png" path="/imagesPhoto/"/>
     <component id="r9ritjn" name="PoemGalleryRuleUI.xml" path="/" exported="true"/>
     <image id="r9ri136" name="hl_phjltsts.png" path="/imagesGallery/"/>
-    <component id="r9ri137" name="ComFooter.xml" path="/componentsGallery/"/>
+    <component id="r9ri137" name="ComPullFooter.xml" path="/componentsGallery/"/>
     <component id="r9ri139" name="ComScroll.xml" path="/componentsGallery/"/>
     <component id="r9ri13a" name="ComboBox.xml" path="/componentsGallery/"/>
     <image id="r9ri13b" name="hz_dakai.png" path="/componentsGallery/"/>
@@ -132,6 +132,7 @@
     <image id="r9ri13g" name="hl_phb_b_4.png" path="/imagesGallery/"/>
     <image id="r9ri13h" name="xc_hl.png" path="/images/"/>
     <component id="r9ri13i" name="ComGetReward.xml" path="/componentsGallery/"/>
+    <image id="v95qtjo" name="zjm_dj_1.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -2,6 +2,7 @@ using FairyGUI;
 using ET;
 using System.Collections.Generic;
 using System;
+using UI.CommonGame;
 
 namespace GFGGame
 {
@@ -131,5 +132,18 @@ namespace GFGGame
             return value;
 
         }
+
+        public void UpdateHead(GComponent component, int roleId, int roleBorderId)
+        {
+
+            ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(roleId == 0 ? ConstItemID.HEADID : roleId);
+            ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(roleBorderId == 0 ? ConstItemID.HEADBORDERID : roleBorderId);
+
+            UI_ComHead comHead = UI_ComHead.Proxy(component);
+            comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
+            comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
+            UI_ComHead.ProxyEnd();
+
+        }
     }
 }

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComFooter.cs.meta

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

+ 0 - 71
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComHeadIcon.cs

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Poem
-{
-    public partial class UI_ComHeadIcon
-    {
-        public GComponent target;
-        public GLoader m_loaicon;
-        public const string URL = "ui://iyz778gkr9ri12n";
-        public const string PACKAGE_NAME = "Poem";
-        public const string RES_NAME = "ComHeadIcon";
-        private static UI_ComHeadIcon _proxy;
-
-        public static UI_ComHeadIcon Create(GObject gObject = null)
-        {
-            var ui = new UI_ComHeadIcon();
-            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_ComHeadIcon Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComHeadIcon();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_loaicon = (GLoader)comp.GetChild("loaicon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaicon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComFooter.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPullFooter.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.Poem
 {
-    public partial class UI_ComFooter
+    public partial class UI_ComPullFooter
     {
         public GComponent target;
         public Transition m_t0;
         public const string URL = "ui://iyz778gkr9ri137";
         public const string PACKAGE_NAME = "Poem";
-        public const string RES_NAME = "ComFooter";
-        private static UI_ComFooter _proxy;
+        public const string RES_NAME = "ComPullFooter";
+        private static UI_ComPullFooter _proxy;
 
-        public static UI_ComFooter Create(GObject gObject = null)
+        public static UI_ComPullFooter Create(GObject gObject = null)
         {
-            var ui = new UI_ComFooter();
+            var ui = new UI_ComPullFooter();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.Poem
             return ui;
         }
 
-        public static UI_ComFooter Proxy(GObject gObject = null)
+        public static UI_ComPullFooter Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComFooter();
+                _proxy = new UI_ComPullFooter();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComHead.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPullFooter.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 790c031fd9189294fa2fa4aaa3b12422
+guid: 033ab1fc5a2230d479d04e37ffd3b0d1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComHead.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPullHead.cs

@@ -4,18 +4,18 @@ using FairyGUI;
 
 namespace UI.Poem
 {
-    public partial class UI_ComHead
+    public partial class UI_ComPullHead
     {
         public GComponent target;
         public Transition m_t0;
         public const string URL = "ui://iyz778gkr9ri12p";
         public const string PACKAGE_NAME = "Poem";
-        public const string RES_NAME = "ComHead";
-        private static UI_ComHead _proxy;
+        public const string RES_NAME = "ComPullHead";
+        private static UI_ComPullHead _proxy;
 
-        public static UI_ComHead Create(GObject gObject = null)
+        public static UI_ComPullHead Create(GObject gObject = null)
         {
-            var ui = new UI_ComHead();
+            var ui = new UI_ComPullHead();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +24,11 @@ namespace UI.Poem
             return ui;
         }
 
-        public static UI_ComHead Proxy(GObject gObject = null)
+        public static UI_ComPullHead Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComHead();
+                _proxy = new UI_ComPullHead();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComHeadIcon.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComPullHead.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 84d0787f20a0dd14eaa897f94ad57692
+guid: ff3b34664bbfb2a4f8e04a939dd72a18
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 71
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComRoleHead.cs

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Poem
-{
-    public partial class UI_ComRoleHead
-    {
-        public GComponent target;
-        public GTextField m_txtLvl;
-        public const string URL = "ui://iyz778gkr9ri12m";
-        public const string PACKAGE_NAME = "Poem";
-        public const string RES_NAME = "ComRoleHead";
-        private static UI_ComRoleHead _proxy;
-
-        public static UI_ComRoleHead Create(GObject gObject = null)
-        {
-            var ui = new UI_ComRoleHead();
-            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_ComRoleHead Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComRoleHead();
-            }
-            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");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_txtLvl = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_ComRoleHead.cs.meta

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

+ 5 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/poem/UI_PoemGalleryPreviewUI.cs

@@ -10,10 +10,11 @@ namespace UI.Poem
         public Controller m_c1;
         public GLoader m_loaPicture;
         public GButton m_btnback;
-        public UI_ComRoleHead m_comHead;
+        public GComponent m_comHead;
         public GTextField m_txtName;
         public GButton m_btnAddFriend;
         public GButton m_btnDelete;
+        public GTextField m_txtLvl;
         public GTextField m_txtTheme;
         public GButton m_btnCollect;
         public GButton m_btnVote;
@@ -67,10 +68,11 @@ namespace UI.Poem
             m_c1 = comp.GetController("c1");
             m_loaPicture = (GLoader)comp.GetChild("loaPicture");
             m_btnback = (GButton)comp.GetChild("btnback");
-            m_comHead = (UI_ComRoleHead)UI_ComRoleHead.Create(comp.GetChild("comHead"));
+            m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnAddFriend = (GButton)comp.GetChild("btnAddFriend");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
+            m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_txtTheme = (GTextField)comp.GetChild("txtTheme");
             m_btnCollect = (GButton)comp.GetChild("btnCollect");
             m_btnVote = (GButton)comp.GetChild("btnVote");
@@ -80,11 +82,11 @@ namespace UI.Poem
             m_c1 = null;
             m_loaPicture = null;
             m_btnback = null;
-            m_comHead.Dispose();
             m_comHead = null;
             m_txtName = null;
             m_btnAddFriend = null;
             m_btnDelete = null;
+            m_txtLvl = null;
             m_txtTheme = null;
             m_btnCollect = null;
             m_btnVote = null;

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

@@ -141,13 +141,7 @@ namespace GFGGame
 
             UI_ListItem item = UI_ListItem.Proxy(obj);
 
-            ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(friendInfo.roleInfo.roleHead);
-            ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(friendInfo.roleInfo.roleHeadBorder);
-            UI_ComHead comHead = UI_ComHead.Proxy(item.m_comHead);
-            comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
-            comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
-            UI_ComHead.ProxyEnd();
-
+            RoleInfoManager.Instance.UpdateHead(item.m_comHead, friendInfo.roleInfo.roleHead, friendInfo.roleInfo.roleHeadBorder);
             item.m_txtName.text = friendInfo.roleInfo.roleName;
             item.m_txtLvl.text = friendInfo.roleInfo.roleLv.ToString();
             item.m_c2.selectedIndex = friendInfo.roleInfo.offlineTimeSec == 0 ? 0 : 1;

+ 4 - 1
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryPreviewView.cs

@@ -1,5 +1,6 @@
 using ET;
 using FairyGUI;
+using UI.CommonGame;
 using UI.Poem;
 using UnityEngine;
 
@@ -69,7 +70,9 @@ namespace GFGGame
             OtherRoleInfoDetailData roleInfo = await RoleInfoSProxy.ReqOtherRoleDetailInfo(_galleryData.AuthorId);
             if (roleInfo != null)
             {
-                _ui.m_comHead.m_txtLvl.text = roleInfo.RoleLvl.ToString();
+                _ui.m_txtLvl.text = roleInfo.RoleLvl.ToString();
+
+                RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId);
             }
         }
 

+ 38 - 26
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -228,14 +228,22 @@ namespace GFGGame
         private void OnBtnRecoverClick()
         {
 
-            if (_tabIndex == TabType.RECOVER && _ui.m_comNormal.m_c1.selectedIndex == RecommendType.RECOMMEND)//当前在推荐页要刷新
+            if (_tabIndex == TabType.RECOVER)//当前在推荐页要刷新
             {
-                PullDown();
-                onPullDownRelease();
+                if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.RECOMMEND)//重新拉取数据
+                {
+                    PullDown();
+                    onPullDownRelease();
+                }
+                else//切页签并重新拉取数据
+                {
+                    _ui.m_comNormal.m_c1.selectedIndex = RecommendType.RECOMMEND;
+                }
             }
-            else//当前不在推荐页只把页签切回到推荐页,不刷新
+            else//更新列表
             {
-                _ui.m_comNormal.m_c1.selectedIndex = RecommendType.RECOMMEND;
+                UpdateList();
+                UpdateGalleryList();
             }
             _tabIndex = _ui.m_c1.selectedIndex;
             _subtabIndex = _ui.m_comNormal.m_c1.selectedIndex;
@@ -282,27 +290,7 @@ namespace GFGGame
             }
             else
             {
-                if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.RECOMMEND)//首页
-                {
-                    _ui.m_comNormal.m_comScroll.target.scrollPane.header.visible = true;
-                    if (_ui.m_comNormal.m_comBoBox.selectedIndex == 0)//推荐
-                    {
-                        _sortType = (int)GallerySortType.Recommend;
-                        _galleryDatas = PoemGalleryDataManager.Instance.RecommendDatas;
-                    }
-                    else//最新
-                    {
-                        _sortType = (int)GallerySortType.Newest;
-                        _galleryDatas = PoemGalleryDataManager.Instance.NewestDatas;
-                    }
-                }
-                else if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.FRIEND)//好友
-                {
-                    _sortType = (int)GallerySortType.Friend;
-                    _galleryDatas = PoemGalleryDataManager.Instance.FrinedDatas;
-                }
-                _list = _ui.m_comNormal.m_comScroll.m_listRecommend;
-                _list1 = _ui.m_comNormal.m_comScroll.m_listRecommend1;
+                UpdateList();
                 if (_list.numItems > 0) _list.ScrollToView(0);
                 if (_list1.numItems > 0) _list.ScrollToView(0);
 
@@ -310,6 +298,30 @@ namespace GFGGame
             }
 
         }
+        private void UpdateList()
+        {
+            if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.RECOMMEND)//首页
+            {
+                _ui.m_comNormal.m_comScroll.target.scrollPane.header.visible = true;
+                if (_ui.m_comNormal.m_comBoBox.selectedIndex == 0)//推荐
+                {
+                    _sortType = (int)GallerySortType.Recommend;
+                    _galleryDatas = PoemGalleryDataManager.Instance.RecommendDatas;
+                }
+                else//最新
+                {
+                    _sortType = (int)GallerySortType.Newest;
+                    _galleryDatas = PoemGalleryDataManager.Instance.NewestDatas;
+                }
+            }
+            else if (_ui.m_comNormal.m_c1.selectedIndex == RecommendType.FRIEND)//好友
+            {
+                _sortType = (int)GallerySortType.Friend;
+                _galleryDatas = PoemGalleryDataManager.Instance.FrinedDatas;
+            }
+            _list = _ui.m_comNormal.m_comScroll.m_listRecommend;
+            _list1 = _ui.m_comNormal.m_comScroll.m_listRecommend1;
+        }
         /// <summary>
         /// 切换收藏页签
         /// </summary>

+ 1 - 5
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs

@@ -122,11 +122,7 @@ namespace GFGGame
             ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(_selectHeadId);
             ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(_selectHeadBorderId);
 
-            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();
-
+            RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId);
             if (_ui.m_c1.selectedIndex == 0)
             {
                 _ui.m_txtName.text = headCfg.name;

+ 1 - 7
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs

@@ -50,13 +50,7 @@ namespace GFGGame
 
             _ui.m_txtRoleName.text = _roleInfo.roleName;
             _ui.m_txtLvl.text = _roleInfo.roleLv.ToString();
-            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();
+            RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId);
 
             OtherRoleInfoDetailData roleInfoDetail = await RoleInfoSProxy.ReqOtherRoleDetailInfo(_roleInfo.roleId);
             if (roleInfoDetail != null)

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

@@ -95,13 +95,7 @@ namespace GFGGame
 
         private void UpdateHead()
         {
-            ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(RoleDataManager.headId);
-            ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(RoleDataManager.headBorderId);
-
-            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();
+            RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId);
         }
         private void RenderListItem(int index, GObject obj)
         {

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


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


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


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


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


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