修复战斗被动

lvxinran 2020-08-16 12:38:09 +08:00
parent a5d9a17b29
commit a05812d3e6
1 changed files with 7 additions and 6 deletions

View File

@ -103,7 +103,7 @@ public class FightDataUtil {
}else { }else {
unitData.set("skill", getSkill(unitSkill[0])); unitData.set("skill", getSkill(unitSkill[0]));
unitData.set("superSkill", getSkill(unitSkill[1])); unitData.set("superSkill", getSkill(unitSkill[1]));
unitData.set("passivity", getPassivity(unitSkill,true)); unitData.set("passivity", getPassivity(unitSkill));
} }
unitData.set("ai", getMonsterAi(sMonster.getMonsterAi())); unitData.set("ai", getMonsterAi(sMonster.getMonsterAi()));
@ -128,18 +128,18 @@ public class FightDataUtil {
return property; return property;
} }
private static LuaValue getPassivity(String[] unitSkill,boolean isMonster) { private static LuaValue getPassivity(String[] unitSkill) {
LuaValue passivityData = new LuaTable(); LuaValue passivityData = new LuaTable();
int length = unitSkill.length; int length = unitSkill.length;
if(length<3){ if(length<3){
return passivityData; return passivityData;
} }
int passivityIndex = 1;
for(int i=2;i<length;i++){ for(int i=2;i<length;i++){
LuaValue detail = new LuaTable(); LuaValue detail = new LuaTable();
int passivityId = Integer.parseInt(unitSkill[i]); int passivityId = Integer.parseInt(unitSkill[i]);
SPassiveSkillLogicConfig sPassiveSkillLogicConfig = SPassiveSkillLogicConfig.getConfig(passivityId); SPassiveSkillLogicConfig sPassiveSkillLogicConfig = SPassiveSkillLogicConfig.getConfig(passivityId);
if(!isMonster&&sPassiveSkillLogicConfig.getEffectiveRange()!=1){ if(sPassiveSkillLogicConfig.getEffectiveRange()!=1){
continue; continue;
} }
detail.rawset(1, LuaValue.valueOf(sPassiveSkillLogicConfig.getType())); detail.rawset(1, LuaValue.valueOf(sPassiveSkillLogicConfig.getType()));
@ -150,7 +150,8 @@ public class FightDataUtil {
detail.rawset(j + 2, effectList.get(j)); detail.rawset(j + 2, effectList.get(j));
} }
} }
passivityData.rawset(i-1,detail); passivityData.rawset(passivityIndex,detail);
passivityIndex++;
} }
return passivityData; return passivityData;
@ -276,7 +277,7 @@ public class FightDataUtil {
}else { }else {
unitData.set("superSkill", getSkill(skillIds[1])); unitData.set("superSkill", getSkill(skillIds[1]));
} }
unitData.set("passivity", getPassivity(skillIds,false)); unitData.set("passivity", getPassivity(skillIds));
unitData.set("property", getProperty(property)); unitData.set("property", getProperty(property));
return unitData; return unitData;
} }