Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

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

@@ -71,20 +71,28 @@ namespace GFGGame
         {
             GButton item = obj.asButton;
             item.text = ConstDressRarity.DressRarityList()[index + 1].ToString();
-            item.data = index + 1;
+            int data = index + 1;
+            item.data = data;
+            item.selected = _selectRarityList.IndexOf(data) >= 0;
         }
         private void RenderListScoreItem(int index, GObject obj)
         {
             GButton item = obj.asButton;
             item.text = ConstDressUpScoreType.scoreTypeList()[index + 1].ToString();
-            item.data = index + 1;
+            int data = index + 1;
+            item.data = data;
+            item.selected = _selectScoreList.IndexOf(data) >= 0;
+
         }
         private void RenderListTagItem(int index, GObject obj)
         {
             GButton item = obj.asButton;
             item.text = ConstDressTag.DressTagList()[index].name;
             item.icon = "ui://DressUp/sxsx_fgdi_" + ConstDressTag.DressTagList()[index].type;
-            item.data = string.Format("{0}_{1}", ConstDressTag.DressTagList()[index].type, ConstDressTag.DressTagList()[index].name);
+            // item.data = 
+            string data = string.Format("{0}_{1}", ConstDressTag.DressTagList()[index].type, ConstDressTag.DressTagList()[index].name);
+            item.data = data;
+            item.selected = _selectTagList.IndexOf(data) >= 0;
         }
         private void OnClickListRarityItem(EventContext context)
         {

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

@@ -93,8 +93,7 @@ namespace GFGGame
             // _ui.m_loaShow.onClick.Add(OnClickLoaShow);
             // _ui.m_btnHide.visible = false;
 
-            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
-            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+
             // EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdatePartsListSort);
             EventAgent.AddEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
             _ui.m_partsList2.m_comboBoxRarity.visible = false;
@@ -103,6 +102,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
+            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
             InstanceZonesDataManager.usedRecommend = false;
             // _ui.m_comboBox.title = "我的套装";
             _ui.m_txtRecommendCount.SetVar("v1", "" + GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.RecommendCount)).FlushVars();
@@ -183,6 +184,8 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
             _fightCfg = null;
             _levelCfg = null;

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

@@ -82,8 +82,7 @@ namespace GFGGame
             _ui.m_loaShow.onClick.Add(OnClickLoaShow);
             _ui.m_btnPhoto.onClick.Add(OnClickBtnPhoto);
 
-            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
-            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+
             EventAgent.AddEventListener(ConstMessage.CLOSE_PHOTOGRAPHVIEW, UpdateScene);
             _ui.m_partsList2.m_comboBoxRarity.visible = false;
         }
@@ -91,6 +90,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
+            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
             _rarityIndex = SORT_BY_HIGH_RARITY;
             // MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DRESS_UP, "mp3"));
             _ui.m_comListType1.target.x = _ui.target.width;
@@ -120,6 +121,8 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
         }
 
         private void OnClickBtnBack()