Merge remote-tracking branch 'origin/master' into ios

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

@@ -42,6 +42,33 @@ namespace GFGGame
             }
         }
 
+        // 佩戴徽章列表
+        private static List<int> _badgeDatas = new List<int>();
+        public static List<int> badgeDatas
+        {
+            get
+            {
+                return _badgeDatas;
+            }
+            set
+            {
+                _badgeDatas = value;
+            }
+        }
+
+        private static int _mainBgID;
+        public static int mainBgID
+        {
+            get
+            {
+                return _mainBgID;
+            }
+            set
+            {
+                _mainBgID = value;
+            }
+        }
+
         public static int power
         {
             get
@@ -298,7 +325,11 @@ namespace GFGGame
         {
             ViewManager.Show<RoleLvUpView>(oldLvValue);
             Timers.inst.Remove(CheckUpLv);
+        }
 
+        public static bool HaveBadge(int id)
+        {
+            return ItemDataManager.GetItemNum(id) > 0;
         }
     }
 }

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

@@ -84,7 +84,6 @@ namespace GFGGame
             }
         }
 
-
         public void AddNew(int itemId)
         {
             int subType = ItemDataManager.GetItemSubType(itemId);
@@ -97,6 +96,7 @@ namespace GFGGame
                 if (_newHeadBorderDatas.IndexOf(itemId) < 0) _newHeadBorderDatas.Add(itemId);
             }
         }
+
         public void RemoveNew(int itemId)
         {
             ItemCfg cfg = ItemCfgArray.Instance.GetCfg(itemId);
@@ -109,10 +109,12 @@ namespace GFGGame
                 if (_newHeadBorderDatas.IndexOf(itemId) >= 0) _newHeadBorderDatas.Remove(itemId);
             }
         }
+
         public bool isNewHead(int itemId)
         {
             return _newHeadDatas.IndexOf(itemId) >= 0;
         }
+
         public bool isNewHeadBorder(int itemId)
         {
             return _newHeadBorderDatas.IndexOf(itemId) >= 0;
@@ -208,6 +210,7 @@ namespace GFGGame
             UI_ComHeadWithLv.ProxyEnd();
 
         }
+
         public void UpdateHeadWithLv1(GComponent component, int headId, int roleBorderId, int lv)
         {
             UI_ComHeadWithLv1 comHeadWithLv = UI_ComHeadWithLv1.Proxy(component);
@@ -221,6 +224,7 @@ namespace GFGGame
             UI_ComHeadWithLv1.ProxyEnd();
 
         }
+
         public void UpdateHead(GComponent component, int headId, int roleBorderId)
         {
             ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(headId == 0 ? ConstItemID.HEADID : headId);
@@ -230,8 +234,8 @@ namespace GFGGame
             comHead.m_comHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
             comHead.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(headBorderCfg.res);
             UI_ComHead3.ProxyEnd();
-
         }
+
         public void UpdateArenaNpcHead(GComponent component, string res)
         {
             UI_ComHead comHead = UI_ComHead.Proxy(component);
@@ -245,6 +249,7 @@ namespace GFGGame
             }
             UI_ComHead.ProxyEnd();
         }
+
         public void UpdateNpcHead(GComponent component, string res)
         {
             UI_ComHead comHead = UI_ComHead.Proxy(component);

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_BadgeChooseUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnback;
+        public GList m_list;
+        public const string URL = "ui://374k3dwvl2zm9fxr";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "BadgeChooseUI";
+        private static UI_BadgeChooseUI _proxy;
+
+        public static UI_BadgeChooseUI Create(GObject gObject = null)
+        {
+            var ui = new UI_BadgeChooseUI();
+            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_BadgeChooseUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BadgeChooseUI();
+            }
+            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_btnback = (GButton)comp.GetChild("btnback");
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnback = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RoleInfo
+{
+    public partial class UI_BadgeItem
+    {
+        public GButton target;
+        public Controller m_type;
+        public GLoader m_iconImg;
+        public GTextField m_name;
+        public const string URL = "ui://374k3dwvl2zm9fxt";
+        public const string PACKAGE_NAME = "RoleInfo";
+        public const string RES_NAME = "BadgeItem";
+        private static UI_BadgeItem _proxy;
+
+        public static UI_BadgeItem Create(GObject gObject = null)
+        {
+            var ui = new UI_BadgeItem();
+            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_BadgeItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BadgeItem();
+            }
+            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_iconImg = (GLoader)comp.GetChild("iconImg");
+            m_name = (GTextField)comp.GetChild("name");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_type = null;
+            m_iconImg = null;
+            m_name = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -8,6 +8,7 @@ namespace UI.RoleInfo
     {
         public GButton target;
         public Controller m_type;
+        public GLoader m_iconImg;
         public const string URL = "ui://374k3dwvp4yn9fwr";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ButtonBadge";
@@ -56,10 +57,12 @@ namespace UI.RoleInfo
         private void Init(GComponent comp)
         {
             m_type = comp.GetController("type");
+            m_iconImg = (GLoader)comp.GetChild("iconImg");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_type = null;
+            m_iconImg = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -14,6 +14,8 @@ namespace UI.RoleInfo
         public GButton m_btnSure;
         public GTextField m_txtNeed;
         public GLoader m_loaIcon;
+        public GButton m_btnRandom;
+        public GButton m_btnClose;
         public const string URL = "ui://374k3dwvnjmnfz";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ChangeNameUI";
@@ -68,6 +70,8 @@ namespace UI.RoleInfo
             m_btnSure = (GButton)comp.GetChild("btnSure");
             m_txtNeed = (GTextField)comp.GetChild("txtNeed");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_btnRandom = (GButton)comp.GetChild("btnRandom");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,6 +82,8 @@ namespace UI.RoleInfo
             m_btnSure = null;
             m_txtNeed = null;
             m_loaIcon = null;
+            m_btnRandom = null;
+            m_btnClose = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,6 +7,7 @@ namespace UI.RoleInfo
     public partial class UI_RoleInfoUI
     {
         public GComponent target;
+        public Controller m_type;
         public GLoader m_loaBg;
         public GTextField m_txtVersion;
         public GButton m_btnHelp;
@@ -18,6 +19,7 @@ namespace UI.RoleInfo
         public GTextField m_txtRoleName;
         public GLoader m_loaChangeName;
         public GTextInput m_txtSlogan;
+        public GTextField m_txtSlogan_2;
         public GGroup m_grpHead;
         public UI_Button2 m_btnSuitGuide;
         public UI_Button2 m_btnCardGuide;
@@ -76,6 +78,7 @@ namespace UI.RoleInfo
 
         private void Init(GComponent comp)
         {
+            m_type = comp.GetController("type");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_txtVersion = (GTextField)comp.GetChild("txtVersion");
             m_btnHelp = (GButton)comp.GetChild("btnHelp");
@@ -87,6 +90,7 @@ namespace UI.RoleInfo
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
             m_loaChangeName = (GLoader)comp.GetChild("loaChangeName");
             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"));
@@ -101,6 +105,7 @@ namespace UI.RoleInfo
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_type = null;
             m_loaBg = null;
             m_txtVersion = null;
             m_btnHelp = null;
@@ -112,6 +117,7 @@ namespace UI.RoleInfo
             m_txtRoleName = null;
             m_loaChangeName = null;
             m_txtSlogan = null;
+            m_txtSlogan_2 = null;
             m_grpHead = null;
             m_btnSuitGuide.Dispose();
             m_btnSuitGuide = null;

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs

@@ -176,7 +176,7 @@ namespace GFGGame
         {
             int id = (int)(eventContext.data as GObject).data;
 
-            object[] goBackDatas = ViewManager.GetGoBackDatas(typeof(CardGuideView).Name);
+            object[] goBackDatas = ViewManager.GetGoBackDatas(typeof(DressUpGuideView).Name);
             object[] sourceDatas = new object[] { id, goBackDatas, 1 };
             GoodsItemTipsController.ShowItemTips(id, sourceDatas, DressUpMenuItemDataManager.CheckHasItem(id));
         }

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

@@ -0,0 +1,140 @@
+using System.Collections;
+using UnityEngine;
+using UI.RoleInfo;
+using FairyGUI;
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class BadgeChooseView : BaseWindow
+    {
+        private UI_BadgeChooseUI _ui;
+        private List<ItemCfg> _badgeList;
+        private int selectedID;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_RoleInfoUI.PACKAGE_NAME;
+            _ui = UI_BadgeChooseUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            isReturnView = true;
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
+            _ui.m_btnback.onClick.Add(Hide);
+            _ui.m_list.itemRenderer = OnRenderItem;
+
+            _badgeList = ItemCfgArray.Instance.GetCfgsByitemType(ConstItemType.BADGE);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            selectedID = (viewData == null ? -1 : (int)viewData);
+            _ui.m_list.numItems = _badgeList.Count;
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void OnRenderItem(int index, GObject gObject)
+        {
+            gObject.data = _badgeList[index].id;
+
+            UI_BadgeItem badgeItem = UI_BadgeItem.Proxy(gObject);
+            badgeItem.m_name.text = _badgeList[index].name;
+            //badgeItem.m_iconImg.url = ResPathUtil.GetIconPath(_badgeList[index]);
+            badgeItem.m_iconImg.url = "ui://RoleInfo/linshj1_l";
+
+            if (RoleDataManager.HaveBadge(_badgeList[index].id))
+            {
+                // 显示 卸下
+                if (_badgeList[index].id == selectedID)
+                {
+                    badgeItem.m_type.SetSelectedIndex(0);
+                    gObject.onClick.Set(RemoveBadge);
+                }
+                // 显示 已选中
+                else if(RoleDataManager.badgeDatas.Contains(_badgeList[index].id))
+                {
+                    badgeItem.m_type.SetSelectedIndex(1);
+                    gObject.onClick.Set(()=>
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("该徽章已在展示中");
+                    });
+                }
+                else
+                {
+                    badgeItem.m_type.SetSelectedIndex(2);
+                    gObject.onClick.Set(SetBadge);
+                }
+            }
+            else
+            {
+                badgeItem.m_type.SetSelectedIndex(3);
+                gObject.onClick.Set(OnClickUnHaveItem);
+            }
+
+            UI_BadgeItem.ProxyEnd();
+        }
+
+        private void RemoveBadge()
+        {
+            RoleDataManager.badgeDatas.Remove(selectedID);
+
+            Hide();
+        }
+
+        private void SetBadge(EventContext eventContext)
+        {
+            int id = (int)(eventContext.sender as GObject).data;
+
+            // 点击空位进来的
+            if(selectedID == -1)
+            {
+                RoleDataManager.badgeDatas.Add(id);
+            }
+            else
+            {
+                int index = RoleDataManager.badgeDatas.FindIndex(x => x.Equals(selectedID));
+                RoleDataManager.badgeDatas[index] = id;
+            }
+
+            Hide();
+        }
+
+        private void OnClickUnHaveItem(EventContext eventContext)
+        {
+            int id = (int)(eventContext.sender as GObject).data;
+
+            object[] goBackDatas = ViewManager.GetGoBackDatas(typeof(BadgeChooseView).Name);
+            object[] sourceDatas = new object[] { id, goBackDatas, 1 };
+            GoodsItemTipsController.ShowItemTips(id, sourceDatas, false);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/BadgeChooseView.cs.meta

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

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

@@ -38,7 +38,9 @@ namespace GFGGame
             this.modal = true;
 
             _ui.m_btnSure.onClick.Add(OnClickBtnSureAsync);
-            // _ui.m_btnDice.onClick.Add(RandomRoleName);
+            _ui.m_btnRandom.onClick.Add(RandomRoleName);
+            _ui.m_btnClose.onClick.Add(Hide);
+
             AddEffect();
         }
 
@@ -50,9 +52,19 @@ namespace GFGGame
             _isNewPlayer = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) == 1;
             _ui.m_txtNeed.visible = !_isNewPlayer;
             _ui.m_loaIcon.visible = !_isNewPlayer;
+
+            long haveNum = ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
+            long needNum = GlobalCfgArray.globalCfg.changeNameCostArr[1];
             if (!_isNewPlayer)
             {
-                _ui.m_txtNeed.text = string.Format("改名卡：{0}/{1}", ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.changeNameCostArr[0]), GlobalCfgArray.globalCfg.changeNameCostArr[1]);
+                if (haveNum < needNum)
+                {
+                    _ui.m_txtNeed.text = string.Format("改名卡：[color=#E26A21]{0}[color]/{1}", haveNum, needNum);
+                }
+                else
+                {
+                    _ui.m_txtNeed.text = string.Format("改名卡：{0}/{1}", haveNum, needNum);
+                }
                 ItemCfg cfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
                 _ui.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
             }

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

@@ -7,7 +7,7 @@ namespace GFGGame
 {
     public class OtherRoleInfoView : BaseWindow
     {
-        private UI_OtherRoleInfoUI _ui;
+        private UI_RoleInfoUI _ui;
         private OtherRoleInfoData _roleInfo;
         private OtherRoleInfoDetailData _roleDetailInfo;
 
@@ -24,17 +24,17 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_OtherRoleInfoUI.PACKAGE_NAME;
-            _ui = UI_OtherRoleInfoUI.Create();
+            packageName = UI_RoleInfoUI.PACKAGE_NAME;
+            _ui = UI_RoleInfoUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
             isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
 
-            _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_photoList.itemRenderer = RenderListItem;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
+            _ui.m_type.SetSelectedIndex(1);
         }
 
         protected override void AddEventListener()
@@ -58,6 +58,8 @@ namespace GFGGame
             {
                 Timers.inst.StartCoroutine(PictureStorageHelper.Download(_roleDetailInfo.showPhotoList));
             }
+
+            UpdateInfo();
         }
 
         protected override void OnHide()
@@ -88,7 +90,7 @@ namespace GFGGame
 
             _ui.m_txtSlogan.text = _roleDetailInfo.slogan;
             //_ui.m_btnFieldGuide.title = string.Format("套装收集度：{0}", _roleDetailInfo.SuitCollectPer);
-            _ui.m_list.numItems = _roleDetailInfo.showPhotoList.Count;
+            _ui.m_photoList.numItems = _roleDetailInfo.showPhotoList.Count;
         }
 
 
@@ -119,5 +121,11 @@ namespace GFGGame
             UI_ListPhotoItem.ProxyEnd();
         }
 
+        private void UpdateInfo()
+        {
+            //_ui.m_leagueName.text = RoleInfoManager.Instance.GetLeagueName();
+            _ui.m_txtRoleID.text = _roleInfo.roleId.ToString();
+        }
+
     }
 }

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

@@ -47,10 +47,9 @@ namespace GFGGame
             _ui.m_btnCopy.onClick.Add(OnBtnCopyClick);
             _ui.m_comHead.onClick.Add(OnComHeadClick);
 
-            _ui.m_photoList.itemRenderer = RenderListItem;
-            _ui.m_photoList.onClickItem.Add(OnListItemClick);
-            //_ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
-
+            _ui.m_photoList.itemRenderer = RenderPhotoListItem;
+            _ui.m_photoList.onClickItem.Add(OnPhotoListItemClick);
+            _ui.m_badgeList.itemRenderer = OnRenderBadgeListItem;
         }
 
         protected override void AddEventListener()
@@ -59,8 +58,9 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.CHANGE_ROLE_NAME, UpdateRoleName);
             EventAgent.AddEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-            EventAgent.AddEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateList);
+            EventAgent.AddEventListener(ConstMessage.DOWNLOAD_FINISH, UpdatePhotoList);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -77,29 +77,32 @@ namespace GFGGame
             }
 
             _ui.m_txtSlogan.text = RoleDataManager.slogan;
-            //_ui.m_btnFieldGuide.title = string.Format("套装收集度：{0}%", RoleInfoManager.Instance.GetSuitGuideProgress());
             UpdateHead();
-            UpdateList();
+            UpdatePhotoList();
             UpdateRedDot();
             UpdateCollectProgress();
             UpdateInfo();
+
+            _ui.m_badgeList.numItems = _ui.m_badgeList.numItems;
         }
 
         protected override void OnHide()
         {
             base.OnHide();
         }
+
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(RoleInfoView).FullName);
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_NAME, UpdateRoleName);
             EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-            EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH, UpdateList);
+            EventAgent.RemoveEventListener(ConstMessage.DOWNLOAD_FINISH, UpdatePhotoList);
         }
 
         private void UpdateRoleName()
@@ -112,12 +115,12 @@ namespace GFGGame
             RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId);
         }
 
-        private void UpdateList()
+        private void UpdatePhotoList()
         {
             _ui.m_photoList.numItems = RoleDataManager.photoDatas.Count;
         }
 
-        private void RenderListItem(int index, GObject obj)
+        private void RenderPhotoListItem(int index, GObject obj)
         {
             long pictureId = RoleDataManager.photoDatas[index];
             PoemPhotoData poemPhotoData = pictureId == 0 ? null : PoemPhotoDataManager.Instance.GetPersonalPhotoDataById(pictureId);
@@ -147,7 +150,7 @@ namespace GFGGame
             UI_ListPhotoItem.ProxyEnd();
         }
 
-        private void OnListItemClick(EventContext context)
+        private void OnPhotoListItemClick(EventContext context)
         {
             GObject obj = context.data as GObject;
             int index = (int)obj.data;
@@ -167,6 +170,46 @@ namespace GFGGame
             ViewManager.Show<PersonalPhotoView>(index);
         }
 
+        private void OnRenderBadgeListItem(int index, GObject gObject)
+        {
+            gObject.data = -1;
+
+            UI_ButtonBadge buttonBadge = UI_ButtonBadge.Proxy(gObject);
+            if (index <= RoleDataManager.badgeDatas.Count)
+            {
+                buttonBadge.target.touchable = true;
+                // 显示 + 号
+                if(index == RoleDataManager.badgeDatas.Count)
+                {
+                    buttonBadge.m_type.SetSelectedIndex(2);
+                }
+                // 显示放置的徽章
+                else
+                {
+                    int badgeID = RoleDataManager.badgeDatas[index];
+                    gObject.data = badgeID;
+                    buttonBadge.m_type.SetSelectedIndex(1);
+                    // 加载徽章图片
+                    //buttonBadge.m_iconImg.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(badgeID));
+                    buttonBadge.m_iconImg.url = "ui://RoleInfo/linshj1";
+                }
+            }
+            else
+            {
+                buttonBadge.m_type.SetSelectedIndex(0);
+                buttonBadge.target.touchable = false;
+            }
+
+            buttonBadge.target.onClick.Add(OnBadgeBtnClick);
+            UI_ButtonBadge.ProxyEnd();
+        }
+
+        private void OnBadgeBtnClick(EventContext eventContext)
+        {
+            int id = (int)(eventContext.sender as GObject).data;
+            ViewManager.Show<BadgeChooseView>(id);
+        }
+
         private async void OnFocuseOut()
         {
             _ui.m_txtSlogan.text = await RoleInfoSProxy.ReqModifySlogan(_ui.m_txtSlogan.text);

GameClient/Assets/Game/HotUpdate/Views/Store/StoreGiftBagAddRebateView.cs

@@ -45,8 +45,10 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, UpDayRebateAndView);
+            EventAgent.AddEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT, UpdateView);
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -68,7 +70,28 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, UpDayRebateAndView);
+            EventAgent.RemoveEventListener(ConstMessage.CONTINUOUS_REBATE_GIFT, UpdateView);
+        }
+
+        //购买连续礼包之后，更新数据+更新界面
+        // ReSharper disable Unity.PerformanceAnalysis
+        private void UpDayRebateAndView(EventContext context)
+        {
+            ShopCfg shopCfg = context.data as ShopCfg;
+            var itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
+
+            if (itemCfg.itemType == ConstItemType.USEABLE &&
+                itemCfg.funType == ConstItemFuncType.CONTINUOUS_REWARD_GIFT)
+            {
+                int dayNum = EnduringGiftBoxDataManager.Instance.GetItemRebateDay(itemCfg.id);
+                int totalDayNum = dayNum + itemCfg.param2Arr[0];
+
+                EnduringGiftBoxDataManager.Instance.UpDayAllRebateItemDic(itemCfg.id, totalDayNum);
+                EnduringGiftBoxDataManager.Instance.AddDayRebateItemIds(itemCfg.id);
+            }
+
+            UpdateView();
         }
 
         private void UpdateView()

GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -229,7 +229,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn2.target, (RedDotDataManager.Instance.GetGiftBagRewardRed() || RedDotDataManager.Instance.GetGiftBagRebateRed()));
             if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_GIFT_BAG)
             {
-                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY).asCom, RedDotDataManager.Instance.GetGiftBagRewardRed());
+                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY).asCom, (RedDotDataManager.Instance.GetGiftBagRewardRed() || RedDotDataManager.Instance.GetGiftBagRebateRed()));
             }
         }
 

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: bee2cfa76e5f7b54ca68a6e5360c84c2
+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_4.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 937f509a032f8594ca405527bec7a40e
+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/ProjectSettings/ProjectSettings.asset

@@ -145,7 +145,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.9
+  bundleVersion: 2.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0