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 c4241250d..d5326d78d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -335,6 +335,7 @@ public class FightDataUtil { unitData.set("passivity", getPassivity(skillIds)); unitData.set("property", getProperty(property)); unitData.set("skinId",data.getSkinId()); + unitData.set("job",hero.getJob()); return unitData; } diff --git a/tablemanager/src/main/java/config/SCHero.java b/tablemanager/src/main/java/config/SCHero.java index d4e1fe738..c10f06832 100644 --- a/tablemanager/src/main/java/config/SCHero.java +++ b/tablemanager/src/main/java/config/SCHero.java @@ -69,6 +69,8 @@ public class SCHero implements BaseConfig{ private static Map piecesMap; + private int job; + public static class ConsumeMaterialInfo{ private int groupID; @@ -169,7 +171,7 @@ public class SCHero implements BaseConfig{ // 大于10星为 觉醒技能 int[][] awakens = scHero.getAwaken(); Map>> awakSkillMapTmp = new HashMap<>(); - if (awakens != null && awakens.length > 0) { + if (awakens != null && awakens.length > 0&&awakens[0].length>0) { awakSkillMapTmp.put(1, new TreeMap<>()); awakSkillMapTmp.put(2, new TreeMap<>()); for (int[] openSkillRule : awakens) { @@ -337,4 +339,8 @@ public class SCHero implements BaseConfig{ public int[][] getAwaken() { return awaken; } + + public int getJob() { + return job; + } }