竞技场换装后自动返回主题界面

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

@@ -142,7 +142,7 @@ namespace GFGGame
         public int GetRecommentCardId(int scoreType, List<int> itemList)
         {
             List<CardData> cardDatas = FightDataManager.Instance.SortCardList(CardDataManager.GetCardListByRarity(0), itemList, scoreType);
-
+            if (cardDatas.Count == 0) return 0;
             return cardDatas[0].itemCfg.id;
         }
         /// <summary>

GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs

@@ -426,8 +426,8 @@ namespace GFGGame
 
             fightData.type = FightTargetType.ROBOT;
             fightData.res = robotCfg.targetRes;
-            double cardScore = (double)robotCfg.cardScore * (double)robotProto.Random / 10000;
-            fightData.cardScore = (int)Math.Ceiling(cardScore);
+            // double cardScore = (double)robotCfg.cardScore * (double)robotProto.Random / 10000;
+            // fightData.cardScore = (int)Math.Ceiling(cardScore);
             fightData.skillLvs.Add(robotCfg.skillLvs);
             fightData.showSuitId = robotProto.SuitList.Count <= index ? 0 : robotProto.SuitList[index];//上赛季没有穿戴数据
 

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDressInfoView.cs

@@ -17,7 +17,7 @@ namespace GFGGame
         private List<FightData> _roleDatas;//可能是自己的搭配，也可能是对方玩家的搭配
         private int _themeIndex = 0;
         private string _openViewName = "";
-        private List<int> _itemList;
+        private List<int> _itemList = new List<int>();
         private string[] _tags;
         private int _roleType = 0;//FightRoleType
         public override void Dispose()
@@ -145,12 +145,22 @@ namespace GFGGame
 
         private void UpdateView()
         {
-            _itemList = _roleDatas[_themeIndex].itemList;
+            // _itemList = _roleDatas[_themeIndex].itemList;
             _tags = _roleDatas[_themeIndex].tags;
             UpdateCardInfo(_roleDatas[_themeIndex].cardId);
             ArenaViewManager.Instance.UpdateValue(_ui.m_comValueInfo.target, _themeIndex, _roleDatas);
 
-            MyDressUpHelper.dressUpObj.PutOnItemList(_itemList);
+            MyDressUpHelper.dressUpObj.PutOnItemList(_roleDatas[_themeIndex].itemList);
+            _itemList.Clear();
+            for (int i = 0; i < _roleDatas[_themeIndex].itemList.Count; i++)
+            {
+                int itemId = _roleDatas[_themeIndex].itemList[i];
+                if (itemId == ConstItemID.DEFULT_FA_XING
+                || itemId == ConstItemID.DEFULT_LIAN_YI_QUN
+                || itemId == ConstItemID.DEFULT_NEI_DA
+                || itemId == ConstItemID.DEFULT_XIA_ZHUANG) continue;
+                _itemList.Add(itemId);
+            }
             _ui.m_list.numItems = _itemList.Count;
         }
 

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

@@ -363,6 +363,7 @@ namespace GFGGame
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
             UpdateListPartsSelected();
             UpdateListSuitPartsSelected();
+            UpdateValueInfo();
         }
 
         private void OnClickBtnNext()
@@ -390,24 +391,25 @@ namespace GFGGame
                 {
                     _itemList = new List<int>(MyDressUpHelper.dressUpObj.itemList);
                     PromptController.Instance.ShowFloatTextPrompt("保存成功");
+                    OnClickBtnBack();
                 }
             }
         }
-        private void OnClickBtnRecommend()
-        {
-            if (this.currentListType == DressUpListType.List4)
-            {
-                this.hideListParts2();
-                this.showListParts(ConstDressUpItemType.TAO_ZHUANG, true);
-            }
-            MyDressUpHelper.dressUpObj.CheckCancelActionWhenPutOn(_currentSuitId);
-            MyDressUpHelper.PutOnRecommendItems2();
-            _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
+        // private void OnClickBtnRecommend()
+        // {
+        //     if (this.currentListType == DressUpListType.List4)
+        //     {
+        //         this.hideListParts2();
+        //         this.showListParts(ConstDressUpItemType.TAO_ZHUANG, true);
+        //     }
+        //     MyDressUpHelper.dressUpObj.CheckCancelActionWhenPutOn(_currentSuitId);
+        //     MyDressUpHelper.PutOnRecommendItems2();
+        //     _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
 
-            UpdateListPartsSelected();
-            UpdateListSuitPartsSelected();
+        //     UpdateListPartsSelected();
+        //     UpdateListSuitPartsSelected();
 
-        }
+        // }
 
         private void InitLists()
         {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -139,6 +139,10 @@ namespace GFGGame
             _ui.m_listCard.ScrollToView(0);
 
             Timers.inst.Remove(CheckGuide);
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+            {
+                ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
+            }
         }
         private void CheckGuide(object param)
         {