换装返回上一步

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

@@ -15,7 +15,7 @@ namespace GFGGame
         public static void SaveSuit(int index, List<int> arrayList, int bgID = 0, int suitId = 0, bool pic = false)
         {
             CustomSuitData suitSavedData = null;
-            if(_dataDic.ContainsKey(index))
+            if (_dataDic.ContainsKey(index))
             {
                 suitSavedData = _dataDic[index];
             }
@@ -33,7 +33,7 @@ namespace GFGGame
         public static CustomSuitData GetSuitList(int index)
         {
             CustomSuitData suitSavedData = null;
-            if(_dataDic.ContainsKey(index))
+            if (_dataDic.ContainsKey(index))
             {
                 suitSavedData = _dataDic[index];
             }
@@ -48,7 +48,7 @@ namespace GFGGame
         public static CustomSuitData CreateDefaultSuitData(int index)
         {
             CustomSuitData suitSavedData = new CustomSuitData(index);
-            suitSavedData.equipDatas = new List<int>{10000, 30000, 50000};
+            suitSavedData.equipDatas = new List<int> { 10000, 30000, 50000 };
             suitSavedData.bg = 180001;
             suitSavedData.suitId = 0;
             suitSavedData.pic = false;
@@ -62,9 +62,9 @@ namespace GFGGame
 
         public static void SaveCurrentSuit(int index)
         {
-            if(currentIndex != index)
+            if (currentIndex != index)
             {
-                StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_CUSTOME_SUIT_INDEX ,index).Coroutine();
+                StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_CUSTOME_SUIT_INDEX, index).Coroutine();
             }
             CustomSuitSProxy.UpdateCustomSuit(index, EquipDataCache.cacher.equipDatas, EquipDataCache.cacher.bgId, EquipDataCache.cacher.suitId, EquipDataCache.cacher.picStatus).Coroutine();
         }
@@ -72,9 +72,9 @@ namespace GFGGame
         public static void InitServerData(List<CustomSuitProto> list)
         {
             _dataDic.Clear();
-            if(list != null)
+            if (list != null)
             {
-                foreach(var suitProto in list)
+                foreach (var suitProto in list)
                 {
                     CustomSuitData suitSavedData = new CustomSuitData(suitProto.Pos);
                     _dataDic[suitProto.Pos] = suitSavedData;

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

@@ -516,15 +516,15 @@ namespace GFGGame
             checkDefaultItem();
             UpdatePicAction();
         }
-        // public CustomSuitData GetCurSuitData(int index)
-        // {
-        //     CustomSuitData suitSavedData = new CustomSuitData(index);
-        //     suitSavedData.equipDatas = EquipDataCache.cacher.equipDatas;
-        //     suitSavedData.bg = EquipDataCache.cacher.bgId;
-        //     suitSavedData.pic = EquipDataCache.cacher.picStatus;
-        //     suitSavedData.suitId = EquipDataCache.cacher.suitId;
-        //     return suitSavedData;
-        // }
+        public CustomSuitData GetCurSuitData(int index)
+        {
+            CustomSuitData suitSavedData = new CustomSuitData(index);
+            suitSavedData.equipDatas = EquipDataCache.cacher.equipDatas;
+            suitSavedData.bg = EquipDataCache.cacher.bgId;
+            suitSavedData.pic = EquipDataCache.cacher.picStatus;
+            suitSavedData.suitId = EquipDataCache.cacher.suitId;
+            return suitSavedData;
+        }
         public void PutOnSuitSaved(int index)
         {
 
@@ -547,6 +547,7 @@ namespace GFGGame
             _isPic = suitSavedData.pic;
             checkDefaultItem();
             UpdatePicAction();
+
         }
         public void PutOnSuitSavedInFight(int index)
         {
@@ -569,10 +570,10 @@ namespace GFGGame
             }
         }
 
-        public void PutOnCurrentSuitSaved()
-        {
-            PutOnSuitSaved(CustomSuitDataManager.currentIndex);
-        }
+        // public void PutOnCurrentSuitSaved()
+        // {
+        //     PutOnSuitSaved(CustomSuitDataManager.currentIndex);
+        // }
 
         public void PutOnDefaultSuitSaved(bool withBg = true)
         {

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

@@ -33,7 +33,7 @@ namespace GFGGame
         private UI_TypeItem listTypeItem_FreedomDress;
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
 
-        private int _stepIndex = 0;
+        private int _stepIndex = -1;
         private List<CustomSuitData> _dressMemory = new List<CustomSuitData>();
         public override void Dispose()
         {
@@ -125,9 +125,9 @@ namespace GFGGame
                 EquipDataCache.cacher.setSceneObj(_sceneObject);
             }
             _ui.m_comboBox.selectedIndex = CustomSuitDataManager.currentIndex;
-            EquipDataCache.cacher.PutOnCurrentSuitSaved();
-            UpdateStepBtn();
-
+            EquipDataCache.cacher.PutOnSuitSaved(CustomSuitDataManager.currentIndex);
+            // UpdateStepBtn();
+            // AddMemoryDressup();
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -170,7 +170,7 @@ namespace GFGGame
             DressUpMenuItemDataManager.dressFilterType = DressFilterType.None;
             DressUpMenuItemDataManager.Clear();
             DressUpMenuItemDataManager.dressSearchTxt = "";
-            _stepIndex = 0;
+            _stepIndex = -1;
             _dressMemory.Clear();
         }
         private void OnClickBtnLastStep()
@@ -178,14 +178,15 @@ namespace GFGGame
             if (_stepIndex - 1 < 0) return;
             _stepIndex--;
             EquipDataCache.cacher.PutOnSuitMemory(_dressMemory[_stepIndex]);
+            _ui.m_comboBox.selectedIndex = _dressMemory[_stepIndex].pos;
             UpdateStepBtn();
-
         }
         private void OnClickBtnNextStep()
         {
             if (_stepIndex + 1 >= MAX_MEMORY_STEP) return;
             _stepIndex++;
             EquipDataCache.cacher.PutOnSuitMemory(_dressMemory[_stepIndex]);
+            _ui.m_comboBox.selectedIndex = _dressMemory[_stepIndex].pos;
             UpdateStepBtn();
 
         }
@@ -290,12 +291,11 @@ namespace GFGGame
                 _stepIndex = MAX_MEMORY_STEP - 1;
                 _dressMemory.RemoveAt(0);
             }
-            ET.Log.Debug("_stepIndex:" + _stepIndex + "   _dressMemory.Count:" + _dressMemory.Count);
             if (_dressMemory.Count > _stepIndex)
             {
                 _dressMemory.RemoveRange(_stepIndex, _dressMemory.Count - _stepIndex);
             }
-            CustomSuitData suitSavedData = CustomSuitDataManager.GetSuitList(CustomSuitDataManager.currentIndex);
+            CustomSuitData suitSavedData = EquipDataCache.cacher.GetCurSuitData(_ui.m_comboBox.selectedIndex);
             _dressMemory.Add(suitSavedData);
             UpdateStepBtn();
         }