From b43b11bb1fb326aa7226e620746668d3d93b377e Mon Sep 17 00:00:00 2001 From: luying Date: Thu, 13 Jan 2022 13:47:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=9C=8D=E6=97=A5=E5=BF=97=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=86=85=E9=83=A8=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/battle/handler/comBattleHandler.ts | 1 + game-server/app/servers/role/handler/friendHandler.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts index b337c3bab..d19ac0bca 100644 --- a/game-server/app/servers/battle/handler/comBattleHandler.ts +++ b/game-server/app/servers/battle/handler/comBattleHandler.ts @@ -404,6 +404,7 @@ export class ComBattleHandler { let roleId = session.get('roleId'); let { teamCode } = msg; let teamStatus = this.teamMap.get(teamCode); + if(!teamStatus) return resResult(STATUS.SUCCESS); let channelService = this.app.get('channelService'); let channel = channelService.getChannel(teamCode, false); let result = await dismissTeam(teamStatus, this.teamMap, roleId, this.teamDisTimer, channel); diff --git a/game-server/app/servers/role/handler/friendHandler.ts b/game-server/app/servers/role/handler/friendHandler.ts index bbf0d0607..56901dafc 100644 --- a/game-server/app/servers/role/handler/friendHandler.ts +++ b/game-server/app/servers/role/handler/friendHandler.ts @@ -431,7 +431,7 @@ export class FriendHandler { // 任务 await checkTaskWithRoles(serverId, roleId, sid, TASK_TYPE.FRIEND_NUM, [role, friend]); await checkActivityTask(serverId, sid, role.roleId, TASK_TYPE.FRIEND_NUM, role.friendCnt); - await checkActivityTask(serverId, null, friend.roleId, TASK_TYPE.FRIEND_NUM, friend.friendCnt); + if(friend) await checkActivityTask(serverId, null, friend.roleId, TASK_TYPE.FRIEND_NUM, friend.friendCnt); return resResult(STATUS.SUCCESS, { frdRoleIds, blackRoleIds,