区分竞技场卡牌展示数据，跟副本战斗关卡卡牌展示数据规则。

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

@@ -67,35 +67,41 @@ namespace GFGGame
 
             _comSelected = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComCardSelect").asCom;
             //_effectUI1 = EffectUIPool.CreateEffectUI(_comSelected.GetChild("holder").asGraph, "ui_fight_new", "kp_Select");
-
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            _scoreType = (int)viewData;
+
+            _scoreType = (int)this.viewData;
             ArenaDataManager dataManager = ArenaDataManager.Instance;
-            //其他主题带的cardIds
-            var otherThemeCardIds = new HashSet<int>();
-            for (int i = 0; i < dataManager.DressupList.Count; i++)
+
+            cardList = CardDataManager.GetCardListByRarity(0);
+            //是从竞技场进来的话，去掉已经在其他主题装配的cardList
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
-                if (dataManager.SelectThemeIndex == i)
+                //其他主题带的cardIds
+                var otherThemeCardIds = new HashSet<int>();
+                for (int i = 0; i < dataManager.DressupList.Count; i++)
                 {
-                    continue;
+                    if (dataManager.SelectThemeIndex == i)
+                    {
+                        continue;
+                    }
+
+                    otherThemeCardIds.Add(dataManager.DressupList[i].cardId);
                 }
 
-                otherThemeCardIds.Add(dataManager.DressupList[i].cardId);
+                //去掉已经在其他主题装配的cardList
+                cardList = cardList.Where(a => !otherThemeCardIds.Contains(a.id)).ToList();
             }
 
-            cardList = CardDataManager.GetCardListByRarity(0);
-            //去掉已经在其他主题装配的cardList
-            cardList = cardList.Where(a => !otherThemeCardIds.Contains(a.id)).ToList();
-
             float dressListAllAcore =
                 FightDataManager.Instance.GetDressListAllScore(MyDressUpHelper.dressUpObj.itemList, _scoreType);
             cardList = FightDataManager.Instance.SortCardList(cardList, dressListAllAcore, _scoreType);
             _ui.m_listCard.numItems = cardList.Count;
             _ui.m_listCard.selectedIndex = 0;
+
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
                 _cardId = dataManager.DressupList[dataManager.SelectThemeIndex].cardId;