diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java index f2193f121..a2ead2c56 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -266,18 +266,19 @@ public class FightDataUtil { if(skillId.equals("0")||skillId==""){ continue; } + ///100代表是修行技能 if (unitInfo.getPosition()==100){ - SPlayerSkill playerSkillConfig=STableManager.getConfig(SPlayerSkill.class).get(Integer.valueOf(skillId)); LuaValue monster = new LuaTable(); monster.set("id",0); monster.set("star",0); monster.set("teamDamage",unitInfo.getForceScore()); monster.set("camp",camp); monster.set("position",unitInfo.getPosition()); - monster.set("property",getProperty(pokemonUnitList.get(i).getProperty())); + monster.set("property",getProperty(unitInfo.getProperty())); String[] skillIdArr = skillId.split("#"); LuaValue skillList= new LuaTable(); for (int k = 0; k < skillIdArr.length; k++) { + SPlayerSkill playerSkillConfig=STableManager.getConfig(SPlayerSkill.class).get(Integer.valueOf(skillIdArr[k])); LuaValue skill= new LuaTable(); int[] skillIDList = playerSkillConfig.getSkillIDList(); for(int j = 0 ; j