diff --git a/conf/c_database_version.json b/conf/c_database_version.json index 2b4b31e47..af142624e 100644 --- a/conf/c_database_version.json +++ b/conf/c_database_version.json @@ -1,4 +1,4 @@ { - "version":"5", - "tables":"" + "version":"6", + "tables":"GlobalActivity" } \ No newline at end of file diff --git a/conf/hotfix.json b/conf/hotfix.json index 2e5c7ac7a..444a9c747 100644 --- a/conf/hotfix.json +++ b/conf/hotfix.json @@ -1,5 +1,6 @@ { - "version":"5", + "version":"6", "classes":[ + {"name":"GetWorldArenaRecordInfoRequestHandler.class","fullName":"com.ljsd.jieling.handler.gtw.GetWorldArenaRecordInfoRequestHandler"} ] } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaRecordInfoRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaRecordInfoRequestHandler.java index c9d7126e0..8ac2db902 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaRecordInfoRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaRecordInfoRequestHandler.java @@ -34,7 +34,7 @@ public class GetWorldArenaRecordInfoRequestHandler extends BaseHandler result = RedisUtil.getInstence().getMapValues(RedisKey.WORLD_ARENA_RRECORD, Integer.toString(iSession.getUid()), String.class, byte[].class); - if (result != null && !result.isEmpty()) { +// LOGGER.info("罗浮战斗记录个人数量,uid:{},num:{}",iSession.getUid(), result.values().size()); List< byte[]> arenaRecordList = new ArrayList<>(result.values()); List collect = arenaRecordList.stream().map(bytes -> { try { @@ -64,27 +64,25 @@ public class GetWorldArenaRecordInfoRequestHandler extends BaseHandler wroldBattleRecord1 != null ? wroldBattleRecord1.getAttackTime() : 0)).collect(Collectors.toList()); Collections.reverse(collect); int size = arenaRecordList.size(); +// LOGGER.info("罗浮战斗记录个人数量2,uid:{},num:{}",iSession.getUid(), size); if (size > 15) { - String[] removeMapKeys = new String[size - 15]; +// String[] removeMapKeys = new String[size - 15]; + ArrayList list = new ArrayList<>(size - 15); +// LOGGER.info("罗浮战斗记录删除数组长度,uid:{},num:{}",iSession.getUid(), size - 15); for (int i = 0; i < size - 15; i++) { WorldProto.WroldBattleRecord remove = collect.remove(size-i-1); - String removeId = remove.getRecordId(); - removeMapKeys[i] = (removeId); +// removeMapKeys[i] = remove.getRecordId(); + list.add(remove.getRecordId()); } - RedisUtil.getInstence().removeMapEntrys(RedisKey.WORLD_ARENA_RRECORD, Integer.toString(iSession.getUid()), (Object) removeMapKeys); + RedisUtil.getInstence().removeMapEntrys(RedisKey.WORLD_ARENA_RRECORD, Integer.toString(iSession.getUid()), list.toArray()); +// LOGGER.info("罗浮战斗记录删除数组,uid:{},num:{}, num2:{}",iSession.getUid(), removeMapKeys, collect.size()); } builder.addAllWroldBattleRecord(collect); } - +// LOGGER.info("罗浮战斗记录结果,uid:{},num:{}",iSession.getUid(), RedisUtil.getInstence().getMapValues(RedisKey.WORLD_ARENA_RRECORD, Integer.toString(iSession.getUid()), String.class, byte[].class).size()); MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.GetWorldArenaRecordInfoResponse.getNumber(),builder.build(),true); - -// //转发到world服 -// boolean b = WorldHelper.sendMessageToWord(iSession.getUid(),proto); -// if(!b){ -// throw new ErrorCodeException(ErrorCode.UNKNOWN); -// } } }