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 ac4c53b28..0c302af2e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -103,7 +103,7 @@ public class FightDataUtil { }else { unitData.set("skill", getSkill(unitSkill[0])); unitData.set("superSkill", getSkill(unitSkill[1])); - unitData.set("passivity", getPassivity(unitSkill)); + unitData.set("passivity", getPassivity(unitSkill,true)); } unitData.set("ai", getMonsterAi(sMonster.getMonsterAi())); @@ -128,7 +128,7 @@ public class FightDataUtil { return property; } - private static LuaValue getPassivity(String[] unitSkill) { + private static LuaValue getPassivity(String[] unitSkill,boolean isMonster) { LuaValue passivityData = new LuaTable(); int length = unitSkill.length; if(length<3){ @@ -139,7 +139,7 @@ public class FightDataUtil { LuaValue detail = new LuaTable(); int passivityId = Integer.parseInt(unitSkill[i]); SPassiveSkillLogicConfig sPassiveSkillLogicConfig = SPassiveSkillLogicConfig.getConfig(passivityId); - if(sPassiveSkillLogicConfig.getEffectiveRange()!=1){ + if(!isMonster&&sPassiveSkillLogicConfig.getEffectiveRange()!=1){ continue; } detail.rawset(1, LuaValue.valueOf(sPassiveSkillLogicConfig.getType())); @@ -276,7 +276,7 @@ public class FightDataUtil { }else { unitData.set("superSkill", getSkill(skillIds[1])); } - unitData.set("passivity", getPassivity(skillIds)); + unitData.set("passivity", getPassivity(skillIds,false)); unitData.set("property", getProperty(property)); return unitData; }