From bbf3a3e80807e422b7610ae9d9b8959d4bc35ec0 Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 14 Mar 2023 15:10:15 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/gvg/gvgBattleService.ts | 5 ++++- shared/consts/statusCode.ts | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/game-server/app/services/gvg/gvgBattleService.ts b/game-server/app/services/gvg/gvgBattleService.ts index 63eb8a599..439789af5 100644 --- a/game-server/app/services/gvg/gvgBattleService.ts +++ b/game-server/app/services/gvg/gvgBattleService.ts @@ -324,7 +324,10 @@ export function checkGVGBattleStart(roleId: string, attackTeam: GVGTeamType, def if(attackTeam.areaId != defenseTeam.areaId) return STATUS.GVG_TEAM_NOT_SAME_AREA; if(attackTeam.attackTime > nowSeconds()) return STATUS.GVG_TEAM_ATTACKING; - if(defenseTeam.defenseTime > nowSeconds() || defenseTeam.lockTime > nowSeconds()) return STATUS.GVG_TEAM_DEFENSEING; + if(defenseTeam.defenseTime > nowSeconds() || defenseTeam.lockTime > nowSeconds()) { + return defenseTeam.isRobot? STATUS.GVG_ROBOT_DEFENSEING: STATUS.GVG_TEAM_DEFENSEING; + } + if(attackTeam.lockTime > nowSeconds()) return STATUS.GVG_BATTLE_TEAM_LOCK; if(attackTeam.durability <= 0) return STATUS.GVG_ATTACK_TEAM_BROKEN; if(defenseTeam.durability <= 0) return STATUS.GVG_DEFENSE_TEAM_BROKEN; diff --git a/shared/consts/statusCode.ts b/shared/consts/statusCode.ts index 72b41d62a..f17b57063 100644 --- a/shared/consts/statusCode.ts +++ b/shared/consts/statusCode.ts @@ -391,6 +391,7 @@ export const STATUS = { GVG_BATTLE_TEAM_HAS_SELLTED: { code: 21423, simStr: '该编队已驻守据点了' }, GVG_BATTLE_TEAM_LOCK_ENTERY_CITY: { code: 21424, simStr: '正在有玩家挑战您，请稍后切换城池' }, GVG_POINT_TYPE_ERR: { code: 21425, simStr: '该积分点不可驻守' }, + GVG_ROBOT_DEFENSEING: { code: 21426, simStr: '该守卫正在与其他玩家战斗' }, // 通用 30000 - 30099 DIC_DATA_NOT_FOUND: { code: 30000, simStr: '数据表未找到' },