上一步下一步

FGUIProject/assets/DressUp/ArenaDressUpFightUI.xml

@@ -32,13 +32,19 @@
     <component id="n62_ofwu" name="partsListSearch" src="k6he1v" fileName="components/PartsList.xml" xy="1080,40" size="230,1880" group="n38_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
+    <component id="n63_ebfi" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="46,1174" group="n44_wono">
+      <Button icon="ui://mbo439wbq08x6"/>
+    </component>
+    <component id="n64_ebfi" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="46,1316" group="n44_wono">
+      <Button icon="ui://mbo439wbq08xl"/>
+    </component>
     <component id="n6_qsvd" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="46,1458" group="n44_wono">
       <Button icon="ui://mbo439wbq08xn"/>
     </component>
     <component id="n7_qsvd" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="46,1600" group="n44_wono">
       <Button icon="ui://mbo439wbq08xo"/>
     </component>
-    <group id="n44_wono" name="n44" xy="46,1458" size="110,252" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
+    <group id="n44_wono" name="n44" xy="46,1174" size="110,536" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
     <component id="n8_qsvd" name="btnNext" src="wonoe5" fileName="components/Button14.xml" xy="325,1728" group="n38_8lqj">

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -49,26 +49,32 @@
     <graph id="n20_8xpg" name="btnClose" xy="0,0" size="1080,1920" group="n38_8lqj" alpha="0" type="rect" fillColor="#ffff0000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <image id="n21_8xpg" name="n21" src="8xpg2s" fileName="images/dz_hz_rwdh_1.png" xy="33,886" group="n46_wono"/>
-    <text id="n22_8xpg" name="txtHint" xy="48,885" size="364,107" group="n46_wono" fontSize="30" color="#997350" align="center" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="清梦清梦清梦清梦清梦清梦 清梦清梦清梦清梦"/>
-    <group id="n46_wono" name="grpTips" xy="33,885" size="394,132" group="n38_8lqj" advanced="true">
+    <image id="n21_8xpg" name="n21" src="8xpg2s" fileName="images/dz_hz_rwdh_1.png" xy="33,602" group="n46_wono"/>
+    <text id="n22_8xpg" name="txtHint" xy="48,601" size="364,107" group="n46_wono" fontSize="30" color="#997350" align="center" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="清梦清梦清梦清梦清梦清梦 清梦清梦清梦清梦"/>
+    <group id="n46_wono" name="grpTips" xy="33,601" size="394,132" group="n38_8lqj" advanced="true">
       <relation target="n15_vxw5" sidePair="bottom-bottom"/>
     </group>
-    <component id="n15_vxw5" name="btnHint" src="f4xv3o" fileName="components/Button6.xml" xy="27,1028" size="122,114" group="n44_wono">
+    <component id="n15_vxw5" name="btnHint" src="f4xv3o" fileName="components/Button6.xml" xy="27,744" size="122,114" group="n44_wono">
       <Button title="任务提示" titleColor="#ffffff" titleFontSize="42" icon="ui://mbo439wb8xpg2q"/>
     </component>
-    <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="46,1155" group="n44_wono" visible="false">
+    <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="46,871" group="n44_wono" visible="false">
       <Button icon="ui://mbo439wb8xpg2n"/>
     </component>
-    <component id="n4_qsvd" name="btnRepeal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1174" group="n44_wono"/>
-    <component id="n5_qsvd" name="btnRenewal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1316" group="n44_wono"/>
+    <component id="n4_qsvd" name="btnRepeal" src="f4xv3o" fileName="components/Button6.xml" xy="46,890" group="n44_wono"/>
+    <component id="n5_qsvd" name="btnRenewal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1032" group="n44_wono"/>
+    <component id="n53_ebfi" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="46,1174" group="n44_wono">
+      <Button icon="ui://mbo439wbq08x6"/>
+    </component>
+    <component id="n54_ebfi" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="46,1316" group="n44_wono">
+      <Button icon="ui://mbo439wbq08xl"/>
+    </component>
     <component id="n6_qsvd" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="46,1458" group="n44_wono">
       <Button icon="ui://mbo439wbq08xn"/>
     </component>
     <component id="n7_qsvd" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="46,1600" group="n44_wono">
       <Button icon="ui://mbo439wbq08xo"/>
     </component>
-    <group id="n44_wono" name="n44" xy="27,1028" size="129,682" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
+    <group id="n44_wono" name="n44" xy="27,744" size="129,966" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
     <component id="n8_qsvd" name="btnNext" src="wonoe5" fileName="components/Button14.xml" xy="140,1728" group="n47_v95q">

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

@@ -21,6 +21,7 @@ namespace GFGGame
         private static int _stepIndex = -1;
         public static int stepIndex { get { return _stepIndex; } }
         private static List<DressUpData> _dressMemory = new List<DressUpData>();
+        public static List<DressUpData> dressMemory { get { return _dressMemory; } }
         public const int MAX_MEMORY_STEP = 20;//×î´ó¼Ç¼²½Êý
 
         public static CustomSuitData GetCurSuitDataClone(int index)
@@ -325,17 +326,14 @@ namespace GFGGame
             if (_stepIndex - 1 < 0) return false;
             _stepIndex--;
             MyDressUpHelper.dressUpObj.PutOnDressUpData(_dressMemory[_stepIndex]);
-            // _ui.m_comboBox.selectedIndex = _dressMemory[_stepIndex].pos;
-            // UpdateStepBtn();
             return true;
         }
         public static bool OnClickBtnNextStep()
         {
-            if (_stepIndex + 1 >= MAX_MEMORY_STEP) return false;
+            if (_stepIndex + 1 >= _dressMemory.Count) return false;
             _stepIndex++;
             MyDressUpHelper.dressUpObj.PutOnDressUpData(_dressMemory[_stepIndex]);
-            // _ui.m_comboBox.selectedIndex = _dressMemory[_stepIndex].pos;
-            // UpdateStepBtn();
+
             return true;
         }
 

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

@@ -18,6 +18,8 @@ namespace UI.DressUp
         public UI_PartsList m_partsList;
         public UI_PartsList m_partsList2;
         public UI_PartsList m_partsListSearch;
+        public GButton m_btnLastStep;
+        public GButton m_btnNextStep;
         public GButton m_btnDelete;
         public GButton m_btnSearch;
         public GButton m_btnNext;
@@ -80,6 +82,8 @@ namespace UI.DressUp
             m_partsList = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList"));
             m_partsList2 = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList2"));
             m_partsListSearch = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsListSearch"));
+            m_btnLastStep = (GButton)comp.GetChild("btnLastStep");
+            m_btnNextStep = (GButton)comp.GetChild("btnNextStep");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_btnNext = (GButton)comp.GetChild("btnNext");
@@ -103,6 +107,8 @@ namespace UI.DressUp
             m_partsList2 = null;
             m_partsListSearch.Dispose();
             m_partsListSearch = null;
+            m_btnLastStep = null;
+            m_btnNextStep = null;
             m_btnDelete = null;
             m_btnSearch = null;
             m_btnNext = null;

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

@@ -29,6 +29,8 @@ namespace UI.DressUp
         public GButton m_btnClothingShop;
         public GButton m_btnRepeal;
         public GButton m_btnRenewal;
+        public GButton m_btnLastStep;
+        public GButton m_btnNextStep;
         public GButton m_btnDelete;
         public GButton m_btnSearch;
         public GButton m_btnNext;
@@ -106,6 +108,8 @@ namespace UI.DressUp
             m_btnClothingShop = (GButton)comp.GetChild("btnClothingShop");
             m_btnRepeal = (GButton)comp.GetChild("btnRepeal");
             m_btnRenewal = (GButton)comp.GetChild("btnRenewal");
+            m_btnLastStep = (GButton)comp.GetChild("btnLastStep");
+            m_btnNextStep = (GButton)comp.GetChild("btnNextStep");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_btnNext = (GButton)comp.GetChild("btnNext");
@@ -145,6 +149,8 @@ namespace UI.DressUp
             m_btnClothingShop = null;
             m_btnRepeal = null;
             m_btnRenewal = null;
+            m_btnLastStep = null;
+            m_btnNextStep = null;
             m_btnDelete = null;
             m_btnSearch = null;
             m_btnNext = null;

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

@@ -70,7 +70,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-
+            _ui.m_btnLastStep.visible = true;
+            _ui.m_btnNextStep.visible = true;
             _ui.m_btnSearch.visible = true;
             _ui.m_partsList.m_comboBoxRarity.items = new string[] { "高分优先", "低分优先" };
             _ui.m_partsListSearch.m_comboBoxRarity.items = new string[] { "高分优先", "低分优先" };
@@ -89,6 +90,8 @@ namespace GFGGame
             _ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
             _ui.m_btnNext.onClick.Add(OnClickBtnNext);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
+            _ui.m_btnLastStep.onClick.Add(OnClickBtnLastStep);
+            _ui.m_btnNextStep.onClick.Add(OnClickBtnNextStep);
             // _ui.m_comValueInfo.m_btnFightScoreRule.onClick.Add(OnBtnFightScoreRule);
             _ui.m_comValueInfo.GetChild("btnFightScoreRule").onClick.Add(OnBtnFightScoreRule);
             _ui.m_grhCloseComFightScore.onClick.Add(OnCloseComFightScore);
@@ -142,7 +145,7 @@ namespace GFGGame
             }
             MyDressUpHelper.dressUpObj.PutOnItemList(_roleData.itemList);
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-
+            UpdateStepBtn(true);
             UpdateValueInfo();
             SendLog();
             Timers.inst.AddUpdate(CheckGuide);
@@ -160,7 +163,7 @@ namespace GFGGame
             // _dressUpData.TakeOffAll();
             // _dressUpData = null;
             DressUpMenuItemDataManager.Clear();
-
+            MyDressUpHelper.ResetMemory();
             Timers.inst.Remove(CheckGuide);
             _ui.m_grhCloseComFightScore.visible = false;
             _ui.m_comValueInfo.GetController("c2").selectedIndex = 0;
@@ -300,7 +303,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();
             UpdateValueInfo();
 
         }
@@ -332,8 +336,9 @@ namespace GFGGame
                 MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
             }
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateListPartsSelected();
-            UpdateListSuitPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateListPartsSelected();
+            // UpdateListSuitPartsSelected();
             UpdateValueInfo();
 
         }
@@ -358,9 +363,23 @@ namespace GFGGame
 
             MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateListSuitPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateListSuitPartsSelected();
             UpdateValueInfo();
         }
+        private void UpdateStepBtn(bool isAdd, int suitId = 0)
+        {
+            if (isAdd)
+            {
+                MyDressUpHelper.AddMemoryDressup();
+            }
+            _ui.m_btnLastStep.enabled = MyDressUpHelper.stepIndex > 0;
+            _ui.m_btnNextStep.enabled = MyDressUpHelper.stepIndex < MyDressUpHelper.dressMemory.Count - 1;
+
+            UpdateListPartsSelected();
+            UpdateListSuitPartsSelected();
+            UpdateSearchListPartsSelected();
+        }
         private void OnLongPress(EventContext context)
         {
             LongPressGesture gesture = (LongPressGesture)context.sender;
@@ -406,8 +425,9 @@ namespace GFGGame
             _ui.m_partsList.m_list.numItems = _currentList3.Count;
             _ui.m_partsList2.m_list.numItems = _currentList4.Count;
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateListPartsSelected();
-            UpdateListSuitPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateListPartsSelected();
+            // UpdateListSuitPartsSelected();
             UpdateValueInfo();
         }
 
@@ -943,7 +963,17 @@ namespace GFGGame
         {
             ViewManager.Show<DressFilterView>(false, new object[] { ViewName.DRESS_UP_VIEW });
         }
+        private void OnClickBtnLastStep()
+        {
+            if (!MyDressUpHelper.OnClickBtnLastStep()) return;
+            UpdateStepBtn(false);
+        }
+        private void OnClickBtnNextStep()
+        {
+            if (!MyDressUpHelper.OnClickBtnNextStep()) return;
+            UpdateStepBtn(false);
 
+        }
         private void SendLog()
         {
 

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

@@ -68,6 +68,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
+            _ui.m_btnLastStep.visible = true;
+            _ui.m_btnNextStep.visible = true;
             _ui.m_btnClose.visible = false;
             _ui.m_grpTips.visible = false;
             _ui.m_btnRepeal.visible = false;
@@ -97,6 +99,8 @@ namespace GFGGame
             _ui.m_btnRecommend.onClick.Add(OnClickBtnRecommend);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
             _ui.m_btnAutoPlay.onClick.Add(OnClickBtnAutoPlay);
+            _ui.m_btnLastStep.onClick.Add(OnClickBtnLastStep);
+            _ui.m_btnNextStep.onClick.Add(OnClickBtnNextStep);
 
             _ui.m_compNeed.target.onClick.Add(OnClickComNeed);
             _ui.m_compNeed.m_listTag.itemRenderer = RenderListTagItem;
@@ -196,6 +200,8 @@ namespace GFGGame
             }
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
 
+            UpdateStepBtn(true);
+
             UpdateScore();
             SendLog();
             Timers.inst.AddUpdate(CheckGuide);
@@ -216,7 +222,7 @@ namespace GFGGame
             _fightCfg = null;
             _levelCfg = null;
             DressUpMenuItemDataManager.Clear();
-
+            MyDressUpHelper.ResetMemory();
             Timers.inst.Remove(CheckGuide);
         }
         protected override void RemoveEventListener()
@@ -230,6 +236,17 @@ namespace GFGGame
             // EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
 
         }
+        private void OnClickBtnLastStep()
+        {
+            if (!MyDressUpHelper.OnClickBtnLastStep()) return;
+            UpdateStepBtn(false);
+        }
+        private void OnClickBtnNextStep()
+        {
+            if (!MyDressUpHelper.OnClickBtnNextStep()) return;
+            UpdateStepBtn(false);
+
+        }
         private void OnClickBtnBack()
         {
             AlertUI.Show("是否确定退出？")
@@ -357,6 +374,7 @@ namespace GFGGame
                 this.showListParts2(id);
                 this.hideListParts();
                 MyDressUpHelper.dressUpObj.PutOnItemList(MyDressUpHelper.GetSuitFightItems(id));
+                UpdateStepBtn(true);
                 // MyDressUpHelper.dressUpObj.PutOnSuitCfg(id, false);
             }
             else
@@ -371,10 +389,11 @@ namespace GFGGame
                     return;
                 }
                 MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+                UpdateStepBtn(true);
             }
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateListPartsSelected();
-            UpdateListSuitPartsSelected();
+            // UpdateListPartsSelected();
+            // UpdateListSuitPartsSelected();
             UpdateScore();
         }
         private void OnClickSuitPartsListItem(EventContext context)
@@ -398,9 +417,22 @@ namespace GFGGame
 
             MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateListSuitPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateListSuitPartsSelected();
             UpdateScore();
         }
+        private void UpdateStepBtn(bool isAdd, int suitId = 0)
+        {
+            if (isAdd)
+            {
+                MyDressUpHelper.AddMemoryDressup();
+            }
+            _ui.m_btnLastStep.enabled = MyDressUpHelper.stepIndex > 0;
+            _ui.m_btnNextStep.enabled = MyDressUpHelper.stepIndex < MyDressUpHelper.dressMemory.Count - 1;
+
+            UpdateListPartsSelected();
+            UpdateListSuitPartsSelected();
+        }
         private void OnLongPress(EventContext context)
         {
             LongPressGesture gesture = (LongPressGesture)context.sender;
@@ -450,8 +482,9 @@ namespace GFGGame
             _ui.m_partsList.m_list.numItems = _currentList3.Count;
             _ui.m_partsList2.m_list.numItems = _currentList4.Count;
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateListPartsSelected();
-            UpdateListSuitPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateListPartsSelected();
+            // UpdateListSuitPartsSelected();
         }
 
         private void OnClickBtnClose()

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

@@ -69,8 +69,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            _ui.m_btnLastStep.visible = false;
-            _ui.m_btnNextStep.visible = false;
+            _ui.m_btnLastStep.visible = true;
+            _ui.m_btnNextStep.visible = true;
             _ui.m_btnSearch.visible = true;
             _ui.m_btnPhoto.visible = true;
             _ui.m_btnAction.visible = false;
@@ -163,6 +163,8 @@ namespace GFGGame
             _ui.m_comboBox.items = CustomSuitDataManager.GetSuitPosItems();
             _ui.m_comboBox.selectedIndex = currentIndex;
             MyDressUpHelper.PutOnSuitSavedByPos(currentIndex);
+            UpdateStepBtn(true);
+
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -187,7 +189,8 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.CLOSE_PHOTOGRAPHVIEW, UpdateScene);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         private void OnClickBtnBack()
@@ -211,12 +214,12 @@ namespace GFGGame
         private void OnClickBtnLastStep()
         {
             if (!MyDressUpHelper.OnClickBtnLastStep()) return;
-            UpdateStepBtn();
+            UpdateStepBtn(false);
         }
         private void OnClickBtnNextStep()
         {
             if (!MyDressUpHelper.OnClickBtnNextStep()) return;
-            UpdateStepBtn();
+            UpdateStepBtn(false);
 
         }
         private void OnComboBoxChanged()
@@ -236,6 +239,7 @@ namespace GFGGame
             }
             currentIndex = _ui.m_comboBox.selectedIndex;
             MyDressUpHelper.PutOnSuitSavedByPos(_ui.m_comboBox.selectedIndex);
+            UpdateStepBtn(true);
         }
 
         private void OnClickListType1Item(EventContext context)
@@ -285,10 +289,12 @@ namespace GFGGame
             }
             UI_PartsListItem listItem = UI_PartsListItem.Proxy(context.data as GObject);// (GObject)context.data as GObject;
             int id = (int)listItem.target.data;
-            // bool isSuit = SuitCfgArray.Instance.GetTotalCountOfOneSuit(id) > 0;
+            bool isDress = true;
 
             if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
             {
+                isDress = false;
+
                 if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0 && GuideDataManager.currentGuideId == GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS).id)
                 {
                     ShowSuitPartList(id, true);
@@ -329,10 +335,12 @@ namespace GFGGame
                     MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
                 }
             }
-            MyDressUpHelper.AddMemoryDressup();
-            UpdateListPartsSelected(id);
-            UpdateListSuitPartsSelected();
-            // AddMemoryDressup();
+            if (isDress)
+            {
+                UpdateStepBtn(true, id);
+            }
+            // UpdateListPartsSelected(id);
+            // UpdateListSuitPartsSelected();
         }
         private void OnBtnNormalClick(EventContext context)
         {
@@ -363,7 +371,7 @@ namespace GFGGame
             {
                 MyDressUpHelper.dressUpObj.PutOnSuitCfg(suitId, false);
             }
-
+            UpdateStepBtn(true);
         }
 
         private void OnClickSuitPartsListItem(EventContext context)
@@ -384,14 +392,20 @@ namespace GFGGame
             {
                 MyDressUpHelper.dressUpObj.PutOnOrTakeOffAction(id);
             }
-            MyDressUpHelper.AddMemoryDressup();
-            UpdateListSuitPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateListSuitPartsSelected();
         }
 
-        private void UpdateStepBtn()
+        private void UpdateStepBtn(bool isAdd, int suitId = 0)
         {
+            if (isAdd)
+            {
+                MyDressUpHelper.AddMemoryDressup();
+            }
             _ui.m_btnLastStep.enabled = MyDressUpHelper.stepIndex > 0;
-            _ui.m_btnNextStep.enabled = MyDressUpHelper.stepIndex < MyDressUpHelper.MAX_MEMORY_STEP - 1;
+            _ui.m_btnNextStep.enabled = MyDressUpHelper.stepIndex < MyDressUpHelper.dressMemory.Count - 1;
+            UpdateListPartsSelected(suitId);
+            UpdateListSuitPartsSelected();
         }
 
         private void OnLongPress(EventContext context)
@@ -446,7 +460,7 @@ namespace GFGGame
             UpdateBtnAction();
             _ui.m_partsList.m_list.numItems = _currentList3.Count;
             _ui.m_partsList2.m_list.numItems = _currentList4.Count;
-            MyDressUpHelper.AddMemoryDressup();
+            UpdateStepBtn(true);
         }
 
         private void OnClickBtnSave()