From 01e8dca8c95913f63f580a8f9a155921b7f0339c Mon Sep 17 00:00:00 2001
From: liangtongchuan <liangtongchuan@bantus.cn>
Date: Tue, 9 Mar 2021 12:48:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=EF=BC=9A=E7=8E=A9=E5=AE=B6?=
 =?UTF-8?q?=E5=9C=A8=E5=86=9B=E5=9B=A2=E9=A2=91=E9=81=93=E5=8F=91=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/servers/connector/handler/entryHandler.ts    |  1 +
 game-server/app/services/chatService.ts              | 12 ++++++------
 game-server/test/chat.test.ts                        |  4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/game-server/app/servers/connector/handler/entryHandler.ts b/game-server/app/servers/connector/handler/entryHandler.ts
index b71450dbc..bf5a672ed 100644
--- a/game-server/app/servers/connector/handler/entryHandler.ts
+++ b/game-server/app/servers/connector/handler/entryHandler.ts
@@ -115,6 +115,7 @@ export class EntryHandler {
                 if(guild) {
                     addRoleToGuildChannel(role.roleId, self.app.get('serverId'), userGuild.guildCode);
                     role['guildAuth'] = userGuild.auth;
+                    role['guildCode'] = userGuild.guildCode;
                     let {lv: guildLv, memberCnt} = guild;
                     let dicGuild = gameData.centerBase.get(guildLv);
                     if(dicGuild && memberCnt >= dicGuild.peopleNum) {
diff --git a/game-server/app/services/chatService.ts b/game-server/app/services/chatService.ts
index bbcb5ea2d..96b3b179b 100644
--- a/game-server/app/services/chatService.ts
+++ b/game-server/app/services/chatService.ts
@@ -151,17 +151,17 @@ async function addRoleToChannel(roomId: string, roleId: string, sid: string) {
 }
 
 export async function addRoleToSysChannel(roleId: string, sid: string, serverId: number) {
-    const roomId = groupRoomId('sys', `${serverId}`);
+    const roomId = groupRoomId(CHANNEL_PREFIX.SYS, `${serverId}`);
     await addRoleToChannel(roomId, roleId, sid);
 }
 
 export async function addRoleToWorldChannel(roleId: string, sid: string, serverId: number) {
-    const roomId = groupRoomId('new_world', `${serverId}`);
+    const roomId = groupRoomId(CHANNEL_PREFIX.WORLD, `${serverId}`);
     await addRoleToChannel(roomId, roleId, sid);
 }
 
 export async function addRoleToGuildChannel(roleId: string, sid: string, guildCode: string) {
-    const roomId = groupRoomId('new_guild', guildCode);
+    const roomId = groupRoomId(CHANNEL_PREFIX.GUILD, guildCode);
     await addRoleToChannel(roomId, roleId, sid);
 }
 
@@ -171,19 +171,19 @@ async function leaveChannel(roomId: string, roleId: string, sid: string) {
 }
 
 export async function leaveSysChannel(roleId: string, sid: string, serverId: number) {
-    const roomId = groupRoomId('sys', `${serverId}`);
+    const roomId = groupRoomId(CHANNEL_PREFIX.SYS, `${serverId}`);
     await leaveChannel(roomId, roleId, sid);
 }
 
 export async function leaveWorldChannel(roleId: string, sid: string, serverId: number) {
-    const roomId = groupRoomId('new_world', `${serverId}`);
+    const roomId = groupRoomId(CHANNEL_PREFIX.WORLD, `${serverId}`);
     await leaveChannel(roomId, roleId, sid);
 }
 
 export async function leaveGuildChannel(roleId: string, sid: string) {
     const { guildCode } = await RoleModel.findByRoleId(roleId, 'guildCode');
     if (!guildCode) return;
-    const roomId = groupRoomId('new_guild', guildCode);
+    const roomId = groupRoomId(CHANNEL_PREFIX.GUILD, guildCode);
     await leaveChannel(roomId, roleId, sid);
 }
 
diff --git a/game-server/test/chat.test.ts b/game-server/test/chat.test.ts
index bce01a3b4..783da0aa3 100644
--- a/game-server/test/chat.test.ts
+++ b/game-server/test/chat.test.ts
@@ -266,4 +266,8 @@ describe('聊天测试', function() {
   it('测试世界频道消息', function(done) {
     testGroupMsg(pinusClient, roleInfo, pinusClientT, CHANNEL_PREFIX.WORLD, roleInfo.serverId, done);
   });
+
+  it('测试军团频道消息', function(done) {
+    testGroupMsg(pinusClient, roleInfo, pinusClientT, CHANNEL_PREFIX.GUILD, roleInfo.guildCode, done);
+  });
 });