From 9c4b21e7ef500665b3702c0a7a01cff2552fd5bb Mon Sep 17 00:00:00 2001 From: duhui Date: Sat, 21 Jan 2023 11:27:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E5=88=92=E9=9C=80=E6=B1=82=EF=BC=9A?= =?UTF-8?q?=E7=BD=97=E6=B5=AE=E4=BA=89=E9=94=8B=E5=8E=BB=E9=99=A4=E6=8C=91?= =?UTF-8?q?=E6=88=98=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/WorldArenaFunction.java | 42 +++++++++---------- .../logic/arenaworld/ArenaWorldLogic.java | 5 ++- .../java/config/SMServerArenaSetting.java | 3 -- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/function/WorldArenaFunction.java b/serverlogic/src/main/java/com/ljsd/jieling/core/function/WorldArenaFunction.java index 26f09c019..ee8fc3284 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/function/WorldArenaFunction.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/function/WorldArenaFunction.java @@ -22,27 +22,27 @@ import java.util.Set; public class WorldArenaFunction implements FunctionManager { @Override public void startAction(TimeControllerOfFunction timeControllerOfFunction) throws Exception { - if(TimeUtils.now() - timeControllerOfFunction.getStartTime()>1000*60*3 ){ - return; - } - SMServerArenaSetting setting = STableManager.getConfig(SMServerArenaSetting.class).get(1); - if(setting!=null){ - //获取竞技场排行榜 - int curSeason = ArenaLogic.getInstance().getCurSeason(); - Set> arenaRankInfo = new HashSet<>(setting.getJoinRank()); - Set> arenaRankInfoOne = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.ARENA_RANK, Integer.toString(curSeason), 0, setting.getJoinRank()-1); - if (arenaRankInfoOne != null && !arenaRankInfoOne.isEmpty()) { - arenaRankInfo.addAll(arenaRankInfoOne); - } - //join - Map memberInfoMap = new HashMap<>(); - int i=1; - for (ZSetOperations.TypedTuple item:arenaRankInfo) { - memberInfoMap.put(item.getValue(), i); - i+=1; - } - RedisUtil.getInstence().putMapEntrys(RedisKey.WORLD_ARE_JOIN, "", memberInfoMap); - } +// if(TimeUtils.now() - timeControllerOfFunction.getStartTime()>1000*60*3 ){ +// return; +// } +// SMServerArenaSetting setting = STableManager.getConfig(SMServerArenaSetting.class).get(1); +// if(setting!=null){ +// //获取竞技场排行榜 +// int curSeason = ArenaLogic.getInstance().getCurSeason(); +// Set> arenaRankInfo = new HashSet<>(setting.getJoinRank()); +// Set> arenaRankInfoOne = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.ARENA_RANK, Integer.toString(curSeason), 0, setting.getJoinRank()-1); +// if (arenaRankInfoOne != null && !arenaRankInfoOne.isEmpty()) { +// arenaRankInfo.addAll(arenaRankInfoOne); +// } +// //join +// Map memberInfoMap = new HashMap<>(); +// int i=1; +// for (ZSetOperations.TypedTuple item:arenaRankInfo) { +// memberInfoMap.put(item.getValue(), i); +// i+=1; +// } +// RedisUtil.getInstence().putMapEntrys(RedisKey.WORLD_ARE_JOIN, "", memberInfoMap); +// } } @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arenaworld/ArenaWorldLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arenaworld/ArenaWorldLogic.java index 5ec2c48e1..45cb86474 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arenaworld/ArenaWorldLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arenaworld/ArenaWorldLogic.java @@ -51,8 +51,9 @@ public class ArenaWorldLogic { * 玩法检查 */ public static boolean checkJoin(String uid){ - Map joinMembers = RedisUtil.getInstence().getMapValues(RedisKey.WORLD_ARE_JOIN, "", String.class, Integer.class); - return joinMembers.keySet().contains(uid); +// Map joinMembers = RedisUtil.getInstence().getMapValues(RedisKey.WORLD_ARE_JOIN, "", String.class, Integer.class); +// return joinMembers.containsKey(uid); + return true; } diff --git a/tablemanager/src/main/java/config/SMServerArenaSetting.java b/tablemanager/src/main/java/config/SMServerArenaSetting.java index 4b0a9ab20..875d8242a 100644 --- a/tablemanager/src/main/java/config/SMServerArenaSetting.java +++ b/tablemanager/src/main/java/config/SMServerArenaSetting.java @@ -1,10 +1,7 @@ package config; -import manager.STableManager; import manager.Table; -import java.util.Map; - @Table(name ="MServerArenaSetting") public class SMServerArenaSetting implements BaseConfig {