From 143a0cd12440c529e67060e51714d8168722042b Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Tue, 19 Apr 2022 17:30:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E7=BA=A2=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/db/redis/RedisUtil.java | 1 + .../java/com/ljsd/jieling/logic/family/GuildLogic.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java index b5894acaf..b23b6b697 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java @@ -1421,6 +1421,7 @@ public class RedisUtil { RedisKey.PLAYER_INFO_CACHE.equals(type) || RedisKey.FAMILY_INFO.equals(type) || RedisKey.PIDGIDTEMP.equals(type) || RedisKey.SERVER_WORLDLEVE_INFO.equals(type) || RedisKey.FAMILY_RED_PACKAGE.equals(type) || "red_remain_list".equals(type)|| + RedisKey.GUILD_RED_PACKAGE_RANK.equals(type) || RedisKey.SERVER_SPLIT_INFO.equals(type) || RedisKey.FAMILY_LOGS.equals(type) || RedisKey.SERVER_SPLIT_MAIL_INFO.equals(type) || RedisKey.CROSS_ARENA_ROBOT_INFO.equals(type) || RedisKey.CROSS_SERVICE_ARENA.equals(type) || RedisKey.WORLD_ARENA_RANK_MY_MATH.equals(type) || diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 8555b9130..49e7467bb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -1467,7 +1467,8 @@ public class GuildLogic { Family.RedPackageDetailResponse.Builder builder = Family.RedPackageDetailResponse.newBuilder(); if(!alreadyList.isEmpty()) { for(Map.Entry already:alreadyList.entrySet()){ - PlayerManager playerInfoManager = UserManager.getUser(already.getValue().getUid()).getPlayerInfoManager(); + User guildUser = PlayerLogic.getInstance().getUserByRpc(already.getValue().getUid()); + PlayerManager playerInfoManager = guildUser.getPlayerInfoManager(); CommonProto.RedOneDetail.Builder detail= CommonProto.RedOneDetail.newBuilder() .setUid(already.getValue().getUid()) .setHead(playerInfoManager.getHead()) @@ -1478,17 +1479,17 @@ public class GuildLogic { .setCount(already.getValue().getCount()) .setPosition(already.getValue().getPosition()) .setUserTitle(playerInfoManager.getUserTitle()) - .setPracticeLevel(UserManager.getUser(already.getValue().getUid()).getHeroManager().getPracticeLevel()); + .setPracticeLevel(guildUser.getHeroManager().getPracticeLevel()); builder.addInfo(detail.build()); } } RedPackage packInfo = RedisUtil.getInstence().getMapValue(RedisKey.FAMILY_RED_PACKAGE, String.valueOf(guildId), String.valueOf(redId), RedPackage.class); - PlayerManager playerInfoManager = UserManager.getUser(packInfo.getUid()).getPlayerInfoManager(); + PlayerManager playerInfoManager = PlayerLogic.getInstance().getUserByRpc(packInfo.getUid()).getPlayerInfoManager(); builder.setSendName(playerInfoManager.getNickName()) .setHead(playerInfoManager.getHead()) .setHeadFrame(playerInfoManager.getHeadFrame()) .setRemainTime(packInfo.getSendTime()+packInfo.getEffectTime()-(int)(TimeUtils.now()/1000)) - .setPracticeLevel(UserManager.getUser(packInfo.getUid()).getHeroManager().getPracticeLevel()); + .setPracticeLevel(PlayerLogic.getInstance().getUserByRpc(packInfo.getUid()).getHeroManager().getPracticeLevel()); MessageUtil.sendMessage(session,1,messageType.getNumber(),builder.build(),true); }