diff --git a/shared/consts/constModules/gvgConst.ts b/shared/consts/constModules/gvgConst.ts index d833e528e..82b311402 100644 --- a/shared/consts/constModules/gvgConst.ts +++ b/shared/consts/constModules/gvgConst.ts @@ -178,4 +178,7 @@ export enum GVG_ATTACK_TYPE { CATAPULT = 1, // 投石车 KNIFE = 2, // 道具 PLAYER = 3, // 玩家 -} \ No newline at end of file +} + +// gvg锁定,为客户端预留载入时间 +export const GVG_BATTLE_PRE_TIME = 5; \ No newline at end of file diff --git a/shared/db/GVGTeam.ts b/shared/db/GVGTeam.ts index bdeef7486..a9ef186dc 100644 --- a/shared/db/GVGTeam.ts +++ b/shared/db/GVGTeam.ts @@ -7,7 +7,7 @@ import { EXTERIOR, GVG } from "../pubUtils/dicParam"; import { DicGVGAreaPoint } from "../pubUtils/dictionary/DicGVGAreaPoint"; import { InitTeamParam, SaveTeamUpdateParam } from "../domain/gvgField/gvgDb"; import { GVGHeroInfo } from "../domain/dbGeneral"; -import { GVG_CATAPULT, GVG_ROBOT } from "../consts"; +import { GVG_BATTLE_PRE_TIME, GVG_CATAPULT, GVG_ROBOT } from "../consts"; @index({ roleId: 1, index: 1 }) @index({ teamCode: 1 }) @@ -248,13 +248,13 @@ export default class GVGTeam extends BaseModel { // 攻击方攻击cd public static async battleStartLockAttack(teamCode: string) { - const team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $set: { attackTime: nowSeconds() + GVG.GVG_DEFAULT_ATTACK_CD, lockTime: nowSeconds() + GVG.GVG_DEFAULT_BATTLE_CD, lockTeamCode: teamCode } }, { new: true }).lean(); + const team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $set: { attackTime: nowSeconds() + GVG.GVG_DEFAULT_ATTACK_CD, lockTime: nowSeconds() + GVG.GVG_DEFAULT_BATTLE_CD + GVG_BATTLE_PRE_TIME, lockTeamCode: teamCode } }, { new: true }).lean(); return team; } // 防守方锁定cd public static async battleStartLockDefense(teamCode: string, lockTeamCode: string) { - const team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $set: { lockTime: nowSeconds() + GVG.GVG_DEFAULT_BATTLE_CD, lockTeamCode } }, { new: true }).lean(); + const team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $set: { lockTime: nowSeconds() + GVG.GVG_DEFAULT_BATTLE_CD + GVG_BATTLE_PRE_TIME, lockTeamCode } }, { new: true }).lean(); return team; } diff --git a/shared/pubUtils/dicParam.ts b/shared/pubUtils/dicParam.ts index 7e4679d9d..dcb792649 100644 --- a/shared/pubUtils/dicParam.ts +++ b/shared/pubUtils/dicParam.ts @@ -428,7 +428,7 @@ export const GVG = { GVG_REDPOINT_BATTLEFEAT: 0, // 千机阁战功红点大于多少可能出现红点 GVG_REVIVE_GOLD: '1&100|2&100|3&100|4&100|5&100|6&100|7&100|8&100|9&100|10&100|11&200', // GVG激战期元宝购买复活的消耗,次数&元宝数 GVG_VESTIGE_CHALLENGE_TIME: '5:00:00&22:00:00', // 征战中原遗迹可挑战时间 - GVG_DEFAULT_BATTLE_CD: 25, // 激战期战斗锁定时长,用于玩家退出时获取不到数据的情况 + GVG_DEFAULT_BATTLE_CD: 20, // 激战期战斗锁定时长,用于玩家退出时获取不到数据的情况 }; export const PLATFORM_CONFIG = { OPEN_ANIMATION: 1, // 0关,1开(开场动画视频)