修改头像界面

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

@@ -212,10 +212,18 @@ namespace GFGGame
             ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(headId == 0 ? ConstItemID.HEADID : headId);
             ItemCfg headBorderCfg = ItemCfgArray.Instance.GetCfg(roleBorderId == 0 ? ConstItemID.HEADBORDERID : roleBorderId);
 
-            UI_ComHead3 comHead = UI_ComHead3.Proxy(component);
+            UI_ComHead comHead = UI_ComHead.Proxy(component);
+            if(headBorderCfg.res.Length == 0)
+            {
+                comHead.m_c2.selectedIndex = 0;
+            }
+            else
+            {
+                comHead.m_c2.selectedIndex = 1;
+                comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
+            }
             comHead.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
-            comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
-            UI_ComHead3.ProxyEnd();
+            UI_ComHead.ProxyEnd();
         }
 
         public void UpdateArenaNpcHead(GComponent component, string res)

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_Button18
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://eg2y0ldpm5qxtoo";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "Button18";
+        private static UI_Button18 _proxy;
+
+        public static UI_Button18 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button18();
+            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_Button18 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button18();
+            }
+            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_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1f704e7837a3dde47913dbe230c50587
+guid: 1e2eed6e60f1229438cdac6ac40b9d55
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.RoleInfo
 {
-    public partial class UI_Button2
+    public partial class UI_ButtonCollectProgress
     {
         public GButton target;
         public Controller m_type;
@@ -15,12 +15,12 @@ namespace UI.RoleInfo
         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 const string RES_NAME = "ButtonCollectProgress";
+        private static UI_ButtonCollectProgress _proxy;
 
-        public static UI_Button2 Create(GObject gObject = null)
+        public static UI_ButtonCollectProgress Create(GObject gObject = null)
         {
-            var ui = new UI_Button2();
+            var ui = new UI_ButtonCollectProgress();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -29,11 +29,11 @@ namespace UI.RoleInfo
             return ui;
         }
 
-        public static UI_Button2 Proxy(GObject gObject = null)
+        public static UI_ButtonCollectProgress Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Button2();
+                _proxy = new UI_ButtonCollectProgress();
             }
             var ui = _proxy;
             if(gObject == null)

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ButtonHeadChoose.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_ButtonHeadChoose
+    {
+        public GButton target;
+        public Controller m_color;
+        public const string URL = "ui://374k3dwvhiis9g0q";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "ButtonHeadChoose";
+        private static UI_ButtonHeadChoose _proxy;
+
+        public static UI_ButtonHeadChoose Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonHeadChoose();
+            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_ButtonHeadChoose Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonHeadChoose();
+            }
+            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_color = comp.GetController("color");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_color = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -10,12 +10,15 @@ namespace UI.RoleInfo
         public Controller m_c1;
         public GList m_list;
         public GList m_listBorder;
-        public GButton m_btnTab0;
-        public GButton m_btnTab1;
+        public UI_ButtonHeadChoose m_btnTab0;
+        public UI_ButtonHeadChoose m_btnTab1;
         public GComponent m_comHead;
         public GTextField m_txtName;
         public GTextField m_txtDesc;
         public GButton m_btnSure;
+        public GButton m_btnClose;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
         public const string URL = "ui://374k3dwvr9ri2";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ChangeHead";
@@ -66,24 +69,32 @@ namespace UI.RoleInfo
             m_c1 = comp.GetController("c1");
             m_list = (GList)comp.GetChild("list");
             m_listBorder = (GList)comp.GetChild("listBorder");
-            m_btnTab0 = (GButton)comp.GetChild("btnTab0");
-            m_btnTab1 = (GButton)comp.GetChild("btnTab1");
+            m_btnTab0 = (UI_ButtonHeadChoose)UI_ButtonHeadChoose.Create(comp.GetChild("btnTab0"));
+            m_btnTab1 = (UI_ButtonHeadChoose)UI_ButtonHeadChoose.Create(comp.GetChild("btnTab1"));
             m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_btnSure = (GButton)comp.GetChild("btnSure");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_list = null;
             m_listBorder = null;
+            m_btnTab0.Dispose();
             m_btnTab0 = null;
+            m_btnTab1.Dispose();
             m_btnTab1 = null;
             m_comHead = null;
             m_txtName = null;
             m_txtDesc = null;
             m_btnSure = null;
+            m_btnClose = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = 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 UI_Button2 m_btnFieldGuide;
+        public UI_ButtonCollectProgress 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 = (UI_Button2)UI_Button2.Create(comp.GetChild("btnFieldGuide"));
+            m_btnFieldGuide = (UI_ButtonCollectProgress)UI_ButtonCollectProgress.Create(comp.GetChild("btnFieldGuide"));
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)

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

@@ -21,9 +21,9 @@ namespace UI.RoleInfo
         public GTextInput m_txtSlogan;
         public GTextField m_txtSlogan_2;
         public GGroup m_grpHead;
-        public UI_Button2 m_btnSuitGuide;
-        public UI_Button2 m_btnCardGuide;
-        public UI_Button2 m_btnTaskArchieveGuide;
+        public UI_ButtonCollectProgress m_btnSuitGuide;
+        public UI_ButtonCollectProgress m_btnCardGuide;
+        public UI_ButtonCollectProgress m_btnTaskArchieveGuide;
         public GList m_badgeList;
         public GGroup m_center;
         public GList m_photoList;
@@ -92,9 +92,9 @@ namespace UI.RoleInfo
             m_txtSlogan = (GTextInput)comp.GetChild("txtSlogan");
             m_txtSlogan_2 = (GTextField)comp.GetChild("txtSlogan");
             m_grpHead = (GGroup)comp.GetChild("grpHead");
-            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_btnSuitGuide = (UI_ButtonCollectProgress)UI_ButtonCollectProgress.Create(comp.GetChild("btnSuitGuide"));
+            m_btnCardGuide = (UI_ButtonCollectProgress)UI_ButtonCollectProgress.Create(comp.GetChild("btnCardGuide"));
+            m_btnTaskArchieveGuide = (UI_ButtonCollectProgress)UI_ButtonCollectProgress.Create(comp.GetChild("btnTaskArchieveGuide"));
             m_badgeList = (GList)comp.GetChild("badgeList");
             m_center = (GGroup)comp.GetChild("center");
             m_photoList = (GList)comp.GetChild("photoList");

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -914,7 +914,18 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(_ui.m_btnCiPai.target, RedDotDataManager.Instance.GetCardRed(), "", -10, 20);
 
             if (redPointUpdateFrame == 15)
-                RedDotController.Instance.SetComRedDot(_ui.m_btnZhaiXing.target, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy) || RedDotDataManager.Instance.GetLuckyBoxFreeTimes());
+            {
+                int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
+                Vector2 pos = new Vector2(-10, 20);
+                if (activityId > 0)
+                {
+                    pos = Vector2.zero;
+                }
+                RedDotController.Instance.SetComRedDot(_ui.m_btnZhaiXing.target,
+                    RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy) || RedDotDataManager.Instance.GetLuckyBoxFreeTimes(), "",
+                    (int)pos.x, (int)pos.y);
+
+            }
 
             // 阿福赠礼
             if (_ui.m_btnActivityAfuGift.target.visible)

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

@@ -14,9 +14,16 @@ namespace GFGGame
         private int _selectHeadId = 0;
         private int _selectHeadBorderId = 0;
         private bool showHeadBorderRedDot = false;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
 
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -33,6 +40,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.SetVirtual();
             _ui.m_list.itemRenderer = RenderListItem;
@@ -44,6 +52,9 @@ namespace GFGGame
 
             _ui.m_c1.onChanged.Add(OnTabChange);
             _ui.m_btnSure.onClick.Add(OnBtnSureClick);
+            _ui.m_btnClose.onClick.Add(Hide);
+
+            AddEffect();
         }
 
         protected override void OnShown()
@@ -84,6 +95,7 @@ namespace GFGGame
                 if (result)
                 {
                     OnTabChange();
+                    PromptController.Instance.ShowFloatTextPrompt("保存成功");
                 }
             }
             else
@@ -97,6 +109,7 @@ namespace GFGGame
                 if (result)
                 {
                     OnTabChange();
+                    PromptController.Instance.ShowFloatTextPrompt("保存成功");
                 }
             }
         }
@@ -222,7 +235,16 @@ namespace GFGGame
 
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnTab1, showHeadBorderRedDot, "", -33, 0);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTab1.target, showHeadBorderRedDot, "", -33, 0);
+        }
+
+        private void AddEffect()
+        {
+            //邊框左上角特效
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderLeftTop, "ui_Activity", "Com_window_L_up");
+
+            //邊框右下角特效
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderRightDowm, "ui_Activity", "Com_window_R_Down");
         }
     }
 }

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

@@ -3,7 +3,6 @@ using FairyGUI;
 using UI.CommonGame;
 using UI.RoleInfo;
 using UnityEngine;
-using UI_Button2 = UI.RoleInfo.UI_Button2;
 
 namespace GFGGame
 {
@@ -260,25 +259,25 @@ namespace GFGGame
 
         private void UpdateCollectProgress()
         {
-            UI_Button2 button2 = UI_Button2.Proxy(_ui.m_btnSuitGuide.target);
+            UI_ButtonCollectProgress button2 = UI_ButtonCollectProgress.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);
+            button2 = UI_ButtonCollectProgress.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);
+            button2 = UI_ButtonCollectProgress.Proxy(_ui.m_btnTaskArchieveGuide.target);
             progress = RoleDataManager.achievementTaskCollect;
             button2.m_rate.text = progress.ToString();
             button2.m_progressBar.fillAmount = progress / 100;
 
-            UI_Button2.ProxyEnd();
+            UI_ButtonCollectProgress.ProxyEnd();
         }
 
         private void UpdateInfo()