图鉴排序展示修改

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -33,7 +33,8 @@ namespace GFGGame
         private int _nowIndex = 0;
         private bool _refDodgeStar = true;
         private int _isAutoSelect = 0;
-        
+        public string _fromUIType;  //来自哪个界面跳转进来
+
         private EffectUI _effectUI1;
         private EffectUI _effectUI3;
         private EffectUI _effectUI4;
@@ -70,7 +71,7 @@ namespace GFGGame
             _effectUI3 = null;
             EffectUIPool.Recycle(_effectUI4);
             _effectUI4 = null;
-            
+
             for (int i = 0; i < _listLongPress.Count; i++)
             {
                 _listLongPress[i].Dispose();
@@ -181,6 +182,7 @@ namespace GFGGame
             _nowIndex -= 1;
             RefLeftAndRight();
             _cardData = _cardList[_nowIndex];
+            _cardData.fromUIType = _fromUIType;
             RefCardFosterInfo();
         }
 
@@ -189,6 +191,7 @@ namespace GFGGame
             _nowIndex += 1;
             RefLeftAndRight();
             _cardData = _cardList[_nowIndex];
+            _cardData.fromUIType = _fromUIType;
             RefCardFosterInfo();
         }
 
@@ -242,28 +245,39 @@ namespace GFGGame
             if (this.viewData != null)
             {
                 _cardData = (CardData)this.viewData;
+                _fromUIType = _cardData.fromUIType;
+                _cardList.Clear();
                 if (_cardData.fromUIType != null && _cardData.fromUIType.Equals(typeof(CardGuideView).FullName))
                 {
                     _ui.m_ComFosterBottom.m_c_from.selectedIndex = (int)Source.DISPLAY;
                     _selectTab = 2; // 默认选中技能tab
+
+                    var listGuideCard = CardDataManager.GetAllCardIdListByRoleType(_cardData.pageIndex);
+                    for (int i = 0; i<listGuideCard.Count; i++) {
+                        var cardInfo = CardDataManager.GetCardDataById(listGuideCard[i]);
+                        if (cardInfo != null)
+                            _cardList.Add(cardInfo);
+                    }
                 }
                 else
                 {
                     _ui.m_ComFosterBottom.m_c_from.selectedIndex = (int)Source.COMMON;
                     _selectTab = 0;
+
+                    _cardList = CardDataManager.GetCardListByRoleType(_cardData.pageIndex);
+
+                    if (CardDataManager.isFilter == true)
+                    {
+                        //筛选
+                        _cardList = CardDataManager.FilterCardList(_cardList);
+                    }
+                    _cardList = CardDataManager.SortItemList(_cardList);
                 }
 
             }
 
             _ui.m_ComFosterTop.m_c1.selectedIndex = _ui.m_ComFosterBottom.m_c_from.selectedIndex;
             _nowIndex = _cardData.index;
-            _cardList = CardDataManager.GetCardListByRoleType(_cardData.pageIndex);
-            if (CardDataManager.isFilter == true)
-            {
-                //筛选
-                _cardList = CardDataManager.FilterCardList(_cardList);
-            }
-            _cardList = CardDataManager.SortItemList(_cardList);
 
             RefCardFosterInfo();
         }