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

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -206,14 +206,15 @@ namespace GFGEditor
         private static void HandleItemAndSuitTags(ItemCfg itemCfg, Dictionary<SuitCfg, Dictionary<string, string>> suitTagsDic)
         {
             if (itemCfg.suitId <= 0)
-            {
                 return;
-            }
+
             var suitCfg = SuitCfgArray.Instance.GetCfg(itemCfg.suitId);
             if (suitCfg == null)
-            {
                 return;
-            }
+
+            if(DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemCfg.id))
+                return;
+
             if (itemCfg.itemType == ConstItemType.DRESS_UP)
             {
                 for (int i = 0; i < itemCfg.tagsArr.Length; i++)

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

@@ -10,10 +10,6 @@ namespace GFGGame
         //每日特惠每次登录没有打开过就给红点
         private bool _isOpenMeiRiTeHui = false;
         public bool IsOpenMeiRiTeHui => _isOpenMeiRiTeHui;
-        
-        //列表数据3--等级条件的数据
-        private List<LimitedTimeGiftBoxItemData> _ltgGbItemData3 = new List<LimitedTimeGiftBoxItemData>();
-        public List<LimitedTimeGiftBoxItemData> LtgGbItemData3 => _ltgGbItemData3;
 
         //圆形样式数据4--等级条件的数据 
         private List<LimitedTimeGiftBoxItemYxData> _ltgGbItemData4 = new List<LimitedTimeGiftBoxItemYxData>();
@@ -25,7 +21,6 @@ namespace GFGGame
 
         public void Clear()
         {
-            _ltgGbItemData3.Clear();
             _ltgGbItemData4.Clear();
             _ltgGbItemData5.Clear();
             _isOpenMeiRiTeHui = false;
@@ -37,71 +32,6 @@ namespace GFGGame
             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
         }
 
-        public void UpLtgGbItemData3()
-        {
-            _ltgGbItemData3.Clear();
-            foreach (ActivityInfo activityInfo in ActivityGlobalDataManager.Instance.GetActivityInfoByType(
-                         ActivityType.XSLB1))
-            {
-                if (activityInfo.EndTime >= TimeInfo.Instance.ServerNow())
-                {
-                    ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
-                    var paramsArr = activityOpenCfg.paramsArr;
-                    Array.Sort(paramsArr);
-                    foreach (var shopCfgId in paramsArr)
-                    {
-                        ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
-
-                        if (shopCfg == null)
-                        {
-                            Log.Error("shopCfg is null");
-                            continue;
-                        }
-
-                        LimitedTimeGiftBoxItemData ltgGbItemData =
-                            _ltgGbItemData3.FirstOrDefault(a => a.IndexType == shopCfg.menu2);
-                        if (ltgGbItemData != null)
-                        {
-                            var index = _ltgGbItemData3.IndexOf(ltgGbItemData);
-                            ltgGbItemData.EndTime = activityInfo.EndTime;
-                            if (ltgGbItemData.ShopCfgIds != null)
-                            {
-                                if (ltgGbItemData.ShopCfgIds.Count < 3)
-                                {
-                                    ltgGbItemData.ShopCfgIds.Add(shopCfgId);
-                                }
-                            }
-                            else
-                            {
-                                ltgGbItemData.ShopCfgIds = new List<int> { shopCfgId };
-                            }
-
-                            _ltgGbItemData3[index] = ltgGbItemData;
-                        }
-                        else
-                        {
-                            ltgGbItemData = new LimitedTimeGiftBoxItemData
-                            {
-                                IndexType = shopCfg.menu2,
-                                ShopCfgIds = new List<int> { shopCfgId },
-                                EndTime = activityInfo.EndTime
-                            };
-
-                            _ltgGbItemData3.Add(ltgGbItemData);
-                        }
-                    }
-                }
-            }
-
-            //排序
-            foreach (var item in _ltgGbItemData3)
-            {
-                item.ShopCfgIds = item.ShopCfgIds.OrderBy(id => id).ToList();
-            }
-
-            _ltgGbItemData3 = _ltgGbItemData3.OrderBy(a => a.IndexType).ToList();
-        }
-
         public void UpLtgGbItemData4()
         {
             _ltgGbItemData4.Clear();
@@ -175,34 +105,91 @@ namespace GFGGame
         }
 
         //1元礼包是否还可购买
-
         public bool SpecialOfferGiftBoxCanBuy()
         {
-            LimitedTimeGiftBoxDataManager.Instance.UpLtgGbItemData3();
-            if (SpecialOfferGiftBoxCanTypeBuy(ListUtil.NavigateType.None))
-                return true;
-            if (SpecialOfferGiftBoxCanTypeBuy(ListUtil.NavigateType.Next))
-                return true;
+            var activityInfoByTypeList =
+             ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB1);
+            var list = activityInfoByTypeList
+                .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
+            if(list.Count == 0)
+                return false;
+
+            bool isSoldOut = true;
+            foreach (var activityInfo in list)
+            {
+                ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
+                var paramsArr = activityOpenCfg.paramsArr;
+                foreach (var shopCfgId in paramsArr)
+                {
+                    var shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
+                    var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfgId);
+                    //只要有一个商品还能购买，就不是售罄
+                    if (remainBuyNum > 0)
+                    {
+                        isSoldOut = false;
+                        break;
+                    }
+                }
+            }
 
-            return false;
+            return !isSoldOut;
         }
 
-        public bool SpecialOfferGiftBoxCanTypeBuy(ListUtil.NavigateType type)
+        //获得特惠礼包展示的列表id
+        public List<int> TryShopCfg()
         {
-            var list = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData3;
-            list = list.Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
-            if (list.Count == 0)
-                return false;
+            int activityId = 0;
+            foreach (ActivityInfo activityInfo in ActivityGlobalDataManager.Instance.GetActivityInfoByType(
+                       ActivityType.XSLB1))
+            {
+                if (activityInfo.EndTime >= TimeInfo.Instance.ServerNow()) { 
+                    activityId = activityInfo.ActivityId;
+                    break;
+                }
+            }
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
+            List<int> shopCfgIds = new List<int>();
+            bool same = false;
+            int sellShowId = 0;
+            var paramsArr = activityOpenCfg.paramsArr;
+            var params2Arr = activityOpenCfg.params2Arr;
+            for (int j = 0; j < params2Arr.Length; j++)
+            {
+                for (int i = 0; i < paramsArr.Length; i++)
+                {
+                    if (params2Arr[j] == paramsArr[i])
+                    {
+                        var shopCfg = ShopCfgArray.Instance.GetCfg(paramsArr[i]);
+                        bool isSellOut = shopCfg.maxBuyNum > 0 &&
+                            shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id) <= 0;
+                        if (!isSellOut)
+                            sellShowId = paramsArr[i];
+                        break;
+                    }
+                }
+                if (sellShowId > 0)
+                    break;
+            }
+            if (sellShowId <= 0)
+                sellShowId = params2Arr[params2Arr.Length - 1];
 
-            var data = ListUtil.Navigate(list, type, 0, out int newIndex);
-            foreach (var shopCfgId in data.ShopCfgIds)
+            shopCfgIds.Add(sellShowId);
+            for (int i = 0; i < paramsArr.Length; i++)
             {
-                var shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
-                var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id);
-                if (remainBuyNum > 0)
-                    return true;
+                same = false;
+                for (int j = 0; j < params2Arr.Length; j++)
+                {
+                    if (params2Arr[j] == paramsArr[i])
+                    {
+                        same = true;
+                        break;
+                    }
+                }
+                if (!same)
+                    shopCfgIds.Add(paramsArr[i]);
             }
-            return false;
+            return shopCfgIds;
         }
+
     }
 }

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

@@ -12,6 +12,7 @@ namespace GFGGame
 
         public const int ONCE_TIME = 1;
         public const int TEN_TIME = 10;
+        public const int FIFTY_TIME = 50;
 
         public const float ANIMATION_TIME = 1.2f; //翻牌获得物品展示时间
 

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

@@ -69,13 +69,11 @@ namespace GFGGame
             }
         }
 
-        private static int _saveDressUpBgToMainBg = 0;
         public static int saveDressUpBgToMainBg
         {
             get
             {
-                //return GameGlobal.myNumericComponent.GetAsInt(NumericType.IsOpenChangeGearBg);
-                return _saveDressUpBgToMainBg;
+                return GameGlobal.myNumericComponent.GetAsInt(NumericType.IsOpenChangeGearBg);
             }
         }
 
@@ -379,8 +377,14 @@ namespace GFGGame
             float endTime = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
             if (endTime > TimeHelper.ServerNow() && saveDressUpBgToMainBg == 1)
             {
-                mainBgID = dressUpBgID;
+                SaveMainBgID(dressUpBgID);
             }
         }
+
+        public static void SaveMainBgID(int bgID)
+        {
+            mainBgID = bgID;
+            RoleInfoSProxy.ReqSaveMainBgID(bgID);
+        }
     }
 }

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

@@ -212,10 +212,24 @@ 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)
+            {
+                if(comHead.m_c2 != null)
+                {
+                    comHead.m_c2.selectedIndex = 0;
+                }            
+            }
+            else
+            {
+                if (comHead.m_c2 != null)
+                {
+                    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/Data/VO/OtherRoleInfoData.cs

@@ -23,7 +23,12 @@ namespace GFGGame
             }
         }//离线时间戳，单位毫秒，0表示在线
 
-
+        public string leagueName;
+        public List<int> itemList = new List<int>();
+        public int suitCollect;
+        public int cardCollect;
+        public int achievementTaskCollect;
+        public long roleExp;
     }
 
     public class OtherRoleInfoDetailData//其他玩家详细信息

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ClothingRewardItemUI.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingFoster
+{
+    public partial class UI_ClothingRewardItemUI
+    {
+        public GComponent target;
+        public GList m_listReward;
+        public const string URL = "ui://uicwtr5btvuw2r";
+        public const string PACKAGE_NAME = "ClothingFoster";
+        public const string RES_NAME = "ClothingRewardItemUI";
+        private static UI_ClothingRewardItemUI _proxy;
+
+        public static UI_ClothingRewardItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ClothingRewardItemUI();
+            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_ClothingRewardItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ClothingRewardItemUI();
+            }
+            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_listReward = (GList)comp.GetChild("listReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_listReward = 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/ClothingFoster/UI_ClothingRewardItemUI.cs.meta

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

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/CommonGame/UI_Button18.cs.meta

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

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

@@ -7,7 +7,8 @@ namespace UI.CommonGame
     public partial class UI_ComHeadWithLv2
     {
         public GComponent target;
-        public UI_ComHead2 m_comHead;
+        public UI_ComHead2 m_comHead2;
+        public UI_ComHead m_comHead;
         public UI_ComHeadLv1 m_comLv;
         public const string URL = "ui://eg2y0ldpo9ghtlp";
         public const string PACKAGE_NAME = "CommonGame";
@@ -56,11 +57,14 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comHead = (UI_ComHead2)UI_ComHead2.Create(comp.GetChild("comHead"));
+            m_comHead2 = (UI_ComHead2)UI_ComHead2.Create(comp.GetChild("comHead2"));
+            m_comHead = (UI_ComHead)UI_ComHead.Create(comp.GetChild("comHead"));
             m_comLv = (UI_ComHeadLv1)UI_ComHeadLv1.Create(comp.GetChild("comLv"));
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_comHead2.Dispose();
+            m_comHead2 = null;
             m_comHead.Dispose();
             m_comHead = null;
             m_comLv.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/EnduringGiftBox/UI_SpecialOfferGiftBoxUI.cs

@@ -10,7 +10,7 @@ namespace UI.EnduringGiftBox
         public GGraph m_holderBaby;
         public GGraph m_holderChiXuTx;
         public GTextField m_txtBoxResidueTime;
-        public GList m_list;
+        public GList m_listGift;
         public GComponent m_btnUp;
         public GComponent m_btnNext;
         public GComponent m_back;
@@ -66,7 +66,7 @@ namespace UI.EnduringGiftBox
             m_holderBaby = (GGraph)comp.GetChild("holderBaby");
             m_holderChiXuTx = (GGraph)comp.GetChild("holderChiXuTx");
             m_txtBoxResidueTime = (GTextField)comp.GetChild("txtBoxResidueTime");
-            m_list = (GList)comp.GetChild("list");
+            m_listGift = (GList)comp.GetChild("listGift");
             m_btnUp = (GComponent)comp.GetChild("btnUp");
             m_btnNext = (GComponent)comp.GetChild("btnNext");
             m_back = (GComponent)comp.GetChild("back");
@@ -78,7 +78,7 @@ namespace UI.EnduringGiftBox
             m_holderBaby = null;
             m_holderChiXuTx = null;
             m_txtBoxResidueTime = null;
-            m_list = null;
+            m_listGift = null;
             m_btnUp = null;
             m_btnNext = null;
             m_back = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_InstanceZonesUI.cs

@@ -8,6 +8,8 @@ namespace UI.InstanceZones
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GGraph m_bg_eff;
+        public GGraph m_fish_eff;
         public GComponent m_valueBar;
         public GButton m_btnBack;
         public UI_ButtonModle7 m_btn1;
@@ -16,6 +18,8 @@ namespace UI.InstanceZones
         public UI_ButtonModle9 m_btnPoem;
         public UI_ButtonModle9 m_btnField;
         public UI_ButtonModle9 m_btnArena;
+        public GGraph m_eff;
+        public Transition m_t0;
         public const string URL = "ui://ez8qotvcyeocfv0";
         public const string PACKAGE_NAME = "InstanceZones";
         public const string RES_NAME = "InstanceZonesUI";
@@ -64,6 +68,8 @@ namespace UI.InstanceZones
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_bg_eff = (GGraph)comp.GetChild("bg_eff");
+            m_fish_eff = (GGraph)comp.GetChild("fish_eff");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
@@ -72,10 +78,14 @@ namespace UI.InstanceZones
             m_btnPoem = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnPoem"));
             m_btnField = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnField"));
             m_btnArena = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnArena"));
+            m_eff = (GGraph)comp.GetChild("eff");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_bg_eff = null;
+            m_fish_eff = null;
             m_valueBar = null;
             m_btnBack = null;
             m_btn1.Dispose();
@@ -90,6 +100,8 @@ namespace UI.InstanceZones
             m_btnField = null;
             m_btnArena.Dispose();
             m_btnArena = null;
+            m_eff = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_comLuckBoxBtn.cs

@@ -7,10 +7,13 @@ namespace UI.LuckyBox
     public partial class UI_comLuckBoxBtn
     {
         public GComponent target;
+        public Controller m_btnNumberType;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
+        public UI_ComCost m_comCostFifty;
         public GButton m_btnBuyOne;
         public GButton m_btnBuyTen;
+        public GButton m_btnBuyFifty;
         public GTextField m_txtRemainTimes;
         public GImage m_imgSpecial;
         public GGraph m_holder;
@@ -65,10 +68,13 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
+            m_btnNumberType = comp.GetController("btnNumberType");
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
+            m_comCostFifty = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostFifty"));
             m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
             m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
+            m_btnBuyFifty = (GButton)comp.GetChild("btnBuyFifty");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
             m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_holder = (GGraph)comp.GetChild("holder");
@@ -79,12 +85,16 @@ namespace UI.LuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnNumberType = null;
             m_comCostOne.Dispose();
             m_comCostOne = null;
             m_comCostTen.Dispose();
             m_comCostTen = null;
+            m_comCostFifty.Dispose();
+            m_comCostFifty = null;
             m_btnBuyOne = null;
             m_btnBuyTen = null;
+            m_btnBuyFifty = null;
             m_txtRemainTimes = null;
             m_imgSpecial = null;
             m_holder = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreResult.cs

@@ -17,9 +17,11 @@ namespace UI.Main
         public GGraph m_holder0;
         public GGraph m_holder1;
         public GGraph m_holder2;
+        public GLoader m_numBg;
         public GTextField m_txtCount0;
         public GTextField m_txtCount1;
         public GTextField m_txtCount2;
+        public GLoader m_evaluatext;
         public GGroup m_grpResult;
         public Transition m_t0;
         public Transition m_t1;
@@ -80,9 +82,11 @@ namespace UI.Main
             m_holder0 = (GGraph)comp.GetChild("holder0");
             m_holder1 = (GGraph)comp.GetChild("holder1");
             m_holder2 = (GGraph)comp.GetChild("holder2");
+            m_numBg = (GLoader)comp.GetChild("numBg");
             m_txtCount0 = (GTextField)comp.GetChild("txtCount0");
             m_txtCount1 = (GTextField)comp.GetChild("txtCount1");
             m_txtCount2 = (GTextField)comp.GetChild("txtCount2");
+            m_evaluatext = (GLoader)comp.GetChild("evaluatext");
             m_grpResult = (GGroup)comp.GetChild("grpResult");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
@@ -99,9 +103,11 @@ namespace UI.Main
             m_holder0 = null;
             m_holder1 = null;
             m_holder2 = null;
+            m_numBg = null;
             m_txtCount0 = null;
             m_txtCount1 = null;
             m_txtCount2 = null;
+            m_evaluatext = null;
             m_grpResult = null;
             m_t0 = null;
             m_t1 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightSingleScoreUI.cs

@@ -7,10 +7,12 @@ namespace UI.Main
     public partial class UI_StoryFightSingleScoreUI
     {
         public GComponent target;
+        public GLoader m_bg;
+        public GGraph m_holder;
         public UI_ComClick m_comClick;
-        public GButton m_btnBack;
         public UI_ProgressBar1 m_proScore;
         public GButton m_btnSpeedUp;
+        public GLoader m_btnBack;
         public const string URL = "ui://mfvz4q8k8xpg3x";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightSingleScoreUI";
@@ -58,19 +60,23 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_holder = (GGraph)comp.GetChild("holder");
             m_comClick = (UI_ComClick)UI_ComClick.Create(comp.GetChild("comClick"));
-            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_proScore = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proScore"));
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
+            m_btnBack = (GLoader)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
+            m_holder = null;
             m_comClick.Dispose();
             m_comClick = null;
-            m_btnBack = null;
             m_proScore.Dispose();
             m_proScore = null;
             m_btnSpeedUp = null;
+            m_btnBack = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightTargetScoreUI.cs

@@ -7,8 +7,10 @@ namespace UI.Main
     public partial class UI_StoryFightTargetScoreUI
     {
         public GComponent target;
+        public GLoader m_bg;
+        public GGraph m_holder;
         public UI_ComClick m_comClick;
-        public GButton m_btnBack;
+        public GLoader m_btnBack;
         public GButton m_btnSpeedUp;
         public GButton m_btnSkip;
         public UI_ComTargetSkillShow m_comTargetCard;
@@ -66,8 +68,10 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_holder = (GGraph)comp.GetChild("holder");
             m_comClick = (UI_ComClick)UI_ComClick.Create(comp.GetChild("comClick"));
-            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnBack = (GLoader)comp.GetChild("btnBack");
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_btnSkip = (GButton)comp.GetChild("btnSkip");
             m_comTargetCard = (UI_ComTargetSkillShow)UI_ComTargetSkillShow.Create(comp.GetChild("comTargetCard"));
@@ -81,6 +85,8 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
+            m_holder = null;
             m_comClick.Dispose();
             m_comClick = null;
             m_btnBack = null;

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/ServerProxy/FriendSProxy.cs

@@ -265,10 +265,10 @@ namespace GFGGame
 
 
         //请求搜索其他玩家
-        public static async ETTask<bool> ReqSearchRole(string roleName)
+        public static async ETTask<bool> ReqSearchRole(long roleID, string roleName)
         {
             S2C_SearchRole response = null;
-            response = (S2C_SearchRole)await MessageHelper.SendToServer(new C2S_SearchRole() { RoleName = roleName });
+            response = (S2C_SearchRole)await MessageHelper.SendToServer(new C2S_SearchRole() { RoleId = roleID, RoleName = roleName });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -276,7 +276,6 @@ namespace GFGGame
                     FriendDataManager.Instance.ClearSearchDatas();
                     for (int i = 0; i < response.RoleList.Count; i++)
                     {
-
                         OtherRoleInfoData roleInfo = new OtherRoleInfoData();
                         roleInfo.roleId = response.RoleList[i].RoleId;
                         roleInfo.roleName = response.RoleList[i].RoleName;
@@ -293,10 +292,10 @@ namespace GFGGame
         }
 
         //请求推荐好友
-        public static async ETTask<bool> ReqRecommendFriends()
+        public static async ETTask<bool> ReqRecommendFriends(long roleId = 1 )
         {
             S2C_GetRecommendFriends response = null;
-            response = (S2C_GetRecommendFriends)await MessageHelper.SendToServer(new C2S_GetRecommendFriends());
+            response = (S2C_GetRecommendFriends)await MessageHelper.SendToServer(new C2S_GetRecommendFriends() { RoleId = roleId });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

GameClient/Assets/Game/HotUpdate/ServerProxy/RoleInfoSProxy.cs

@@ -19,23 +19,26 @@ namespace GFGGame
                     RoleDataManager.headBorderId = response.HeadBorderItemId;
                     RoleDataManager.photoDatas = response.PictureIds;
 
-                    //for(int i = 0; i < response.ItemList.Count; i++)
-                    //{
-                    //    RoleDataManager.badgeDatas.Add(response.ItemList[i]);
-                    //}
-                    //RoleDataManager.mainBgID = response.MyMainBgId;
-                    //RoleDataManager.achievementTaskCollect = (int)response.AchievementTaskCollect;
+                    RoleDataManager.badgeDatas.Clear();
+                    for (int i = 0; i < response.ItemList.Count; i++)
+                    {
+                        RoleDataManager.badgeDatas.Add(response.ItemList[i]);
+                    }
+
+                    RoleDataManager.mainBgID = response.MyMainBgId;
+                    RoleDataManager.achievementTaskCollect = response.AchievementTaskCollect;
 
                     return true;
                 }
             }
             return false;
         }
+
         //请求其他玩家详细信息
         public static async ETTask<OtherRoleInfoDetailData> ReqOtherRoleDetailInfo(long otherRoleId)
         {
             S2C_GetOtherRoleDetailInfo response = null;
-            response = (S2C_GetOtherRoleDetailInfo)await MessageHelper.SendToServer(new C2S_GetOtherRoleDetailInfo() { RoleId = otherRoleId });
+            response = (S2C_GetOtherRoleDetailInfo)await MessageHelper.SendToServer(new C2S_GetOtherRoleDetailInfo() { OtherRoleId = otherRoleId });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
@@ -48,6 +51,11 @@ namespace GFGGame
                     roleInfoDetail.roleInfo.headId = response.RoleInfo.HeadItemId;
                     roleInfoDetail.roleInfo.headBorderId = response.RoleInfo.HeadBorderItemId;
                     roleInfoDetail.roleInfo.offlineTimeSec = response.RoleInfo.OfflineTimeSec;
+                    roleInfoDetail.roleInfo.leagueName = response.RoleInfo.LeagueName;
+                    roleInfoDetail.roleInfo.suitCollect = response.RoleInfo.SuitCollect;
+                    roleInfoDetail.roleInfo.cardCollect = response.RoleInfo.CardCollect;
+                    roleInfoDetail.roleInfo.achievementTaskCollect = response.RoleInfo.AchievementTaskCollect;
+                    roleInfoDetail.roleInfo.roleExp = response.RoleInfo.RoleExp;
 
                     roleInfoDetail.slogan = response.Signature;
                     roleInfoDetail.SuitCollectPer = response.SuitCollectPer;
@@ -78,6 +86,12 @@ namespace GFGGame
                         roleInfoDetail.customSuitData.dressUpData.itemList = response.CustomSuit.EquipIds;
                     }
 
+                    roleInfoDetail.roleInfo.itemList.Clear();
+                    for(int i = 0; i < response.RoleInfo.ItemList.Count; i++)
+                    {
+                        roleInfoDetail.roleInfo.itemList.Add(response.RoleInfo.ItemList[i]);
+                    }
+
                     return roleInfoDetail;
                 }
             }
@@ -188,5 +202,35 @@ namespace GFGGame
             }
             return false;
         }
+
+        public static async ETTask<bool> ReqSaveMainBgID(int bgID)
+        {
+            S2C_UpMyMainBg response;
+            response = (S2C_UpMyMainBg)await MessageHelper.SendToServer(new C2S_UpMyMainBg() { MyMainBgId = bgID });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public static async ETTask<bool> ReqSaveBadgeList(List<int> itemList)
+        {
+            S2C_UpWearBadges response;
+            response = (S2C_UpWearBadges)await MessageHelper.SendToServer(new C2S_UpWearBadges() { ItemList = itemList });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+
     }
 }

GameClient/Assets/Game/HotUpdate/ServerProxy/SettingSProxy.cs

@@ -12,16 +12,21 @@ namespace GFGGame
         /// </summary>
         /// <param name="code"></param>
         /// <returns></returns>
-        public static async ETTask<bool> ReqGiftCodeInfo(string code)
+        public static async ETTask<bool> ReqGiftCodeCheck(string code)
         {
-            var response = (S2C_RedeemRewards)await MessageHelper.SendToServer(new C2S_RedeemRewards { ActivationCode = code });
-            if(!(response is { Error: ErrorCode.ERR_Success }))
+            S2C_RedeemRewards response;
+            response = (S2C_RedeemRewards)await MessageHelper.SendToServer(new C2S_RedeemRewards() { ActivationCode = code });
+            if (response != null)
             {
-                return false;
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    // 奖励弹窗
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.ItemList));
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+                    return true;
+                }
             }
-            // 奖励弹窗
-            BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.ItemList));
-            return true;
+            return false;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRewardItemView.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using FairyGUI;
+using UI.ClothingFoster;
+using UI.CommonGame;
+
+namespace GFGGame
+{
+    public class ClothingRewardItemView : BaseWindow
+    {
+        private UI_ClothingRewardItemUI _ui;
+        private int _suitId;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ClothingRewardItemUI.PACKAGE_NAME;
+            _ui = UI_ClothingRewardItemUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+            _ui.m_listReward.itemRenderer = ListRewardRender;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _suitId = (int)this.viewData;
+            SuitFosterListCfg cfg = SuitFosterListCfgArray.Instance.GetCfg(_suitId);
+            _ui.m_listReward.data = cfg.renewRewardsArr;
+            _ui.m_listReward.numItems = cfg.renewRewardsArr.Length;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void ListRewardRender(int index, GObject obj)
+        {
+            int[][] rewards = (int[][])obj.parent.data;
+            ItemData itemData = ItemUtil.createItemData(rewards[index]);
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(itemData);
+            (obj.data as ItemView).ShowName = true;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRewardItemView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -61,6 +61,7 @@ namespace GFGGame
             _dressUpObjUI = new DressUpObjUI("SceneSuitFoster");
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_comRenewReward.target.onClick.Add(OnClickRenewRewardItem);
             _ui.m_btnLeft.onClick.Add(() => { OnClickBtnDirection(-1); });
             _ui.m_btnRight.onClick.Add(() => { OnClickBtnDirection(1); });
             _ui.m_comFosterReward.target.onClick.Add(OnClickComFosterReward);
@@ -70,7 +71,6 @@ namespace GFGGame
             _ui.m_listFoster.onClickItem.Add(OnClickListFosterItem);
             _ui.m_listProperty.itemRenderer = ListPropertyItemRender;
 
-
             _ui.m_listRenewMaterial.itemRenderer = ListRenewMaterialItemRender;
             _ui.m_listRenewMaterial.onClickItem.Add(OnListRenewMaterialsItem);
             _ui.m_btnRenew.onClick.Add(OnClickBtnRenew);
@@ -453,5 +453,10 @@ namespace GFGGame
             GuideController.TryCompleteGuide(ConstGuideId.SUIT_LIST_VIEW, 5);
 
         }
+
+        private void OnClickRenewRewardItem()
+        {
+            ViewManager.Show<ClothingRewardItemView>(_suitId);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -263,7 +263,7 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             int indexPrior = Math.Max(0, _curSelectIndex - 1);
-            int indexNext = Math.Min(_rechargeCfgs.Count, _curSelectIndex + 1);
+            int indexNext = Math.Min(_rechargeCfgs.Count - 1, _curSelectIndex + 1);
             SetRedDot(indexPrior);
             SetRedDot(indexNext);
         }

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/SpecialOfferGiftBoxView.cs

@@ -13,8 +13,7 @@ namespace GFGGame
     {
         private UI_SpecialOfferGiftBoxUI _ui;
 
-        private int _pageIndex; //当前页码,需要显示的数据的索引
-        private List<GGraph> _graphList = new List<GGraph>();
+        //private int _pageIndex; //当前页码,需要显示的数据的索引
         private List<EffectUI> _effectUIList = new List<EffectUI>();
         private List<EffectUI> _effect1UIList = new List<EffectUI>();
         
@@ -33,13 +32,22 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.None;
 
+            _ui.m_listGift.itemRenderer = RenderListGiftItem;
+
             _ui.m_back.onClick.Add(OnBtnCancelClick);
-            _ui.m_btnUp.onClick.Add(OnBtnPreviousClick);
-            _ui.m_btnNext.onClick.Add(OnBtnNextClick);
+            AddEffect();
+            //_ui.m_btnUp.onClick.Add(OnBtnPreviousClick);
+            //_ui.m_btnNext.onClick.Add(OnBtnNextClick);
         }
 
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
 
             if (_ui != null)
             {
@@ -53,119 +61,53 @@ namespace GFGGame
         {
             base.OnShown();
             GameGlobal.AutoSpecialOfferGiftBoxView = false;
-            AddEffect();
             _ui.m_t0.Play();
-            InitPageInex();
-
+           
             UpViewNone();
+            //InitPageInex();
         }
 
-        protected override void AddEventListener()
+        private void OnBtnCancelClick()
         {
-            base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.ACTIVITY_REMOVE, UpViewNone);
-            EventAgent.AddEventListener(ConstMessage.ACTIVITY_ADD, UpViewNone);
-            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpViewNone); 
-            EventAgent.AddEventListener(ConstMessage.LUCKY_BOX_TIME, UpTime);
+            this.Hide();
         }
 
-        protected override void RemoveEventListener()
+        protected override void OnHide()
         {
-            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_REMOVE, UpViewNone);
-            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_ADD, UpViewNone);
-            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpViewNone);
-            EventAgent.RemoveEventListener(ConstMessage.LUCKY_BOX_TIME, UpTime);
-            base.RemoveEventListener();
+            DestroyObjectFromView();
+
+            this.RemoveEventListener();
+            base.Hide();
         }
 
-        private void AddEffect()
+        private void DestroyObjectFromView()
         {
-            if (_effectUI1 == null)
-            {
-                _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderBaby, "ui_Activity", "Prefer_person");
-            }
-            if (_effectUI2 == null)
+            for (int i = 0; i < _effectUIList.Count; i++)
             {
-                _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderChiXuTx, "ui_Activity", "Prefer_chixu_tx");
-            }
-
-            if (_effectUI3 == null)
-            {
-                _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_holderOneTx, "ui_Activity", "Prefer_one_tx");
+                EffectUIPool.Recycle(_effectUIList[i]);
+                _effectUIList[i] = null;
             }
-        }
-
-        public void UpTime()
-        {
-            //筛选一条数据用来界面渲染
-            var list = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData3;
+            _effectUIList.Clear();
 
-            list = list.Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
-            if (list.Count == 0)
+            for (int i = 0; i < _effect1UIList.Count; i++)
             {
-                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-                this.Hide();
-                return;
+                EffectUIPool.Recycle(_effect1UIList[i]);
+                _effect1UIList[i] = null;
             }
-
-            _ui.m_txtBoxResidueTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
-        }
-
-        //实例化索引
-        private void InitPageInex()
-        {
-            _pageIndex = 0;
+            _effect1UIList.Clear();
         }
 
-        private void UpdateView(ListUtil.NavigateType type)
+        private void UpViewNone()
         {
-            //筛选一条数据用来界面渲染
-            var list = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData3;
-
-            list = list.Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
-            if (list.Count == 0)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-                this.Hide();
-                return;
-            }
-
-            var data = ListUtil.Navigate(list, type, _pageIndex, out int newIndex);
-            _pageIndex = newIndex;
-
-            _ui.m_btnUp.visible = true;
-            _ui.m_btnNext.visible = true;
-            if (list.Count == 1)
-            {
-                _ui.m_btnUp.visible = false;
-                _ui.m_btnNext.visible = false;
-            }
-            else
-            {
-                //翻页翻到了最后一条数据
-                if (list.Count == _pageIndex + 1)
-                {
-                    _ui.m_btnNext.visible = false;
-                }
-
-                if (_pageIndex == 0)
-                {
-                    _ui.m_btnUp.visible = false;
-                }
-            }
-
-            _ui.m_txtBoxResidueTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), data.EndTime);
-            _ui.m_list.data = data.ShopCfgIds;
-            _ui.m_list.itemRenderer = ListItemRender;
+            var shopCfgIds = LimitedTimeGiftBoxDataManager.Instance.TryShopCfg();
             DestroyObjectFromView();
-            _ui.m_list.numItems = data.ShopCfgIds.Count;
-            _ui.m_list.visible = true;
+            _ui.m_listGift.numItems = shopCfgIds.Count;
         }
 
-        private void ListItemRender(int index, GObject obj)
+        private void RenderListGiftItem(int index, GObject obj)
         {
             UI_ComSpecialOfferGiftBoxItem uiItem = UI_ComSpecialOfferGiftBoxItem.Proxy(obj);
-            var shopCfgIds = uiItem.target.parent.data as List<int>;
+            var shopCfgIds = LimitedTimeGiftBoxDataManager.Instance.TryShopCfg();
             var shopCfgId = shopCfgIds[index];
             var shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
             var shopItemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
@@ -176,21 +118,13 @@ namespace GFGGame
             string mTxtUrc = string.Empty;
             string mTxtNewPrice;
             if (shopCfg.refreshType == RefreshType.DAY)
-            {
                 mTxtUrc = $"每日限购{remainBuyNum}/{shopCfg.maxBuyNum}";
-            }
             else if (shopCfg.refreshType == RefreshType.WEEK)
-            {
                 mTxtUrc = $"每周限购{remainBuyNum}/{shopCfg.maxBuyNum}";
-            }
             else if (shopCfg.refreshType == RefreshType.MONTH)
-            {
                 mTxtUrc = $"每月限购{remainBuyNum}/{shopCfg.maxBuyNum}";
-            }
             else
-            {
                 mTxtUrc = $"永久限购{remainBuyNum}/{shopCfg.maxBuyNum}";
-            }
 
             uiItem.m_btnBuy.m_txtOldPrice.text = shopCfg.originalPrice.ToString();
             if (shopCfg.costType == CostType.ITEM)
@@ -260,81 +194,42 @@ namespace GFGGame
             _effectUIList.Add(_effectUI);
             uiItem.m_t0.Play();
 
-            //子列表
-            uiItem.m_list.itemRenderer = ChildListItemRender;
+            ////子列表
+            if(uiItem.m_list.data == null)
+                uiItem.m_list.itemRenderer = ChildListItemRender;
+
+            uiItem.m_list.data = 1;
             uiItem.m_list.onClickItem.Add(OnListSelectorItemClick);
             uiItem.m_list.numItems = shopItemCfg.itemsArr.Length;
-            uiItem.m_list.visible = true;
-        }
-
-        private void ChildListItemRender(int index, GObject obj)
-        {
-            UI_ComItem uiItemChild = UI_ComItem.Proxy(obj);
-            var shopCfg = uiItemChild.target.parent.parent.data as ShopCfg;
-            var itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
-
-            int[][] result;
-            // if (shopCfg.refreshType == RefreshType.DAY)
-            // {
-            result = itemCfg.itemsArr;
-            //uiItemChild.m_bagYellow.visible = false;
-            //uiItemChild.m_bagBlue.visible = true;
-            //uiItemChild.m_bagYellowEx.visible = false;
-            //uiItemChild.m_bagBlueEx.visible = true;
-            // }
-            // else
-            // {
-            //周刷
-            // result = itemCfg.param1Arr;
-            // uiItemChild.m_bagYellow.visible = true;
-            // uiItemChild.m_bagBlue.visible = false;
-            // uiItemChild.m_bagYellowEx.visible = true;
-            // uiItemChild.m_bagBlueEx.visible = false;
-            // }
-
-            var itemArr = result[index];
-            var itemCfgChild = ItemCfgArray.Instance.GetCfg(itemArr[0]);
-            uiItemChild.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfgChild);
-            uiItemChild.m_txtCount.text = itemArr[1].ToString();
-            uiItemChild.target.data = itemCfgChild;
-            uiItemChild.m_QualityType.selectedIndex = itemCfgChild.rarity - 1;
-
-            //if (!_graphList.Contains(uiItemChild.m_holderItem))
-            //{
-            //    EffectUI _effectUI = EffectUIPool.CreateEffectUI(uiItemChild.m_holderItem, "ui_Activity", "Prefer_kuang");
-            //    _graphList.Add(uiItemChild.m_holderItem);
-            //    _effectUIList.Add(_effectUI);
-            //}
-
-            //uiItemChild.m_t0.Play();
-
-            UI_ComItem.ProxyEnd();
-        }
-
-        //弹出物品详细描述框
-        private void OnListSelectorItemClick(EventContext context)
-        {
-            GComponent item = context.data as GComponent;
-            ItemCfg itemCfg = item.data as ItemCfg;
-            GoodsItemTipsController.ShowItemTips(itemCfg.id);
+            UI_ComSpecialOfferGiftBoxItem.ProxyEnd();
         }
 
-        private void UpViewNone()
+        private void AddEffect()
         {
-            LimitedTimeGiftBoxDataManager.Instance.UpLtgGbItemData3();
-            UpdateView(ListUtil.NavigateType.None);
+            if (_effectUI1 == null)
+                _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderBaby, "ui_Activity", "Prefer_person");
+            if (_effectUI2 == null)
+                _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_holderChiXuTx, "ui_Activity", "Prefer_chixu_tx");
+            if (_effectUI3 == null)
+                _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_holderOneTx, "ui_Activity", "Prefer_one_tx");
         }
 
-        //上一条
-        private void OnBtnPreviousClick()
+        protected override void AddEventListener()
         {
-            UpdateView(ListUtil.NavigateType.Previous);
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.ACTIVITY_REMOVE, UpViewNone);
+            EventAgent.AddEventListener(ConstMessage.ACTIVITY_ADD, UpViewNone);
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpViewNone);
+            EventAgent.AddEventListener(ConstMessage.LUCKY_BOX_TIME, UpTime);
         }
 
-        //下一条
-        private void OnBtnNextClick()
+        protected override void RemoveEventListener()
         {
-            UpdateView(ListUtil.NavigateType.Next);
+            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_REMOVE, UpViewNone);
+            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_ADD, UpViewNone);
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpViewNone);
+            EventAgent.RemoveEventListener(ConstMessage.LUCKY_BOX_TIME, UpTime);
+            base.RemoveEventListener();
         }
 
         //购买按钮点击事件
@@ -368,42 +263,109 @@ namespace GFGGame
             }
         }
 
-        private void DestroyObjectFromView()
+        private void ChildListItemRender(int index, GObject obj)
         {
-            for (int i = 0; i < _effectUIList.Count; i++) {
-                EffectUIPool.Recycle(_effectUIList[i]);
-                _effectUIList[i] = null;
-            }
-            _effectUIList.Clear();
-
-            for (int i = 0; i < _effect1UIList.Count; i++)
-            {
-                EffectUIPool.Recycle(_effect1UIList[i]);
-                _effect1UIList[i] = null;
-            }
-            _effect1UIList.Clear();
-            
-            _graphList.Clear();
+            UI_ComItem uiItemChild = UI_ComItem.Proxy(obj);
+            var shopCfg = uiItemChild.target.parent.parent.data as ShopCfg;
+            var itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
+            int[][] result;
+            result = itemCfg.itemsArr;
+            var itemArr = result[index];
+            var itemCfgChild = ItemCfgArray.Instance.GetCfg(itemArr[0]);
+            uiItemChild.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfgChild);
+            uiItemChild.m_txtCount.text = itemArr[1].ToString();
+            uiItemChild.target.data = itemCfgChild;
+            uiItemChild.m_QualityType.selectedIndex = itemCfgChild.rarity - 1;
+            UI_ComItem.ProxyEnd();
         }
 
-        protected override void OnHide()
+        //弹出物品详细描述框
+        private void OnListSelectorItemClick(EventContext context)
         {
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
-            EffectUIPool.Recycle(_effectUI2);
-            _effectUI2 = null;
-            EffectUIPool.Recycle(_effectUI3);
-            _effectUI3 = null;
-           
-            DestroyObjectFromView();
-
-            this.RemoveEventListener();
-            base.Hide();
+            GComponent item = context.data as GComponent;
+            ItemCfg itemCfg = item.data as ItemCfg;
+            GoodsItemTipsController.ShowItemTips(itemCfg.id);
         }
 
-        private void OnBtnCancelClick()
+        public void UpTime()
         {
-            this.Hide();
+            var activityInfoByTypeList =
+                ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB1);
+            var list = activityInfoByTypeList
+                .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
+            if (list.Count == 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+                this.Hide();
+                return;
+            }
+            _ui.m_txtBoxResidueTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
         }
+
+        //    //实例化索引
+        //    private void InitPageInex()
+        //    {
+        //        _pageIndex = 0;
+        //    }
+
+        //    private void UpdateView(ListUtil.NavigateType type)
+        //    {
+        //        //筛选一条数据用来界面渲染
+        //var list = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData3;
+
+        //        list = list.Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
+        //        if (list.Count == 0)
+        //        {
+        //            PromptController.Instance.ShowFloatTextPrompt("活动已结束");
+        //            this.Hide();
+        //            return;
+        //        }
+
+        //        var data = ListUtil.Navigate(list, type, _pageIndex, out int newIndex);
+        //        _pageIndex = newIndex;
+
+        //        _ui.m_btnUp.visible = true;
+        //        _ui.m_btnNext.visible = true;
+        //        if (list.Count == 1)
+        //        {
+        //            _ui.m_btnUp.visible = false;
+        //            _ui.m_btnNext.visible = false;
+        //        }
+        //        else
+        //        {
+        //            //翻页翻到了最后一条数据
+        //            if (list.Count == _pageIndex + 1)
+        //                _ui.m_btnNext.visible = false;
+
+        //            if (_pageIndex == 0)
+        //                _ui.m_btnUp.visible = false;
+        //        }
+
+        //        _ui.m_txtBoxResidueTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), data.EndTime);
+        //        _ui.m_list.data = data.ShopCfgIds;
+        //        _ui.m_list.itemRenderer = ListItemRender;
+        //        DestroyObjectFromView();
+        //        _ui.m_list.numItems = data.ShopCfgIds.Count;
+        //        _ui.m_list.visible = true;
+        //    }
+
+
+        //    private void UpViewNone()
+        //    {
+        //        LimitedTimeGiftBoxDataManager.Instance.UpLtgGbItemData3();
+        //        UpdateView(ListUtil.NavigateType.None);
+        //    }
+
+        //    //上一条
+        //    private void OnBtnPreviousClick()
+        //    {
+        //        UpdateView(ListUtil.NavigateType.Previous);
+        //    }
+
+        //    //下一条
+        //    private void OnBtnNextClick()
+        //    {
+        //        UpdateView(ListUtil.NavigateType.Next);
+        //    }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendAddView.cs

@@ -125,7 +125,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("请输入至少两个字符");
                 return;
             }
-            bool result = await FriendSProxy.ReqSearchRole(_ui.m_txtSearch.text);
+            bool result = await FriendSProxy.ReqSearchRole(RoleDataManager.roleId, _ui.m_txtSearch.text);
             if (result)
             {
                 _ui.m_txtTips.text = "搜索结果";
@@ -154,7 +154,7 @@ namespace GFGGame
             _ui.m_txtTips.text = "推荐好友";
             _ui.m_listSearch.numItems = 0;
 
-            bool result = await FriendSProxy.ReqRecommendFriends();
+            bool result = await FriendSProxy.ReqRecommendFriends(RoleDataManager.roleId);
             if (result)
             {
                 _searchDatas = FriendDataManager.Instance.RecommendDatas;

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs

@@ -11,9 +11,19 @@ namespace GFGGame
     {
         private UI_InstanceZonesUI _ui;
         private ValueBarController _valueBarController;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+        private EffectUI _effectUI3;
+
 
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
+
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -46,6 +56,8 @@ namespace GFGGame
             _ui.m_btnArena.target.onClick.Add(OnClickBtnArena);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hzs_bg");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_bg_eff, "ui_HaiZhiShi", "Bg_All_Tx");
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_fish_eff, "ui_HaiZhiShi", "Bg_Yu");
         }
 
         protected override void OnShown()
@@ -56,11 +68,14 @@ namespace GFGGame
             CheckFunOpen();
             UpdateRedDot();
             Timers.inst.AddUpdate(CheckGuide);
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_eff, "ui_HaiZhiShi", "Bg_ZhuanChang_NiuQu");
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
             _valueBarController.OnHide();
             Timers.inst.Remove(CheckGuide);
         }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -140,12 +140,12 @@ namespace GFGGame
 
             _curIndex = LuckyBoxDataManager.Instance.luckyBoxIds.IndexOf(boxId);
             LuckyBoxDataManager.Instance.luckyBoxIndex = _curIndex;
-            _listActivityBtnObj.Clear();
             foreach (var v in _effectUIDic)
             {
                 EffectUIPool.Recycle(v.Value);
             }
             _effectUIDic.Clear();
+            _listActivityBtnObj.Clear();
             _ui.m_listBg.numItems = LuckyBoxDataManager.Instance.luckyBoxIds.Count;
             _ui.m_listBg.ScrollToView(_curIndex);
             _ui.m_listBg.scrollPane.decelerationRate = 0.8f;
@@ -183,6 +183,11 @@ namespace GFGGame
             else
                 comBox.m_showActivityType.selectedIndex = 0;
 
+            //if (cfg.costNumfifty > 0)
+            //    comBox.m_comLuckBoxBtn.m_btnNumberType.selectedIndex = 1;
+            //else
+                comBox.m_comLuckBoxBtn.m_btnNumberType.selectedIndex = 0;
+
             if (_luckyBoxCtrl.ContainsKey(boxId))
             {
                 _luckyBoxCtrl[boxId].OnHide();
@@ -214,6 +219,10 @@ namespace GFGGame
 
             comBox.m_comLuckBoxBtn.m_comCostTen.m_txtCost.text = cfg.costNumTen.ToString();
             comBox.m_comLuckBoxBtn.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
+
+            comBox.m_comLuckBoxBtn.m_comCostFifty.m_txtCost.text = cfg.costNumfifty.ToString();
+            comBox.m_comLuckBoxBtn.m_comCostFifty.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
+
             if (comBox.m_comLuckBoxBtn.m_btnBuyOne.data == null)
             {
                 comBox.m_comLuckBoxBtn.m_btnBuyOne.onClick.Add(OnClickBtnBuyOne);
@@ -232,6 +241,13 @@ namespace GFGGame
             }
             comBox.m_comLuckBoxBtn.m_btnBuyTen.data = boxId;
 
+            if (comBox.m_comLuckBoxBtn.m_btnBuyFifty.data == null)
+            {
+                comBox.m_comLuckBoxBtn.m_btnBuyFifty.onClick.Add(OnClickBtnBuyFifty);
+            }
+            comBox.m_comLuckBoxBtn.m_btnBuyFifty.data = boxId;
+            
+
             if (comBox.m_btnPreview.data == null)
             {
                 comBox.m_btnPreview.onClick.Add(OnClickBtnPreview);
@@ -312,13 +328,13 @@ namespace GFGGame
                 _luckyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnHide();
 
             _curIndex = _ui.m_listBg.GetFirstChildInView();
-
             LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
-            if (LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_3)
+            if (LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_3) {
                 _valueBarController.Controller(3);
-            else
+            }
+            else {
                 _valueBarController.Controller(4);
-
+            }
             _valueBarController.UpdateCJ();
 
             _luckyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnShown(LuckyBoxDataManager.Instance.currentBoxId);
@@ -335,6 +351,7 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(comBox.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy), "", -21, 18);
 
                 comBox.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastTsyDrawCount.ToString()).FlushVars();
+                UI_ComBox1.ProxyEnd();
             }
         }
 
@@ -546,6 +563,31 @@ namespace GFGGame
             });
         }
 
+        private void OnClickBtnBuyFifty(EventContext context)
+        {
+            GetSuitItemController.showSingle = true;
+            GObject obj = context.sender as GObject;
+            int boxId = (int)obj.data;
+            LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
+            int boughtCount = GameGlobal.myNumericComponent.GetAsInt(luckyBoxCfg.numericType);
+
+            if (boughtCount + LuckyBoxDataManager.FIFTY_TIME > luckyBoxCfg.maxCount)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("抽奖次数不足");
+                return;
+            }
+            LuckyBoxDataManager.Instance.CheckItemEnough(boxId, LuckyBoxDataManager.FIFTY_TIME, async () =>
+            {
+                bool result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.FIFTY_TIME, false, 0);
+                if (result)
+                {
+                    BonusController.TryShowBonusList(LuckyBoxDataManager.Instance.RewardList);
+                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 3);
+                    GetSuitItemController.showSingle = false;
+                }
+            });
+        }
+
         protected override void OnHide()
         {
             base.OnHide();

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -29,6 +29,8 @@ namespace GFGGame
         private bool tryGuide = false;
         //战斗表现修改,得分和星星偏移
         private float offsetX = 150.0f;
+        //部位图片
+        private List<string> partImage = new List<string> { "","fx","zr","sp","scw","fz","zb"};
 
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
@@ -155,13 +157,24 @@ namespace GFGGame
         {
             base.OnShown();
             roleData = InstanceZonesDataManager.roleData;
-            if (_sceneObject == null)
+            //if (_sceneObject == null)
+            //{
+            //    _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
+            //    MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, true);
+            //    MyDressUpHelper.dressUpObj.AddOrRemove(180014, false);
+            //}
+            //MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
+
+            DressUpObjUI dressUpObjUI;
+            if (_ui.m_holder.data == null)
             {
-                _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
-                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, true);
-                MyDressUpHelper.dressUpObj.AddOrRemove(180014, false);
+                _ui.m_holder.data = new DressUpObjUI("SceneFightSingleScore");
             }
-            MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
+            dressUpObjUI = _ui.m_holder.data as DressUpObjUI;
+            dressUpObjUI.ResetSceneObj(100, false, true, null, false);
+            dressUpObjUI.dressUpObj.PutOnItemList(roleData.itemList);
+            dressUpObjUI.UpdateWrapper(_ui.m_holder);
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("zd_g_bg");
 
             if (!FightDataManager.Instance.autoPlay)
             {
@@ -271,6 +284,7 @@ namespace GFGGame
             x = pos.x;
             y = pos.y;
             _ui.m_comClick.m_comResult.target.visible = true;
+            _ui.m_comClick.m_comResult.m_holderNormal.scale = new Vector2(1.6f, 1.6f);
             _ui.m_comClick.m_comResult.m_holderResult.SetXY(130, 130);
             // _ui.m_comClick.m_comResult.m_loaGlass.url = string.Format("ui://Main/zd_bl_{0}", UnityEngine.Random.Range(0, 3));
             _ui.m_comClick.m_comResult.target.SetXY(x, y);
@@ -291,7 +305,7 @@ namespace GFGGame
                 _ui.m_comClick.m_comResult.m_t0.ClearHooks();
                 _ui.m_comClick.m_comResult.m_t0.Play(OnComResultComplete);
             }
-            _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/pf_picture_{0}", _partId);
+            _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/zd_icon_{0}", partImage[_partId]);
         }
         private void OnComResultComplete()
         {
@@ -332,6 +346,7 @@ namespace GFGGame
             _score += _partScore;
             _ui.m_comClick.m_comResult.target.GetChild("holder" + clickType).visible = true;
             _ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
+            _ui.m_comClick.m_comResult.m_evaluatext.url = string.Format("ui://Main/zd_wz_pf_{0}", partImage[_partId]);
             switch (clickType)
             {
                 case ClickType.MISS_CLICK:
@@ -473,6 +488,7 @@ namespace GFGGame
             if (GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0 && !ViewManager.isViewOpen(typeof(GuideView).FullName)) return;
             Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
 
+            _effectUI15.GetObj().GetComponent<Animator>().SetBool("player", true);  
         }
         private void ComAllCirclePressTime(object param = null)
         {
@@ -683,11 +699,18 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            if (_sceneObject != null)
+            //if (_sceneObject != null)
+            //{
+            //    PrefabManager.Instance.Restore(_sceneObject);
+            //    _sceneObject = null;
+            //}
+
+            DressUpObjUI dressUpObjUI = _ui.m_holder.data as DressUpObjUI;
+            if (dressUpObjUI != null)
             {
-                PrefabManager.Instance.Restore(_sceneObject);
-                _sceneObject = null;
+                dressUpObjUI.Dispose();
             }
+            _ui.m_holder.data = null;
 
             Reset();
             Timers.inst.Remove(CheckGuide);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -52,6 +52,9 @@ namespace GFGGame
         private int _prefectCount = 0;//卓越点击数量
         private float _time = 0;// 登峰造极按住的时间
 
+        //部位图片
+        private List<string> partImage = new List<string> { "", "fx", "zr", "sp", "scw", "fz", "zb" };
+
         public override void Dispose()
         {
             EffectUIPool.Recycle(_effectUI1);
@@ -157,13 +160,24 @@ namespace GFGGame
             roleData = (this.viewData as object[])[0] as FightData;
             targetData = (this.viewData as object[])[1] as FightData;
 
-            if (_sceneObject == null)
+            //if (_sceneObject == null)
+            //{
+            //    _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
+            //    MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, true);
+            //    MyDressUpHelper.dressUpObj.AddOrRemove(180014, false);
+            //}
+            //MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
+
+            DressUpObjUI dressUpObjUI;
+            if (_ui.m_holder.data == null)
             {
-                _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
-                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, true);
-                MyDressUpHelper.dressUpObj.AddOrRemove(180014, false);
+                _ui.m_holder.data = new DressUpObjUI("SceneFightSingleScore");
             }
-            MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
+            dressUpObjUI = _ui.m_holder.data as DressUpObjUI;
+            dressUpObjUI.ResetSceneObj(100, false, true, null, false);
+            dressUpObjUI.dressUpObj.PutOnItemList(roleData.itemList);
+            dressUpObjUI.UpdateWrapper(_ui.m_holder);
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("zd_g_bg");
 
 
             _ui.m_btnBack.visible = true;
@@ -508,6 +522,7 @@ namespace GFGGame
 
             x = pos.x;
             y = pos.y;
+            _ui.m_comClick.m_comResult.m_holderNormal.scale = new Vector2(1.6f, 1.6f);
             _ui.m_comClick.m_comResult.m_holderResult.SetXY(130, 130);
             _ui.m_comClick.m_comResult.target.visible = true;
             // _ui.m_comClick.m_comResult.m_loaGlass.url = string.Format("ui://Main/zd_bl_{0}", UnityEngine.Random.Range(0, 3));
@@ -524,7 +539,7 @@ namespace GFGGame
                 _ui.m_comClick.m_comResult.m_t0.ClearHooks();
                 _ui.m_comClick.m_comResult.m_t0.Play(OnComResultComplete);
             }
-            _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/pf_picture_{0}", _partId);
+            _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/zd_icon_{0}", partImage[_partId]);
         }
 
         private void OnComResultComplete()
@@ -593,7 +608,7 @@ namespace GFGGame
             PartScoreResultEnd();
             _ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
             _ui.m_comClick.m_comResult.target.GetChild("holder" + clickType).visible = true;
-
+            _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/zd_wz_pf_{0}", partImage[_partId]);
         }
         private void PartScoreResultEnd()
         {
@@ -689,7 +704,7 @@ namespace GFGGame
             {
                 _ui.m_comClick.m_comAllPerfect.m_t0.Play();
             }
-
+            _effectUI12.GetObj().GetComponent<Animator>().SetBool("player", true);
         }
         private void OnComAllCircleClickBegin()
         {
@@ -850,11 +865,18 @@ namespace GFGGame
         {
             base.OnHide();
             Reset();
-            if (_sceneObject != null)
+            //if (_sceneObject != null)
+            //{
+            //    PrefabManager.Instance.Restore(_sceneObject);
+            //    _sceneObject = null;
+            //}
+
+            DressUpObjUI dressUpObjUI = _ui.m_holder.data as DressUpObjUI;
+            if (dressUpObjUI != null)
             {
-                PrefabManager.Instance.Restore(_sceneObject);
-                _sceneObject = null;
+                dressUpObjUI.Dispose();
             }
+            _ui.m_holder.data = null;
 
             Timers.inst.Remove(CheckGuide);
         }

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

@@ -518,44 +518,15 @@ namespace GFGGame
         //列表样式
         private void UpGiftBox1()
         {
-            var activityInfoByTypeList =
-                ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB1);
+            _ui.m_btnGiftBag2.target.visible = LimitedTimeGiftBoxDataManager.Instance.SpecialOfferGiftBoxCanBuy();
 
-            var list = activityInfoByTypeList
-                .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
-            if (list.Count == 0)
-            {
-                _ui.m_btnGiftBag2.target.visible = false;
-            }
-            else
-            {
-                bool isSoldOut = true;
-                foreach (var activityInfo in list)
-                {
-                    ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
-                    var paramsArr = activityOpenCfg.paramsArr;
-                    foreach (var shopCfgId in paramsArr)
-                    {
-                        var shopCfg = ShopCfgArray.Instance.GetCfg(shopCfgId);
-                        var remainBuyNum = shopCfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(shopCfgId);
-                        //只要有一个商品还能购买，就不是售罄
-                        if (remainBuyNum > 0)
-                        {
-                            isSoldOut = false;
-                            break;
-                        }
-                    }
-                }
+            if (_ui.m_btnGiftBag2.target.visible) {
+                var activityInfoByTypeList =
+               ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB1);
+                var list = activityInfoByTypeList
+                    .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
 
-                if (isSoldOut)
-                {
-                    _ui.m_btnGiftBag2.target.visible = false;
-                }
-                else
-                {
-                    _ui.m_btnGiftBag2.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
-                    _ui.m_btnGiftBag2.target.visible = true;
-                }
+                _ui.m_btnGiftBag2.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
             }
         }
 
@@ -914,7 +885,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/Notice/NoticeView.cs

@@ -80,10 +80,10 @@ namespace GFGGame
 
         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");
         }
 
@@ -109,7 +109,7 @@ namespace GFGGame
             item.m_txtName.text = showActivity[index].res;
             switch (showActivity[index].jumpId)
             {
-                //后续添加其他活动
+                //鍚庣画娣诲姞鍏朵粬娲诲姩
                 case "LuckyBoxView":
                     item.m_imgTips.visible = RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy) || RedDotDataManager.Instance.GetLuckyBoxFreeTimes();
                     break;
@@ -122,7 +122,7 @@ namespace GFGGame
             {
                 endTime = TimeUtil.DateTimeToTimestamp(showActivity[0].endTime);
             }
-            item.m_txtTime.text = string.Format("剩余时间：{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
+            item.m_txtTime.text = string.Format("鍓╀綑鏃堕棿锛歿0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
             item.target.onClick.Add(OnListActivityClick);
             item.target.data = showActivity[index];
             UI_ListActivityItem.ProxyEnd();

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

@@ -3,6 +3,7 @@ using UnityEngine;
 using UI.RoleInfo;
 using FairyGUI;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace GFGGame
 {
@@ -68,8 +69,8 @@ namespace GFGGame
 
             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";
+            badgeItem.m_iconImg.url = ResPathUtil.GetIconPath(_badgeList[index]);
+            //badgeItem.m_iconImg.url = "ui://RoleInfo/linshj1_l";
 
             if (RoleDataManager.HaveBadge(_badgeList[index].id))
             {
@@ -106,8 +107,7 @@ namespace GFGGame
         private void RemoveBadge()
         {
             RoleDataManager.badgeDatas.Remove(selectedID);
-
-            Hide();
+            UpdateBadgeList();
         }
 
         private void SetBadge(EventContext eventContext)
@@ -124,6 +124,12 @@ namespace GFGGame
                 int index = RoleDataManager.badgeDatas.FindIndex(x => x.Equals(selectedID));
                 RoleDataManager.badgeDatas[index] = id;
             }
+            UpdateBadgeList();
+        }
+
+        private async Task UpdateBadgeList()
+        {
+            await RoleInfoSProxy.ReqSaveBadgeList(RoleDataManager.badgeDatas);
 
             Hide();
         }

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,8 +109,10 @@ namespace GFGGame
                 if (result)
                 {
                     OnTabChange();
+                    PromptController.Instance.ShowFloatTextPrompt("头像框设置成功");
                 }
             }
+            
         }
 
         private void RenderListItem(int index, GObject obj)
@@ -117,10 +131,6 @@ namespace GFGGame
             {
                 ItemProxy.ReqSetItemRead(headId).Coroutine();
             }
-            if (headId == RoleDataManager.headId)
-            {
-                _ui.m_list.selectedIndex = index;
-            }
             item.target.data = headId;
             UI_ListHeadItem.ProxyEnd();
         }
@@ -144,10 +154,6 @@ namespace GFGGame
             {
                 ItemProxy.ReqSetItemRead(headBorderId).Coroutine();
             }
-            if (headBorderId == RoleDataManager.headBorderId)
-            {
-                _ui.m_listBorder.selectedIndex = index;
-            }
             item.target.data = headBorderId;
             UI_ListHeadBorderItem.ProxyEnd();
         }
@@ -172,10 +178,14 @@ namespace GFGGame
         {
             _selectHeadId = RoleDataManager.headId;
             _selectHeadBorderId = RoleDataManager.headBorderId;
+            _ui.m_btnTab0.m_color.selectedIndex = 1 - _ui.m_c1.selectedIndex;
+            _ui.m_btnTab1.m_color.selectedIndex = _ui.m_c1.selectedIndex;
             if (_ui.m_c1.selectedIndex == 0)
             {
                 _ui.m_list.numItems = _headCfgs.Count;
-                _ui.m_list.scrollPane.ScrollTop();
+                int selectedIndex = _headCfgs.FindIndex(x => x.id == _selectHeadId);
+                _ui.m_list.ScrollToView(selectedIndex);
+                _ui.m_list.selectedIndex = selectedIndex;
             }
             else
             {
@@ -185,7 +195,9 @@ namespace GFGGame
                     UpdateRedDot();
                 }
                 _ui.m_listBorder.numItems = _headBorderCfgs.Count;
-                _ui.m_listBorder.scrollPane.ScrollTop();
+                int selectedIndex = _headBorderCfgs.FindIndex(x => x.id == _selectHeadBorderId);
+                _ui.m_listBorder.ScrollToView(selectedIndex);
+                _ui.m_listBorder.selectedIndex = selectedIndex;
             }
             UpdateView();
         }
@@ -222,7 +234,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/InputGiftCodeView.cs

@@ -4,6 +4,9 @@ using UI.RoleInfo;
 
 namespace GFGGame
 {
+    /// <summary>
+    /// 兑换码输入界面
+    /// </summary>
     public class InputGiftCodeView : BaseWindow
     {
         private UI_InputGiftCodeUI _ui;
@@ -31,6 +34,12 @@ namespace GFGGame
 
         }
 
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_inputCode.text = "";
+        }
+
         private async void OnClickBtnSure()
         {
             string code = _ui.m_inputCode.text;
@@ -40,7 +49,7 @@ namespace GFGGame
                 return;
             }
 
-            bool result = await SettingSProxy.ReqGiftCodeInfo(code);
+            bool result = await SettingSProxy.ReqGiftCodeCheck(code);
             if (result)
             {
                 _ui.m_inputCode.text = "";

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

@@ -50,7 +50,8 @@ namespace GFGGame
             base.OnShown();
             SetDefaultSelectedBg();
             InitMainUIPreview();
-            UpdateSaveDressUpBgToggleState();
+
+            UpdateSaveDressUpBgBtn();
         }
 
         protected override void OnHide()
@@ -129,7 +130,7 @@ namespace GFGGame
         private void OnClickBtnChange()
         {
             PromptController.Instance.ShowFloatTextPrompt("主界面背景已更换");
-            RoleDataManager.mainBgID = (int)_ui.m_bgList.GetChildAt(_ui.m_bgList.selectedIndex).data;
+            RoleDataManager.SaveMainBgID((int)_ui.m_bgList.GetChildAt(_ui.m_bgList.selectedIndex).data);
             Hide();
         }
 
@@ -146,6 +147,9 @@ namespace GFGGame
         /// <returns></returns>
         private async Task PicAdaption()
         {
+            _ui.m_mainUIShow.visible = false;
+            _ui.m_frame.visible = false;
+
             await Task.Delay(5);
             float orginHeight = _ui.m_frame.height;
             float curHeight = _ui.m_heightAdaptHelper.size.y;
@@ -160,6 +164,9 @@ namespace GFGGame
                 _ui.m_mainUIShow.y = _ui.m_frame.y +
                     ((_ui.m_frame.height * _ui.m_frame.scale.y) - (_ui.m_mainUIShow.height * _ui.m_mainUIShow.scale.y)) / 2;
             }
+            _ui.m_mainUIShow.visible = true;
+            _ui.m_frame.visible = true;
+
         }
 
         private void OnBtnRuleClick()
@@ -187,6 +194,7 @@ namespace GFGGame
                         .SetRightButton(true, "确认", (object data) =>
                         {
                             RoleInfoSProxy.ReqSaveChangeGearSwitch(1);
+
                             ViewManager.Show<DressUpView>(null, true);
                             ViewManager.DeleteViewStackCountDown("MainUIView");
                         });
@@ -197,9 +205,8 @@ namespace GFGGame
                     .SetLeftButton(true)
                     .SetRightButton(true, "确认", (object data) =>
                     {
-                        RoleInfoSProxy.ReqSaveChangeGearSwitch(0);
-                        RoleDataManager.mainBgID = MainBackgroundCfgArray.Instance.dataArray[0].id;
-                        UpdateSaveDressUpBgToggleState();
+                        UpdateSaveDressUpBgToggleState(0);
+                        RoleDataManager.SaveMainBgID(MainBackgroundCfgArray.Instance.dataArray[0].id);
                     });
                 }
             }
@@ -215,7 +222,13 @@ namespace GFGGame
             ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GOLD_CARD });
         }
 
-        private void UpdateSaveDressUpBgToggleState()
+        private async Task UpdateSaveDressUpBgToggleState(int isOn)
+        {
+            await RoleInfoSProxy.ReqSaveChangeGearSwitch(isOn);
+            UpdateSaveDressUpBgBtn();
+        }
+
+        private void UpdateSaveDressUpBgBtn()
         {
             UI_ButtonToggle2 buttonToggle2 = UI_ButtonToggle2.Proxy(_ui.m_btnSaveDressUpBg.target);
             buttonToggle2.m_type.SetSelectedIndex(RoleDataManager.saveDressUpBgToMainBg);

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

@@ -2,6 +2,7 @@ using ET;
 using FairyGUI;
 using UI.CommonGame;
 using UI.RoleInfo;
+using UnityEngine;
 
 namespace GFGGame
 {
@@ -33,7 +34,7 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
 
             _ui.m_photoList.itemRenderer = RenderListItem;
-
+            _ui.m_badgeList.itemRenderer = OnRenderBadgeListItem;
             _ui.m_type.SetSelectedIndex(1);
         }
 
@@ -53,13 +54,15 @@ namespace GFGGame
             RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, _roleInfo.headId, _roleInfo.headBorderId);
 
             _roleDetailInfo = await RoleInfoSProxy.ReqOtherRoleDetailInfo(_roleInfo.roleId);
-            
+            _roleInfo = _roleDetailInfo.roleInfo;
             if (_roleDetailInfo != null)
             {
                 Timers.inst.StartCoroutine(PictureStorageHelper.Download(_roleDetailInfo.showPhotoList));
             }
 
             UpdateInfo();
+            UpdateView();
+            UpdateCollectProgress();
         }
 
         protected override void OnHide()
@@ -78,18 +81,17 @@ namespace GFGGame
 
         private void UpdateView()
         {
-            // RoleLevelCfg roleLevelCfg = RoleLevelCfgArray.Instance.GetCfg(_roleInfo.roleLv);
-            // if (roleLevelCfg.exp > 0)
-            // {
-            //     _ui.m_txtExp.text = string.Format("{0}/{1}", _roleDetailInfo.RoleExp, roleLevelCfg.exp);
-            // }
-            // else
-            // {
-            //     _ui.m_txtExp.text = "已满级";
-            // }
+            RoleLevelCfg roleLevelCfg = RoleLevelCfgArray.Instance.GetCfg(_roleInfo.roleLv);
+            if (roleLevelCfg.exp > 0)
+            {
+                _ui.m_txtExp.text = string.Format("{0}/{1}", _roleInfo.roleExp, roleLevelCfg.exp);
+            }
+            else
+            {
+                _ui.m_txtExp.text = "已满级";
+            }
 
             _ui.m_txtSlogan.text = _roleDetailInfo.slogan;
-            //_ui.m_btnFieldGuide.title = string.Format("套装收集度：{0}", _roleDetailInfo.SuitCollectPer);
             _ui.m_photoList.numItems = _roleDetailInfo.showPhotoList.Count;
         }
 
@@ -99,32 +101,77 @@ namespace GFGGame
             PoemPhotoData poemPhotoData = _roleDetailInfo.showPhotoList[index];
             UI_ListPhotoItem item = UI_ListPhotoItem.Proxy(obj);
             item.target.data = index;
-
-            if (poemPhotoData != null)
+            if (poemPhotoData != null && poemPhotoData.Ntexture != null)
             {
-                item.m_type.SetSelectedIndex(0);
+                item.m_type.SetSelectedIndex(1);
+                item.m_comPhoto.m_loaPhoto.texture = poemPhotoData == null ? null : poemPhotoData.Ntexture;
             }
+            // 隐藏
             else
             {
-                item.m_type.SetSelectedIndex(1);
+                item.m_type.SetSelectedIndex(3);
             }
+            
+            UI_ListPhotoItem.ProxyEnd();
+        }
 
-
-            if (RoleInfoManager.GetPosType(index) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold)
-            || RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
+        private void UpdateInfo()
+        {
+            if (_roleInfo.leagueName == null)
             {
-                item.m_comPhoto.m_loaPhoto.texture = null;
-                return;
+                _ui.m_leagueName.text = "暂未加入雅集";
+            }
+            else
+            {
+                _ui.m_leagueName.text = _roleInfo.leagueName;
             }
 
-            item.m_comPhoto.m_loaPhoto.texture = poemPhotoData == null ? null : poemPhotoData.Ntexture;
-            UI_ListPhotoItem.ProxyEnd();
+            _ui.m_txtRoleID.text = _roleInfo.roleId.ToString();
+            _ui.m_badgeList.numItems = _ui.m_badgeList.numItems;
         }
 
-        private void UpdateInfo()
+        private void UpdateCollectProgress()
         {
-            //_ui.m_leagueName.text = RoleInfoManager.Instance.GetLeagueName();
-            _ui.m_txtRoleID.text = _roleInfo.roleId.ToString();
+            UI_ButtonCollectProgress button2 = UI_ButtonCollectProgress.Proxy(_ui.m_btnSuitGuide.target);
+            // 套装
+            float progress = _roleInfo.suitCollect;
+            button2.m_rate.text = progress.ToString();
+            button2.m_progressBar.fillAmount = progress / 100;
+
+            // 词牌
+            button2 = UI_ButtonCollectProgress.Proxy(_ui.m_btnCardGuide.target);
+            progress = _roleInfo.cardCollect;
+            button2.m_rate.text = progress.ToString();
+            button2.m_progressBar.fillAmount = progress / 100;
+
+            // 成就
+            button2 = UI_ButtonCollectProgress.Proxy(_ui.m_btnTaskArchieveGuide.target);
+            progress = _roleInfo.achievementTaskCollect;
+            button2.m_rate.text = progress.ToString();
+            button2.m_progressBar.fillAmount = progress / 100;
+
+            UI_ButtonCollectProgress.ProxyEnd();
+        }
+
+        private void OnRenderBadgeListItem(int index, GObject gObject)
+        {
+            gObject.data = -1;
+
+            UI_ButtonBadge buttonBadge = UI_ButtonBadge.Proxy(gObject);
+            if (index < _roleInfo.itemList.Count)
+            {
+                int badgeID = _roleInfo.itemList[index];
+                gObject.data = badgeID;
+                buttonBadge.m_type.SetSelectedIndex(1);
+                // 加载徽章图片
+                buttonBadge.m_iconImg.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(badgeID));
+            }
+            else
+            {
+                buttonBadge.m_type.SetSelectedIndex(0);
+            }
+
+            UI_ButtonBadge.ProxyEnd();
         }
 
     }

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

@@ -117,7 +117,7 @@ namespace GFGGame
             bool result = await RoleInfoSProxy.ReqModifyShowPhoto(RoleDataManager.photoDatas);
             if (result)
             {
-                ViewManager.GoBackFrom(typeof(PersonalPhotoView).FullName);
+                Hide();
             }
         }
     }

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

@@ -9,9 +9,16 @@ namespace GFGGame
     {
 
         private UI_PhoneBindingUI _ui;
+        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();
@@ -34,6 +41,8 @@ namespace GFGGame
             _ui.m_icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(ConstItemID.DIAMOND_RED));
             _ui.m_btnGetCode.onClick.Add(OnBtnGetCode);
             _ui.m_btnClose.onClick.Add(Hide);
+
+            AddEffect();
         }
 
         protected override void OnShown()
@@ -55,5 +64,14 @@ namespace GFGGame
         {
 
         }
+
+        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

@@ -1,9 +1,9 @@
 using ET;
 using FairyGUI;
+using System.Threading.Tasks;
 using UI.CommonGame;
 using UI.RoleInfo;
 using UnityEngine;
-using UI_Button2 = UI.RoleInfo.UI_Button2;
 
 namespace GFGGame
 {
@@ -77,13 +77,8 @@ namespace GFGGame
             }
 
             _ui.m_txtSlogan.text = RoleDataManager.slogan;
-            UpdateHead();
-            UpdatePhotoList();
-            UpdateRedDot();
-            UpdateCollectProgress();
-            UpdateInfo();
+            UpdateAllInfo();
 
-            _ui.m_badgeList.numItems = _ui.m_badgeList.numItems;
         }
 
         protected override void OnHide()
@@ -191,8 +186,8 @@ namespace GFGGame
                     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";
+                    buttonBadge.m_iconImg.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(badgeID));
+                    //buttonBadge.m_iconImg.url = "ui://RoleInfo/linshj1";
                 }
             }
             else
@@ -260,25 +255,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()
@@ -286,5 +281,18 @@ namespace GFGGame
             _ui.m_leagueName.text = RoleInfoManager.Instance.GetLeagueName();
             _ui.m_txtRoleID.text = RoleInfoManager.Instance.GetRoleID().ToString();
         }
+
+        private async Task UpdateAllInfo()
+        {
+            await RoleInfoSProxy.ReqPersonalInfo();
+            UpdateHead();
+            UpdatePhotoList();
+            UpdateRedDot();
+            UpdateCollectProgress();
+            UpdateInfo();
+
+            _ui.m_badgeList.numItems = _ui.m_badgeList.numItems;
+
+        }
     }
 }

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -54,6 +54,7 @@ namespace GFGGame
             netType = EnumNetType.PUBLIC;
             cfgName = "cfg_ios";
             platformId = 2;
+            ChannelId = (int)ChannelID.AppStore;
 #elif PT_TISHEN
             netType = EnumNetType.TISHEN;
             cfgName = "cfg_ts";
@@ -61,7 +62,6 @@ namespace GFGGame
             netType = EnumNetType.LOCAL;
             cfgName = "cfg_local";
 #endif
-
             if (netType == EnumNetType.LOCAL)
             {
                 launcherRootUrl = "http://10.108.64.189:81/";