diff --git a/game-server/app/servers/guild/handler/gvgBattleHandler.ts b/game-server/app/servers/guild/handler/gvgBattleHandler.ts index e9c45ef74..11367c964 100644 --- a/game-server/app/servers/guild/handler/gvgBattleHandler.ts +++ b/game-server/app/servers/guild/handler/gvgBattleHandler.ts @@ -467,8 +467,9 @@ export class GVGBattleHandler { let { configId, period } = getGVGPeriodData(); if (period != GVG_PERIOD.BATTLE) return resResult(STATUS.GVG_NOT_BATTLE_PERIOD); - let { startFightTime } = getFightTimeByPeriod(period); + let { startFightTime, endFightTime } = getFightTimeByPeriod(period); if(startFightTime > nowSeconds()) return resResult(STATUS.GVG_NOT_BATTLE_TIME); + if(endFightTime < nowSeconds()) return resResult(STATUS.GVG_BATTLE_IS_END); let groupKey = await getGroupKey(serverId); @@ -496,6 +497,10 @@ export class GVGBattleHandler { const { cityId, battleCode, isSuccess } = msg; let { configId, period } = getGVGPeriodData(); + let { startFightTime, endFightTime } = getFightTimeByPeriod(period); + if(startFightTime > nowSeconds()) return resResult(STATUS.GVG_NOT_BATTLE_TIME); + if(endFightTime < nowSeconds()) return resResult(STATUS.GVG_BATTLE_IS_END); + const record = await GVGBattleRecModel.findByBattleCode(battleCode); if(!record) return resResult(STATUS.GVG_BATTLEREC_NOT_FOUND); if(record.battleEndTime > 0) return resResult(STATUS.GVG_BATTLEREC_HAS_SUMMIT); diff --git a/shared/consts/statusCode.ts b/shared/consts/statusCode.ts index 2802d220b..cc3cc1223 100644 --- a/shared/consts/statusCode.ts +++ b/shared/consts/statusCode.ts @@ -360,6 +360,7 @@ export const STATUS = { GVG_NOT_BATTLE_TIME: { code: 21343, simStr: '您此时只能进驻据点不可挑战' }, GVG_TECH_HAS_PROGRESS: { code: 21344, simStr: '该科技进度不为0' }, GVG_LV_RESOURCE: { code: 21345, simStr: '该联军等级下该资源已满' }, + GVG_BATTLE_IS_END: { code: 21346, simStr: '激战期已结束' }, // GVG征战中原 GVG_VESTIGE_ERR: { code: 21350, simStr: '今日未开放该遗迹' },