diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java index dbae84b80..28a2875b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java @@ -66,7 +66,7 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler30){ + if (day == 1 && hour == 23 && minute > 30) { throw new ErrorCodeException(ErrorCode.CROSS_YXLD_OVER); } ArenaManager arenaManager = user.getArenaManager(); @@ -201,14 +201,14 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler= 1000) { if (defQuery.getCrossYuxulundaoNewScore() >= winerGetScore) { defQuery.setCrossYuxulundaoNewScore(defQuery.getCrossYuxulundaoNewScore() + loserGetScore); - rank.incrementRankScore(defUid, String.valueOf(crossGroup), loserGetScore); + rank.addRank(user.getId(), String.valueOf(crossGroup), defQuery.getCrossYuxulundaoNewScore()); } else { //分数不够扣 - rank.incrementRankScore(defUid, String.valueOf(crossGroup), -defQuery.getCrossYuxulundaoNewScore()); + rank.addRank(user.getId(), String.valueOf(crossGroup), 0); defQuery.setCrossYuxulundaoNewScore(0); } } @@ -219,17 +219,16 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler= 0) { myQuery.setCrossYuxulundaoNewScore(myQuery.getCrossYuxulundaoNewScore() + loserGetScore); myQuery.setCrossYuxulundaoOldScore(myQuery.getCrossYuxulundaoOldScore() + loserGetScore); - rank.incrementRankScore(user.getId(), String.valueOf(crossGroup), loserGetScore); + rank.addRank(user.getId(), String.valueOf(crossGroup), myQuery.getCrossYuxulundaoNewScore()); } else { //分数不够扣 - rank.incrementRankScore(user.getId(), String.valueOf(crossGroup), -myQuery.getCrossYuxulundaoNewScore()); + rank.addRank(user.getId(), String.valueOf(crossGroup), 0); myQuery.setCrossYuxulundaoNewScore(0); myQuery.setCrossYuxulundaoOldScore(0); } if (defUid >= 1000) { - //defQuery = CrossServiceLogic.getInstance().query(defUid); defQuery.setCrossYuxulundaoNewScore(defQuery.getCrossYuxulundaoNewScore() + winerGetScore); - rank.incrementRankScore(defUid, String.valueOf(crossGroup), winerGetScore); + rank.addRank(user.getId(), String.valueOf(crossGroup), defQuery.getCrossYuxulundaoNewScore()); } } int id = SMServerRankConfig.getIdByScore(myQuery.getCrossYuxulundaoNewScore()); @@ -283,15 +282,15 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler rPCClient = null; - try{ + try { rPCClient = ClientAdapterPo.getClientAdapterPo(sb.toString()); crossArenaManager = rPCClient.getClient().getHeroManagerInfo(uid); - }catch (Exception e) { + } catch (Exception e) { LOGGER.info("callback=>", e); } finally { - if(rPCClient != null){ + if (rPCClient != null) { rPCClient.returnObject(sb.toString()); - }else{ + } else { LOGGER.info("callback=> rPCClient is null "); return null; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoGetInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoGetInfoHandler.java index d03456f1a..dcab01e36 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoGetInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoGetInfoHandler.java @@ -69,6 +69,9 @@ public class CrossYuxulundaoGetInfoHandler extends BaseHandler> teamPosForHero = teamPosManager.getTeamPosForHero(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java index 98d4d5f77..9ef1cad98 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java @@ -81,8 +81,8 @@ public class CrossYuxulundaoLogic { //TODO 删除初始化一些数据 String key1 = RedisUtil.getInstence().getKey(RedisKey.CROSS_YUXULUNDAO_RANK, String.valueOf(crossGroup)); String key2 = RedisUtil.getInstence().getKey(RedisKey.CROSS_YUXULUNDAO_ROBOT_INFO, String.valueOf(crossGroup)); - String key3 = RedisUtil.getInstence().getKey(RedisKey.CROSS_YUXULUNDAO_RECORD, String.valueOf(crossGroup)); - RedisUtil.getInstence().del(key1, key2, key3); + //String key3 = RedisUtil.getInstence().getKey(RedisKey.CROSS_YUXULUNDAO_RECORD, String.valueOf(crossGroup)); + RedisUtil.getInstence().del(key1, key2); AbstractRank rank = RankContext.getRankEnum(RankEnum.CROSS_YUXULUNDAO_RANK.getType()); int robotIndex = 100; Random random = new Random(); @@ -100,8 +100,8 @@ public class CrossYuxulundaoLogic { } while (--robotIndex >= 0) { int server = random.nextInt(groupList.size()); - rank.addRank(robotIndex, String.valueOf(crossGroup), 100 - robotIndex); SArenaRobotConfig config = SArenaRobotConfig.getsArenaRobotConfigById(robotIds.get(robotIndex)); + rank.addRank(robotIndex, String.valueOf(crossGroup), config.getMsScroe()); robotInfo.put(String.valueOf(robotIndex), new CrossArenaEnemy(robotIds.get(robotIndex), robotIndex, groupList.get(server), 0, config.getMsScroe(), random.nextBoolean(), PlayerLogic.getInstance().getRandomName2WithOutVerify(), config.getTotalForce(), config.getRoleLv())); } LOGGER.info("跨服玉虚论道初始化结束");