From 030c1543e7a9db315ddaf05da4a27583aefc4c04 Mon Sep 17 00:00:00 2001 From: liangtongchuan Date: Fri, 26 Mar 2021 11:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=EF=BC=9A=E7=BB=84=E9=98=9F?= =?UTF-8?q?=E4=B8=80=E9=94=AE=E9=82=80=E8=AF=B7=E4=B9=9F=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=BB=99=E5=86=9B=E5=9B=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/battle/handler/comBattleHandler.ts | 4 ++-- game-server/app/services/chatService.ts | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts index e7185d979..9e65bb50d 100644 --- a/game-server/app/servers/battle/handler/comBattleHandler.ts +++ b/game-server/app/servers/battle/handler/comBattleHandler.ts @@ -675,8 +675,8 @@ export class ComBattleHandler { let roleName = session.get('roleName'); let serverId = session.get('serverId'); const { teamCode } = msg; - const msgData = await pushTeamInviteMsg(roleId, roleName, serverId, teamCode); - if (!msgData) return resResult(STATUS.WRONG_PARMS); + const { msgDataWorld, msgDataGuild } = await pushTeamInviteMsg(roleId, roleName, serverId, teamCode); + if (!msgDataWorld || !msgDataGuild) return resResult(STATUS.WRONG_PARMS); return resResult(STATUS.SUCCESS); } diff --git a/game-server/app/services/chatService.ts b/game-server/app/services/chatService.ts index f0b83ab2a..a6f07b3a9 100644 --- a/game-server/app/services/chatService.ts +++ b/game-server/app/services/chatService.ts @@ -314,9 +314,11 @@ export async function updatePrivateMsgReadInfo(roleId: string, targetRoleId: str * @param {string} teamCode 队伍唯一标识 */ export async function pushTeamInviteMsg(roleId: string, roleName: string, serverId: number, teamCode: string) { - const msgData = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.WORLD, `${serverId}`, MSG_TYPE.RICH_TEXT, MSG_SOURCE.TEAM_INVITE, teamCode, null, null); - await pushGroupMsgToRoom(msgData); - return msgData; + const msgDataWorld = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.WORLD, `${serverId}`, MSG_TYPE.RICH_TEXT, MSG_SOURCE.TEAM_INVITE, teamCode, null, null); + const msgDataGuild = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.GUILD, `${serverId}`, MSG_TYPE.RICH_TEXT, MSG_SOURCE.TEAM_INVITE, teamCode, null, null); + await pushGroupMsgToRoom(msgDataWorld); + await pushGroupMsgToRoom(msgDataGuild); + return { msgDataWorld, msgDataGuild }; } export async function createAccuseData(roleId: string, targetRoleId: string, targetMsgCode: string, reason: number) {