Merge remote-tracking branch 'remotes/origin/master' into dev

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -248,5 +248,7 @@ namespace GFGGame
         public const string TIMETRACINGREDUPDATE = "TIMETRACING_RED_UPDATE";
         //章节奖励红点更新
         public const string STORYCHAPREDUPDATE = "STORYCHAP_RED_UPDATE";
+        //新手领取套装
+        public const string NEWROLEGETSUIT = "NEWROLE_GETSUIT";
     }
 }

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

@@ -198,9 +198,10 @@ namespace GFGGame
                         //ViewManager.Show<StoryChapterView>(StudioDataManager.Instance.luckyBoxFilingChapterId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData });
 
                         ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId);
-                        //if(true)
+                        ////新玩家选择套装
+                        //if (RoleInfoManager.Instance.NewRoleSuitStatus == false)
                         //{
-                        //    ViewManager.Show<NewRoleGetSuitView>();
+                            //ViewManager.Show<NewRoleGetSuitView>();
                         //}
                     }
                 }
@@ -272,6 +273,7 @@ namespace GFGGame
             LeagueSproxy.GetTeapartyInfos().Coroutine();
             LeagueSproxy.GetTeapartyMatchingInfos(RoleDataManager.roleId).Coroutine();
             ActivitySProxy.ReqGetActivitySignInfos().Coroutine();
+            //RoleInfoSProxy.ReqNewRoleGetSuitStatus().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

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

@@ -29,6 +29,8 @@ namespace GFGGame
 
         private static Dictionary<int, int> _suitSyntheticBoxBonusStatus = new Dictionary<int, int>();
 
+        public static Dictionary<int, int> _suitSyntheticRewardStatus = new Dictionary<int, int>();
+
         public static void InitData()
         {
             _suitIDList.Clear();
@@ -43,6 +45,7 @@ namespace GFGGame
             {
                 _suitGuideBoxBonusStatus.Clear();
                 _suitSyntheticBoxBonusStatus.Clear();
+                _suitSyntheticRewardStatus.Clear();
                 foreach (SuitInfoProto suitInfo in suitInfoList)
                 {
                     SuitFosterData suitFosterData = new SuitFosterData()
@@ -58,6 +61,9 @@ namespace GFGGame
                     _suitGuideBoxBonusStatus.Add(suitInfo.SuitId, suitInfo.GuideBoxBonusState);
                     //合成
                     _suitSyntheticBoxBonusStatus.Add(suitInfo.SuitId, suitInfo.SyntheticBoxBonusState);
+                    //套装合成奖励2
+                    _suitSyntheticRewardStatus.Add(suitInfo.SuitId,suitInfo.BringTogetherRewardStatus);
+
                     _progressBySuitIdDic[suitInfo.SuitId] = suitInfo.PartsCount;
                     if (suitInfo.CollectedAll)
                     {
@@ -239,7 +245,30 @@ namespace GFGGame
             _suitSyntheticBoxBonusStatus[suitId] = ConstBonusStatus.GOT;
             EventAgent.DispatchEvent(ConstMessage.SUIT_BOX_STATUS_CHANGED, suitId);
         }
-
+        //套装集齐奖励2
+        public static void SetSuitSyntheticRewardStatus(int suitId)
+        {
+            if(_suitSyntheticRewardStatus.ContainsKey(suitId))
+            {
+                _suitSyntheticRewardStatus[suitId] = ConstBonusStatus.GOT;
+            }
+        }
+        public static int GetSuitSyntheticRewardStatus(int suitId)
+        {
+            int status = ConstBonusStatus.CAN_NOT_GET;
+            if (_suitSyntheticRewardStatus.ContainsKey(suitId))
+            {
+                status = _suitSyntheticRewardStatus[suitId];
+            }
+            if (status == ConstBonusStatus.CAN_NOT_GET)
+            {
+                if (CheckHaveSuit(suitId))
+                {
+                    status = ConstBonusStatus.CAN_GET;
+                }
+            }
+            return status;
+        }
         //检查套装是否有动作资源
         public static bool CheckSuitHasActionRes(int suitId)
         {

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

@@ -402,6 +402,13 @@ namespace GFGGame
                 RoleLimitData limitData = RoleLimitDataManager.GetLimitData(activityFightCfg.limit);
                 times = limitData.TotalPlayMax - limitData.PlayTimes;
             }
+            else if(type == 1 && subType == 1)
+            {
+                //精英关卡特殊处理
+                RoleLimitData limitData = RoleLimitDataManager.GetLimitData(50);
+                times = limitData.TotalPlayMax - limitData.PlayTimes;
+                times = Math.Min(times, 10);
+            }
             title = string.Format("挑战{0}次", NumberUtil.GetChiniseNumberText(times));
         }
         public static void GetTotalProgress(out int count, out int totalCount)

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

@@ -515,7 +515,7 @@ namespace GFGGame
             List<SuitCfg> suitCfgs = SuitCfgArray.Instance.GetCfgsBysyntheticType(tab);
             for (int i = 0; i < suitCfgs.Count; i++)
             {
-                if (GetClothingSyntheticBonusRed(suitCfgs[i].id)) return true;
+                if (GetClothingSyntheticBonusRed(suitCfgs[i].id) || GetClothingSyntheticRewardRed(suitCfgs[i].id)) return true;
                 bool isLevelPass = InstanceZonesDataManager.CheckLevelPass(suitCfgs[i].syntheticStoryLevelId);
                 if (!isLevelPass) continue;
                 if (GetClothingSyntheticRed(suitCfgs[i].id)) return true;
@@ -571,6 +571,36 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 套装合成奖励2红点
+        /// </summary>
+        /// <param name="suitId"></param>
+        /// <returns></returns>
+        public bool GetClothingSyntheticRewardRed(int suitId)
+        {
+            bool isLock = false;
+            int status = DressUpMenuSuitDataManager.GetSuitSyntheticRewardStatus(suitId);
+
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            if (suitCfg.syntheticStoryLevelId > 0)
+            {
+                bool isLevelPass = InstanceZonesDataManager.CheckLevelPass(suitCfg.syntheticStoryLevelId);
+                if (!isLevelPass)
+                {
+                    isLock = true;
+                }
+            }
+            if (suitCfg.syntheticPreSuitId > 0)
+            {
+                bool hasPreSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitCfg.syntheticPreSuitId);
+                if (!hasPreSuit)
+                {
+                    isLock = true;
+                }
+            }
+            return status == ConstBonusStatus.CAN_GET && !isLock;
+        }
+
+        /// <summary>
         /// 合成-服装部件红点
         /// </summary>
         /// <param name="itemId"></param>

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

@@ -33,7 +33,7 @@ namespace GFGGame
                 return _headBorderDatas;
             }
         }
-
+        public bool NewRoleSuitStatus;
         public void Add(ItemInfoProto itemInfoProto)
         {
             var itemId = itemInfoProto.ConfigId;

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

@@ -122,16 +122,13 @@ namespace GFGGame
         }
 
         //移除原价商品
-        public List<ShopCfg> RemoveNotSaleCfg(List<ShopCfg> shop)
+        public List<ShopCfg> RemoveNotSaleCfg(List<ShopCfg> shop,List<int> idList)
         {
             List<ShopCfg> shopCfgs = new List<ShopCfg>();
-            for (int i = shop.Count - 1; i >= 0; i--)
+            for (int i = 0; i < idList.Count; i++)
             {
-                if (shop[i].originalId == 0)
-                {
-                    continue;
-                }
-                shopCfgs.Add(shop[i]);
+                ShopCfg shopcfg = ShopCfgArray.Instance.GetCfg(idList[i]);
+                shopCfgs.Add(shopcfg);
             }
             return shopCfgs;
         }

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

@@ -265,7 +265,7 @@ namespace GFGGame
         /// <param name="excludeType">排除类型列表</param>
         /// <param name="showOptional">是否显示可选部件</param>
         /// <param name="CheckOwn">是否只显示主角拥有的部件</param>
-        public void PutOnSuitCfg(int suitId, bool tryShowAction, int[] excludeType = null, bool showOptional = true, bool CheckOwn = true)
+        public void PutOnSuitCfg(int suitId, bool tryShowAction, int[] excludeType = null, bool showOptional = true, bool CheckOwn = true,bool isDress = false)
         {
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
             if(suitCfg == null)
@@ -278,7 +278,7 @@ namespace GFGGame
             _dressUpData.actionId = (hasSuitActionRes && tryShowAction) ? suitId : 0;
             
             //找到要穿的散件
-            List<int> targetItemList = DressUpUtil.GetSuitItems(suitId, IsAction, excludeType, showOptional, CheckOwn);
+            List<int> targetItemList = DressUpUtil.GetSuitItems(suitId, IsAction, excludeType, showOptional, CheckOwn, isDress);
             CompareAndAddItemList(oldIsAction, IsAction, targetItemList);
             checkDefaultItem();
         }

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

@@ -524,7 +524,7 @@ namespace GFGGame
             }
         }
 
-        public static List<int> GetSuitItems(int suitId, bool isAction, int[] excludeType = null, bool showOptional = true, bool CheckOwn = true)
+        public static List<int> GetSuitItems(int suitId, bool isAction, int[] excludeType = null, bool showOptional = true, bool CheckOwn = true,bool isDress = false)
         {
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
             if (suitCfg == null)
@@ -544,7 +544,7 @@ namespace GFGGame
             List<int> targetItemList = new List<int>();
             foreach (int itemId in items)
             {
-                if (!CheckOwn || DressUpMenuItemDataManager.CheckHasItem(itemId))
+                if (!CheckOwn || DressUpMenuItemDataManager.CheckHasItem(itemId) || isDress)
                 {
                     subType = ItemDataManager.GetItemSubType(itemId);
                     bool notInAction = SuitCfgArray.Instance.CheckItemNotInAction(itemId);

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ZCJBBuyTips.cs

@@ -7,9 +7,10 @@ namespace UI.ActivityMain
     public partial class UI_ZCJBBuyTips
     {
         public GComponent target;
-        public GGraph m_graphBg;
+        public GGraph m_graph;
         public GTextField m_txtContent;
         public GTextField m_txtTips;
+        public GTextField m_txtNumTips;
         public GButton m_btnLeft;
         public GButton m_btnRight;
         public const string URL = "ui://4ht5s77uqzw81c";
@@ -59,17 +60,19 @@ namespace UI.ActivityMain
 
         private void Init(GComponent comp)
         {
-            m_graphBg = (GGraph)comp.GetChild("graphBg");
+            m_graph = (GGraph)comp.GetChild("graph");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_txtNumTips = (GTextField)comp.GetChild("txtNumTips");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
             m_btnRight = (GButton)comp.GetChild("btnRight");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_graphBg = null;
+            m_graph = null;
             m_txtContent = null;
             m_txtTips = null;
+            m_txtNumTips = null;
             m_btnLeft = null;
             m_btnRight = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardSkillUI.cs

@@ -15,7 +15,10 @@ namespace UI.Card
         public UI_ComSkillDiscribe m_comNextLv;
         public GList m_listConsume;
         public GComponent m_comConsume;
+        public GButton m_btnUpLvSpecial;
         public GButton m_btnUpLv;
+        public GButton m_btnCheckself;
+        public GButton m_btnCheckother;
         public GGroup m_lvInfo;
         public GGraph m_holderIcon;
         public const string URL = "ui://7l6lvkayrhha9m";
@@ -73,7 +76,10 @@ namespace UI.Card
             m_comNextLv = (UI_ComSkillDiscribe)UI_ComSkillDiscribe.Create(comp.GetChild("comNextLv"));
             m_listConsume = (GList)comp.GetChild("listConsume");
             m_comConsume = (GComponent)comp.GetChild("comConsume");
+            m_btnUpLvSpecial = (GButton)comp.GetChild("btnUpLvSpecial");
             m_btnUpLv = (GButton)comp.GetChild("btnUpLv");
+            m_btnCheckself = (GButton)comp.GetChild("btnCheckself");
+            m_btnCheckother = (GButton)comp.GetChild("btnCheckother");
             m_lvInfo = (GGroup)comp.GetChild("lvInfo");
             m_holderIcon = (GGraph)comp.GetChild("holderIcon");
         }
@@ -89,7 +95,10 @@ namespace UI.Card
             m_comNextLv = null;
             m_listConsume = null;
             m_comConsume = null;
+            m_btnUpLvSpecial = null;
             m_btnUpLv = null;
+            m_btnCheckself = null;
+            m_btnCheckother = null;
             m_lvInfo = null;
             m_holderIcon = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CardSynthetic/UI_MateriasListItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CardSynthetic
+{
+    public partial class UI_MateriasListItem
+    {
+        public GButton target;
+        public GLoader m_loaderIcon;
+        public GTextField m_txtName;
+        public GTextField m_txtProgess;
+        public const string URL = "ui://c6tzok8ouje10";
+        public const string PACKAGE_NAME = "CardSynthetic";
+        public const string RES_NAME = "MateriasListItem";
+        private static UI_MateriasListItem _proxy;
+
+        public static UI_MateriasListItem Create(GObject gObject = null)
+        {
+            var ui = new UI_MateriasListItem();
+            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_MateriasListItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MateriasListItem();
+            }
+            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_loaderIcon = (GLoader)comp.GetChild("loaderIcon");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtProgess = (GTextField)comp.GetChild("txtProgess");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaderIcon = null;
+            m_txtName = null;
+            m_txtProgess = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CardSynthetic/UI_MateriasListItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_ClothingSyntheticListUI.cs

@@ -8,7 +8,7 @@ namespace UI.ClothingSynthetic
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GButton m_btnBack;
+        public GComponent m_btnBack;
         public GList m_listMenu;
         public GList m_listSuit;
         public const string URL = "ui://4f294tdkj5390";
@@ -59,7 +59,7 @@ namespace UI.ClothingSynthetic
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnBack = (GComponent)comp.GetChild("btnBack");
             m_listMenu = (GList)comp.GetChild("listMenu");
             m_listSuit = (GList)comp.GetChild("listSuit");
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_ClothingSyntheticUI.cs

@@ -22,7 +22,7 @@ namespace UI.ClothingSynthetic
         public GButton m_btnBack;
         public GButton m_btnHome;
         public GComponent m_valueBar;
-        public GLoader m_cardSyntheticBtn;
+        public GButton m_cardSyntheticBtn;
         public Transition m_hide;
         public Transition m_show;
         public const string URL = "ui://4f294tdkj5391";
@@ -87,7 +87,7 @@ namespace UI.ClothingSynthetic
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnHome = (GButton)comp.GetChild("btnHome");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_cardSyntheticBtn = (GLoader)comp.GetChild("cardSyntheticBtn");
+            m_cardSyntheticBtn = (GButton)comp.GetChild("cardSyntheticBtn");
             m_hide = comp.GetTransition("hide");
             m_show = comp.GetTransition("show");
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4b68bf69a6d9e534aa05f083da6deb44
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_ClothingSelectUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingUpgrade
+{
+    public partial class UI_ClothingSelectUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GList m_selectList;
+        public GButton m_btnBack;
+        public const string URL = "ui://n7cyoafqckqp0";
+        public const string PACKAGE_NAME = "ClothingUpgrade";
+        public const string RES_NAME = "ClothingSelectUI";
+        private static UI_ClothingSelectUI _proxy;
+
+        public static UI_ClothingSelectUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ClothingSelectUI();
+            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_ClothingSelectUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ClothingSelectUI();
+            }
+            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_bg = (GLoader)comp.GetChild("bg");
+            m_selectList = (GList)comp.GetChild("selectList");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_selectList = null;
+            m_btnBack = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_ClothingSelectUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_ClothingUpgradeUI.cs

@@ -0,0 +1,101 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingUpgrade
+{
+    public partial class UI_ClothingUpgradeUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GButton m_btnBack;
+        public GTextField m_desc1Text;
+        public GTextField m_desc2Text;
+        public GTextField m_desc3Text;
+        public GComponent m_item0;
+        public GComponent m_item1;
+        public GComponent m_item2;
+        public GLoader m_upgradeBtn;
+        public GTextField m_finish;
+        public GTextField m_unLockText;
+        public const string URL = "ui://n7cyoafqckqp4";
+        public const string PACKAGE_NAME = "ClothingUpgrade";
+        public const string RES_NAME = "ClothingUpgradeUI";
+        private static UI_ClothingUpgradeUI _proxy;
+
+        public static UI_ClothingUpgradeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ClothingUpgradeUI();
+            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_ClothingUpgradeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ClothingUpgradeUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_desc1Text = (GTextField)comp.GetChild("desc1Text");
+            m_desc2Text = (GTextField)comp.GetChild("desc2Text");
+            m_desc3Text = (GTextField)comp.GetChild("desc3Text");
+            m_item0 = (GComponent)comp.GetChild("item0");
+            m_item1 = (GComponent)comp.GetChild("item1");
+            m_item2 = (GComponent)comp.GetChild("item2");
+            m_upgradeBtn = (GLoader)comp.GetChild("upgradeBtn");
+            m_finish = (GTextField)comp.GetChild("finish");
+            m_unLockText = (GTextField)comp.GetChild("unLockText");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_btnBack = null;
+            m_desc1Text = null;
+            m_desc2Text = null;
+            m_desc3Text = null;
+            m_item0 = null;
+            m_item1 = null;
+            m_item2 = null;
+            m_upgradeBtn = null;
+            m_finish = null;
+            m_unLockText = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_ClothingUpgradeUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_clothingSelectItem.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingUpgrade
+{
+    public partial class UI_clothingSelectItem
+    {
+        public GComponent target;
+        public GLoader m_partIcon;
+        public GTextField m_levelText;
+        public GTextField m_levelDescText;
+        public GTextField m_levelNumText;
+        public const string URL = "ui://n7cyoafqckqp1";
+        public const string PACKAGE_NAME = "ClothingUpgrade";
+        public const string RES_NAME = "clothingSelectItem";
+        private static UI_clothingSelectItem _proxy;
+
+        public static UI_clothingSelectItem Create(GObject gObject = null)
+        {
+            var ui = new UI_clothingSelectItem();
+            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_clothingSelectItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_clothingSelectItem();
+            }
+            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_partIcon = (GLoader)comp.GetChild("partIcon");
+            m_levelText = (GTextField)comp.GetChild("levelText");
+            m_levelDescText = (GTextField)comp.GetChild("levelDescText");
+            m_levelNumText = (GTextField)comp.GetChild("levelNumText");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_partIcon = null;
+            m_levelText = null;
+            m_levelDescText = null;
+            m_levelNumText = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingUpgrade/UI_clothingSelectItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_ComboBoxRarity_popup.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CreateRole
+{
+    public partial class UI_ComboBoxRarity_popup
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://5al8chbdckqp13";
+        public const string PACKAGE_NAME = "CreateRole";
+        public const string RES_NAME = "ComboBoxRarity_popup";
+        private static UI_ComboBoxRarity_popup _proxy;
+
+        public static UI_ComboBoxRarity_popup Create(GObject gObject = null)
+        {
+            var ui = new UI_ComboBoxRarity_popup();
+            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_ComboBoxRarity_popup Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComboBoxRarity_popup();
+            }
+            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_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_ComboBoxRarity_popup.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_NewRoleGetSuitUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CreateRole
+{
+    public partial class UI_NewRoleGetSuitUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GButton m_suit1;
+        public GButton m_suit2;
+        public GButton m_suit3;
+        public GLoader m_btnDress;
+        public Transition m_t0;
+        public const string URL = "ui://5al8chbdckqpp";
+        public const string PACKAGE_NAME = "CreateRole";
+        public const string RES_NAME = "NewRoleGetSuitUI";
+        private static UI_NewRoleGetSuitUI _proxy;
+
+        public static UI_NewRoleGetSuitUI Create(GObject gObject = null)
+        {
+            var ui = new UI_NewRoleGetSuitUI();
+            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_NewRoleGetSuitUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NewRoleGetSuitUI();
+            }
+            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_bg = (GLoader)comp.GetChild("bg");
+            m_suit1 = (GButton)comp.GetChild("suit1");
+            m_suit2 = (GButton)comp.GetChild("suit2");
+            m_suit3 = (GButton)comp.GetChild("suit3");
+            m_btnDress = (GLoader)comp.GetChild("btnDress");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_suit1 = null;
+            m_suit2 = null;
+            m_suit3 = null;
+            m_btnDress = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_NewRoleGetSuitUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_PartsList.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CreateRole
+{
+    public partial class UI_PartsList
+    {
+        public GComponent target;
+        public GImage m_imgTop;
+        public GComboBox m_comboBoxRarity;
+        public GList m_list;
+        public const string URL = "ui://5al8chbdckqpx";
+        public const string PACKAGE_NAME = "CreateRole";
+        public const string RES_NAME = "PartsList";
+        private static UI_PartsList _proxy;
+
+        public static UI_PartsList Create(GObject gObject = null)
+        {
+            var ui = new UI_PartsList();
+            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_PartsList Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_PartsList();
+            }
+            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_imgTop = (GImage)comp.GetChild("imgTop");
+            m_comboBoxRarity = (GComboBox)comp.GetChild("comboBoxRarity");
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_imgTop = null;
+            m_comboBoxRarity = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_PartsList.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_PartsListItem.cs

@@ -0,0 +1,107 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CreateRole
+{
+    public partial class UI_PartsListItem
+    {
+        public GComponent target;
+        public Controller m_itemType;
+        public GLoader m_loaBorder;
+        public GImage m_iconSelected;
+        public GLoader m_icon;
+        public GLoader m_rarity;
+        public GLoader m_ScoreType;
+        public GTextField m_txtScore;
+        public GGroup m_grpScore;
+        public GImage m_imgNeed;
+        public GImage m_imgNew;
+        public GTextField m_txtTitle;
+        public GButton m_btnAni;
+        public GList m_ListTag;
+        public const string URL = "ui://5al8chbdckqp19";
+        public const string PACKAGE_NAME = "CreateRole";
+        public const string RES_NAME = "PartsListItem";
+        private static UI_PartsListItem _proxy;
+
+        public static UI_PartsListItem Create(GObject gObject = null)
+        {
+            var ui = new UI_PartsListItem();
+            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_PartsListItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_PartsListItem();
+            }
+            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_itemType = comp.GetController("itemType");
+            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
+            m_iconSelected = (GImage)comp.GetChild("iconSelected");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_rarity = (GLoader)comp.GetChild("rarity");
+            m_ScoreType = (GLoader)comp.GetChild("ScoreType");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_grpScore = (GGroup)comp.GetChild("grpScore");
+            m_imgNeed = (GImage)comp.GetChild("imgNeed");
+            m_imgNew = (GImage)comp.GetChild("imgNew");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_btnAni = (GButton)comp.GetChild("btnAni");
+            m_ListTag = (GList)comp.GetChild("ListTag");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_itemType = null;
+            m_loaBorder = null;
+            m_iconSelected = null;
+            m_icon = null;
+            m_rarity = null;
+            m_ScoreType = null;
+            m_txtScore = null;
+            m_grpScore = null;
+            m_imgNeed = null;
+            m_imgNew = null;
+            m_txtTitle = null;
+            m_btnAni = null;
+            m_ListTag = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_PartsListItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_TryDressUpView.cs

@@ -0,0 +1,81 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CreateRole
+{
+    public partial class UI_TryDressUpView
+    {
+        public GComponent target;
+        public GTextField m_title;
+        public UI_PartsList m_partsListSearch;
+        public GButton m_btnBack;
+        public GGraph m_suitShow;
+        public const string URL = "ui://5al8chbdckqpw";
+        public const string PACKAGE_NAME = "CreateRole";
+        public const string RES_NAME = "TryDressUpView";
+        private static UI_TryDressUpView _proxy;
+
+        public static UI_TryDressUpView Create(GObject gObject = null)
+        {
+            var ui = new UI_TryDressUpView();
+            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_TryDressUpView Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TryDressUpView();
+            }
+            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_title = (GTextField)comp.GetChild("title");
+            m_partsListSearch = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsListSearch"));
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_suitShow = (GGraph)comp.GetChild("suitShow");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_title = null;
+            m_partsListSearch.Dispose();
+            m_partsListSearch = null;
+            m_btnBack = null;
+            m_suitShow = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CreateRole/UI_TryDressUpView.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterItemGuideUI.cs

@@ -8,7 +8,7 @@ namespace UI.FieldGuide
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GButton m_btnBack;
+        public GComponent m_btnBack;
         public GList m_list;
         public const string URL = "ui://vqq9h9h4s61p1y";
         public const string PACKAGE_NAME = "FieldGuide";
@@ -58,7 +58,7 @@ namespace UI.FieldGuide
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnBack = (GComponent)comp.GetChild("btnBack");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_CompSuitItem.cs

@@ -7,7 +7,6 @@ namespace UI.FieldGuide
     public partial class UI_CompSuitItem
     {
         public GComponent target;
-        public Controller m_c1;
         public Controller m_state;
         public GGraph m_holderBg;
         public GLoader m_bg;
@@ -16,7 +15,7 @@ namespace UI.FieldGuide
         public GProgressBar m_progBar;
         public GLoader m_rarity;
         public GTextField m_txtName;
-        public GImage m_unlockMask;
+        public GTextField m_activityName;
         public const string URL = "ui://vqq9h9h4e3ot6n";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "CompSuitItem";
@@ -64,7 +63,6 @@ namespace UI.FieldGuide
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
             m_state = comp.GetController("state");
             m_holderBg = (GGraph)comp.GetChild("holderBg");
             m_bg = (GLoader)comp.GetChild("bg");
@@ -73,11 +71,10 @@ namespace UI.FieldGuide
             m_progBar = (GProgressBar)comp.GetChild("progBar");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_unlockMask = (GImage)comp.GetChild("unlockMask");
+            m_activityName = (GTextField)comp.GetChild("activityName");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
             m_state = null;
             m_holderBg = null;
             m_bg = null;
@@ -87,7 +84,7 @@ namespace UI.FieldGuide
             m_progBar = null;
             m_rarity = null;
             m_txtName = null;
-            m_unlockMask = null;
+            m_activityName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitComitem.cs

@@ -0,0 +1,99 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_SuitComitem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_state;
+        public GGraph m_holderBg;
+        public GLoader m_bg;
+        public GLoader m_loaderPic;
+        public UI_BonusBox m_loaderBonusBox;
+        public GProgressBar m_progBar;
+        public GLoader m_rarity;
+        public GTextField m_txtName;
+        public GImage m_unlockMask;
+        public const string URL = "ui://vqq9h9h4xfki83";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "SuitComitem";
+        private static UI_SuitComitem _proxy;
+
+        public static UI_SuitComitem Create(GObject gObject = null)
+        {
+            var ui = new UI_SuitComitem();
+            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_SuitComitem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SuitComitem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_state = comp.GetController("state");
+            m_holderBg = (GGraph)comp.GetChild("holderBg");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_loaderPic = (GLoader)comp.GetChild("loaderPic");
+            m_loaderBonusBox = (UI_BonusBox)UI_BonusBox.Create(comp.GetChild("loaderBonusBox"));
+            m_progBar = (GProgressBar)comp.GetChild("progBar");
+            m_rarity = (GLoader)comp.GetChild("rarity");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_unlockMask = (GImage)comp.GetChild("unlockMask");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_state = null;
+            m_holderBg = null;
+            m_bg = null;
+            m_loaderPic = null;
+            m_loaderBonusBox.Dispose();
+            m_loaderBonusBox = null;
+            m_progBar = null;
+            m_rarity = null;
+            m_txtName = null;
+            m_unlockMask = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitComitem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitGuideDetailUI.cs

@@ -13,6 +13,9 @@ namespace UI.FieldGuide
         public GTextField m_title;
         public GButton m_btnSearch;
         public UI_ProgressBar4 m_progress;
+        public GLoader m_rightBtn;
+        public GLoader m_leftBtn;
+        public GButton m_lookBtn;
         public Transition m_In;
         public Transition m_Refresh;
         public const string URL = "ui://vqq9h9h4e3ot6l";
@@ -68,6 +71,9 @@ namespace UI.FieldGuide
             m_title = (GTextField)comp.GetChild("title");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_progress = (UI_ProgressBar4)UI_ProgressBar4.Create(comp.GetChild("progress"));
+            m_rightBtn = (GLoader)comp.GetChild("rightBtn");
+            m_leftBtn = (GLoader)comp.GetChild("leftBtn");
+            m_lookBtn = (GButton)comp.GetChild("lookBtn");
             m_In = comp.GetTransition("In");
             m_Refresh = comp.GetTransition("Refresh");
         }
@@ -81,6 +87,9 @@ namespace UI.FieldGuide
             m_btnSearch = null;
             m_progress.Dispose();
             m_progress = null;
+            m_rightBtn = null;
+            m_leftBtn = null;
+            m_lookBtn = null;
             m_In = null;
             m_Refresh = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitGuideListUI.cs

@@ -0,0 +1,94 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_SuitGuideListUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public UI_listSuit m_listSuitCom;
+        public GTextField m_title;
+        public GButton m_btnSearch;
+        public UI_ProgressBar4 m_progress;
+        public Transition m_In;
+        public Transition m_Refresh;
+        public const string URL = "ui://vqq9h9h4iufg81";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "SuitGuideListUI";
+        private static UI_SuitGuideListUI _proxy;
+
+        public static UI_SuitGuideListUI Create(GObject gObject = null)
+        {
+            var ui = new UI_SuitGuideListUI();
+            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_SuitGuideListUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SuitGuideListUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_listSuitCom = (UI_listSuit)UI_listSuit.Create(comp.GetChild("listSuitCom"));
+            m_title = (GTextField)comp.GetChild("title");
+            m_btnSearch = (GButton)comp.GetChild("btnSearch");
+            m_progress = (UI_ProgressBar4)UI_ProgressBar4.Create(comp.GetChild("progress"));
+            m_In = comp.GetTransition("In");
+            m_Refresh = comp.GetTransition("Refresh");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_listSuitCom.Dispose();
+            m_listSuitCom = null;
+            m_title = null;
+            m_btnSearch = null;
+            m_progress.Dispose();
+            m_progress = null;
+            m_In = null;
+            m_Refresh = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitGuideListUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_listSuit.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_listSuit.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/TimeTracing/UI_TimeTracingShowUI.cs

@@ -15,6 +15,7 @@ namespace UI.TimeTracing
         public GButton m_challgeBtn;
         public UI_Button2 m_makeSuitBtn;
         public GButton m_btnBack;
+        public GLoader m_nameIcon;
         public const string URL = "ui://gayfh946l8158";
         public const string PACKAGE_NAME = "TimeTracing";
         public const string RES_NAME = "TimeTracingShowUI";
@@ -70,6 +71,7 @@ namespace UI.TimeTracing
             m_challgeBtn = (GButton)comp.GetChild("challgeBtn");
             m_makeSuitBtn = (UI_Button2)UI_Button2.Create(comp.GetChild("makeSuitBtn"));
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_nameIcon = (GLoader)comp.GetChild("nameIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -83,6 +85,7 @@ namespace UI.TimeTracing
             m_makeSuitBtn.Dispose();
             m_makeSuitBtn = null;
             m_btnBack = null;
+            m_nameIcon = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -386,7 +386,15 @@ namespace GFGGame
             S2C_GetDataRecord response = (S2C_GetDataRecord)await MessageHelper.SendToServer(new C2S_GetDataRecord() { });
             for (int i = 0; i < response.AllKs.Count; i++)
             {
-                ActivityDataManager.Instance.TipsStatusDic.Add(response.AllKs[i], response.AllVs[i]);
+                if(ActivityDataManager.Instance.TipsStatusDic.ContainsKey(response.AllKs[i]))
+                {
+                    ActivityDataManager.Instance.TipsStatusDic[response.AllKs[i]] = response.AllVs[i];
+                }
+                else
+                {
+                    ActivityDataManager.Instance.TipsStatusDic.Add(response.AllKs[i], response.AllVs[i]);
+                }
+                //
             }
         }
     }

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

@@ -23,25 +23,46 @@ namespace GFGGame
 
         }
 
-        public static async ETTask<bool> CardSynthetic(int itemId,bool isFirst)
+        public static async ETTask<bool> CardSynthetic(int itemId)
         {
-            var response = (M2C_ClothingSynthetic)await MessageHelper.SendToServer(new C2M_ClothingSynthetic() { ItemId = itemId });
+            var response = (M2C_CardSynthetic)await MessageHelper.SendToServer(new C2M_CardSynthetic() { ItemId = itemId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.RewardList));
+                    return true;
+                }
+            }
+            return true;
+
+        }
+
+        public static async ETTask<int> GetCardSyntheticCount(int cardId)
+        {
+            var response = (M2C_GetCardSyntheticNum)await MessageHelper.SendToServer(new C2M_GetCardSyntheticNum() { ItemId = cardId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    return response.Num;
+                }
+            }
+            return -1;
+
+        }
+        //领取套装集齐奖励
+        public static async ETTask<bool> GetSuitGetReward(int suitId)
+        {
+            var response = (M2C_BringTogetherReward)await MessageHelper.SendToServer(new C2M_GetBringTogetherReward() { SuitId = suitId });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    if(isFirst)
-                    {
-                        ViewManager.Show<LuckyBoxNewCardView>(itemId);
-                    }
-                    else
-                    {
-                        int[][] array = new int[][]
-                                        {
-                                            new int[] { 3000028, 1 }
-                                        };
-                        BonusController.TryShowBonusList(array);
-                    }
+                    DressUpMenuSuitDataManager.SetSuitSyntheticRewardStatus(suitId);
+                    SuitCfg item = SuitCfgArray.Instance.GetCfg(suitId);
+                    ViewManager.Show<LuckyBoxNewCardView>(item.SuitCollectrewardArr[0][0]);
+                    //BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.RewardList));
                     return true;
                 }
             }
@@ -49,4 +70,19 @@ namespace GFGGame
 
         }
     }
+    public class NoticeSuitGetRewardChange : AMHandler<M2C_PushBringTogetherRewardState>
+    {
+        protected override async ETTask Run(Session session, M2C_PushBringTogetherRewardState message)
+        {
+            if(DressUpMenuSuitDataManager._suitSyntheticRewardStatus.ContainsKey(message.SuitId))
+            {
+                DressUpMenuSuitDataManager._suitSyntheticRewardStatus[message.SuitId] = message.BringTogetherRewardStatus;
+            }
+            else
+            {
+                DressUpMenuSuitDataManager._suitSyntheticRewardStatus.Add(message.SuitId, message.BringTogetherRewardStatus);
+            }
+            await ETTask.CompletedTask;
+        }
+    }
 }

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

@@ -56,6 +56,14 @@ namespace GFGGame
                             }
                         }
                     }
+                    //if(storyLevelCfg.id == 100001001)
+                    //{
+                        ////新玩家选择套装
+                        //if (RoleInfoManager.Instance.NewRoleSuitStatus == false)
+                        //{
+                            //ViewManager.Show<NewRoleGetSuitView>();
+                        //}
+                    //}
                     EventAgent.DispatchEvent(ConstMessage.STORY_LEVEL_CHANGE);
                     return;
                 }

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

@@ -1,4 +1,7 @@
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using ET;
 
 namespace GFGGame
@@ -231,6 +234,37 @@ namespace GFGGame
             return false;
         }
 
-
+        //新手领取套装
+        public static async ETTask<bool> ReqNewRoleGetSuit(int id)
+        {
+            S2C_GetSuitSelectReward response;
+            response = (S2C_GetSuitSelectReward)await MessageHelper.SendToServer(new C2S_GetSuitSelectReward() { SuitId = id });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    RoleInfoManager.Instance.NewRoleSuitStatus = response.Status;
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.RewardList));
+                    EventAgent.DispatchEvent(ConstMessage.NEWROLEGETSUIT);
+                    return true;
+                }
+            }
+            return false;
+        }
+        //新手领取套装状态
+        public static async ETTask<bool> ReqNewRoleGetSuitStatus()
+        {
+            S2C_GetSuitSelectStatus response;
+            response = (S2C_GetSuitSelectStatus)await MessageHelper.SendToServer(new C2S_GetSuitSelectStatus() {  });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    RoleInfoManager.Instance.NewRoleSuitStatus = response.Status;
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

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

@@ -37,10 +37,10 @@ namespace GFGGame
 {
     public static class SkillSProxy
     {
-        public static async ETTask<bool> ReqUpgradeCardSkill(int cardId, int skillId)
+        public static async ETTask<bool> ReqUpgradeCardSkill(int cardId, int skillId ,int type = 0)
         {
             M2C_UpgradeCardSkill response = null;
-            response = (M2C_UpgradeCardSkill)await MessageHelper.SendToServer(new C2M_UpgradeCardSkill() { CardId = cardId, SkillId = skillId });
+            response = (M2C_UpgradeCardSkill)await MessageHelper.SendToServer(new C2M_UpgradeCardSkill() { CardId = cardId, SkillId = skillId,CostType = type });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaMainView.cs

@@ -48,6 +48,9 @@ namespace GFGGame
             base.OnShown();
             _ui.m_Bg.url = ResPathUtil.GetBgImgPath("gfxwc_zymbj");
             _ui.m_BgOne.url = ResPathUtil.GetBgImgPath("gfxwc_zjmlp");
+            _ui.m_oneTimeIcon.visible = false;
+            _ui.m_threeTimeIcon.visible = false;
+            _ui.m_twoTimeIcon.visible = false;
             RedDotController.Instance.SetComRedDot(_ui.m_twoViewIcon, ActivityTeaDataManager.Instance.GetRewardRed()|| ActivityTeaDataManager.Instance.CheckVisitTaskRed());
             RedDotController.Instance.SetComRedDot(_ui.m_oneViewIcon, ActivityTeaDataManager.Instance.CheckHRDRed(),"",-85);
             RedDotController.Instance.SetComRedDot(_ui.m_threeViewIcon, ActivityTeaDataManager.Instance.GetActivitySyntheticRed(),"",-85);

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ZCJBBuyTipsView.cs

@@ -33,7 +33,7 @@ namespace GFGGame
 
             _ui.m_btnRight.onClick.Add(OnClickBtnSure);
             _ui.m_btnLeft.onClick.Add(OnClickBtnCancel);
-            _ui.m_graphBg.onClick.Add(OnClickBtnCancel);
+            _ui.m_graph.onClick.Add(OnClickBtnCancel);
         }
 
         protected override void OnShown()
@@ -59,6 +59,8 @@ namespace GFGGame
         {
             _ui.m_txtContent.text = Desc;
             _ui.m_txtTips.text = "（购买的次数请及时使用，次日5：00重置）";
+            _ui.m_txtNumTips.text = string.Format("今日购买次数：{0}/{1}", RoleLimitDataManager.GetLimitData(limitID).BuyTimes, LimitCfgArray.Instance.GetCfg(limitID).buyNum);
+            UpdateDesc();
         }
 
         private void OnClickBtnSure()
@@ -71,8 +73,47 @@ namespace GFGGame
             {
                 return;
             }
+            UpdateDesc();
             PromptController.Instance.ShowFloatTextPrompt("次数+1");
         }
+        private void UpdateDesc()
+        {
+            LimitCfg limitcfg = LimitCfgArray.Instance.GetCfg(limitID);
+            int buyCount = RoleLimitDataManager.GetLimitData(limitID).BuyTimes; 
+            int costNum = 0;
+            if(limitcfg.moneyBuyTimesArr.Length>0)
+            {
+                for(int i=0;i< limitcfg.moneyBuyTimesArr.Length;i++)
+                {
+                    int t = buyCount - limitcfg.moneyBuyTimesArr[i];
+                    if(t<0)
+                    {
+                        costNum = limitcfg.moneyNumArr[i-1];
+                        break;
+                    }
+                    else
+                    {
+                        if (i == limitcfg.moneyBuyTimesArr.Length - 1)
+                        {
+                            costNum = limitcfg.moneyNumArr[i];
+                            break;
+                        }
+                        else
+                        {
+                            costNum = limitcfg.itemNum;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                costNum = LimitCfgArray.Instance.GetCfg(limitID).moneyNumArr[0];
+            }
+            string name = ItemCfgArray.Instance.GetCfg(LimitCfgArray.Instance.GetCfg(limitID).moneyId).name;
+            string desc = string.Format("是否花费{0}{1}购买{2}次过关次数？", costNum, name, 1);
+            _ui.m_txtNumTips.text = string.Format("今日购买次数：{0}/{1}", RoleLimitDataManager.GetLimitData(limitID).BuyTimes, LimitCfgArray.Instance.GetCfg(limitID).buyNum);
+            _ui.m_txtContent.text = desc;
+        }
 
         private void OnClickBtnCancel()
         {

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ZGTHgiftDCTipsView.cs

@@ -16,7 +16,10 @@ namespace GFGGame
         private int indexSuit = 0;
         private int giftItemId = 0;
         private int giftShopId = 0;
-
+        //创角时间
+        private long second_CreateRole = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole().CreateTime;
+        //折扣时间两天(豪秒)
+        private long saleSecondNum = 172800000;
         public override void Dispose()
         {
 
@@ -63,15 +66,12 @@ namespace GFGGame
             zgthdcListCfg = EverydaySaleCfgArray.Instance.GetCfgsByactivityId(6001);
             indexSuit = ReturnDiscountTimeSuitIndex();
             UpdateView();
-
             var activityInfo = zgthdcListCfg[indexSuit];
-            long endTime = 0;
             if (activityInfo != null)
             {
-                endTime = TimeUtil.DateTimeToTimestamp(activityInfo.endTime);
+                long timeSale = (second_CreateRole + (saleSecondNum * activityInfo.id)) - TimeHelper.ServerNow();
+                _ui.m_timeText.text = TimeUtil.FormattingTimeTo_DDHHmm(timeSale);
             }
-            var leftTime = endTime - TimeHelper.ServerNow();
-            _ui.m_timeText.text = TimeUtil.FormattingTimeTo_DDHHmm((int)leftTime);
 
             Timers.inst.Add(1, 0, UpdateTime);
         }
@@ -174,20 +174,19 @@ namespace GFGGame
         private void UpdateTime(object param)
         {
             var activityInfo = zgthdcListCfg[indexSuit];
-            long endTime = 0;
+            long timeSale = 0;
             if (activityInfo != null)
             {
-                endTime = TimeUtil.DateTimeToTimestamp(activityInfo.endTime);
+                timeSale = (second_CreateRole + (saleSecondNum * activityInfo.id)) - TimeHelper.ServerNow();   
             }
-            var leftTime = endTime - TimeHelper.ServerNow();
-            if (leftTime <= 0)
+            if (timeSale <= 0)
             {
                 _ui.m_timeText.text = "";
                 _ui.m_btnCharge.visible = false;
                 Timers.inst.Remove(UpdateTime);
                 return;
             }
-            _ui.m_timeText.text = TimeUtil.FormattingTimeTo_DDHHmm((int)leftTime);
+            _ui.m_timeText.text = TimeUtil.FormattingTimeTo_DDHHmm(timeSale);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -29,7 +29,7 @@ namespace GFGGame
         private List<GGraph> _listEffectHolder = new List<GGraph>();
         private List<CardData> _cardList = new List<CardData>();
         private int _wordRow = 4;  //字行数
-        private int _wordNumber = 5;//字每行个数
+        private int _wordNumber = 6;//字每行个数
         private int _nowIndex = 0;
         private bool _refDodgeStar = true;
         private int _isAutoSelect = 0;
@@ -758,7 +758,7 @@ namespace GFGGame
             _comFosterBottom.m_btnCheckAuto.selected = _isAutoSelect == 1;
 
             //升星后星数正5才不进入
-            if (_refDodgeStar || _cardData.star % 5 != 0)
+            if (_refDodgeStar || _cardData.star % 6 != 0)
             {
                 UpdateUpStarOfStarAndText();
             }
@@ -954,7 +954,7 @@ namespace GFGGame
 
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
                 UpdateRedDot();
-                if (_cardData.star % 5 == 0)
+                if (_cardData.star % 6 == 0)
                 {
                     int starLevelDodge = _cardData.star / _wordNumber;
                     int starLevel = _cardData.star / _wordNumber - 1;

GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -36,6 +36,9 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnUpLv.onClick.Add(OnClickBtnUp);
+            _ui.m_btnCheckself.onClick.Add(OnClickCheckSelf);
+            _ui.m_btnCheckother.onClick.Add(OnClickCheckOther);
+            _ui.m_btnUpLvSpecial.onClick.Add(OnClickBtnUpSpecial);
             _ui.m_listConsume.itemRenderer = RenderListStarConsumeItem;
 
 
@@ -83,7 +86,20 @@ namespace GFGGame
             costCurrency.m_txtNeed.text = skillLvCfg.costNum.ToString();
             UI_ComCostCurrency.ProxyEnd();
             UpdateComLv(_ui.m_comNextLv, skillLv + 1, "下一级");
-            _ui.m_listConsume.numItems = skillLvCfg.materiarsArr.Length;
+            ItemCfg item = ItemCfgArray.Instance.GetCfg(skillLvCfg.materiarsArr[0][0]);
+            if(item.subType == 1)
+            {
+                _ui.m_listConsume.numItems = skillLvCfg.materiarsArr.Length + 1;
+                _ui.m_btnUpLvSpecial.visible = true;
+                _ui.m_btnUpLv.visible = false;
+            }
+            else
+            {
+                _ui.m_listConsume.numItems = skillLvCfg.materiarsArr.Length;
+                _ui.m_btnUpLvSpecial.visible = false;
+                _ui.m_btnUpLv.visible = true;
+            }
+           
         }
 
         private void UpdateUpSkill()
@@ -109,26 +125,59 @@ namespace GFGGame
             UI_ComStarConsume listItem = UI_ComStarConsume.Proxy(obj);
             // int skillLv = SkillDataManager.Instance.GetSkillLv(_cardId, _skillId);
             // skillCfg = SkillDataManager.Instance.GetPassivitySkillCfg(_cardId, _skillId, skillLv);
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(skillLvCfg.materiarsArr[index][0]);
 
-            listItem.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
-
-            int needCount = skillLvCfg.materiarsArr[index][1];
-            long hasCount = ItemDataManager.GetItemNum(skillLvCfg.materiarsArr[index][0]);
-            listItem.m_txtNeedCount.text = needCount.ToString();
-            listItem.m_txtHasCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#716660"); ;
-            listItem.m_btnPlus.visible = false;
-            if (listItem.target.data == null)
+            if(ItemCfgArray.Instance.GetCfg(skillLvCfg.materiarsArr[0][0]).subType == 1 && index > skillLvCfg.materiarsArr.Length - 1)
             {
-                listItem.target.onClick.Add(() => OnClickBtnPlusStarConsum(index));
-            }
-            listItem.target.data = skillLvCfg.materiarsArr[index][0];
+                ItemCfg item = ItemCfgArray.Instance.GetCfg(_cardId);
+                int needCount = GeneralMaterialCfgArray.Instance.GetCfgByrarityAndlevel(item.rarity,_skillLv).materiarsArr[0][1];
+                int id = GeneralMaterialCfgArray.Instance.GetCfgByrarityAndlevel(item.rarity, _skillLv).materiarsArr[0][0];
+                long hasCount = ItemDataManager.GetItemNum(id);
+                listItem.m_txtNeedCount.text = needCount.ToString();
+                listItem.m_txtHasCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#716660"); ;
+                listItem.m_btnPlus.visible = false;
 
-            if (hasCount < needCount)
+                ItemCfg item1 = ItemCfgArray.Instance.GetCfg(id);
+                listItem.m_loaItem.url = ResPathUtil.GetIconPath(item1.res, "png");
+                if (listItem.target.data == null)
+                {
+                    listItem.target.onClick.Add(() => OnClickBtnPlusStarConsum(index));
+                }
+                listItem.target.data = id;
+
+                if (hasCount < needCount)
+                {
+                    //材料不足显示加号
+                    listItem.m_btnPlus.visible = true;
+                }
+                _ui.m_btnCheckself.visible = true;
+                _ui.m_btnCheckother.visible = true;
+            }
+            else
             {
-                //材料不足显示加号
-                listItem.m_btnPlus.visible = true;
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(skillLvCfg.materiarsArr[index][0]);
+
+                listItem.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
+
+                int needCount = skillLvCfg.materiarsArr[index][1];
+                long hasCount = ItemDataManager.GetItemNum(skillLvCfg.materiarsArr[index][0]);
+                listItem.m_txtNeedCount.text = needCount.ToString();
+                listItem.m_txtHasCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#716660"); ;
+                listItem.m_btnPlus.visible = false;
+                if (listItem.target.data == null)
+                {
+                    listItem.target.onClick.Add(() => OnClickBtnPlusStarConsum(index));
+                }
+                listItem.target.data = skillLvCfg.materiarsArr[index][0];
+
+                if (hasCount < needCount)
+                {
+                    //材料不足显示加号
+                    listItem.m_btnPlus.visible = true;
+                }
+                _ui.m_btnCheckself.visible = false;
+                _ui.m_btnCheckother.visible = false;
             }
+
             UI_ComStarConsume.ProxyEnd();
         }
         private void OnClickBtnPlusStarConsum(int index)
@@ -163,6 +212,56 @@ namespace GFGGame
             }
 
         }
+        private async void OnClickBtnUpSpecial()
+        {
+            if (!ItemUtil.CheckItemEnough(skillLvCfg.costID, skillLvCfg.costNum))
+            {
+                long has = ItemDataManager.GetItemNum(skillLvCfg.costID);
+                ItemUtil.BuyCurrency(skillLvCfg.costID, skillLvCfg.costNum - has);
+                return;
+            }
+            if (_ui.m_btnCheckself.selected && !_ui.m_btnCheckother.selected)
+            {
+                for (int i = 0; i < skillLvCfg.materiarsArr.Length; i++)
+                {
+                    if (!ItemUtil.CheckItemEnough(skillLvCfg.materiarsArr[i][0], skillLvCfg.materiarsArr[i][1], true)) return;
+                }
+
+                bool result = await SkillSProxy.ReqUpgradeCardSkill(_cardId, _skillId);
+                if (result)
+                {
+                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
+                }
+            }
+            else if (!_ui.m_btnCheckself.selected && _ui.m_btnCheckother.selected)
+            {
+                ItemCfg item = ItemCfgArray.Instance.GetCfg(_cardId);
+                GeneralMaterialCfg grneral = GeneralMaterialCfgArray.Instance.GetCfgByrarityAndlevel(item.rarity, _skillLv);
+                for (int i = 0; i < grneral.materiarsArr.Length; i++)
+                {
+                    if (!ItemUtil.CheckItemEnough(grneral.materiarsArr[i][0], grneral.materiarsArr[i][1], true)) return;
+                }
+                //这里要改
+                bool result = await SkillSProxy.ReqUpgradeCardSkill(_cardId, _skillId,1);
+                if (result)
+                {
+                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
+                }
+            }
+            else
+            {
+                PromptController.Instance.ShowFloatTextPrompt("请选择消耗的材料");
+            }
+            
+        }
+        private void OnClickCheckSelf()
+        {
+            _ui.m_btnCheckother.selected = false;
+        }
+        private void OnClickCheckOther()
+        {
+            _ui.m_btnCheckself.selected = false;
+        }
         protected override void OnHide()
         {
             base.OnHide();

GameClient/Assets/Game/HotUpdate/Views/Card/CardSyntheticView.cs

@@ -1,5 +1,5 @@
 using UnityEngine;
-using UI.ClothingSynthetic;
+//using UI.ClothingSynthetic;
 using UI.CardSynthetic;
 using FairyGUI;
 using System.Collections.Generic;
@@ -19,11 +19,11 @@ namespace GFGGame
         private int _chapterID;
         private int _itemId;
         private int[] _items;
+        private int cardSyntheticCount;
 
         private List<ItemData> _materiarsOfSelectedItem;
         private ItemCfg _cardItem;
         private UI_MateriasListItem listTypeItem_CloSynthetic;
-        private UI_Component2 _compMover;
 
 
         public override void Dispose()
@@ -69,7 +69,7 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemNumChanged);
         }
-        protected override void OnShown()
+        protected async override void OnShown()
         {
             base.OnShown();
             _cardId = 0;
@@ -84,7 +84,8 @@ namespace GFGGame
 
             _valueBarController.OnShown();
             _ui.m_loaBg2.url = ResPathUtil.GetBgImgPath("hc_bj_1");
-
+            var response = await ClothingSyntheticSProxy.GetCardSyntheticCount(_cardId);
+            cardSyntheticCount = response;
             UpdateView();
 
             Timers.inst.AddUpdate(CheckGuide);
@@ -112,7 +113,7 @@ namespace GFGGame
         {
             bool isfirst;
             //这里应该是制作卡牌次数
-            if (ItemDataManager.GetItemNum(_cardId) > 0)
+            if (cardSyntheticCount > 0)
             {
                 isfirst = false;
             }
@@ -120,7 +121,7 @@ namespace GFGGame
             {
                 isfirst = true;
             }
-            if (ItemDataManager.GetItemNum(_cardId) >= _cardItem.syntheticTimes)
+            if (cardSyntheticCount >= _cardItem.syntheticTimes)
             {
                 isfirst = false;
                 PromptController.Instance.ShowFloatTextPrompt("制作已上限");
@@ -148,7 +149,7 @@ namespace GFGGame
                 if (itemData == null || !ItemUtil.CheckItemEnough(itemData.id, itemData.num, true)) return;
             }
 
-            bool result = await ClothingSyntheticSProxy.CardSynthetic(_cardId, isfirst);
+            bool result = await ClothingSyntheticSProxy.CardSynthetic(_cardId);
             if (result)
             {
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_HE_CHENG, 2);
@@ -159,7 +160,7 @@ namespace GFGGame
         {
             UpdateName(_cardItem.name);
             _ui.m_comImgCard.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetCardPath(_cardItem.res);
-            _ui.m_timesText.text = string.Format("{0}/{1}", ItemDataManager.GetItemNum(_cardId), _cardItem.syntheticTimes);
+            _ui.m_timesText.text = string.Format("合成次数:{0}/{1}", cardSyntheticCount, _cardItem.syntheticTimes);
             UpdateSelectedItemInfo();
         }
 
@@ -188,7 +189,7 @@ namespace GFGGame
 
             _ui.m_listMaterias.selectedIndex = 0;
             //这里应该是制作卡牌次数
-            _ui.m_btnProduction.grayed = ItemDataManager.GetItemNum(_cardId) > clothingSyntheticCfg.syntheticTimes;
+            _ui.m_btnProduction.grayed = cardSyntheticCount > clothingSyntheticCfg.syntheticTimes;
         }
 
         private void UpdateName(string name)
@@ -273,12 +274,19 @@ namespace GFGGame
         {
             GameController.GoBackToMainView();
         }
-        private void OnItemNumChanged()
+        private async void OnItemNumChanged()
         {
             _ui.m_listMaterias.numItems = _materiarsOfSelectedItem.Count;
+            var response = await ClothingSyntheticSProxy.GetCardSyntheticCount(_cardId);
+            cardSyntheticCount = response;
             //这里应该是制作卡牌次数
-            _ui.m_btnProduction.grayed = ItemDataManager.GetItemNum(_cardId) > _cardItem.syntheticTimes;
-            _ui.m_timesText.text = string.Format("{0}/{1}", ItemDataManager.GetItemNum(_cardId), _cardItem.syntheticTimes);
+            _ui.m_btnProduction.grayed = cardSyntheticCount > _cardItem.syntheticTimes;
+            _ui.m_timesText.text = string.Format("合成次数:{0}/{1}", cardSyntheticCount, _cardItem.syntheticTimes);
+        }
+        private async void GetCardSyntheticCount(int cardID)
+        {
+            var response = await ClothingSyntheticSProxy.GetCardSyntheticCount(cardID);
+            cardSyntheticCount = response;
         }
         private void CheckGuide(object param)
         {

GameClient/Assets/Game/HotUpdate/Views/Card/CardUpView.cs

@@ -92,8 +92,8 @@ namespace GFGGame
             else if (_type == "star")
             {
                 _ui.m_c1.selectedIndex = 1;
-                _ui.m_txtLast.text = string.Format("{0}星", _lastNum / 5);
-                _ui.m_txtNow.text = string.Format("{0}星", _curNum / 5);
+                _ui.m_txtLast.text = string.Format("{0}星", _lastNum / 6);
+                _ui.m_txtNow.text = string.Format("{0}星", _curNum / 6);
                 _cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardId, _lastNum);
                 if (_cardStarCfg == null)
                     ET.Log.Error("RenderListCardPropertyItemd _cardStarCfg 1 is null=" + _cardId + "==" + _lastNum);

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -48,7 +48,7 @@ namespace GFGGame
 
         private UI_MateriasListItem listTypeItem_CloSynthetic;
         private UI_Component2 _compMover;
-
+        private int _cardID;
 
         public override void Dispose()
         {
@@ -107,6 +107,7 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnProduction.onClick.Add(OnClickBtnProcuction);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
+            _ui.m_cardSyntheticBtn.onClick.Add(OnClickBtnCardSyntheticView);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hc_bj_1");
 
             UpdateMaskHeight();
@@ -130,6 +131,7 @@ namespace GFGGame
                 if((this.viewData as object[]).Length > 2)
                     _chapterID = (int)(this.viewData as object[])[2];
             }
+            UpdateCardSyntheticBtn();
 
             if (DressUpMenuSuitDataManager.chooseClothing > 0)
                 _selectedItemId = DressUpMenuSuitDataManager.chooseClothing;
@@ -137,7 +139,7 @@ namespace GFGGame
             _valueBarController.OnShown();
             _ui.m_loaBg2.url = ResPathUtil.GetBgImgPath("hc_bj_1");
             UpdateClothingList(false);
-
+    
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -342,6 +344,7 @@ namespace GFGGame
             DressUpMenuSuitDataManager.chooseClothing = _selectedItemId;
             UpdateRole(tween);
             UpdateSelectedItemInfo();
+            UpdateCardSyntheticBtn();
         }
 
         private void UpdateSelectedItemInfo()
@@ -524,5 +527,53 @@ namespace GFGGame
         {
             _ui.m_loaBg2.material = null;
         }
+        private void UpdateCardSyntheticBtn()
+        {
+            int count = ItemCfgArray.Instance.GetCfgsBysuitId(_suitId).Count - 1;
+            ItemCfg item = ItemCfgArray.Instance.GetCfgsBysuitId(_suitId)[count];
+            _cardID = item.id;
+            int rewardStatus = DressUpMenuSuitDataManager.GetSuitSyntheticRewardStatus(_suitId);
+
+            if(item.syntheticTimes > 0)
+            {
+                _ui.m_cardSyntheticBtn.visible = true;
+                if(rewardStatus == 1)
+                {
+                    _ui.m_cardSyntheticBtn.icon = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(_cardID).res,"png");
+                    RedDotController.Instance.SetComRedDot(_ui.m_cardSyntheticBtn, true, "", -18, 20);
+                }
+                else
+                {
+                    _ui.m_cardSyntheticBtn.icon = "ui://ClothingSynthetic/kphc_huimeng";
+                    RedDotController.Instance.SetComRedDot(_ui.m_cardSyntheticBtn, (rewardStatus == 1), "", -18, 20);
+                }
+            }
+            else
+            {
+                _ui.m_cardSyntheticBtn.visible = false;
+            }
+
+        }
+
+        private async void OnClickBtnCardSyntheticView()
+        {
+            int rewardStatus = DressUpMenuSuitDataManager.GetSuitSyntheticRewardStatus(_suitId);
+            if (DressUpMenuSuitDataManager.CheckHaveSuit(_suitId))
+            {
+                if(rewardStatus == 1)
+                {
+                    bool result = await ClothingSyntheticSProxy.GetSuitGetReward(_suitId);
+                    UpdateCardSyntheticBtn();
+                }
+                else
+                {
+                    ViewManager.Show<CardSyntheticView>(new object[] { _cardID, _selectedItemId });
+                }  
+            }
+            else
+            {
+                PromptController.Instance.ShowFloatTextPrompt("集齐套装后可领取卡牌奖励");
+            }  
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ClothingUpgarde.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aab1d971cdf175946aceb4060a32b19b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/ClothingUpgarde/ClothingSelectView.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.CommonGame;
+using UI.ClothingUpgrade;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ClothingSelectView : BaseWindow
+    {
+        private UI_ClothingSelectUI _ui;
+
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ClothingSelectUI.PACKAGE_NAME;
+            _ui = UI_ClothingSelectUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            modal = true;
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_selectList.itemRenderer = RenderListItem;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            UpdateList();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            UI_clothingSelectItem listItem = UI_clothingSelectItem.Proxy(obj);
+            if (listItem.target.data == null)
+            {
+                listItem.target.onClick.Add(OnBtnItem);
+            }
+            listItem.target.data = index;
+            UI_clothingSelectItem.ProxyEnd();
+        }
+
+        private void OnBtnItem(EventContext context)
+        {
+            GObject Item = context.sender as GObject;
+            int partIndex = (int)Item.data;
+            ViewManager.Show<ClothingUpgradeView>(new object[] {partIndex });
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(ClothingSelectView).FullName);
+        }
+
+        private void UpdateList()
+        {
+
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ClothingUpgarde/ClothingSelectView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ClothingUpgarde/ClothingUpgradeView.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.CommonGame;
+using UI.ClothingUpgrade;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ClothingUpgradeView : BaseWindow
+    {
+        private UI_ClothingUpgradeUI _ui;
+        private int _partIndex;
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ClothingSelectUI.PACKAGE_NAME;
+            _ui = UI_ClothingUpgradeUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            modal = true;
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            if (this.viewData != null)
+            {
+                _partIndex = (int)(this.viewData as object[])[0];
+            }
+            UpdateItems();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        private void UpdateItems()
+        {
+            _ui.m_c1.selectedIndex = 4;
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(ClothingUpgradeView).FullName);
+        }
+
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ClothingUpgarde/ClothingUpgradeView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/CreateRole/NewRoleGetSuitView.cs

@@ -0,0 +1,91 @@
+using FairyGUI;
+using UI.CreateRole;
+using System;
+using System.Text.RegularExpressions;
+using ET;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class NewRoleGetSuitView : BaseWindow
+    {
+        private UI_NewRoleGetSuitUI _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_NewRoleGetSuitUI.PACKAGE_NAME;
+            _ui = UI_NewRoleGetSuitUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.isfullScreen = true;
+            isReturnView = true;
+            _ui.m_suit1.onClick.Add(OnClickSuitOne);
+            _ui.m_suit2.onClick.Add(OnClickSuitTwo);
+            _ui.m_suit3.onClick.Add(OnClickSuitThree);
+            _ui.m_btnDress.onClick.Add(OnClickTryDress);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NEWROLEGETSUIT, OnHide);
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NEWROLEGETSUIT, OnHide);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("sxy_bj");
+        }
+        private void OnClickTryDress()
+        {
+            ViewManager.Show<TryDressUpView>();
+        }
+        private void OnClickSuitOne()
+        {
+            suitID = 201020;
+            OnClickTip();
+        }
+        private void OnClickSuitTwo()
+        {
+            suitID = 201010;
+            OnClickTip();
+        }
+        private void OnClickSuitThree()
+        {
+            suitID = 201030;
+            OnClickTip();
+        }
+        private void OnClickTip()
+        {
+            string exitTip = "是否确定选择该套装，确认选择后不可更改";
+            AlertUI.Show(exitTip)
+            .SetLeftButton(true, "取消", (object data) =>
+            {
+            })
+            .SetRightButton(true, "确定", async (object data) =>
+            {
+                var result = await RoleInfoSProxy.ReqNewRoleGetSuit(suitID);
+                this.Hide();
+            });
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/CreateRole/NewRoleGetSuitView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/CreateRole/TryDressUpView.cs

@@ -0,0 +1,182 @@
+using FairyGUI;
+using UI.CreateRole;
+using System;
+using System.Text.RegularExpressions;
+using ET;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class TryDressUpView : BaseWindow
+    {
+        //新手套装试穿界面
+        private UI_TryDressUpView _ui;
+        private GameObject _sceneObject;
+        private List<int> _currentList3 = new List<int>() { 201020,201010, 201030 };
+        private int _currentMenuType = 20;
+        public override void Dispose()
+        {
+            if (_sceneObject != null)
+            {
+                PrefabManager.Instance.Restore(_sceneObject);
+                _sceneObject = null;
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_TryDressUpView.PACKAGE_NAME;
+            _ui = UI_TryDressUpView.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.isfullScreen = true;
+            isReturnView = true;
+            _ui.m_btnBack.onClick.Add(this.Hide);
+            _ui.m_partsListSearch.m_list.itemRenderer = ListPartsItem;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            if (_sceneObject == null)
+            {
+                _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneDressUp"));
+            }
+            MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, true, null, true, ScaleGestureController.Instance.UpdatePos);
+            MyDressUpHelper.dressUpObj.AddOrRemove(ConstItemID.DEFULT_BG, false);
+            _ui.m_partsListSearch.m_list.numItems = _currentList3.Count;
+        }
+
+        protected override void OnHide()
+        {
+            if (_sceneObject != null)
+            {
+                PrefabManager.Instance.Restore(_sceneObject);
+                _sceneObject = null;
+                //MyDressUpHelper.dressUpObj.ClearView();
+            }
+            base.OnHide();
+        }
+
+        private void ListPartsItem(int index, GObject item)
+        {
+            UI_PartsListItem listItem = UI_PartsListItem.Proxy(item);
+            int id = (int)_currentList3[index];
+            string iconRes = "";
+            string partName = "";
+            string ext = "png";
+            listItem.m_btnAni.visible = false;
+            Debug.Log("id:" + id + "   _currentMenuType:" + _currentMenuType);
+            if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(id);
+                iconRes = suitCfg.res;
+                partName = suitCfg.name;
+                listItem.m_iconSelected.visible = false;
+
+                RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false, true);
+                listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + suitCfg.rarity;
+
+                listItem.m_ScoreType.visible = false;
+                listItem.m_imgNew.visible = false;
+                bool SuitHasAction = SuitCfgArray.Instance.CheckSuitHasAction(id);
+                bool HasActionRes = DressUpMenuSuitDataManager.CheckSuitHasActionRes(id);
+                Debug.Log("SuitHasAction:" + SuitHasAction + "   HasActionRes:" + HasActionRes + "    suitCfg.res" + suitCfg.aniRes);
+                listItem.m_btnAni.visible = SuitCfgArray.Instance.CheckSuitHasAction(id) && DressUpMenuSuitDataManager.CheckSuitHasActionRes(id);
+
+                // listItem.m_comAxtionSelect.m_btnNormal.icon = ResPathUtil.GetIconPath(suitCfg.res, ext);
+                // listItem.m_comAxtionSelect.m_btnAction.icon = ResPathUtil.GetIconPath(suitCfg.res, ext);
+
+                if (listItem.m_btnAni.data == null)
+                {
+                    listItem.m_btnAni.onClick.Add(OnBtnActionClick);
+                }
+                listItem.m_btnAni.data = id;
+            }
+            else if (_currentMenuType == (int)ConstDressUpItemType.DONG_ZUO)
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(id);
+                iconRes = suitCfg.res;
+                partName = suitCfg.name;
+                listItem.m_iconSelected.visible = false;
+                RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false, true);
+                listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + suitCfg.rarity;
+
+                listItem.m_ScoreType.visible = false;
+                listItem.m_imgNew.visible = false;
+
+            }
+
+            if (listItem.m_icon.data == null)
+            {
+                listItem.m_icon.onClick.Add(OnClickPartsListItem);
+            }
+            listItem.m_icon.data = id;
+
+            listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
+            listItem.m_txtTitle.text = partName;
+            listItem.target.data = id;
+            listItem.m_grpScore.visible = false;
+            //listItem.m_ScoreType.visible = true;
+            listItem.m_imgNeed.visible = false;
+
+            UI_PartsListItem.ProxyEnd();
+        }
+
+
+        private void OnClickPartsListItem(EventContext context)
+        {
+            //LogUtil.LogEditor("OnClickPartsListItem");
+            if (ViewManager.isViewOpen(typeof(DressUpItemTipsView).FullName))
+            {
+                return;
+            }
+
+            int id = (int)(context.sender as GObject).data;
+            if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
+            {
+                OnBtnNormalClick(context);
+            }
+            else if (_currentMenuType == ConstDressUpItemType.DONG_ZUO)
+            {
+                MyDressUpHelper.dressUpObj.PutOnOrTakeOffAction(id);
+            }
+            else
+            {
+                MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+            }
+        }
+        private void OnBtnNormalClick(EventContext context)
+        {
+            // _isNormalSuitType = true;
+            GObject gObject = context.sender as GObject;
+            int suitId = (int)gObject.data;
+            ShowSuitPartList(suitId, false);
+        }
+        private void OnBtnActionClick(EventContext context)
+        {
+            GObject gObject = context.sender as GObject;
+            int suitId = (int)gObject.data;
+            ShowSuitPartList(suitId, true);
+        }
+        private void ShowSuitPartList(int suitId, bool showAction)
+        {
+            if (showAction)
+            {
+                MyDressUpHelper.dressUpObj.PutOnSuitCfg(suitId, true,null,true,true,true);
+            }
+            else
+            {
+                MyDressUpHelper.dressUpObj.PutOnSuitCfg(suitId, false,null, true, true, true);
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/CreateRole/TryDressUpView.cs.meta

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

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

@@ -14,6 +14,7 @@ namespace GFGGame
         private List<int> _suitIds;
         private int _suitTypeId;
         private Dictionary<int, EffectUI> _effectUIDic = new Dictionary<int, EffectUI>();
+        private int index = 0;
         public override void Dispose()
         {
             foreach (var v in _effectUIDic)
@@ -44,6 +45,12 @@ namespace GFGGame
             _ui.m_listSuitCom.m_listSuit.itemRenderer = RenderListSuitItem;
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
+            _ui.m_leftBtn.onClick.Add(OnClickLeft);
+            _ui.m_rightBtn.onClick.Add(OnClickRight);
+            _ui.m_lookBtn.onClick.Add(OnClickLook);
+
+            _ui.m_listSuitCom.m_listSuit.scrollPane.onScroll.Add(DoTouch);//滚动时派发事件
+            _ui.m_listSuitCom.m_listSuit.scrollPane.onScrollEnd.Add(DoTouchEnd);//滚动时派发事件
         }
         protected override void AddEventListener()
         {
@@ -152,6 +159,17 @@ namespace GFGGame
 
             _ui.m_listSuitCom.m_listSuit.numItems = _suitIds.Count;
             _ui.m_listSuitCom.m_listSuit.scrollPane.ScrollTop();
+            _ui.m_listSuitCom.m_listSuit.ScrollToView(0);
+            if (index <= 0)
+            {
+                _ui.m_leftBtn.visible = false;
+                _ui.m_rightBtn.visible = true;
+            }
+            else
+            {
+                _ui.m_leftBtn.visible = true;
+                _ui.m_rightBtn.visible = false;
+            }
         }
 
         private void RenderListSuitItem(int index, GObject item)
@@ -171,7 +189,6 @@ namespace GFGGame
 
             listItem.m_txtName.text = suitCfg.name;
             listItem.m_loaderPic.url = ResPathUtil.GetFieldGuideIconPath(suitCfg.res);
-            listItem.m_c1.SetSelectedIndex(suitCfg.rarity - 1);
             RarityIconController.UpdateRarityIcon(listItem.m_rarity, suitId, false, true);
             listItem.target.data = suitId;
             UpdateSuitStatusView(listItem);
@@ -233,5 +250,72 @@ namespace GFGGame
         {
             UpdateListSuit();
         }
+
+        private void OnClickRight()
+        {
+            index++;
+            _ui.m_listSuitCom.m_listSuit.ScrollToView(index, true);
+            if (index >= _suitIds.Count)
+            {
+                _ui.m_leftBtn.visible = false;
+                _ui.m_rightBtn.visible = true;
+            }
+            else
+            {
+                _ui.m_leftBtn.visible = true;
+                _ui.m_rightBtn.visible = false;
+            }
+        }
+        private void OnClickLeft()
+        {
+            index--;
+            _ui.m_listSuitCom.m_listSuit.ScrollToView(index, true);
+            if (index <= 0)
+            {
+                _ui.m_leftBtn.visible = false;
+                _ui.m_rightBtn.visible = true;
+            }
+            else
+            {
+                _ui.m_leftBtn.visible = true;
+                _ui.m_rightBtn.visible = false;
+            }
+        }
+        private void OnClickLook()
+        {
+            int suitid = _suitIds[index];
+            bool haveSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitid);
+            if (haveSuit)
+            {
+                ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitid, _suitIds }, false, false);
+            }
+            else
+            {
+                ViewManager.Show<SuitPartsDetailView>(suitid);
+            }
+        }
+        private void DoTouchEnd()
+        {
+            _ui.m_leftBtn.touchable = true;
+            _ui.m_rightBtn.touchable = true;
+            _ui.m_lookBtn.touchable = true;
+            index = _ui.m_listSuitCom.m_listSuit.GetFirstChildInView();
+            if (index <= 0)
+            {
+                _ui.m_leftBtn.visible = false;
+                _ui.m_rightBtn.visible = true;
+            }
+            else
+            {
+                _ui.m_leftBtn.visible = true;
+                _ui.m_rightBtn.visible = false;
+            }
+        }
+        private void DoTouch()
+        {
+            _ui.m_leftBtn.touchable = false;
+            _ui.m_rightBtn.touchable = false;
+            _ui.m_lookBtn.touchable = true;
+        }
     }
 }

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

@@ -0,0 +1,235 @@
+using FairyGUI;
+using UI.FieldGuide;
+using UI.CommonGame;
+using System.Collections.Generic;
+using UI.ClothingSynthetic;
+using UnityEngine;
+using System;
+
+namespace GFGGame
+{
+    public class SuitGuideListView : BaseWindow
+    {
+        private UI_SuitGuideListUI _ui;
+        private List<int> _suitIds;
+        private int _suitTypeId;
+        private Dictionary<int, EffectUI> _effectUIDic = new Dictionary<int, EffectUI>();
+        public override void Dispose()
+        {
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+            _effectUIDic.Clear();
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_SuitGuideListUI.PACKAGE_NAME;
+            _ui = UI_SuitGuideListUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            isReturnView = true;
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
+
+            _ui.m_listSuitCom.m_listSuit.itemRenderer = RenderListSuitItem;
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.JUMP_TO_SOURCE, this.Hide);
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateSuitStatus);
+            EventAgent.AddEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateSuitStatus);
+            EventAgent.AddEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateListSuit);
+            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, FilterItems);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, FilterItems);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET, ResetFilter);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _suitTypeId = (int)viewData;
+            UpdateListSuit();
+            if (backRefresh)
+            {
+                _ui.m_In.Play();
+            }
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+            DressUpMenuItemDataManager.Clear();
+
+            // 清空服装过滤界面选择
+            EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER_RESET_ALL);
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.JUMP_TO_SOURCE, this.Hide);
+            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateSuitStatus);
+            EventAgent.RemoveEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateSuitStatus);
+            EventAgent.RemoveEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateListSuit);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, FilterItems);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, FilterItems);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, ResetFilter);
+
+        }
+
+        private void FilterItems(EventContext context)
+        {
+            UpdateListSuit();
+
+            if (context.data.ToString() == ConstMessage.DRESS_SEARCH)
+            {
+                _suitIds = DressUpMenuItemDataManager.DressSearch(_suitIds, DressFilterItemType.Suit);
+            }
+            else if (context.data.ToString() == ConstMessage.DRESS_FILTER)
+            {
+                _suitIds = DressUpMenuItemDataManager.DressFilter(_suitIds, DressFilterItemType.Suit);
+            }
+
+            ViewManager.Hide<ModalStatusView>();
+            _ui.m_listSuitCom.m_listSuit.numItems = _suitIds.Count;
+            UpdateProgress();
+            _ui.m_Refresh.Play();
+
+        }
+
+        private void OnClickBtnBack()
+        {
+            Hide();
+        }
+
+        private void OnClickBtnSearch()
+        {
+            ViewManager.Show<DressFilterView>(new object[] { 0, 2 });
+        }
+
+        private void UpdateListSuit()
+        {
+            _suitIds = SuitUtil.GetSuitIdList(true, true, _suitTypeId, 0);
+            UpdateProgress();
+        }
+
+        private void UpdateProgress()
+        {
+            int haveCount = SuitUtil.GetHaveSuitCount(_suitIds);
+            int totalCount = _suitIds.Count;
+            SuitGuideMenuCfg cfg = SuitGuideMenuCfgArray.Instance.GetCfg(_suitTypeId);
+            _ui.m_title.text = cfg.name;
+            _ui.m_progress.target.value = haveCount;
+            _ui.m_progress.target.max = totalCount;
+            _ui.m_progress.m_title1.SetVar("value", haveCount.ToString()).SetVar("max", totalCount.ToString()).FlushVars();
+            if (totalCount > 0)
+            {
+                _ui.m_progress.m_rate.SetVar("rate", FieldGuideView.ProgressCalculate(haveCount, totalCount).ToString()).FlushVars();
+            }
+            else
+            {
+                _ui.m_progress.m_rate.SetVar("rate", "0").FlushVars();
+            }
+
+
+            foreach (var v in _effectUIDic)
+            {
+                EffectUIPool.Recycle(v.Value);
+            }
+            _effectUIDic.Clear();
+
+            _ui.m_listSuitCom.m_listSuit.numItems = _suitIds.Count;
+            _ui.m_listSuitCom.m_listSuit.scrollPane.ScrollTop();
+        }
+
+        private void RenderListSuitItem(int index, GObject item)
+        {
+            UI_SuitComitem listItem = UI_SuitComitem.Proxy(item);
+            int suitId = _suitIds[index];
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+
+            if ((suitCfg.rarity - 1) == 4)
+            {
+                bool haveSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitId);
+                if (haveSuit && !_effectUIDic.ContainsKey(index))
+                {
+                    _effectUIDic.Add(index, EffectUIPool.CreateEffectUI(listItem.m_holderBg, "ui_KP", "KP_Other_Gold_Frame"));
+                }
+            }
+
+            listItem.m_txtName.text = suitCfg.name;
+            listItem.m_loaderPic.url = ResPathUtil.GetFieldGuideIconPath(suitCfg.res);
+            RarityIconController.UpdateRarityIcon(listItem.m_rarity, suitId, false, true);
+            listItem.target.data = suitId;
+            listItem.m_loaderBonusBox.target.onClick.Clear();
+            listItem.m_loaderBonusBox.target.onClick.Add(() =>
+            {
+                SuitUtil.ShowSuitGuideBonus(suitId);
+            });
+            UI_SuitComitem.ProxyEnd();
+        }
+
+        private void UpdateSuitStatus(EventContext eventContext)
+        {
+            int num = _ui.m_listSuitCom.m_listSuit.numChildren;
+            for (int i = 0; i < num; i++)
+            {
+                UI_CompSuitItem listItem = UI_CompSuitItem.Proxy(_ui.m_listSuitCom.m_listSuit.GetChildAt(i));
+                UpdateSuitStatusView(listItem);
+                UI_CompSuitItem.ProxyEnd();
+            }
+        }
+
+        private void UpdateSuitStatusView(UI_CompSuitItem listItem)
+        {
+            int suitId = (int)listItem.target.data;
+            int count = 0;
+            int totalCount = 0;
+            DressUpMenuSuitDataManager.GetSuitProgressBySuitId(suitId, out count, out totalCount);
+            listItem.m_progBar.max = totalCount;
+            listItem.m_progBar.value = count;
+            bool haveSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitId);
+            listItem.m_state.selectedIndex = (haveSuit ? 0 : 1);
+            int status = DressUpMenuSuitDataManager.GetSuitGuideBonusStatus(suitId);
+            RedDotController.Instance.SetComRedDot(listItem.m_loaderBonusBox.target, status == ConstBonusStatus.CAN_GET, "", -3, -1);
+            if (status == ConstBonusStatus.CAN_GET)
+            {
+                listItem.m_loaderBonusBox.m_loaderBonusBox.url = "ui://FieldGuide/tujian_lw_1";
+            }
+            else
+            {
+                listItem.m_loaderBonusBox.m_loaderBonusBox.url = "ui://FieldGuide/tujian_lw_2";
+            }
+
+            listItem.m_bg.onClick.Clear();
+            listItem.m_bg.onClick.Add(() =>
+            {
+                if (haveSuit)
+                {
+                    ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, _suitIds }, false, false);
+                }
+                else
+                {
+                    ViewManager.Show<SuitPartsDetailView>(suitId);
+                }
+            });
+        }
+
+        private void ResetFilter()
+        {
+            UpdateListSuit();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideListView.cs.meta

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

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

@@ -163,7 +163,7 @@ namespace GFGGame
             item.m_icon.url = string.Format("ui://FieldGuide/tj_tz_{0}", typeId);
             item.target.onClick.Add(() =>
             {
-                ViewManager.Show<SuitGuideDetailView>(typeId, false, false);
+                ViewManager.Show<SuitGuideListView>(typeId, false, false);
             });
 
             _suitTypeItems.Add(item);
@@ -206,7 +206,7 @@ namespace GFGGame
         {
             GObject obj = eventContext.data as GObject;
             int index = _ui.m_suitType2Items.GetChildIndex(obj);
-            ViewManager.Show<SuitGuideDetailView>(_menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index], false, false);
+            ViewManager.Show<SuitGuideDetailView>(_menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index], false, false);     
         }
 
         private void OnClickBtnBack()

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

@@ -119,6 +119,7 @@ namespace GFGGame
             StopAllCoroutines();
             videoPlayer.Stop();
             videoPlayer.loopPointReached -= OnVideoEnded;
+            MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             handle.Release();
             handle = null;
             videoHandle.Release();

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

@@ -221,6 +221,17 @@ namespace GFGGame
                 UpdateVisitNum();
                 UI_ComCostCurrency.ProxyEnd();
             }
+            else if(levelCfg.subType == 1 && levelCfg.type == 1)
+            {
+                _ui.m_ctrlNeed.selectedIndex = 0;
+                EventAgent.AddEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, UpdateVisitNum);
+                _ui.m_comCostCurrent.visible = true;
+                _ui.m_btnBg.url = "ui://Main/zx_jq_dituditu";
+                UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(_ui.m_comCostCurrent);
+                com.m_c1.selectedIndex = 2;
+                UpdateVisitNum();
+                UI_ComCostCurrency.ProxyEnd();
+            }
             else
             {
                 _ui.m_btnBg.url = "ui://Main/zx_jq_dituditu";
@@ -357,17 +368,36 @@ namespace GFGGame
         private void UpdateVisitNum()
         {
             UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(_ui.m_comCostCurrent);
-            RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityFightCfgArray.Instance.GetCfg(61001).limit);
+            RoleLimitData limitData;
+            int limitID;
+            if (_type == 1 && _storyType == 1)
+            {
+                limitData = RoleLimitDataManager.GetLimitData(50);
+                limitID = 50;
+            }
+            else
+            {
+                limitData = RoleLimitDataManager.GetLimitData(ActivityFightCfgArray.Instance.GetCfg(61001).limit);
+                limitID = ActivityFightCfgArray.Instance.GetCfg(61001).limit;
+            }
             int time = limitData.TotalPlayMax - limitData.PlayTimes;
             com.m_limitNum.text = "今日免费次数：" + time + "/" + limitData.MaxStorageCount;
-            com.m_addBtn.onClick.Add(OnClickAddBtn);
+            if(com.m_addBtn.data == null)
+            {
+                com.m_addBtn.onClick.Add(OnClickAddBtn);
+            }
+
+            com.m_addBtn.data = limitID;
             UI_ComCostCurrency.ProxyEnd();
         }
-        private void OnClickAddBtn()
+        private void OnClickAddBtn(EventContext context)
         {
-            string name = ItemCfgArray.Instance.GetCfg(LimitCfgArray.Instance.GetCfg(500).moneyId).name;
-            string desc = string.Format("是否花费{0}{1}购买{2}次过关次数？", LimitCfgArray.Instance.GetCfg(500).moneyNumArr[0],name, 1);
-            ViewManager.Show<ZCJBBuyTipsView>(new object[] { desc,500 });
+            // GObject obj, int type
+            GObject sender = context.sender as GObject;
+            int id = (int)sender.data;
+            string name = ItemCfgArray.Instance.GetCfg(LimitCfgArray.Instance.GetCfg(id).moneyId).name;
+            string desc = string.Format("是否花费{0}{1}购买{2}次过关次数？", LimitCfgArray.Instance.GetCfg(id).moneyNumArr[0],name, 1);
+            ViewManager.Show<ZCJBBuyTipsView>(new object[] { desc, id });
         }
         //******************//
         private void CheckGuide(object param)

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerStoryView.cs

@@ -127,15 +127,28 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(item.target, redVisible, "", posRedX, posRedY);
 
             if (activityStoryCfg.needItemsArr.Length > 0) {
-                if (ItemDataManager.ItemCollect[activityStoryCfg.needItemsArr[0][0]] < activityStoryCfg.needItemsArr[0][1])
+                int count;
+                if (ItemDataManager.ItemCollect.TryGetValue(activityStoryCfg.needItemsArr[0][0], out count))
+                {
+                    if (count < activityStoryCfg.needItemsArr[0][1])
+                    {
+                        item.m_openCloseType.selectedIndex = 0;
+                        item.m_txtNotOpenTitle.text = string.Format("收集{0}/{1}个", ItemDataManager.ItemCollect[activityStoryCfg.needItemsArr[0][0]], activityStoryCfg.needItemsArr[0][1]);
+                        ItemCfg itemNeedCfg = ItemCfgArray.Instance.GetCfg(activityStoryCfg.needItemsArr[0][0]);
+                        item.m_loaNeedIcon.url = ResPathUtil.GetIconPath(itemNeedCfg);
+                    }
+                    else
+                    { 
+                        item.m_openCloseType.selectedIndex = 1; 
+                    }
+                }
+                else
                 {
                     item.m_openCloseType.selectedIndex = 0;
-                    item.m_txtNotOpenTitle.text = string.Format("收集{0}/{1}个", ItemDataManager.ItemCollect[activityStoryCfg.needItemsArr[0][0]], activityStoryCfg.needItemsArr[0][1]);
+                    item.m_txtNotOpenTitle.text = string.Format("收集{0}/{1}个", 0, activityStoryCfg.needItemsArr[0][1]);
                     ItemCfg itemNeedCfg = ItemCfgArray.Instance.GetCfg(activityStoryCfg.needItemsArr[0][0]);
                     item.m_loaNeedIcon.url = ResPathUtil.GetIconPath(itemNeedCfg);
                 }
-                else
-                    item.m_openCloseType.selectedIndex = 1;
             }
 
             if (item.m_loaItemBg.data == null)
@@ -163,10 +176,22 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("需通关前置关卡");
                 return;
             }
-            if(index > 0 && ItemDataManager.ItemCollect[activityStoryCfg.needItemsArr[0][0]] < activityStoryCfg.needItemsArr[0][1])
+            if (index > 0)
             {
-                PromptController.Instance.ShowFloatTextPrompt("需收集物达到开启需求");
-                return;
+                int count;
+                if (ItemDataManager.ItemCollect.TryGetValue(activityStoryCfg.needItemsArr[0][0], out count))
+                {
+                    if (count < activityStoryCfg.needItemsArr[0][1])
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("需收集物达到开启需求");
+                        return;
+                    }
+                }
+                else
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("需收集物达到开启需求");
+                    return;
+                }
             }
 
             MainStoryDataManager.currentLevelCfgId = storyLevelCfg.id;

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

@@ -20,6 +20,12 @@ namespace GFGGame
         private int muem2;
         private List<int> listIndex = new List<int>();
         private List<EffectUI> _effectUIs = new List<EffectUI>();
+
+        //创角时间
+        private long day_CreateRole = 0;
+        private long second_CreateRole = 0;
+        //折扣时间两天(豪秒)
+        private long saleSecondNum = 172800000;
         public override void Dispose()
         {
             if (_valueBarController != null)
@@ -71,6 +77,9 @@ namespace GFGGame
             base.OnShown();
             _valueBarController.OnShown();
             muem2 = (int)this.viewData;
+            long time = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole().CreateTime;
+            second_CreateRole = time;
+            day_CreateRole = TimeUtil.DaysDifference(TimeHelper.ServerNow() / 1000, time / 1000);
             AddgiftBagID();
             ReturnDiscountTimeSuitIndex();
             UpdateView();
@@ -107,7 +116,7 @@ namespace GFGGame
             ClearItemEff();
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(102, muem2);
             _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
-            _shopCfgs = ShopDataManager.Instance.RemoveNotSaleCfg(_shopCfgs);
+            _shopCfgs = SortSaleCfg();
             _shopCfgs = ShopDataManager.Instance.SortShopGoodsCfgs(_shopCfgs);
             //UpdateShopCfg();
             _ui.m_suitList.numItems = giftBagList.Count;
@@ -216,7 +225,7 @@ namespace GFGGame
             item.m_suitIcon.url = string.Format("ui://Store/{0}", suitCfg.res);
             item.m_txtName.text = suitCfg.name;
             ////判断是否在折扣时间内，是否显示
-            if (IsDisountTime(EverydaySaleCfgArray.Instance.dataArray[index]))
+            if (!IsDisountTime(EverydaySaleCfgArray.Instance.dataArray[index]))
             {
                 //不在
                 item.m_DiscountGroud.visible = false;
@@ -231,17 +240,19 @@ namespace GFGGame
                 item.m_DiscountGroud.visible = true;
                 item.m_timeText.visible = true;
                 long endTime;
-                if (EverydaySaleCfgArray.Instance.dataArray[index].endTime == "" || EverydaySaleCfgArray.Instance.dataArray[index].endTime == null)
+                if (EverydaySaleCfgArray.Instance.dataArray[index].activityId == 6002)
                 {
                     var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(EverydaySaleCfgArray.Instance.dataArray[index].activityId);
                     endTime = activityInfo.EndTime;
+                    var leftTime = endTime - TimeHelper.ServerNow();
+                    item.m_timeText.text = TimeUtil.FormattingTimeTo_DDHHmm(leftTime);
                 }
                 else
                 {
-                    endTime = TimeUtil.DateTimeToTimestamp(EverydaySaleCfgArray.Instance.dataArray[index].endTime);
+                    long timeSale = (second_CreateRole+(saleSecondNum*(index+1))) - TimeHelper.ServerNow();
+                    item.m_timeText.text = TimeUtil.FormattingTimeTo_DDHHmm(timeSale);
                 }
-                var leftTime = endTime - TimeHelper.ServerNow();
-                item.m_timeText.text = TimeUtil.FormattingTimeTo_DDHHmm(leftTime);
+
             }
             if(suitCfg.rarity == 5)
             {
@@ -299,43 +310,64 @@ namespace GFGGame
             itemIndex = itemIndex == _ui.m_suitList.numItems ? 0 : itemIndex;
             _ui.m_suitList.scrollPane.ScrollRight(0.8f, true);
         }
-        private int GetDiscountTimeID()
+        
+        public List<ShopCfg> SortSaleCfg()
         {
-            //判断当前indexSuit是否在折扣时间内，根据配置表返回不同的直购id
-            return 0;//activityInfo.StartTime <= TimeHelper.ServerNow() && activityInfo.EndTime > TimeHelper.ServerNow();
+            List<ShopCfg> shopCfgs = new List<ShopCfg>();
+            for (int i = 0; i < EverydaySaleCfgArray.Instance.dataArray.Length; i++)
+            {
+                ShopCfg shopcfg = ShopCfgArray.Instance.GetCfg(giftBagList[i]);
+                var item = EverydaySaleCfgArray.Instance.dataArray[i];
+                if (item.openTime == "" || item.openTime == null)
+                {
+                    shopCfgs.Add(shopcfg);
+                    break;
+                }
+                if (IsDisountTime(item) || day_CreateRole >= item.id*2)
+                {
+                    shopCfgs.Add(shopcfg);
+                }    
+            }
+            return shopCfgs;
         }
         private bool IsDisountTime(EverydaySaleCfg item)
         {
-            long endTime;
-            long startTime;
-            if(item.openTime == "" || item.openTime == null)
+            if(item.activityId == 6002 && item.openTime == "")
+            {
+                return ActivityGlobalDataManager.Instance.IsActivityOpen(item.activityId);
+            }
+            long second = TimeHelper.ServerNow() - second_CreateRole;
+            if (second < (saleSecondNum * item.id) && second >= (saleSecondNum*(item.id-1)))
+            {
+                return true;
+            }
+                return false;
+        }
+        private bool IsSaleTime(EverydaySaleCfg item)
+        {
+            if (item.activityId == 6002 && item.openTime == "")
             {
                 return !ActivityGlobalDataManager.Instance.IsActivityOpen(item.activityId);
             }
-            endTime = TimeUtil.DateTimeToTimestamp(item.endTime);
-            startTime = TimeUtil.DateTimeToTimestamp(item.openTime);
-            if (startTime <= TimeHelper.ServerNow() && endTime > TimeHelper.ServerNow())
+            long second = TimeHelper.ServerNow() - second_CreateRole;
+            if (second < (saleSecondNum * item.id) && second >= (saleSecondNum * (item.id - 1)))
             {
                 return false;
             }
-                return true;
+            return true;
         }
         private void ReturnDiscountTimeSuitIndex()
         {
             int count = 0;
-            long endTime;
-            long startTime;
             foreach (var item in EverydaySaleCfgArray.Instance.dataArray)
             {
-                if(item.openTime == "" || item.openTime == null)
+                if(item.activityId == 6002)
                 {
                     listIndex.Add(giftBagList[count]);
                     count++;
                     break;
                 }
-                endTime = TimeUtil.DateTimeToTimestamp(item.endTime);
-                startTime = TimeUtil.DateTimeToTimestamp(item.openTime);
-                if (startTime <= TimeHelper.ServerNow() && endTime > TimeHelper.ServerNow())
+                if (IsDisountTime(item))
                 {
                     listIndex.Add(giftBagList[count]);
                 }

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingShowView.cs

@@ -12,6 +12,7 @@ namespace GFGGame
     {
         private UI_TimeTracingShowUI _ui;
         private List<int> suitIdList = new List<int>() { 201030, 201010, 202006 };
+        private Dictionary<int,string> nameIconList = new Dictionary<int,string>() { [201030] ="dtfd" , [201010]="jldl",[202006]="sszz" };
         private int SuitID = 201030;
         private int ChapterID;
         public override void Dispose()
@@ -77,6 +78,7 @@ namespace GFGGame
             SuitID = TimeTracingDataManager.SuitID;
             _ui.m_suitName.text = SuitCfgArray.Instance.GetCfg(SuitID).name;
             ChapterID = TimeTracingDataManager._currentChapterId;
+            _ui.m_nameIcon.url = string.Format("ui://TimeTracing/{0}", nameIconList[SuitID]);
             if (true)
             {
                 DressUpObjUI dressUpObjUI;

GameClient/Assets/Game/HotUpdate/Views/TimeTracing/TimeTracingSwitchView.cs

@@ -36,7 +36,7 @@ namespace GFGGame
         {
             base.OnShown();
             UpdateList();
-            _ui.m_List.numItems = 6;
+            _ui.m_List.numItems = suitIdList.Count + 2;
             for(int i = 0;i< suitIdList.Count;i++)
             {
                 if(TimeTracingDataManager.SuitID == suitIdList[i])

GameClient/Assets/ResIn/UI/ClothingUpgrade.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9bde403a8c1e68945b6a968b4a0056ce
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: afd912a061ebbee4492b5e47b381a870
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_atlas0.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 4675716f4c4c147438bb9830176e6567
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ClothingUpgrade/ClothingUpgrade_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 85d529f3e18652d448722553c8a1b9cd
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: