Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -25,6 +25,8 @@ namespace GFGGame
         public const string DRESS_FILTER = "DRESS_FILTER";
         public const string DRESS_SEARCH = "DRESS_SEARCH";
         public const string DRESS_FILTER_RESET = "DRESS_FILTER_RESET";
+        public const string DRESS_FILTER_RESET_ALL = "DRESS_FILTER_RESET_ALL";
+
         public const string CARD_CHOOSE = "CARD_CHOOSE";
         public const string CARD_SELECTED = "CARD_SELECTED";
         public const string SHOW_CARD_SKILL_END = "SHOW_CARD_SKILL_END";

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

@@ -14,6 +14,14 @@ namespace GFGGame
         Search,
         Filter
     }
+
+    public enum DressFilterItemType
+    {
+        ALL,
+        DressUpItem,    // 散件
+        Suit            // 套装
+    }
+
     public class DressUpMenuItemDataManager
     {
         public static string dressSearchTxt = "";
@@ -412,7 +420,8 @@ namespace GFGGame
             }
             return filterList;
         }
-        public static List<int> DressSearch(List<int> list)
+
+        public static List<int> DressSearch(List<int> list, DressFilterItemType type = DressFilterItemType.ALL)
         {
             List<int> searchList = new List<int>();
             for (int i = 0; i < list.Count; i++)
@@ -420,7 +429,21 @@ namespace GFGGame
                 bool isSearch = true;
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(list[i]);
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(list[i]);
-                string name = itemCfg != null ? itemCfg.name : suitCfg.name;
+
+                // 散件优先于套装
+                if (type == DressFilterItemType.ALL)
+                {
+                    if (itemCfg == null)
+                    {
+                        type = DressFilterItemType.Suit;
+                    }
+                    else
+                    {
+                        type = DressFilterItemType.DressUpItem;
+                    }
+                }
+
+                string name = (type == DressFilterItemType.DressUpItem) ? itemCfg.name : suitCfg.name;
                 for (int j = 0; j < dressSearchTxt.Length; j++)
                 {
                     if (name.IndexOf(dressSearchTxt[j]) < 0)
@@ -436,20 +459,36 @@ namespace GFGGame
             }
             return searchList;
         }
-        public static List<int> DressFilter(List<int> list)
+
+        public static List<int> DressFilter(List<int> list, DressFilterItemType type = DressFilterItemType.ALL)
         {
             List<int> filterList = new List<int>();
 
             for (int i = 0; i < list.Count; i++)
             {
                 ItemCfg cfg = ItemCfgArray.Instance.GetCfg(list[i]);
-                SuitCfg tzCfg = SuitCfgArray.Instance.GetCfg(list[i]);
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(list[i]);
+
+                // 散件优先于套装
+                if(type == DressFilterItemType.ALL)
+                {
+                    if(cfg == null)
+                    {
+                        type = DressFilterItemType.Suit;
+                    }
+                    else
+                    {
+                        type = DressFilterItemType.DressUpItem;
+                    }
+                }
 
-                bool isRarity = cfg == null ? FilterRarity(tzCfg) : FilterRarity(cfg);
+                ItemCfg suitItemCfg = (suitCfg != null) ? ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[0]) : null;
 
-                bool isScore = cfg == null ? true : FilterScore(cfg);
+                bool isRarity = (type == DressFilterItemType.Suit) ? FilterRarity(suitCfg) : FilterRarity(cfg);
 
-                bool isTag = cfg == null ? true : FilterTag(cfg);
+                bool isScore = FilterScore((type == DressFilterItemType.Suit) ? suitItemCfg : cfg);
+
+                bool isTag = FilterTag((type == DressFilterItemType.Suit) ? suitItemCfg : cfg);
 
                 if (isRarity && isScore && isTag)
                 {
@@ -507,6 +546,7 @@ namespace GFGGame
             }
             return isRarity;
         }
+
         private static bool FilterScore(ItemCfg cfg)
         {
             bool isScore = false;
@@ -531,6 +571,33 @@ namespace GFGGame
             }
             return isScore;
         }
+
+        private static bool FilterScore(SuitCfg suitCfg)
+        {
+            bool isScore = false;
+            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[0]);
+            if (selectScoreList.Count > 0)
+            {
+                if (cfg != null)
+                {
+                    for (int j = 0; j < selectScoreList.Count; j++)
+                    {
+                        if (cfg.mainScore == selectScoreList[j])
+                        {
+                            isScore = true;
+                            break;
+                        }
+
+                    }
+                }
+            }
+            else
+            {
+                isScore = true;
+            }
+            return isScore;
+        }
+
         private static bool FilterTag(ItemCfg cfg)
         {
             bool isTag = false;

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

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

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ButtonHeadChoose.cs

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

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ButtonPage.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DressUp
+{
+    public partial class UI_ButtonPage
+    {
+        public GButton target;
+        public GTextField m_title1;
+        public const string URL = "ui://mbo439wbez6qfg";
+        public const string PACKAGE_NAME = "DressUp";
+        public const string RES_NAME = "ButtonPage";
+        private static UI_ButtonPage _proxy;
+
+        public static UI_ButtonPage Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonPage();
+            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_ButtonPage Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonPage();
+            }
+            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_title1 = (GTextField)comp.GetChild("title1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_title1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ButtonPage.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressFilterUI.cs

@@ -8,12 +8,17 @@ namespace UI.DressUp
     {
         public GComponent target;
         public Controller m_c1;
-        public GTextInput m_txtInput;
-        public GButton m_btnSearch;
+        public Controller m_page;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
         public GButton m_btnClose;
+        public UI_ComSearch m_comSearch;
+        public GTextInput m_txtInput;
         public GButton m_btnConfirm;
         public GButton m_btnReset;
-        public UI_ComSearch m_comSearch;
+        public UI_ButtonHeadChoose m_btnTab0;
+        public UI_ButtonHeadChoose m_btnTab1;
+        public Transition m_t0;
         public const string URL = "ui://mbo439wbih7532";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "DressFilterUI";
@@ -62,23 +67,35 @@ namespace UI.DressUp
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_txtInput = (GTextInput)comp.GetChild("txtInput");
-            m_btnSearch = (GButton)comp.GetChild("btnSearch");
+            m_page = comp.GetController("page");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
             m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_comSearch = (UI_ComSearch)UI_ComSearch.Create(comp.GetChild("comSearch"));
+            m_txtInput = (GTextInput)comp.GetChild("txtInput");
             m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
             m_btnReset = (GButton)comp.GetChild("btnReset");
-            m_comSearch = (UI_ComSearch)UI_ComSearch.Create(comp.GetChild("comSearch"));
+            m_btnTab0 = (UI_ButtonHeadChoose)UI_ButtonHeadChoose.Create(comp.GetChild("btnTab0"));
+            m_btnTab1 = (UI_ButtonHeadChoose)UI_ButtonHeadChoose.Create(comp.GetChild("btnTab1"));
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_txtInput = null;
-            m_btnSearch = null;
+            m_page = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
             m_btnClose = null;
-            m_btnConfirm = null;
-            m_btnReset = null;
             m_comSearch.Dispose();
             m_comSearch = null;
+            m_txtInput = null;
+            m_btnConfirm = null;
+            m_btnReset = null;
+            m_btnTab0.Dispose();
+            m_btnTab0 = null;
+            m_btnTab1.Dispose();
+            m_btnTab1 = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Utils/SuitUtil.cs

@@ -16,7 +16,7 @@ namespace GFGGame
             {
                 //int itemType = ItemUtilCS.GetItemSubType(itemId);
                 //if (itemType != ConstDressUpItemType.FEN_WEI && itemType != ConstDressUpItemType.BEI_JING 
-                    //&& itemType != ConstDressUpItemType.HUAN_JING && itemType != ConstDressUpItemType.QIAN_JING && itemType != ConstDressUpItemType.BEI_SHI)
+                //&& itemType != ConstDressUpItemType.HUAN_JING && itemType != ConstDressUpItemType.QIAN_JING && itemType != ConstDressUpItemType.BEI_SHI)
 
                 if (!DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemId))
                 {
@@ -309,12 +309,11 @@ namespace GFGGame
 
         public static List<int> GetSuitIdList(bool notGet, bool haveGot, int typeId, int sortIndex)
         {
-
             List<int> result = new List<int>();
             void CheckToAdd(int targetId)
             {
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(targetId);
-                if(suitCfg == null || suitCfg.isHide > 0)
+                if (suitCfg == null || suitCfg.isHide > 0)
                 {
                     return;
                 }
@@ -388,6 +387,18 @@ namespace GFGGame
             return result;
         }
 
+        public static int GetHaveSuitCount(List<int> list)
+        {
+            int count = 0;
+            for (int i = 0; i < list.Count; i++)
+            {
+                if (DressUpMenuSuitDataManager.CheckHaveSuit(list[i]))
+                {
+                    ++count;
+                }
+            }
+            return count;
+        }
 
         public static void ShowSuitGuideBonus(int suitId)
         {

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

@@ -2,6 +2,7 @@ using FairyGUI;
 using UI.ActivityAfternoonTea;
 using UI.CommonGame;
 using ET;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
@@ -37,17 +38,19 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_listSynthetic.itemRenderer = RenderListSyntheticItem;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gf_hdzy_bj");
         }
 
         protected override void OnShown()
         {
             base.OnShown();
 
-            _valueBarController.OnShown();
-            _valueBarController.Controller(6);
-
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(5005);
             _suitCfg = SuitCfgArray.Instance.GetCfg(activityOpenCfg.paramsArr[0]);
+            ItemCfg itemSyntheticCfg = ItemCfgArray.Instance.GetCfg(_suitCfg.partsArr[0]);
+            _valueBarController.OnShown();
+            _valueBarController.UpdateList(new List<int>() { itemSyntheticCfg.syntheticMateriarsArr[0][0], ConstItemID.GOLD });
+
             _ui.m_listSynthetic.numItems = _suitCfg.partsArr.Length;
             RefreshTimeText();
             _ui.m_txtTips.SetVar("name", _suitCfg.name).FlushVars();
@@ -57,10 +60,31 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-
+            _valueBarController.OnHide();
             Timers.inst.Remove(UpdateTime);
         }
 
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemChange);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, OnItemChange);
+        }
+
+        private void OnItemChange(EventContext context)
+        {
+            var itemId = (int)context.data;
+            ItemCfg itemSyntheticCfg = ItemCfgArray.Instance.GetCfg(_suitCfg.partsArr[0]);
+            if (itemId != itemSyntheticCfg.syntheticMateriarsArr[0][0] && itemId != itemSyntheticCfg.syntheticMateriarsArr[1][0]) return;
+            _ui.m_listSynthetic.numItems = _suitCfg.partsArr.Length;
+        }
+
+
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(typeof(ActivitySyntheticView).FullName);
@@ -160,9 +184,7 @@ namespace GFGGame
             ItemCfg itemSyntheticCfg = ItemCfgArray.Instance.GetCfg(_suitCfg.partsArr[index]);
             var materiarsArr = itemSyntheticCfg.syntheticMateriarsArr;
             if (ItemDataManager.GetItemNum(materiarsArr[0][0]) < materiarsArr[0][1])
-            {
                 MainControllerr.GotoStoryChapter();
-            }
             else
                 ItemUtil.BuyCurrency(materiarsArr[1][0], materiarsArr[1][1] - ItemDataManager.GetItemNum(materiarsArr[1][0]));
         }

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

@@ -23,6 +23,8 @@ namespace GFGGame
 
         public override void Dispose()
         {
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET_ALL, ResetAll);
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -42,7 +44,6 @@ namespace GFGGame
             this.clickBlankToClose = false;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            _ui.m_btnSearch.onClick.Add(OnclickBtnSearch);
             _ui.m_btnConfirm.onClick.Add(OnClickBtnConfirm);
             _ui.m_btnReset.onClick.Add(OnClickBtnReset);
             _ui.m_btnClose.onClick.Add(this.OnHide);
@@ -54,6 +55,9 @@ namespace GFGGame
             _ui.m_comSearch.m_listRarity.onClickItem.Add(OnClickListRarityItem);
             _ui.m_comSearch.m_listScore.onClickItem.Add(OnClickListScoreItem);
             //_ui.m_comSearch.m_listTag.onClickItem.Add(OnClickListTagItem);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET_ALL, ResetAll);
+            _ui.m_page.onChanged.Add(OnTabChange);
+
         }
 
         protected override void OnShown()
@@ -85,6 +89,18 @@ namespace GFGGame
             UpdateView();
 
         }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            //EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET_ALL, ResetAll);
+        }
+
         private void UpdateView()
         {
             _ui.m_comSearch.m_listRarity.numItems = ConstDressRarity.DressRarityList().Count;
@@ -108,6 +124,10 @@ namespace GFGGame
             int data = index + 1;
             item.data = data;
             item.selected = _selectScoreList.IndexOf(data) >= 0;
+            UI_Button2 button2 = UI_Button2.Proxy(obj);
+            button2.m_type.selectedIndex = 1;
+            button2.m_mainScoreIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + ConstDressUpScoreType.scoreTypeList().GetKey(index));
+            UI_Button2.ProxyEnd();
         }
 
         private List<GButton> _TagItemObj = new List<GButton>();
@@ -210,7 +230,8 @@ namespace GFGGame
             }
             return true;
         }
-        private void OnclickBtnSearch()
+
+        private void OnClickBtnSearch()
         {
             DressUpMenuItemDataManager.dressFilterType = DressFilterType.Search;
             if (!CheckIllegalCharacter(_ui.m_txtInput.text))
@@ -222,24 +243,32 @@ namespace GFGGame
             EventAgent.DispatchEvent(ConstMessage.DRESS_SEARCH, ConstMessage.DRESS_SEARCH);
             ResetFilter();
             this.OnHide();
-
         }
+
         private void OnClickBtnConfirm()
         {
-            DressUpMenuItemDataManager.dressFilterType = DressFilterType.Filter;
-            DressUpMenuItemDataManager.selectRarityList = _selectRarityList;
-            DressUpMenuItemDataManager.selectScoreList = _selectScoreList;
-            DressUpMenuItemDataManager.selectTagList = _selectTagList;
-            if (_selectRarityList.Count == 0 && _selectScoreList.Count == 0 && _selectTagList.Count == 0)
+            // 筛选
+            if(_ui.m_page.selectedIndex == 0)
             {
-                PromptController.Instance.ShowFloatTextPrompt("未选择要搜索的类型");
-                return;
+                DressUpMenuItemDataManager.dressFilterType = DressFilterType.Filter;
+                DressUpMenuItemDataManager.selectRarityList = _selectRarityList;
+                DressUpMenuItemDataManager.selectScoreList = _selectScoreList;
+                DressUpMenuItemDataManager.selectTagList = _selectTagList;
+                if (_selectRarityList.Count == 0 && _selectScoreList.Count == 0 && _selectTagList.Count == 0)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("未选择要搜索的类型");
+                    return;
+                }
+                ViewManager.Show<ModalStatusView>("搜索中...");
+                EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER, ConstMessage.DRESS_FILTER);
+                ResetSearch();
+                this.OnHide();
+            }
+            // 搜索
+            else if(_ui.m_page.selectedIndex == 1)
+            {
+                OnClickBtnSearch();
             }
-            ViewManager.Show<ModalStatusView>("搜索中...");
-
-            EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER, ConstMessage.DRESS_FILTER);
-            ResetSearch();
-            this.OnHide();
         }
         private void OnClickBtnReset()
         {
@@ -249,6 +278,7 @@ namespace GFGGame
             UpdateView();
             EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER_RESET);
         }
+
         private void ResetFilter()
         {
             _selectRarityList.Clear();
@@ -261,10 +291,18 @@ namespace GFGGame
             _ui.m_comSearch.m_listScore.SelectNone();
             _ui.m_comSearch.m_listTag.SelectNone();
         }
+
+        private void ResetAll()
+        {
+            _ui.m_page.selectedIndex = 0;
+            OnClickBtnReset();
+        }
+
         private void ResetSearch()
         {
             _ui.m_txtInput.text = null;
         }
+
         protected override void OnHide()
         {
             base.OnHide();
@@ -273,5 +311,11 @@ namespace GFGGame
             _ui.m_comSearch.m_listScore.SelectNone();
             _ui.m_comSearch.m_listTag.SelectNone();
         }
+
+        private void OnTabChange()
+        {
+            _ui.m_btnTab0.m_color.selectedIndex = 1 - _ui.m_page.selectedIndex;
+            _ui.m_btnTab1.m_color.selectedIndex = _ui.m_page.selectedIndex;
+        }
     }
 }

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

@@ -210,6 +210,9 @@ namespace GFGGame
             Reset();
             Timers.inst.Remove(CheckGuide);
             ScaleGestureController.Instance.target = null;
+
+            // 清空服装过滤界面选择
+            EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER_RESET_ALL);
         }
         protected override void RemoveEventListener()
         {

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

@@ -16,6 +16,7 @@ namespace GFGGame
         private UI_DressUpGuideUI _ui;
         private List<int> _itemIdList;
         private bool _startInAnim;
+        private string _filterStr;
 
         // 上次点击单选按钮的index
         private struct LastClickIndex
@@ -65,6 +66,7 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, FilterItems);
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, FilterItems);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET, ResetFilterStr);
             EventAgent.AddEventListener(ConstMessage.DRESS_PART_LOAD_FINISHED, LoadFinished);
 
         }
@@ -74,6 +76,7 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, FilterItems);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, FilterItems);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, ResetFilterStr);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_PART_LOAD_FINISHED, LoadFinished);
         }
 
@@ -110,7 +113,11 @@ namespace GFGGame
             base.OnHide();
             _itemIdList.Clear();
             _currentList2 = null;
+            _filterStr = "";
             DressUpMenuItemDataManager.Clear();
+
+            // 清空服装过滤界面选择
+            EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER_RESET_ALL);
         }
 
         /// <summary>
@@ -247,6 +254,8 @@ namespace GFGGame
                     _itemIdList = DressUpMenuItemDataManager.GetAllDressUpGuideIdListBySubType(item1.type);
                 }
             }
+
+            _itemIdList = GetFilterList(_itemIdList, _filterStr);
         }
 
         /// <summary>
@@ -273,6 +282,8 @@ namespace GFGGame
                 DressUpMenuItemCfg2 item2 = DressUpMenuItemCfg2Array.Instance.dataArray[_currentList2[index - 1] - 1];
                 _itemIdList = DressUpMenuItemDataManager.GetAllDressUpGuideIdListBySubType(item2.type);
             }
+
+            _itemIdList = GetFilterList(_itemIdList, _filterStr);
         }
 
         /// <summary>
@@ -325,7 +336,15 @@ namespace GFGGame
             _ui.m_progressBar.target.max = totalCount;
             _ui.m_progressBar.target.value = haveCount;
             _ui.m_progressBar.m_title1.SetVar("value", haveCount.ToString()).SetVar("max", totalCount.ToString()).FlushVars();
-            _ui.m_progressBar.m_rate.SetVar("rate", FieldGuideView.ProgressCalculate(haveCount, totalCount).ToString()).FlushVars();
+
+            if(totalCount > 0)
+            {
+                _ui.m_progressBar.m_rate.SetVar("rate", FieldGuideView.ProgressCalculate(haveCount, totalCount).ToString()).FlushVars();
+            }
+            else
+            {
+                _ui.m_progressBar.m_rate.SetVar("rate", "0").FlushVars();
+            }
         }
 
         private void OnClickBtnBack()
@@ -341,6 +360,7 @@ namespace GFGGame
 
         private void FilterItems(EventContext context)
         {
+            _filterStr = "";
             // 过滤之前，需要更新_itemIdList为全部物品
             if (_lastClickIndex.typeIndex == 1)
             {
@@ -351,16 +371,10 @@ namespace GFGGame
                 UpdateItemIdListByType2(_lastClickIndex.index);
             }
 
-            if (context.data.ToString() == ConstMessage.DRESS_SEARCH)
-            {
-                _itemIdList = DressUpMenuItemDataManager.DressSearch(_itemIdList);
-            }
-            else if (context.data.ToString() == ConstMessage.DRESS_FILTER)
-            {
-                _itemIdList = DressUpMenuItemDataManager.DressFilter(_itemIdList);
-            }
+            _filterStr = context.data.ToString();
+            _itemIdList = GetFilterList(_itemIdList, _filterStr);
+            UpdateItemListUI();
             ViewManager.Hide<ModalStatusView>();
-            UpdateItemListUI(false);
             _ui.m_Refresh.Play();
         }
 
@@ -369,5 +383,34 @@ namespace GFGGame
             UpdateItemIdListByType1(0);
             UpdateItemListUI();
         }
+
+        private List<int> GetFilterList(List<int> list, string filterStr)
+        {
+            if (filterStr == ConstMessage.DRESS_SEARCH)
+            {
+                list = DressUpMenuItemDataManager.DressSearch(list, DressFilterItemType.DressUpItem);
+            }
+            else if (filterStr == ConstMessage.DRESS_FILTER)
+            {
+                list = DressUpMenuItemDataManager.DressFilter(list, DressFilterItemType.DressUpItem);
+            }
+
+            return list;
+        }
+
+        private void ResetFilterStr()
+        {
+            _filterStr = "";
+
+            if (_lastClickIndex.typeIndex == 1)
+            {
+                UpdateItemIdListByType1(_lastClickIndex.index);
+            }
+            else if(_lastClickIndex.typeIndex == 2)
+            {
+                UpdateItemIdListByType2(_lastClickIndex.index);
+            }
+            UpdateItemListUI();
+        }
     }
 }

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

@@ -48,6 +48,7 @@ namespace GFGGame
             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()
         {
@@ -64,6 +65,9 @@ namespace GFGGame
         {
             base.OnHide();
             DressUpMenuItemDataManager.Clear();
+
+            // 清空服装过滤界面选择
+            EventAgent.DispatchEvent(ConstMessage.DRESS_FILTER_RESET_ALL);
         }
         protected override void RemoveEventListener()
         {
@@ -74,6 +78,8 @@ namespace GFGGame
             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)
@@ -82,15 +88,16 @@ namespace GFGGame
 
             if (context.data.ToString() == ConstMessage.DRESS_SEARCH)
             {
-                _suitIds = DressUpMenuItemDataManager.DressSearch(_suitIds);
+                _suitIds = DressUpMenuItemDataManager.DressSearch(_suitIds, DressFilterItemType.Suit);
             }
             else if (context.data.ToString() == ConstMessage.DRESS_FILTER)
             {
-                _suitIds = DressUpMenuItemDataManager.DressFilter(_suitIds);
+                _suitIds = DressUpMenuItemDataManager.DressFilter(_suitIds, DressFilterItemType.Suit);
             }
 
             ViewManager.Hide<ModalStatusView>();
             _ui.m_listSuit.numItems = _suitIds.Count;
+            UpdateProgress();
             _ui.m_Refresh.Play();
 
         }
@@ -108,14 +115,27 @@ namespace GFGGame
         private void UpdateListSuit()
         {
             _suitIds = SuitUtil.GetSuitIdList(true, true, _suitTypeId, 0);
-            int haveCount = SuitUtil.GetSuitIdList(false, true, _suitTypeId, 0).Count;
+            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();
-            _ui.m_progress.m_rate.SetVar("rate", FieldGuideView.ProgressCalculate(haveCount, 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();
+            }
+
             _ui.m_listSuit.numItems = _suitIds.Count;
             _ui.m_listSuit.scrollPane.ScrollTop();
         }
@@ -184,5 +204,10 @@ namespace GFGGame
                 }
             });
         }
+
+        private void ResetFilter()
+        {
+            UpdateListSuit();
+        }
     }
 }

GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 1e7435730c9868e44b5515d1367ce532
+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/DressUp/DressUp_atlas0_1.png.meta

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