diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts index 7c105f9bc..6d00072be 100644 --- a/game-server/app/servers/battle/handler/comBattleHandler.ts +++ b/game-server/app/servers/battle/handler/comBattleHandler.ts @@ -692,7 +692,9 @@ export class ComBattleHandler { let roleName = session.get('roleName'); let serverId = session.get('serverId'); const { teamCode } = msg; - const { msgDataWorld, msgDataGuild } = await pushTeamInviteMsg(roleId, roleName, serverId, teamCode); + let teamStatus = this.teamMap.get(teamCode); + if(!teamStatus) return resResult(STATUS.WRONG_PARMS); + const { msgDataWorld, msgDataGuild } = await pushTeamInviteMsg(roleId, roleName, serverId, teamCode, teamStatus.blueprtId); 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 ef1835531..a1e1d7841 100644 --- a/game-server/app/services/chatService.ts +++ b/game-server/app/services/chatService.ts @@ -350,9 +350,9 @@ export async function delPrivateMsg(roleId: string, targetRoleId: string) { * @description 发送组队一键邀请消息 * @param {string} teamCode 队伍唯一标识 */ -export async function pushTeamInviteMsg(roleId: string, roleName: string, serverId: number, teamCode: string) { - 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); +export async function pushTeamInviteMsg(roleId: string, roleName: string, serverId: number, teamCode: string, blueprtId: number) { + const msgDataWorld = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.WORLD, `${serverId}`, MSG_TYPE.RICH_TEXT, MSG_SOURCE.TEAM_INVITE, JSON.stringify({ teamCode, blueprtId }), null, null); + const msgDataGuild = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.GUILD, `${serverId}`, MSG_TYPE.RICH_TEXT, MSG_SOURCE.TEAM_INVITE, JSON.stringify({ teamCode, blueprtId }), null, null); await pushGroupMsgToRoom(msgDataWorld); await pushGroupMsgToRoom(msgDataGuild); return { msgDataWorld, msgDataGuild };