Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw

DESKTOP-98AVA47\Administrator 2020-12-19 22:52:01 +08:00
commit bdd009d7cb
2 changed files with 10 additions and 2 deletions

View File

@ -145,12 +145,14 @@ public class FightDataUtil {
if(sPassiveSkillLogicConfig.getEffectiveRange()!=1){
continue;
}
detail.rawset(1, LuaValue.valueOf(sPassiveSkillLogicConfig.getType()));
detail.rawset(1,LuaValue.valueOf(sPassiveSkillLogicConfig.getId()));
detail.rawset(2, LuaValue.valueOf(sPassiveSkillLogicConfig.getJudge()));
detail.rawset(3, LuaValue.valueOf(sPassiveSkillLogicConfig.getType()));
List<LuaValue> effectList = parseArraayToLuaValues(sPassiveSkillLogicConfig.getValue());
int size = effectList.size();
if (size > 0) {
for (int j = 0; j < size; j++) {
detail.rawset(j + 2, effectList.get(j));
detail.rawset(j + 4, effectList.get(j));
}
}
passivityData.rawset(passivityIndex,detail);

View File

@ -22,6 +22,8 @@ public class SPassiveSkillLogicConfig implements BaseConfig {
private int coverID;
private int judge;
public static Map<Integer, SPassiveSkillLogicConfig> config;
@Override
@ -60,4 +62,8 @@ public class SPassiveSkillLogicConfig implements BaseConfig {
public int getCoverID() {
return coverID;
}
public int getJudge() {
return judge;
}
}