From 5f811290c305609da919b0e919ca57b65f1a2865 Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 23 Aug 2021 14:08:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E5=AE=9D=EF=BC=9A=E5=AF=BB=E5=AE=9D?= =?UTF-8?q?=E9=82=80=E8=AF=B7=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../servers/battle/handler/comBattleHandler.ts | 15 ++++++++------- game-server/app/services/chatService.ts | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts index 4371ad7f6..7c105f9bc 100644 --- a/game-server/app/servers/battle/handler/comBattleHandler.ts +++ b/game-server/app/servers/battle/handler/comBattleHandler.ts @@ -707,16 +707,17 @@ export class ComBattleHandler { let roleId = session.get('roleId'); let roleName = session.get('roleName'); const { teamCode, targetRoleId } = msg; - const msgData = await pushFriendTeamInviteMsg(roleId, roleName, teamCode, targetRoleId); + + let teamStatus = this.teamMap.get(teamCode); + if(!teamStatus) return resResult(STATUS.WRONG_PARMS); + + const msgData = await pushFriendTeamInviteMsg(roleId, roleName, teamCode, teamStatus.blueprtId, targetRoleId); if (!msgData) return resResult(STATUS.WRONG_PARMS); const roleInfo = await getSimpleRoleInfo(targetRoleId); - let teamStatus = this.teamMap.get(teamCode); - if(teamStatus) { - let index = teamStatus.blacklist.indexOf(targetRoleId); - if(index != -1) { - teamStatus.blacklist.splice(index, 1); - } + let index = teamStatus.blacklist.indexOf(targetRoleId); + if(index != -1) { + teamStatus.blacklist.splice(index, 1); } return resResult(STATUS.SUCCESS, {...msgData, roleInfo}); diff --git a/game-server/app/services/chatService.ts b/game-server/app/services/chatService.ts index 2ff9b54e3..ef1835531 100644 --- a/game-server/app/services/chatService.ts +++ b/game-server/app/services/chatService.ts @@ -362,8 +362,8 @@ export async function pushTeamInviteMsg(roleId: string, roleName: string, server * @description 发送组队私人邀请消息 * @param {string} teamCode 队伍唯一标识 */ - export async function pushFriendTeamInviteMsg(roleId: string, roleName: string, teamCode: string, targetRoleId) { - const msgData = await createPrivateMsg(roleId, roleName, MSG_TYPE.RICH_TEXT, MSG_SOURCE.TEAM_INVITE, teamCode, targetRoleId, null); + export async function pushFriendTeamInviteMsg(roleId: string, roleName: string, teamCode: string, blueprtId: number, targetRoleId) { + const msgData = await createPrivateMsg(roleId, roleName, MSG_TYPE.RICH_TEXT, MSG_SOURCE.TEAM_INVITE, JSON.stringify({ teamCode, blueprtId}), targetRoleId, null); await pushMsgToRole(msgData); return msgData; }