From 8eb605135d7cfde8e0b8b816bc6457c034903563 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Wed, 28 Jul 2021 16:57:46 +0800 Subject: [PATCH] =?UTF-8?q?//=E8=B7=A8=E6=9C=8D=E8=81=8A=E5=A4=A9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/chat/logic/ChatLogic.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 2eb91d8d8..8d4863bbc 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 @@ -64,7 +64,7 @@ public class ChatLogic { case 0: // 系统 chatInfoList = MessageCache.sysMsg.getObjs(messageId); break; - case -1: //世界 + case 1: //世界 chatInfoList = MessageCache.worldMsg.getObjs(messageId); break; case 2://公会 @@ -95,7 +95,7 @@ public class ChatLogic { } break; - case 1: + case 4: int group = GlobleSystemLogic.getInstence().getCrossGroup(); if(group==-1){ throw new ErrorCodeException(ErrorCode.CHAT_NOT_CROSS); @@ -162,7 +162,7 @@ public class ChatLogic { } boolean result = true; switch (chatType){ - case -1: + case 1: //0|content需要解字符串 String s = message; String[] strs = message.split("|",3); @@ -177,7 +177,7 @@ public class ChatLogic { case 3: result = ShieldedWordUtils.checkName(user,message,false,ChatContentType.PRIVATE_CHAT,UserManager.getUser(friendId)); break; - case 1: + case 4: result = ShieldedWordUtils.checkName(user,message,false,ChatContentType.CROSS_CHAT); break; default: @@ -200,7 +200,7 @@ public class ChatLogic { } switch (chatType){ - case -1: //世界 + case 1: //世界 long messageId = RedisUtil.getInstence().increment(GameApplication.serverId + RedisKey.CHAT_WORD_MSG_ID + GameApplication.serverId); ChatProto.ChatInfo chatInfo = CBean2Proto.getChatInfoBuilder(user,message,nowTime,messageId); @@ -243,7 +243,7 @@ public class ChatLogic { break; - case 1: //跨服 + case 4: //跨服 int group = GlobleSystemLogic.getInstence().getCrossGroup(); if(group==-1){ throw new ErrorCodeException(ErrorCode.CHAT_NOT_CROSS);