From 82c4149063a89ee539d349b7106368206139ac95 Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 27 Feb 2023 21:21:51 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E9=98=9F=E4=BC=8D?= =?UTF-8?q?=E5=A4=8D=E6=B4=BB=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/gvg/gvgBattleService.ts | 1 + shared/consts/statusCode.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/game-server/app/services/gvg/gvgBattleService.ts b/game-server/app/services/gvg/gvgBattleService.ts index 4b2e9c740..09c85bd43 100644 --- a/game-server/app/services/gvg/gvgBattleService.ts +++ b/game-server/app/services/gvg/gvgBattleService.ts @@ -102,6 +102,7 @@ export function checkMoveStatus(team: GVGTeamType, cityId: number, areaId: numbe if(team.pointId > 0) return STATUS.GVG_BATTLE_TEAM_IS_SELLTED; if(team.stopMoveTime > nowSeconds()) return STATUS.GVG_BATTLE_IS_MOVING; if(team.moveCdTime > nowSeconds()) return STATUS.GVG_BATTLE_IS_MOVING_CD; + if(team.restartTime > nowSeconds()) return STATUS.GVG_BATTLE_TEAM_REVIVE; let dicArea = gameData.gvgArea.get(areaId); if(!dicArea) return STATUS.DIC_DATA_NOT_FOUND; if(dicArea.relateArea.indexOf(team.areaId) == -1) return STATUS.GVG_BATTLE_AREA_NOT_RELATE; diff --git a/shared/consts/statusCode.ts b/shared/consts/statusCode.ts index c0ff90191..1f9fb6cfe 100644 --- a/shared/consts/statusCode.ts +++ b/shared/consts/statusCode.ts @@ -384,6 +384,7 @@ export const STATUS = { GVG_POINT_NOT_AREA: { code: 21417, simStr: '您不在该积分点所在区域' }, GVG_TEAM_NOT_NEED_REVIVE: { code: 21418, simStr: '此队伍不需要复活' }, GVG_BATTLE_IS_MOVING_CD: { code: 21403, simStr: '移动冷却中' }, + GVG_BATTLE_TEAM_REVIVE: { code: 21404, simStr: '队伍复活中' }, // 通用 30000 - 30099 DIC_DATA_NOT_FOUND: { code: 30000, simStr: '数据表未找到' },