From 4376b5ece7fd2a6ea4af07772ab5f4c6cd3668ce Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 29 Sep 2021 15:23:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4key*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/rank/rankImpl/AbstractRank.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java index e807582ba..50250af1c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java @@ -10,12 +10,15 @@ import com.ljsd.jieling.logic.dao.root.GuildCache; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.family.CrossDeathPathLogic; import com.ljsd.jieling.logic.rank.IRank; +import config.SGuildCheckpointConfig; +import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.ZSetOperations; import rpc.protocols.CommonProto; import rpc.protocols.PlayerInfoProto; +import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -369,9 +372,18 @@ public abstract class AbstractRank implements IRank { RedisUtil.getInstence().zsetRemoveOne(RedisKey.getKey(redisKey,rkey,false),value); } public void removeAllRank(String rkey){ + Map configMap = STableManager.getConfig(SGuildCheckpointConfig.class); + if (configMap == null || configMap.isEmpty()) { + return; + } try { - Set dimKey = RedisUtil.getInstence().getDimKey(RedisKey.getKey(redisKey, rkey, false) + "*", 200); - dimKey.forEach(item->RedisUtil.getInstence().del(item)); +// Set dimKey = RedisUtil.getInstence().getDimKey(RedisKey.getKey(redisKey, rkey, false) + "*", 200); + String[] dimKey = new String[configMap.size()]; + int index = 0; + for (Integer integer : configMap.keySet()) { + dimKey[index] = RedisKey.getKey(redisKey, rkey, false) + integer; + } + RedisUtil.getInstence().del(dimKey); } catch (Exception e) { e.printStackTrace(); } From 54b53fda543a76d08774c6b6861025d794e9cd9b Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 29 Sep 2021 18:09:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=98=E6=96=97=E5=8A=9B=E6=97=B6?= =?UTF-8?q?=E4=BA=8B=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 82d3ec4ae..e731dee6c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1199,6 +1199,10 @@ public class HeroLogic{ RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), teamForce); } + if (teamId == GlobalsDef.FORMATION_NORMAL) { + Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(iSession.getUid())); + } + // 跨服 更新编队信息 if (teamId == GlobalsDef.WORLD_TEAM_ARENA_DEFENSE) { CrossServiceLogic.getInstance().dispose(user);