添加个人信息界面逻辑

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -253,6 +253,7 @@ namespace GFGGame
             LuckyBoxSProxy.ReqGetLuckyBoxRotatingInfo().Coroutine();
             LeagueSproxy.GetTeapartyInfos().Coroutine();
             LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId).Coroutine();
+            TaskSProxy.GetTaskTypePro().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

GameClient/Assets/Game/HotUpdate/Data/RoleInfoManager.cs

@@ -185,7 +185,7 @@ namespace GFGGame
         public string GetLeagueName()
         {
             LeagueData leagueData = LeagueDataManager.Instance.LeagueData;
-            if (leagueData.Name.Length == 0)
+            if (leagueData == null)
             {
                 return "暂未加入雅集";
             }
@@ -223,14 +223,13 @@ namespace GFGGame
         }
         public void UpdateHead(GComponent component, int headId, int roleBorderId)
         {
-
             ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(headId == 0 ? ConstItemID.HEADID : headId);
             ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(roleBorderId == 0 ? ConstItemID.HEADBORDERID : roleBorderId);
 
-            UI_ComHead comHead = UI_ComHead.Proxy(component);
+            UI_ComHead3 comHead = UI_ComHead3.Proxy(component);
             comHead.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
             comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
-            UI_ComHead.ProxyEnd();
+            UI_ComHead3.ProxyEnd();
 
         }
         public void UpdateArenaNpcHead(GComponent component, string res)

GameClient/Assets/Game/HotUpdate/Data/TaskDataManager.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using ET;
 
 namespace GFGGame

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -12,13 +12,14 @@ namespace GFGGame
     public class SceneController
     {
         // 临时存主界面路径
-        public static string bgTempRes = "zjm_1";  
+        public static string bgTempRes = ResPathUtil.GetBgImgPath("zjm_1");  
         public static void UpdateMainScene(GameObject sceneObj)
         {
             //背景0
             Transform tf = sceneObj.transform.Find("Bg");
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
-            var resPath = ResPathUtil.GetBgImgPath(bgTempRes);
+            var resPath = bgTempRes;
+
             SpriteHelper.AddSpriteTo(spr, resPath);
             //角色
             CustomSuitData suitSavedData = CustomSuitDataManager.GetCurrentSuitData();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead3.cs

@@ -0,0 +1,81 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComHead3
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public UI_ComHeadIcon m_comHead;
+        public GLoader m_loaBorder;
+        public const string URL = "ui://eg2y0ldpp4yntr6";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComHead3";
+        private static UI_ComHead3 _proxy;
+
+        public static UI_ComHead3 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComHead3();
+            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_ComHead3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComHead3();
+            }
+            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_comHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comHead"));
+            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_comHead.Dispose();
+            m_comHead = null;
+            m_loaBorder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead3.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_Button2.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_Button2
+    {
+        public GButton target;
+        public Controller m_type;
+        public GLoader m_bg;
+        public GLoader m_progressBg;
+        public GLoader m_progressBar;
+        public GTextField m_rate;
+        public GTextField m_name;
+        public const string URL = "ui://374k3dwvr9ri1j";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "Button2";
+        private static UI_Button2 _proxy;
+
+        public static UI_Button2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button2();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_type = comp.GetController("type");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_progressBg = (GLoader)comp.GetChild("progressBg");
+            m_progressBar = (GLoader)comp.GetChild("progressBar");
+            m_rate = (GTextField)comp.GetChild("rate");
+            m_name = (GTextField)comp.GetChild("name");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_type = null;
+            m_bg = null;
+            m_progressBg = null;
+            m_progressBar = null;
+            m_rate = null;
+            m_name = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_Button2.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ButtonBadge.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_ButtonBadge
+    {
+        public GButton target;
+        public Controller m_type;
+        public const string URL = "ui://374k3dwvp4yn9fwr";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "ButtonBadge";
+        private static UI_ButtonBadge _proxy;
+
+        public static UI_ButtonBadge Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonBadge();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ButtonBadge Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonBadge();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_type = comp.GetController("type");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_type = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ButtonBadge.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListPhotoItem.cs

@@ -7,10 +7,9 @@ namespace UI.RoleInfo
     public partial class UI_ListPhotoItem
     {
         public GComponent target;
-        public GImage m_imgNone;
+        public Controller m_type;
         public UI_ComPhoto m_comPhoto;
         public GTextField m_txtLock;
-        public GGroup m_grpLock;
         public const string URL = "ui://374k3dwvr9ri1m";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ListPhotoItem";
@@ -58,18 +57,16 @@ namespace UI.RoleInfo
 
         private void Init(GComponent comp)
         {
-            m_imgNone = (GImage)comp.GetChild("imgNone");
+            m_type = comp.GetController("type");
             m_comPhoto = (UI_ComPhoto)UI_ComPhoto.Create(comp.GetChild("comPhoto"));
             m_txtLock = (GTextField)comp.GetChild("txtLock");
-            m_grpLock = (GGroup)comp.GetChild("grpLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_imgNone = null;
+            m_type = null;
             m_comPhoto.Dispose();
             m_comPhoto = null;
             m_txtLock = null;
-            m_grpLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_OtherRoleInfoUI.cs

@@ -14,7 +14,7 @@ namespace UI.RoleInfo
         public GTextField m_txtRoleName;
         public GTextField m_txtSlogan;
         public GGroup m_grpHead;
-        public GButton m_btnFieldGuide;
+        public UI_Button2 m_btnFieldGuide;
         public GList m_list;
         public const string URL = "ui://374k3dwvv95qg2";
         public const string PACKAGE_NAME = "RoleInfo";
@@ -70,7 +70,7 @@ namespace UI.RoleInfo
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
             m_txtSlogan = (GTextField)comp.GetChild("txtSlogan");
             m_grpHead = (GGroup)comp.GetChild("grpHead");
-            m_btnFieldGuide = (GButton)comp.GetChild("btnFieldGuide");
+            m_btnFieldGuide = (UI_Button2)UI_Button2.Create(comp.GetChild("btnFieldGuide"));
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
@@ -82,6 +82,7 @@ namespace UI.RoleInfo
             m_txtRoleName = null;
             m_txtSlogan = null;
             m_grpHead = null;
+            m_btnFieldGuide.Dispose();
             m_btnFieldGuide = null;
             m_list = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs

@@ -11,16 +11,23 @@ namespace UI.RoleInfo
         public GTextField m_txtVersion;
         public GButton m_btnHelp;
         public GButton m_btnBack;
+        public GTextField m_leagueName;
         public GComponent m_comHead;
-        public GTextField m_txtLvl;
         public GTextField m_txtExp;
+        public GTextField m_txtLvl;
         public GTextField m_txtRoleName;
         public GLoader m_loaChangeName;
         public GTextInput m_txtSlogan;
         public GGroup m_grpHead;
-        public GButton m_btnFieldGuide;
-        public GList m_list;
+        public UI_Button2 m_btnSuitGuide;
+        public UI_Button2 m_btnCardGuide;
+        public UI_Button2 m_btnTaskArchieveGuide;
+        public GList m_badgeList;
+        public GGroup m_center;
+        public GList m_photoList;
         public GButton m_btnSkill;
+        public GTextField m_txtRoleID;
+        public GButton m_btnCopy;
         public GButton m_btnSetting;
         public const string URL = "ui://374k3dwvd4iw6k";
         public const string PACKAGE_NAME = "RoleInfo";
@@ -73,16 +80,23 @@ namespace UI.RoleInfo
             m_txtVersion = (GTextField)comp.GetChild("txtVersion");
             m_btnHelp = (GButton)comp.GetChild("btnHelp");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_leagueName = (GTextField)comp.GetChild("leagueName");
             m_comHead = (GComponent)comp.GetChild("comHead");
-            m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_txtExp = (GTextField)comp.GetChild("txtExp");
+            m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
             m_loaChangeName = (GLoader)comp.GetChild("loaChangeName");
             m_txtSlogan = (GTextInput)comp.GetChild("txtSlogan");
             m_grpHead = (GGroup)comp.GetChild("grpHead");
-            m_btnFieldGuide = (GButton)comp.GetChild("btnFieldGuide");
-            m_list = (GList)comp.GetChild("list");
+            m_btnSuitGuide = (UI_Button2)UI_Button2.Create(comp.GetChild("btnSuitGuide"));
+            m_btnCardGuide = (UI_Button2)UI_Button2.Create(comp.GetChild("btnCardGuide"));
+            m_btnTaskArchieveGuide = (UI_Button2)UI_Button2.Create(comp.GetChild("btnTaskArchieveGuide"));
+            m_badgeList = (GList)comp.GetChild("badgeList");
+            m_center = (GGroup)comp.GetChild("center");
+            m_photoList = (GList)comp.GetChild("photoList");
             m_btnSkill = (GButton)comp.GetChild("btnSkill");
+            m_txtRoleID = (GTextField)comp.GetChild("txtRoleID");
+            m_btnCopy = (GButton)comp.GetChild("btnCopy");
             m_btnSetting = (GButton)comp.GetChild("btnSetting");
         }
         public void Dispose(bool disposeTarget = false)
@@ -91,16 +105,26 @@ namespace UI.RoleInfo
             m_txtVersion = null;
             m_btnHelp = null;
             m_btnBack = null;
+            m_leagueName = null;
             m_comHead = null;
-            m_txtLvl = null;
             m_txtExp = null;
+            m_txtLvl = null;
             m_txtRoleName = null;
             m_loaChangeName = null;
             m_txtSlogan = null;
             m_grpHead = null;
-            m_btnFieldGuide = null;
-            m_list = null;
+            m_btnSuitGuide.Dispose();
+            m_btnSuitGuide = null;
+            m_btnCardGuide.Dispose();
+            m_btnCardGuide = null;
+            m_btnTaskArchieveGuide.Dispose();
+            m_btnTaskArchieveGuide = null;
+            m_badgeList = null;
+            m_center = null;
+            m_photoList = null;
             m_btnSkill = null;
+            m_txtRoleID = null;
+            m_btnCopy = null;
             m_btnSetting = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI_old.cs

@@ -0,0 +1,114 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_RoleInfoUI_old
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GTextField m_txtVersion;
+        public GButton m_btnHelp;
+        public GButton m_btnBack;
+        public GComponent m_comHead;
+        public GTextField m_txtLvl;
+        public GTextField m_txtExp;
+        public GTextField m_txtRoleName;
+        public GLoader m_loaChangeName;
+        public GTextInput m_txtSlogan;
+        public GGroup m_grpHead;
+        public UI_Button2 m_btnFieldGuide;
+        public GList m_list;
+        public GButton m_btnSkill;
+        public GButton m_btnSetting;
+        public const string URL = "ui://374k3dwvp4yn9fw1";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "RoleInfoUI_old";
+        private static UI_RoleInfoUI_old _proxy;
+
+        public static UI_RoleInfoUI_old Create(GObject gObject = null)
+        {
+            var ui = new UI_RoleInfoUI_old();
+            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_RoleInfoUI_old Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_RoleInfoUI_old();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_txtVersion = (GTextField)comp.GetChild("txtVersion");
+            m_btnHelp = (GButton)comp.GetChild("btnHelp");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_comHead = (GComponent)comp.GetChild("comHead");
+            m_txtLvl = (GTextField)comp.GetChild("txtLvl");
+            m_txtExp = (GTextField)comp.GetChild("txtExp");
+            m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
+            m_loaChangeName = (GLoader)comp.GetChild("loaChangeName");
+            m_txtSlogan = (GTextInput)comp.GetChild("txtSlogan");
+            m_grpHead = (GGroup)comp.GetChild("grpHead");
+            m_btnFieldGuide = (UI_Button2)UI_Button2.Create(comp.GetChild("btnFieldGuide"));
+            m_list = (GList)comp.GetChild("list");
+            m_btnSkill = (GButton)comp.GetChild("btnSkill");
+            m_btnSetting = (GButton)comp.GetChild("btnSetting");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_txtVersion = null;
+            m_btnHelp = null;
+            m_btnBack = null;
+            m_comHead = null;
+            m_txtLvl = null;
+            m_txtExp = null;
+            m_txtRoleName = null;
+            m_loaChangeName = null;
+            m_txtSlogan = null;
+            m_grpHead = null;
+            m_btnFieldGuide.Dispose();
+            m_btnFieldGuide = null;
+            m_list = null;
+            m_btnSkill = null;
+            m_btnSetting = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI_old.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -436,6 +436,7 @@ namespace GFGGame
 
         private void OnClickBtnSave()
         {
+            SceneController.bgTempRes = ResPathUtil.GetSceneBgPath(ItemCfgArray.Instance.GetCfg(MyDressUpHelper.dressUpObj.bgId).res);
             CustomSuitDataManager.SaveCurrentSuit(_ui.m_comboBox.selectedIndex);
         }
 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs

@@ -87,7 +87,7 @@ namespace GFGGame
             // }
 
             _ui.m_txtSlogan.text = _roleDetailInfo.slogan;
-            _ui.m_btnFieldGuide.title = string.Format("套装收集度：{0}", _roleDetailInfo.SuitCollectPer);
+            //_ui.m_btnFieldGuide.title = string.Format("套装收集度：{0}", _roleDetailInfo.SuitCollectPer);
             _ui.m_list.numItems = _roleDetailInfo.showPhotoList.Count;
         }
 
@@ -98,13 +98,20 @@ namespace GFGGame
             UI_ListPhotoItem item = UI_ListPhotoItem.Proxy(obj);
             item.target.data = index;
 
-            item.m_imgNone.visible = poemPhotoData == null;
-            item.m_grpLock.visible = false;
+            if (poemPhotoData != null)
+            {
+                item.m_type.SetSelectedIndex(0);
+            }
+            else
+            {
+                item.m_type.SetSelectedIndex(1);
+            }
+
+
             if (RoleInfoManager.GetPosType(index) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold)
             || RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
             {
                 item.m_comPhoto.m_loaPhoto.texture = null;
-                item.m_imgNone.visible = true;
                 return;
             }
 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -3,6 +3,7 @@ using FairyGUI;
 using UI.CommonGame;
 using UI.RoleInfo;
 using UnityEngine;
+using UI_Button2 = UI.RoleInfo.UI_Button2;
 
 namespace GFGGame
 {
@@ -37,14 +38,18 @@ namespace GFGGame
             _ui.m_loaChangeName.onClick.Add(OnClickLoaChangeName);
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-            _ui.m_btnFieldGuide.onClick.Add(OnBtnFieldGuideClick);
+            _ui.m_btnSuitGuide.target.onClick.Add(OnBtnFieldGuideClick);
+            _ui.m_btnCardGuide.target.onClick.Add(OnBtnFieldGuideClick);
+            _ui.m_btnTaskArchieveGuide.target.onClick.Add(OnBtnTaskArchieveClick);
+
             _ui.m_btnSkill.onClick.Add(OnBtnSkillClick);
             _ui.m_btnSetting.onClick.Add(OnBtnSettingClick);
-            _ui.m_comHead.GetChild("comHead").asCom.onClick.Add(OnComHeadClick);
+            _ui.m_btnCopy.onClick.Add(OnBtnCopyClick);
+            _ui.m_comHead.onClick.Add(OnComHeadClick);
 
-            _ui.m_list.itemRenderer = RenderListItem;
-            _ui.m_list.onClickItem.Add(OnListItemClick);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
+            _ui.m_photoList.itemRenderer = RenderListItem;
+            _ui.m_photoList.onClickItem.Add(OnListItemClick);
+            //_ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
 
         }
 
@@ -72,10 +77,12 @@ namespace GFGGame
             }
 
             _ui.m_txtSlogan.text = RoleDataManager.slogan;
-            _ui.m_btnFieldGuide.title = string.Format("套装收集度：{0}%", RoleInfoManager.Instance.GetSuitGuideProgress());
+            //_ui.m_btnFieldGuide.title = string.Format("套装收集度：{0}%", RoleInfoManager.Instance.GetSuitGuideProgress());
             UpdateHead();
             UpdateList();
             UpdateRedDot();
+            UpdateCollectProgress();
+            UpdateInfo();
         }
 
         protected override void OnHide()
@@ -94,6 +101,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
             EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateList);
         }
+
         private void UpdateRoleName()
         {
             _ui.m_txtRoleName.text = RoleDataManager.roleName;
@@ -103,10 +111,12 @@ namespace GFGGame
         {
             RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId);
         }
+
         private void UpdateList()
         {
-            _ui.m_list.numItems = RoleDataManager.photoDatas.Count;
+            _ui.m_photoList.numItems = RoleDataManager.photoDatas.Count;
         }
+
         private void RenderListItem(int index, GObject obj)
         {
             long pictureId = RoleDataManager.photoDatas[index];
@@ -114,18 +124,25 @@ namespace GFGGame
             UI_ListPhotoItem item = UI_ListPhotoItem.Proxy(obj);
             item.target.data = index;
 
-            item.m_imgNone.visible = poemPhotoData == null;
-            item.m_grpLock.visible = false;
+            if(poemPhotoData == null)
+            {
+                item.m_type.SetSelectedIndex(0);
+            }
+            else
+            {
+                item.m_type.SetSelectedIndex(1);
+            }
+
             if (RoleInfoManager.GetPosType(index) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold)
             || RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
             {
+                item.m_type.SetSelectedIndex(2);
                 item.m_txtLock.text = RoleInfoManager.GetSuitPosItems()[index];
-                item.m_grpLock.visible = true;
                 item.m_comPhoto.m_loaPhoto.texture = null;
-                item.m_imgNone.visible = false;
                 RoleDataManager.photoDatas[index] = 0;
                 return;
             }
+
             item.m_comPhoto.m_loaPhoto.texture = poemPhotoData == null ? null : poemPhotoData.Ntexture;
             UI_ListPhotoItem.ProxyEnd();
         }
@@ -164,17 +181,30 @@ namespace GFGGame
         {
             ViewManager.Show<FieldGuideView>();
         }
+
+        private void OnBtnTaskArchieveClick()
+        {
+            ViewManager.Show<TaskAchieveView>();
+        }
+
         private void OnBtnSkillClick()
         {
             ViewManager.Show<PersonalSkillView>();
         }
+
         private void OnBtnSettingClick()
         {
             ViewManager.Show<SettingView>();
         }
+
+        private void OnBtnCopyClick()
+        {
+            GUIUtility.systemCopyBuffer = _ui.m_txtRoleID.text;
+            PromptController.Instance.ShowFloatTextPrompt("已复制ID");
+        }
+
         private void OnComHeadClick()
         {
-            GUIUtility.systemCopyBuffer = RoleDataManager.roleName;
             ViewManager.Show<ChangeHeadView>();
         }
 
@@ -182,5 +212,34 @@ namespace GFGGame
         {
             RedDotController.Instance.SetComRedDot(_ui.m_comHead, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", -30, 40);
         }
+
+        private void UpdateCollectProgress()
+        {
+            UI_Button2 button2 = UI_Button2.Proxy(_ui.m_btnSuitGuide.target);
+            // 套装
+            float progress = RoleInfoManager.Instance.GetSuitGuideProgress();
+            button2.m_rate.text = progress.ToString();
+            button2.m_progressBar.fillAmount = progress / 100;
+
+            // 词牌
+            button2 = UI_Button2.Proxy(_ui.m_btnCardGuide.target);
+            progress = RoleInfoManager.Instance.GetCardGuideProgress();
+            button2.m_rate.text = progress.ToString();
+            button2.m_progressBar.fillAmount = progress / 100;
+
+            // 成就
+            button2 = UI_Button2.Proxy(_ui.m_btnTaskArchieveGuide.target);
+            progress = RoleInfoManager.Instance.GetTaskAchieveProgress();
+            button2.m_rate.text = progress.ToString();
+            button2.m_progressBar.fillAmount = progress / 100;
+
+            UI_Button2.ProxyEnd();
+        }
+
+        private void UpdateInfo()
+        {
+            _ui.m_leagueName.text = RoleInfoManager.Instance.GetLeagueName();
+            _ui.m_txtRoleID.text = RoleInfoManager.Instance.GetRoleID().ToString();
+        }
     }
 }

GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_2!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: e3ab9387a69af004592c30b8aaab78fe
+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: 

GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_2.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: d007e0b8f15017b4786e5f9e60e7a813
+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: 

GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_3!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 7a8dc37d45ce04a47aae4c77421cf656
+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: 

GameClient/Assets/ResIn/UI/RoleInfo/RoleInfo_atlas0_3.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 20636b0acf606114a891a60b9e1fdbf8
+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: