卡牌

GameClient/Assets/Editor/Excel/Scanner/CardScanner.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using GFGGame;
+using UnityEngine;
+
+namespace GFGEditor
+{
+    public class CardScanner
+    {
+        private static Dictionary<int, int> levelCountDIc = new Dictionary<int, int>();
+
+        public static void StartScan()
+        {
+
+            var dataArray = CardLvlCfgArray.Instance.dataArray;
+            SQLiteHelper.Instance.OpenConnection();
+            try
+            {
+                foreach (var cfg in dataArray)
+                {
+                    levelCountDIc.TryGetValue(cfg.cardRarity, out var count);
+                    count++;
+                    levelCountDIc[cfg.cardRarity] = count;
+                    var names = new string[] { "maxCardLvl" };
+                    var values = new string[] { "" + count };
+                    SQLiteHelper.Instance.UpdateValues(nameof(CardRarityCfgArray), names, values, nameof(cfg.cardRarity), cfg.cardRarity.ToString());
+                }
+            }
+            catch (Exception e)
+            {
+                ET.Log.Error(e.ToString());
+            }
+            finally
+            {
+                SQLiteHelper.Instance.CloseConnection();
+            }
+
+
+        }
+
+        public static void WriteCardRarity()
+        {
+
+        }
+
+    }
+}

GameClient/Assets/Editor/Excel/Scanner/CardScanner.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e11c0c22df21fff4ca00f8e6daf8fc20
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Editor/Excel/Scanner/ShopScanner.cs

@@ -33,7 +33,7 @@ namespace GFGEditor
                 string typeIndex = "";
                 int itemId;
                 int id;
-                var reader = SQLiteHelper.Instance.ReadLine("ShopCfgClothingArray");
+                var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgClothingArray");
                 while (reader.Read())
                 {
                     typeIndex = reader["_typeIndex"].ToString();
@@ -103,7 +103,7 @@ namespace GFGEditor
                 string typeIndex = "";
                 int itemId;
                 int id;
-                var reader = SQLiteHelper.Instance.ReadLine("ShopCfgCJArray");
+                var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgCJArray");
                 while (reader.Read())
                 {
                     typeIndex = reader["_typeIndex"].ToString();
@@ -175,7 +175,7 @@ namespace GFGEditor
                 string typeIndex = "";
                 int itemId;
                 int id;
-                var reader = SQLiteHelper.Instance.ReadLine("ShopCfgCJAArray");
+                var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgCJAArray");
                 while (reader.Read())
                 {
                     typeIndex = reader["_typeIndex"].ToString();

GameClient/Assets/Editor/ToolsMenu.cs

@@ -127,11 +127,14 @@ namespace GFGEditor
             {
                 SQLiteHelper.Instance.CloseConnection();
             }
-            ShopScanner.StartScan();
-            //扫描物品表获取途径并更新数据库
-            ItemApproachScanner.startScan();
-            //扫描副本
-            InstanceZonesScanner.StartScan();
+            // //写入商店物品类型Index
+            // ShopScanner.StartScan();
+            // //扫描物品表获取途径并更新数据库
+            // ItemApproachScanner.startScan();
+            // //扫描副本
+            // InstanceZonesScanner.StartScan();
+            //写入卡牌最大等级
+            CardScanner.StartScan();
             AssetDatabase.Refresh();
             EditorUtility.ClearProgressBar();
         }

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit c3b5d248f23898f89df9d0bf3f787c1ac4a92cac
+Subproject commit 24fb676424b9cf11c6840ae5e7ae0f1515856384

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

@@ -31,14 +31,14 @@ namespace GFGGame
             cardData.exp = cardInfoProto.Exp;
             cardData.star = cardInfoProto.Star;
             cardData.itemCfg = itemCfg;
-            cardData.res = itemCfg.res;
+            cardData.res = cardInfoProto.ResIndex == 0 ? itemCfg.res : itemCfg.cardRes;
             cardData.scores = new Dictionary<int, int>();
 
             for (int j = 0; j < cardInfoProto.KsAttribute.Count; j++)
             {
                 cardData.scores.Add(cardInfoProto.KsAttribute[j], cardInfoProto.VsAttribute[j]);
             }
-            cardData.mainScore = itemCfg.mainScore;// CardDataManager.GetMainScore(card.scores);
+            cardData.mainScore = itemCfg.mainScore;
             cardData.resources = CardDataManager.GetCardResources(itemCfg);
 
             if (_cardDicByType.ContainsKey(0) == false)
@@ -53,21 +53,6 @@ namespace GFGGame
             _cardDicByType[cardData.itemCfg.rarity].Add(cardData.id, cardData);
 
         }
-        // private static int GetMainScore(Dictionary<int, int> scores)
-        // {
-        //     //五个属性中最大的为主属性
-        //     int mainScore = 1;
-        //     int mainScoreValue = 0;
-        //     ICollection keys = scores.Keys;
-        //     foreach (int key in keys)
-        //     {
-        //         if (scores[key] > mainScoreValue)
-        //         {
-        //             mainScore = key;
-        //         }
-        //     }
-        //     return mainScore;
-        // }
 
         public static List<string> GetCardResources(ItemCfg itemCfg)
         {
@@ -88,29 +73,28 @@ namespace GFGGame
 
         private static void RefreshCardLvProperty(CardData lastCardData, int lv)
         {
-            List<CardLvlCfg> cardLvCfgs = CardCfgManager.GetCardLvCfgsByRarity(lastCardData.itemCfg.rarity);
-
-            for (int i = lastCardData.lv; i < lv; i++)
-            {
-                lastCardData.scores[ConstDressUpScoreType.SCORE_FENG] += cardLvCfgs[i - 1].score1;
-                lastCardData.scores[ConstDressUpScoreType.SCORE_HUA] += cardLvCfgs[i - 1].score1;
-                lastCardData.scores[ConstDressUpScoreType.SCORE_XUE] += cardLvCfgs[i - 1].score1;
-                lastCardData.scores[ConstDressUpScoreType.SCORE_YUE] += cardLvCfgs[i - 1].score1;
-            }
+            // List<CardLvlCfg> cardLvCfgs = CardCfgManager.GetCardLvCfgsByRarity(lastCardData.itemCfg.rarity);
+
+            // for (int i = lastCardData.lv; i < lv; i++)
+            // {
+            //     lastCardData.scores[ConstDressUpScoreType.SCORE_FENG] += cardLvCfgs[i - 1].score1;
+            //     lastCardData.scores[ConstDressUpScoreType.SCORE_HUA] += cardLvCfgs[i - 1].score1;
+            //     lastCardData.scores[ConstDressUpScoreType.SCORE_XUE] += cardLvCfgs[i - 1].score1;
+            //     lastCardData.scores[ConstDressUpScoreType.SCORE_YUE] += cardLvCfgs[i - 1].score1;
+            // }
         }
         private static void RefreshCardStarProperty(CardData lastCardData, int star)
         {
-            List<CardLvlCfg> cardLvCfgs = CardCfgManager.GetCardLvCfgsByRarity(lastCardData.itemCfg.rarity);
+            // List<CardLvlCfg> cardLvCfgs = CardCfgManager.GetCardLvCfgsByRarity(lastCardData.itemCfg.rarity);
+
+            // for (int i = lastCardData.star; i < star; i++)
+            // {
+            //     lastCardData.scores[ConstDressUpScoreType.SCORE_FENG] += cardLvCfgs[i - 1].score1;
+            //     lastCardData.scores[ConstDressUpScoreType.SCORE_HUA] += cardLvCfgs[i - 1].score1;
+            //     lastCardData.scores[ConstDressUpScoreType.SCORE_XUE] += cardLvCfgs[i - 1].score1;
+            //     lastCardData.scores[ConstDressUpScoreType.SCORE_YUE] += cardLvCfgs[i - 1].score1;
+            // }
 
-            for (int i = lastCardData.star; i < star; i++)
-            {
-                lastCardData.scores[ConstDressUpScoreType.SCORE_FENG] += cardLvCfgs[i - 1].score1;
-                lastCardData.scores[ConstDressUpScoreType.SCORE_HUA] += cardLvCfgs[i - 1].score1;
-                lastCardData.scores[ConstDressUpScoreType.SCORE_XUE] += cardLvCfgs[i - 1].score1;
-                lastCardData.scores[ConstDressUpScoreType.SCORE_YUE] += cardLvCfgs[i - 1].score1;
-            }
-            // lastCardData.star = star + 1;
-            // CardDataManager.Refresh(lastCardData);
         }
         private static List<CardData> SortItemList(List<CardData> arrayList)
         {
@@ -175,36 +159,37 @@ namespace GFGGame
             CardDataManager.Refresh(_cardDicByType[0][cardId]);
         }
 
-
         /// <summary>
-        /// 根据男主类型获取卡牌字典
+        /// 根据卡牌Id获取卡牌升级升星数据，无数据返回null
         /// </summary>
-        public static Dictionary<int, CardData> GetCardDicByRarity(int rarity)
+        /// <param name="cardId"></param>
+        /// <returns></returns>
+        public static CardData GetCardDataById(int cardId)
         {
-            if (rarity == 0)
-            {
-                return _cardDicByType.ContainsKey(0) ? _cardDicByType[0] : null;
-            }
-            else
-            {
-                return _cardDicByType.ContainsKey(rarity) ? _cardDicByType[rarity] : null;
-            }
+            return _cardDicByType[0].ContainsKey(cardId) ? _cardDicByType[0][cardId] : null;
         }
-        public static List<CardData> CardDicToList(Dictionary<int, CardData> cardDic)
+        /// <summary>
+        /// 根据男主类型获取卡牌列表
+        /// </summary>
+        public static List<CardData> GetCardListByRarity(int rarity)
         {
-            CardData[] cardArray = new CardData[cardDic.Count];
-            cardDic.Values.CopyTo(cardArray, 0);
-
-            List<CardData> cardList = new List<CardData>(cardArray);
-            cardList = CardDataManager.SortItemList(cardList);
+            if (_cardDicByType.ContainsKey(rarity))
+            {
+                Dictionary<int, CardData> cardDic = _cardDicByType[rarity];
+                CardData[] cardArray = new CardData[cardDic.Count];
+                cardDic.Values.CopyTo(cardArray, 0);
 
-            return cardList;
+                List<CardData> cardList = new List<CardData>(cardArray);
+                cardList = CardDataManager.SortItemList(cardList);
+                return cardList;
+            }
+            return new List<CardData>();
         }
 
         public static bool isFullLv(int cardId, int lv, bool showTips = true)
         {
             CardData cardData = _cardDicByType[0][cardId];
-            if (lv > CardCfgManager.GetCardLvCfgsByRarity(cardData.itemCfg.rarity).Count)
+            if (lv > CardRarityCfgArray.Instance.GetCfg(cardData.itemCfg.rarity).maxCardLvl)
             {
                 if (showTips == true)
                 {
@@ -234,20 +219,6 @@ namespace GFGGame
             }
         }
 
-
-        /// <summary>
-        ///  根据物品id获取卡牌数据
-        /// </summary>
-        /// <param name="itemId"></param>
-        /// <returns></returns>
-        public static CardData GetCardDataById(int itemId)
-        {
-            return _cardDicByType[0][itemId];
-
-        }
-
-
-
         public static void GetPreViewLvAndExp(int rarity, int curLv, int curExp, int hasExp, out int showLv, out int showExp)
         {
             List<CardLvlCfg> listCardLvCfgs = CardCfgManager.GetCardLvCfgsByRarity(rarity);
@@ -279,10 +250,8 @@ namespace GFGGame
 
                     if (selectList[(int)EnumCardFilterType.SubType].ContainsKey(cardList[i].itemCfg.subType) == false)
                     {
-
                         //稀有度
                         cardList.RemoveAt(i);
-
                         continue;
                     }
                 }

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/CardCfgManager.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    public class CardCfgManager 
+    public class CardCfgManager
     {
         private static Dictionary<string, List<CardLvlCfg>> _cardLvCfgDic = new Dictionary<string, List<CardLvlCfg>>();
         private static Dictionary<string, Dictionary<string, List<CardStarCfg>>> _cardStarCfgDic = new Dictionary<string, Dictionary<string, List<CardStarCfg>>>();
@@ -36,7 +36,7 @@ namespace GFGGame
         {
             if (_cardLvCfgDic.Count == 0)
             {
-              
+
                 int _rarity = 1;
                 int _lv = 1;
                 CardLvlCfg lvCfg = CardLvlCfgArray.Instance.GetCfg(_lv, _rarity);
@@ -61,6 +61,7 @@ namespace GFGGame
             }
             return _cardLvCfgDic[rarity.ToString()];
         }
+
         /// <summary>
         /// 根据男主类型和稀有度获取升星配置数组
         /// </summary>
@@ -70,7 +71,7 @@ namespace GFGGame
         public static List<CardStarCfg> GetCardStarCfgsByTypeAndRarity(int type, int rarity)
         {
             if (_cardStarCfgDic.Count == 0)
-            {            
+            {
 
                 int _type = 1;
                 int _rarity = 1;
@@ -100,14 +101,14 @@ namespace GFGGame
                     _star++;
                     starCfg = CardStarCfgArray.Instance.GetCfg(_type, _rarity, _star);
                     if (starCfg != null) continue;
-                   
+
                     _star = 1;
                     _rarity++;
                     starCfg = CardStarCfgArray.Instance.GetCfg(_type, _rarity, _star);
 
                     if (starCfg != null) continue;
                     _star = 1;
-                    _rarity=1;
+                    _rarity = 1;
                     _type++;
                     starCfg = CardStarCfgArray.Instance.GetCfg(_type, _rarity, _star);
                     if (starCfg == null) break;
@@ -120,7 +121,7 @@ namespace GFGGame
 
             int count = 0;
             List<int> resourceStar = _cardResCfgDic[type.ToString()][rarity.ToString()];
-            for(int i = 0; i < resourceStar.Count; i++)
+            for (int i = 0; i < resourceStar.Count; i++)
             {
                 if (CardDataManager.GetCardDataById(cardId).star >= resourceStar[i])
                 {
@@ -130,23 +131,23 @@ namespace GFGGame
             return count;
         }
 
-        public static List<CardStoryCfg>  GetStoryCfgsById(int cardId)
+        public static List<CardStoryCfg> GetStoryCfgsById(int cardId)
         {
             if (_cardStoryCfgDic.Keys.Count == 0)
             {
                 CardStoryCfg[] cardStoryCfgs = CardStoryCfgArray.Instance.dataArray;
 
-                for (int i=0;i< cardStoryCfgs.Length; i++)
+                for (int i = 0; i < cardStoryCfgs.Length; i++)
                 {
                     int _cardId = cardStoryCfgs[i].cardId;
-                    if (_cardStoryCfgDic.ContainsKey(_cardId)==false)
+                    if (_cardStoryCfgDic.ContainsKey(_cardId) == false)
                     {
                         _cardStoryCfgDic.Add(_cardId, new List<CardStoryCfg>());
                     }
                     _cardStoryCfgDic[_cardId].Add(cardStoryCfgs[i]);
                 }
             }
-            return _cardStoryCfgDic.ContainsKey(cardId)? _cardStoryCfgDic[cardId]: new List<CardStoryCfg>();
+            return _cardStoryCfgDic.ContainsKey(cardId) ? _cardStoryCfgDic[cardId] : new List<CardStoryCfg>();
         }
     }
 }

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

@@ -58,27 +58,27 @@ namespace GFGGame
         }
         private void UpdateCardList(int rarity = 0)
         {
-            _ui.m_listCard.numItems = 0;
-
-            Dictionary<int, CardData> cardDic = CardDataManager.GetCardDicByRarity(rarity);
-
-            if (cardDic == null)
+            // _ui.m_listCard.numItems = 0;
+
+            // Dictionary<int, CardData> cardDic = CardDataManager.GetCardDicByRarity(rarity);
+
+            // if (cardDic == null)
+            // {
+            //     _ui.m_listCard.numItems = 0;
+            //     return;
+            // }
+            // else
+            // {
+            List<CardData> cardList = CardDataManager.GetCardListByRarity(rarity);// CardDataManager.CardDicToList(cardDic);
+            if (CardDataManager._selectList.Keys.Count > 0)
             {
-                _ui.m_listCard.numItems = 0;
-                return;
+                //筛选
+                cardList = CardDataManager.FilterCardList(cardList, CardDataManager._selectList as Dictionary<int, Dictionary<int, int>>);
             }
-            else
-            {
-                List<CardData> cardList = CardDataManager.CardDicToList(cardDic);
-                if (CardDataManager._selectList.Keys.Count > 0)
-                {
-                    //筛选
-                    cardList = CardDataManager.FilterCardList(cardList, CardDataManager._selectList as Dictionary<int, Dictionary<int, int>>);
-                }
-                _ui.m_listCard.data = cardList;
-                _ui.m_listCard.numItems = cardList.Count;
+            _ui.m_listCard.data = cardList;
+            _ui.m_listCard.numItems = cardList.Count;
 
-            }
+            // }
 
             _ui.m_txtTips.visible = _ui.m_listCard.numItems == 0 ? true : false;
         }
@@ -88,7 +88,7 @@ namespace GFGGame
             CardData data = (_ui.m_listCard.data as List<CardData>)[index];//CardDataManager.GetCardList(_ui.m_listRole.selectedIndex)[index];
             listItem.target.data = data;
             listItem.m_loaCard.m_loaCard.url = ResPathUtil.GetCardSmallPath(data.res);
-            listItem.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + (5 - data.itemCfg.rarity));//(5-res):res1-4为黄玄地天，但是资源1天，2地，3玄，4黄，所以（5-res）是为了使其资源对应
+            listItem.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             listItem.m_txtLv.text = "Lv.\n" + data.lv;
             listItem.m_txtName.text = data.itemCfg.name;
 

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

@@ -98,6 +98,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _cardData = CardDataManager.GetCardDataById((this.viewData as CardData).id);
+
             _cardScale = _ui.target.height * 0.8f / _ui.target.initHeight;
             Input.multiTouchEnabled = false;
 
@@ -113,50 +115,38 @@ namespace GFGGame
             _comFosterBottom.m_txtName.text = _cardData.itemCfg.name;
             _comFosterBottom.m_btnStory.visible = CardCfgManager.GetStoryCfgsById(_cardData.id).Count > 0 ? true : false;
             _comFosterBottom.m_btnUpLv.grayed = true;
-            _comFosterBottom.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sx_da_" + (5 - _cardData.itemCfg.rarity));
+            _comFosterBottom.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sx_da_" + _cardData.itemCfg.rarity);
             _valueBarController = new ValueBarController(_ui.m_ComFosterTop.m_comValueBar, 5);
             _valueBarController.OnShown();
 
         }
         private void UpdateCommon()
         {
-            _cardData = CardDataManager.GetCardDataById((this.viewData as CardData).id);
             _comFosterBottom.m_listProperty.numItems = _cardData.scores.Count;
             _comFosterBottom.m_ComLvConsumeGold.m_txtCount.text = "0";
 
         }
         private void UpdateCardRes()
         {
-            List<CardStarCfg> cardStarCfgs = CardCfgManager.GetCardStarCfgsByTypeAndRarity(_cardData.itemCfg.subType, _cardData.itemCfg.rarity);
 
-            if (_cardData.res == _cardData.itemCfg.res || _cardData.star < cardStarCfgs.Count)
+            if (_cardObj != null)
             {
-                _ui.m_comCard.target.visible = false;
-                _ui.m_loaCard.visible = true;
-                _ui.m_loaListener.visible = false;
-                _ui.m_loaCard.url = ResPathUtil.GetCardPath(_cardData.res);
-                _ui.m_loaCard.width = _ui.m_loaCard.image.width;
-
-
+                GameObject.Destroy(_cardObj);
+                _cardObj = null;
             }
-            else
+            string resPath = ResPathUtil.GetCardAnimationPath(_cardData.res);
+            _cardObj = DressUpUtil.AddAnimationObj(resPath);
+
+            if (_cardObj != null)
             {
                 _ui.m_loaListener.visible = true;
                 _ui.m_comCard.target.visible = true;
                 _ui.m_loaCard.visible = false;
 
                 int scale = 100;
-                if (_cardObj != null)
-                {
-                    GameObject.Destroy(_cardObj);
-                    _cardObj = null;
-                }
-                string resPath = ResPathUtil.GetCardAnimationPath(_cardData.res);
-                _cardObj = DressUpUtil.AddAnimationObj(resPath);
                 _cardObj.transform.localScale = new Vector3(scale, scale, scale);
                 if (_wrapper == null)
                 {
-
                     _wrapper = new GoWrapper(_cardObj);
                     _ui.m_comCard.m_comCardHolder.m_holder.SetNativeObject(_wrapper);
                 }
@@ -166,8 +156,16 @@ namespace GFGGame
                 }
                 _ui.m_comCard.target.scrollPane.SetPercX(0.5f, false);
                 _ui.m_comCard.target.SetScale(_cardScale, _cardScale);
-
             }
+            else
+            {
+                _ui.m_comCard.target.visible = false;
+                _ui.m_loaCard.visible = true;
+                _ui.m_loaListener.visible = false;
+                _ui.m_loaCard.url = ResPathUtil.GetCardPath(_cardData.res);
+                _ui.m_loaCard.width = _ui.m_loaCard.image.width;
+            }
+
         }
         private void RenderListPropertyItem(int index, GObject obj)
         {
@@ -183,13 +181,13 @@ namespace GFGGame
         {
             _showLv = isPreview == true ? lv : _cardData.lv;
             _showExp = isPreview == true ? exp : _cardData.exp;
-            CardLvlCfg cardLvCfg = CardCfgManager.GetCardLvCfgByRarityAndLv(_cardData.itemCfg.rarity, _showLv);
+            CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfg(_showLv, _cardData.itemCfg.rarity);
 
             _comFosterBottom.m_barLv.max = cardLvCfg.needExp;
             _comFosterBottom.m_barLv.value = _showExp;
-
-            _comFosterBottom.m_txtMaxLv.text = (CardCfgManager.GetCardLvCfgsByRarity(_cardData.itemCfg.rarity).Count - 1).ToString();
-            _comFosterBottom.m_txtCurLv.text = StringUtil.GetColorText(_showLv.ToString(), _showLv < int.Parse(_comFosterBottom.m_txtMaxLv.text) ? "#D27869" : "#7D6956");
+            int maxLv = CardRarityCfgArray.Instance.GetCfg(_cardData.itemCfg.rarity).maxCardLvl;
+            _comFosterBottom.m_txtMaxLv.text = maxLv.ToString();
+            _comFosterBottom.m_txtCurLv.text = StringUtil.GetColorText(_showLv.ToString(), _showLv < maxLv ? "#D27869" : "#7D6956");
             _comFosterBottom.m_txtMaxExp.text = cardLvCfg.needExp.ToString();
             _comFosterBottom.m_txtCurExp.text = _showExp.ToString();
 
@@ -239,7 +237,7 @@ namespace GFGGame
             {
                 if (ItemDataManager.GetItemNum((listItem.target.data as ItemCfg).id) == 0)
                 {
-                    ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { (listItem.target.data as ItemCfg).id, new object[] { ViewName.CARD_FOSTER_VIEW, this.viewData } });
+                    ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { (listItem.target.data as ItemCfg).id, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } });
                 }
             }
             //_timer.Start();
@@ -419,7 +417,7 @@ namespace GFGGame
                 if (_showLv - lv >= 1)
                 {
                     this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
-                    ViewManager.Show(ViewName.CARD_UP_VIEW, new object[] { _cardData.scores, "lv", lv, _showLv }, new object[] { ViewName.CARD_FOSTER_VIEW, this.viewData });
+                    ViewManager.Show(ViewName.CARD_UP_VIEW, new object[] { _cardData.scores, "lv", lv, _showLv }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
                 }
             }
         }
@@ -514,7 +512,7 @@ namespace GFGGame
         {
             int itemId = int.Parse(UI_ComStarConsume.Proxy(_comFosterBottom.m_listStarConsume.GetChildAt(index)).target.data.ToString());
 
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, this.viewData } });
+            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } });
 
         }
         private void OnClickBtnUpStar()
@@ -570,18 +568,14 @@ namespace GFGGame
             this.UpdateUpStarView();
 
             this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
-            ViewManager.Show(ViewName.CARD_UP_VIEW, new object[] { _cardData.scores, "star", _cardData.star - 1, _cardData.star }, new object[] { ViewName.CARD_FOSTER_VIEW, this.viewData });
+            ViewManager.Show(ViewName.CARD_UP_VIEW, new object[] { _cardData.scores, "star", _cardData.star - 1, _cardData.star }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
 
         }
         /***********************************************************升技能***************************************************/
 
         private void UpdateUpSkillView()
         {
-            // if (_comFosterBottom.m_listSkill.data == null)
-            // {
-            //     _comFosterBottom.m_listSkill.data = PassivitySkillCfgArray.Instance.GetCfgs(_cardData.id);// new List<int>(ScardDataManager.Instance.dicPassivitySkill[_viewData.id].Keys);
-            // }
-            _comFosterBottom.m_listSkill.numItems = PassivitySkillCfgArray.Instance.GetCfgs(_cardData.id).Length;// SkillDataManager.Instance.dicPassivitySkill[_cardData.id].Keys.Count;
+            _comFosterBottom.m_listSkill.numItems = PassivitySkillCfgArray.Instance.GetCfgs(_cardData.id).Length;
         }
 
         private void RenderListSkilItem(int index, GObject obj)
@@ -589,14 +583,13 @@ namespace GFGGame
             UI_ListSkillItem item = UI_ListSkillItem.Proxy(obj);
 
             PassivitySkillCfg skillCfg = PassivitySkillCfgArray.Instance.GetCfgs(_cardData.id)[index];
-            // int skillId = (_comFosterBottom.m_listSkill.data as List<int>)[index];
+
             int skillLv = SkillDataManager.Instance.GetSkillLv(_cardData.id, skillCfg.skillId);
-            // List<PassivitySkillCfg> skillScoreCfgs = SkillDataManager.Instance.dicPassivitySkill[_cardData.id][skillId];
             item.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(skillCfg.res);
             item.m_txtName.text = skillCfg.name;
             item.m_txtLv.text = string.Format("{0}级", skillLv);
 
-            // item.m_btnUp.visible = skillLv == skillScoreCfgs.Count ? false : true;
+            item.m_btnUp.visible = PassivitySkillLvlCfgArray.Instance.GetCfg(skillLv + 1, skillCfg.skillId) != null;//?  skillLv == skillScoreCfgs.Count ? false : true;
 
             if (item.m_btnUp.data == null)
             {
@@ -616,7 +609,7 @@ namespace GFGGame
 
             _ui.m_t0.Play(() =>
             {
-                ViewManager.Show(ViewName.CARD_SHOW_VIEW, _cardData, new object[] { ViewName.CARD_FOSTER_VIEW, this.viewData });
+                ViewManager.Show(ViewName.CARD_SHOW_VIEW, _cardData, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
 
             });
         }

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

@@ -56,11 +56,11 @@ namespace GFGGame
             int skillLv = SkillDataManager.Instance.GetSkillLv(_cardId, _skillId);
             UpdateComLv(_ui.m_comCurLV, skillLv, skillLv + "级");
 
-            // if (skillLv == SkillDataManager.Instance.dicPassivitySkill[_cardId][_skillId].Count) //已满级
-            // {
-            //     _ui.m_c1.selectedIndex = 1;
-            //     return;
-            // }
+            if (PassivitySkillLvlCfgArray.Instance.GetCfg(skillLv, _skillId) == null) //已满级
+            {
+                _ui.m_c1.selectedIndex = 1;
+                return;
+            }
 
             _ui.m_comConsume.m_txtCount.text = skillLvCfg.costNum.ToString();
             UpdateComLv(_ui.m_comNextLv, skillLv + 1, "下一级");
@@ -70,9 +70,7 @@ namespace GFGGame
         private void UpdateComLv(UI_ComSkillDiscribe com, int lv, string title)
         {
             com.m_txtLv.text = title;
-            com.m_txtDiscribe.text = string.Format(skillCfg.describe, skillLvCfg.probability, skillLvCfg.count);//  SkillDataManager.Instance.GetPassivitySkillCfg(_cardId, _skillId, lv).describe;
-
-
+            com.m_txtDiscribe.text = string.Format(skillCfg.describe, skillLvCfg.probability, skillLvCfg.count);
         }
         private void RenderListStarConsumeItem(int index, GObject obj)
         {

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

@@ -321,7 +321,7 @@ namespace GFGGame
                     .SetRightButton(true, "好的");
                 return;
             }
-            if (CardDataManager.GetCardDicByRarity(0) != null)
+            if (CardDataManager.GetCardListByRarity(0).Count > 0)
             {
 
                 ViewManager.Show<StoryCardChoose>(_fightCfg.scoreType);

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

@@ -39,7 +39,7 @@ namespace GFGGame
         {
             base.OnShown();
             _scoreType = (int)viewData;
-            cardList = CardDataManager.CardDicToList(CardDataManager.GetCardDicByRarity(0));
+            cardList = CardDataManager.GetCardListByRarity(0);//.CardDicToList(CardDataManager.GetCardDicByRarity(0));
             cardList = SortCardList(cardList);
             _ui.m_listCard.numItems = cardList.Count;
             _ui.m_listCard.selectedIndex = 0;
@@ -60,7 +60,7 @@ namespace GFGGame
             item.GetChild("txtName").asTextField.text = cardList[index].itemCfg.name;
             item.GetChild("comCardMask").asCom.GetChild("loaCard").asLoader.url = ResPathUtil.GetCardSmallPath(cardList[index].res);
             item.GetChild("txtLv").asTextField.text = string.Format("Lv.\n{0}", cardList[index].lv);
-            item.GetChild("loaRarity").asLoader.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + (5 - cardList[index].itemCfg.rarity));
+            item.GetChild("loaRarity").asLoader.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" +cardList[index].itemCfg.rarity);
             UI_ComStar comStar = UI_ComStar.Proxy(item.GetChild("comStar").asCom);
             comStar.m_c1.selectedIndex = cardList[index].star;
 

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

@@ -20,7 +20,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            CardData data = CardDataManager.GetCardDicByRarity(0)[InstanceZonesDataManager.currentCardId];
+            CardData data = CardDataManager.GetCardDataById(InstanceZonesDataManager.currentCardId);//(0)[InstanceZonesDataManager.currentCardId];
             _ui.m_comSkillCard.m_loaCard.url = ResPathUtil.GetCardSmallPath(data.res);
             PassivitySkillCfg cfg = ScoreSystemData.Instance.GetMainSkillCfg(data.id);
             _ui.m_ComSkillName.target.GetChild("txtName").asTextField.text = cfg.name;