diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/HardStageReportRequsetHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/HardStageReportRequsetHandler.java index 64a3c041c..eed43c879 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/HardStageReportRequsetHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/HardStageReportRequsetHandler.java @@ -30,13 +30,13 @@ public class HardStageReportRequsetHandler extends BaseHandler chapterMap = user.getHardStageManager().getChapterMap(user); if (!chapterMap.containsKey(nodeConfig.getChapter()) ||chapterMap.get(nodeConfig.getChapter()).getNode(nodeId) == null) { //上一个节点 - String a; SHardStage preNodeConfig = SHardStage.getConfigMap().get(nodeConfig.getNextLevel()); if(preNodeConfig != null){ if(chapterMap.containsKey(preNodeConfig.getChapter())){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index ed4a4e1ba..6fac47d35 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -785,7 +785,7 @@ public class CBean2Proto { return CommonProto.TeamSimpleInfo.newBuilder().setHeroid(pokemon.getId()).setHeroTid(pokemon.getTmpId()).setLevel(pokemon.getLevel()).setStar(pokemon.getStar()).setPosition(position).build(); } - public static CommonProto.HardStagePlayerInfo getHardStagePlayerInfo(ArenaRecord arenaRecord,int type)throws Exception { + public static CommonProto.HardStagePlayerInfo getHardStagePlayerInfo(ArenaRecord arenaRecord,int type,User user)throws Exception { CommonProto.FightData fightDataProto = CommonProto.FightData.parseFrom(arenaRecord.getFightData()); return CommonProto.HardStagePlayerInfo.newBuilder() .setUid(arenaRecord.getAttackId()) @@ -793,7 +793,7 @@ public class CBean2Proto { .setHead(arenaRecord.getHead()) .setUserName(arenaRecord.getUserName()) .setHeadFrame(arenaRecord.getHeadFrame()) - .setFightData(fightDataProto).setPower(arenaRecord.getAttackForce()).setType(type).build(); + .setFightData(fightDataProto).setPower(arenaRecord.getAttackForce()).setType(type).setPracticeLevel(user.getHeroManager().getPracticeLevel()).build(); } /**