From 17f1f0a639839f624f8816348016b08c0ee07388 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 15 May 2020 21:11:26 +0800 Subject: [PATCH] =?UTF-8?q?indication=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/family/DeathPathLogic.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java index 1eff2379e..a7b116a30 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.java @@ -385,10 +385,10 @@ public class DeathPathLogic { //您所在的公会或您没有达到领奖条件 throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } - if(countInfo.getUserReward().get(uid).getPosition()!=0){ - //您已领取过奖励 - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); - } +// if(countInfo.getUserReward().get(uid).getPosition()!=0){ +// //您已领取过奖励 +// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); +// } // 根据排名进行随机奖励 Long rank = RedisUtil.getInstence().getZSetreverseRank(RedisKey.DEATH_PATH_TOTAL_GUILD_RANK, "", String.valueOf(user.getPlayerInfoManager().getGuildId())); if(rank==-1){ @@ -398,10 +398,11 @@ public class DeathPathLogic { countInfo.putUserReward(uid,new DeathReward(reward[0],reward[1],position,user.getPlayerInfoManager().getNickName())); RedisUtil.getInstence().set(RedisKey.DEATH_PAHT_TOTAL_CHALLENGE_COUNT, String.valueOf(guildId),countInfo); ItemUtil.drop(user,new int[][]{reward},BIReason.DEATH_PAHT_RANDOM_REWARD); - Family.RewardInfo info = Family.RewardInfo.newBuilder().setUid(uid).setItemCount(reward[1]).setItemId(reward[0]).setPosition(position).build(); - - GuildLogic.sendIndicationToMember(GuilidManager.guildInfoMap.get(guildId), MessageTypeProto.MessageType.DEATH_PATH_DO_REWARD_INDICATION,info); - MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true); + Family.RewardInfo info = Family.RewardInfo.newBuilder().setUid(uid).setItemCount(reward[1]).setItemId(reward[0]).setPosition(position).setUsername(user.getPlayerInfoManager().getNickName()).build(); + Family.DoRewardIndication indication =Family.DoRewardIndication.newBuilder().setInfo(info).build(); + GuildLogic.sendIndicationToMember(GuilidManager.guildInfoMap.get(guildId), MessageTypeProto.MessageType.DEATH_PATH_DO_REWARD_INDICATION,indication); + MessageUtil.sendMessage(sessio + n,1,messageType.getNumber(),null,true); }