战斗选卡卡顿

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

@@ -229,19 +229,9 @@ namespace GFGGame
         public List<CardData> SortCardList(List<CardData> cardList, double itemSum, int scoreType)
         {
 
-            List<CardData> arrayList = new List<CardData>(cardList);
-            for (int i = arrayList.Count - 1; i >= 0; i--)
-            {
-                List<int> skillLvs = SkillDataManager.Instance.GetCardSkillLvs(arrayList[i].id);
-                if (skillLvs.Count == 0)
-                {
-                    ET.Log.Error("卡牌：" + arrayList[i].id + " 未配置技能");
-                    arrayList.RemoveAt(i);
-                }
-            }
             int baseScore = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).baseScore;
             int leagueSkillScore = LeagueDataManager.Instance.GetAllSkillScore(scoreType);
-            arrayList.Sort((CardData a, CardData b) =>
+            cardList.Sort((CardData a, CardData b) =>
             {
                 List<int> skillLvsA = SkillDataManager.Instance.GetCardSkillLvs(a.id);
                 List<int> skillLvsB = SkillDataManager.Instance.GetCardSkillLvs(b.id);
@@ -260,7 +250,7 @@ namespace GFGGame
 
                 return string.Compare(a.itemCfg.res, b.itemCfg.res);
             });
-            return arrayList;
+            return cardList;
         }
 
         /// <summary>
@@ -275,11 +265,11 @@ namespace GFGGame
         public long GetSkillFightScore(double itemScoreSum, int baseScore, long leagueSkillScore, int cardId, int cardScore, List<int> skillLvs)
         {
             float skillScore = 0;
+            if (skillLvs.Count == 0) return (long)skillScore;
             float skillBaseScore = (long)itemScoreSum + cardScore + baseScore + leagueSkillScore;
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
             for (int j = 0; j < skillCfgs.Count; j++)
             {
-                if (skillLvs.Count == 0) continue;
                 PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLvs[j], skillCfgs[j].skillId);
                 if (skillLvlCfg == null) continue;
                 skillScore += skillBaseScore * ((float)skillLvlCfg.fightPowerParam / 10000f);