Forráskód Böngészése

取消“穿好衣服才能出门提示,”修改搜索列表穿戴后无选中状态,战斗换装搜索列表无穿戴记录

zhaoyang 2 éve
szülő
commit
58f1520d6d

+ 13 - 13
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -244,19 +244,19 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("挑战次数不足");
                 return;
             }
-            for (int i = 0; i < _dataManager.DressupList.Count; i++)
-            {
-                if (!MyDressUpHelper.CheckPutOnFinish(_dataManager.DressupList[i].itemList))
-                {
-                    AlertUI.Show("全部主题穿戴完整才能开始战斗哦!").
-                    SetLeftButton(true, "取消").
-                    SetRightButton(true, "去换装", (object param) =>
-                    {
-                        OnBtnDressClick();
-                    });
-                    return;
-                }
-            }
+            // for (int i = 0; i < _dataManager.DressupList.Count; i++)
+            // {
+            //     if (!MyDressUpHelper.CheckPutOnFinish(_dataManager.DressupList[i].itemList))
+            //     {
+            //         AlertUI.Show("全部主题穿戴完整才能开始战斗哦!").
+            //         SetLeftButton(true, "取消").
+            //         SetRightButton(true, "去换装", (object param) =>
+            //         {
+            //             OnBtnDressClick();
+            //         });
+            //         return;
+            //     }
+            // }
 
             bool result = await GetFightResult();
             if (!result) return;

+ 15 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs

@@ -914,12 +914,25 @@ namespace GFGGame
         }
         private void UpdateListPartsSelected()
         {
-            int count = _ui.m_partsList.m_list.numChildren;
+            GList list;
+            if (_ui.m_partsList.target.x == partsListX)
+            {
+                list = _ui.m_partsList.m_list;
+            }
+            else if (_ui.m_partsListSearch.target.x == partsListX)
+            {
+                list = _ui.m_partsListSearch.m_list;
+            }
+            else
+            {
+                return;
+            }
+            int count = list.numChildren;
             int suitId = MyDressUpHelper.dressUpObj.suitId;
 
             for (int i = 0; i < count; i++)
             {
-                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(i));
+                UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(i));
                 int id = (int)listItem.target.data;
                 if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
                 {

+ 23 - 9
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -358,7 +358,8 @@ namespace GFGGame
             MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
 
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制:{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateSearchListPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateSearchListPartsSelected();
 
             UpdateScore();
         }
@@ -502,12 +503,12 @@ namespace GFGGame
 
         private void OnClickBtnNext()
         {
-            if (!MyDressUpHelper.CheckPutOnFinish())
-            {
-                AlertUI.Show("只有换好衣服才能出门哦!")
-                    .SetRightButton(true, "好的");
-                return;
-            }
+            // if (!MyDressUpHelper.CheckPutOnFinish())
+            // {
+            //     AlertUI.Show("只有换好衣服才能出门哦!")
+            //         .SetRightButton(true, "好的");
+            //     return;
+            // }
 
             if (!CheckHasNeed())
             {
@@ -1052,12 +1053,25 @@ namespace GFGGame
         }
         private void UpdateListPartsSelected()
         {
-            int count = _ui.m_partsList.m_list.numChildren;
+            GList list;
+            if (_ui.m_partsList.target.x == partsListX)
+            {
+                list = _ui.m_partsList.m_list;
+            }
+            else if (_ui.m_partsListSearch.target.x == partsListX)
+            {
+                list = _ui.m_partsListSearch.m_list;
+            }
+            else
+            {
+                return;
+            }
+            int count = list.numChildren;
             int suitId = MyDressUpHelper.dressUpObj.suitId;
 
             for (int i = 0; i < count; i++)
             {
-                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(i));
+                UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(i));
                 int id = (int)listItem.target.data;
                 if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
                 {

+ 16 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -845,14 +845,28 @@ namespace GFGGame
             UI_PartsListItem.ProxyEnd();
 
         }
+
         private void UpdateListPartsSelected(int selectSuitId = 0)
         {
-            int count = _ui.m_partsList.m_list.numChildren;
+            GList list;
+            if (_ui.m_partsList.target.x == partsListX)
+            {
+                list = _ui.m_partsList.m_list;
+            }
+            else if (_ui.m_partsListSearch.target.x == partsListX)
+            {
+                list = _ui.m_partsListSearch.m_list;
+            }
+            else
+            {
+                return;
+            }
+            int count = list.numChildren;
             int suitId = MyDressUpHelper.dressUpObj.suitId;
 
             for (int i = 0; i < count; i++)
             {
-                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(i));
+                UI_PartsListItem listItem = UI_PartsListItem.Proxy(list.GetChildAt(i));
                 int id = (int)listItem.target.data;
                 if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
                 {