From e1dbce80cf5ecc5f6d80176a26310603764a743d Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Thu, 27 May 2021 14:48:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=20=20=E5=B1=B1=E6=B2=B3=E7=A4=BE=E7=A8=B7?= =?UTF-8?q?=E5=9B=BE=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StartHardStageRequestHandler.java | 81 ++++++++++--------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java index 11bcff983..385e46206 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java @@ -121,9 +121,6 @@ public class StartHardStageRequestHandler extends BaseHandler0){ + Poster.getPoster().dispatchEvent(new ShanHeSheJiTuStarEvent(iSession.getUid(), 2, starSum)); + //成就任务 + user.getUserMissionManager().onGameEvent(user, GameEvent.HARSTAGE_STARS,starSum); + } } } - //排行榜 + //排行榜章节 int hardStageId = SHardStage.getStageIdByChapterAndSection(user.getHardStageManager().getCurChapter(), user.getHardStageManager().getCurNode()); Poster.getPoster().dispatchEvent(new ShanHeSheJiTuStarEvent(iSession.getUid(), 1, hardStageId)); - int starSum = HardStageLogic.getHardStageStarsSum(user); - if(starSum >0){ - Poster.getPoster().dispatchEvent(new ShanHeSheJiTuStarEvent(iSession.getUid(), 2, starSum)); - } + ItemUtil.drop(user, dropList.stream().mapToInt(Integer::intValue).toArray(), drop, 1, 0, BIReason.HARD_STAGE_GET); fightStartResponse.setDrop(drop); Map chapt = user.getHardStageManager().getChapterMap(user); @@ -183,8 +186,6 @@ public class StartHardStageRequestHandler extends BaseHandler Date: Thu, 27 May 2021 15:52:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E7=BA=A2=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WelfareRedPacketRequestHandler.java | 21 +++++++++++++++++++ .../ljsd/jieling/logic/family/GuildLogic.java | 8 ++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/handler/family/WelfareRedPacketRequestHandler.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/family/WelfareRedPacketRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/family/WelfareRedPacketRequestHandler.java new file mode 100644 index 000000000..023304bc1 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/family/WelfareRedPacketRequestHandler.java @@ -0,0 +1,21 @@ +package com.ljsd.jieling.handler.family; + +import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.family.GuildLogic; +import com.ljsd.jieling.network.session.ISession; +import rpc.protocols.MessageTypeProto; +import rpc.protocols.PlayerInfoProto; + +public class WelfareRedPacketRequestHandler extends BaseHandler { + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.WELFARE_RED_PACKET_REQUEST; + } + @Override + public void processWithProto(ISession iSession, PlayerInfoProto.WelfareRedPacketRequest proto) throws Exception { + User user = UserManager.getUser(iSession.getUid()); + GuildLogic.sendWelfareRedPacketInfo(user); + } +} 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 a7a47908a..04f9a8917 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 @@ -1420,16 +1420,18 @@ public class GuildLogic { .setItemId(already.getValue().getItemId()) .setCount(already.getValue().getCount()) .setPosition(already.getValue().getPosition()) - .setUserTitle(playerInfoManager.getUserTitle()); + .setUserTitle(playerInfoManager.getUserTitle()) + .setPracticeLevel(UserManager.getUser(already.getValue().getUid()).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 = UserManager.getUser(session.getUid()).getPlayerInfoManager(); builder.setSendName(playerInfoManager.getNickName()) .setHead(playerInfoManager.getHead()) .setHeadFrame(playerInfoManager.getHeadFrame()) - .setRemainTime(packInfo.getSendTime()+packInfo.getEffectTime()-(int)(TimeUtils.now()/1000)); + .setRemainTime(packInfo.getSendTime()+packInfo.getEffectTime()-(int)(TimeUtils.now()/1000)) + .setPracticeLevel(UserManager.getUser(packInfo.getUid()).getHeroManager().getPracticeLevel()); MessageUtil.sendMessage(session,1,messageType.getNumber(),builder.build(),true); }