From 52ecb5e28251edf0a5eb3d36b36f91775dfbb9e0 Mon Sep 17 00:00:00 2001 From: liangtongchuan Date: Mon, 8 Feb 2021 16:16:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E5=AE=9D=EF=BC=9A=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E7=9A=84=E4=BA=8B=E4=BB=B6=E9=9C=80=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E6=9C=80=E6=96=B0=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/battle/handler/comBattleHandler.ts | 3 ++- game-server/app/services/comBattleService.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts index 39159645e..b996a2307 100644 --- a/game-server/app/servers/battle/handler/comBattleHandler.ts +++ b/game-server/app/servers/battle/handler/comBattleHandler.ts @@ -187,7 +187,8 @@ export class ComBattleHandler { for(let robotIdx = 0; robotIdx < robotCnt; robotIdx++) { const joinTime = getRandValueByMinMax(COM_BTL_CONST.MIN_CAP_TIME, COM_BTL_CONST.MAX_CAP_TIME, 0); setTimeout(async () => { - if (teamStatus.status === COM_TEAM_STATUS.DEFAULT && teamStatus.roleIds.length < 3) { + teamStatus = thiz.teamMap.get(teamCode); + if (teamStatus && teamStatus.status === COM_TEAM_STATUS.DEFAULT && teamStatus.roleIds.length < 3) { let { robotStArr, robotIdArr } = getRandComBtlRobots(topFiveCe, teamStatus.ceLimit, lv, 1); teamStatus.roleIds = teamStatus.roleIds.concat(robotIdArr); teamStatus.roleStatus = teamStatus.roleStatus.concat(robotStArr); diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts index 5bce01f10..16cd24ac2 100644 --- a/game-server/app/services/comBattleService.ts +++ b/game-server/app/services/comBattleService.ts @@ -357,6 +357,7 @@ export async function dismissTeam(teamStatus, teamMap: Map, roleId: export function setDismissTimer(teamStatus, teamMap: Map, roleId: string, teamDisTimer: Map, app) { if (teamStatus && teamStatus.roleIds && teamStatus.roleIds.length === 3 && teamStatus.status === COM_TEAM_STATUS.DEFAULT) { + clearComBtlTimer(teamStatus.teamCode, teamDisTimer); let timer = setTimeout(async () => { await dismissTeam(teamStatus, teamMap, roleId, teamDisTimer, app); }, COM_BTL_CONST.CAP_START_TIME);