From 178f56bbe577919408fa4400762fcb9e023097cc Mon Sep 17 00:00:00 2001 From: gaojie Date: Wed, 19 Jun 2019 16:49:16 +0800 Subject: [PATCH] fix --- .../ljsd/jieling/chat/handler/GetChatMessageHandler.java | 2 +- .../main/java/com/ljsd/jieling/chat/logic/ChatLogic.java | 2 +- .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/chat/handler/GetChatMessageHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/chat/handler/GetChatMessageHandler.java index 3d67c8aa0..a71ea7d4e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/chat/handler/GetChatMessageHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/chat/handler/GetChatMessageHandler.java @@ -19,7 +19,7 @@ public class GetChatMessageHandler extends BaseHandler{ public void process(ISession iSession, PacketNetData netData) throws Exception { ChatProto.GetChatMessageInfoRequest getChatMessageInfoRequest = ChatProto.GetChatMessageInfoRequest.parseFrom(netData.parseClientProtoNetData()); int chatType = getChatMessageInfoRequest.getChatType(); - int messageId = getChatMessageInfoRequest.getMessageId(); + long messageId = getChatMessageInfoRequest.getMessageId(); ChatLogic.getInstance().getAllChatMessageInfo(iSession,chatType,messageId); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java index 9e3885865..80af804bc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java @@ -34,7 +34,7 @@ public class ChatLogic { * 获取聊天信息 * @param chatType */ - public void getAllChatMessageInfo(ISession iSession, int chatType,int messageId) throws Exception { + public void getAllChatMessageInfo(ISession iSession, int chatType,long messageId) throws Exception { int uid = iSession.getUid(); FriendManager friendManager = UserManager.getUser(uid).getFriendManager(); List friends = friendManager.getFriends(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 9a9df608d..38b76de94 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -720,16 +720,18 @@ public class ItemUtil { Hero hero = new Hero(user.getId(),heroStar[0],heroStar[1]); heroManager.addHero(hero); heroList.add(CBean2Proto.getHero(hero)); - String message = ""; SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId()); if (scHero.getNatural() >= 3) { + String message = ""; String quality = HeroLogic.getInstance().getQuality(scHero.getNatural()); if (reason == BIReason.COMPOS_HERO_REWARD) { message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_synthesize_content", new Object[]{playerInfoManager.getNickName(), quality, scHero.getReadingName()}); } else if (reason == BIReason.HERO_RANDOM) { message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_recruit_content", new Object[]{playerInfoManager.getNickName(), quality, scHero.getReadingName()}); } - ChatLogic.getInstance().sendSysChatMessage(message,Global.LUCKY_LUCK,hero.getTemplateId(),0,0,0,0,0); + if (!message.isEmpty()){ + ChatLogic.getInstance().sendSysChatMessage(message,Global.LUCKY_LUCK,hero.getTemplateId(),0,0,0,0,0); + } } user.getUserMissionManager().onGameEvent(user,GameEvent.GET_HERO,heroStar[0],heroStar[1]); }