diff --git a/serverlogic/src/main/java/com/ljsd/GameApplication.java b/serverlogic/src/main/java/com/ljsd/GameApplication.java index a12b4df10..647fee101 100644 --- a/serverlogic/src/main/java/com/ljsd/GameApplication.java +++ b/serverlogic/src/main/java/com/ljsd/GameApplication.java @@ -67,7 +67,7 @@ public class GameApplication { String cmd = sc.nextLine(); if(cmd.startsWith("//")) { - System.out.println("执行命令:" + cmd.substring(2)); + System.out.println("gmgmgm:" + cmd.substring(2)); String cmd2 = cmd.substring(2); GmService.exeCmd(cmd2); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampinGetHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampinGetHandler.java index aace8c196..433cd74d9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampinGetHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampinGetHandler.java @@ -79,7 +79,10 @@ public class ChampinGetHandler extends BaseHandler { int state = -1; for (String redisId : strings) { ArenaRecord record = RedisUtil.getInstence().getMapValue(RedisKey.CHAMPION_ARENA_RECORD, "", redisId, ArenaRecord.class); - if ((!record.getId().equals(arenaRecord.getId())) && record.getRoundTims() == roundTims) { + if(record.getTurn()==-1){ + continue; + } + if(ChampionshipLogic.getFightTime()!=record.getTurn()&&record.getRoundTims()==(arenaRecord.getRoundTims())){ if (record.getFightResult() == 1) { if (state == -1) { state = 2; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java index 21d47ce63..5e221caae 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java @@ -73,7 +73,7 @@ public class ChampionBetInfoHandler extends BaseHandler heroMap = heroManager.getHeroMap();