From c81995c849138c365a514cb8a5b5c059810220cd Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 16 May 2020 08:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=81=E7=BB=9D=E9=98=B5=E6=8E=89=E8=90=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/family/DeathPathLogic.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 a7b116a30..8eb351188 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){ @@ -397,12 +397,12 @@ public class DeathPathLogic { int[] reward = getRewardByRank(rank.intValue()); 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); + CommonProto.Drop.Builder drop = ItemUtil.drop(user, new int[][]{reward}, BIReason.DEATH_PAHT_RANDOM_REWARD); + Family.DoRewardDeathPathResponse response =Family.DoRewardDeathPathResponse.newBuilder().setDrop(drop).build(); 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); + MessageUtil.sendMessage(session,1,messageType.getNumber(),response,true); }