Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -268,7 +268,9 @@ namespace GFGGame
             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++)
+            //容错处理，防止两个长度不一致
+            var count = Mathf.Min(skillLvs.Count, skillCfgs.Count);
+            for (int j = 0; j < count; j++)
             {
                 PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLvs[j], skillCfgs[j].skillId);
                 if (skillLvlCfg == null) continue;