diff --git a/shared/db/GVGTeam.ts b/shared/db/GVGTeam.ts
index d4dfddbf9..bdeef7486 100644
--- a/shared/db/GVGTeam.ts
+++ b/shared/db/GVGTeam.ts
@@ -248,7 +248,7 @@ 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 } }, { 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, lockTeamCode: teamCode } }, { new: true }).lean();
         return team;
     }
 
@@ -266,7 +266,7 @@ export default class GVGTeam extends BaseModel {
 
     // 结算挑战方
     public static async battleEndAttack(teamCode: string, hpInc: number, rebirthAreaId: number, reviveCd: number) {
-        let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $inc: { durability: hpInc } }, { new: true }).lean();
+        let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ teamCode }, { $inc: { durability: hpInc }, $set: { lockTime: 0, lockTeamCode: '' } }, { new: true }).lean();
         if(team.durability <= 0) {
             let originPointId = team.pointId;
             team = await GVGTeamModel.teamBreak(teamCode, team.isRobot, team.maxDurability, rebirthAreaId, team.areaId, reviveCd);
diff --git a/shared/pubUtils/dicParam.ts b/shared/pubUtils/dicParam.ts
index b5e027a9d..5dbb7bad3 100644
--- a/shared/pubUtils/dicParam.ts
+++ b/shared/pubUtils/dicParam.ts
@@ -420,7 +420,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: 20, // 激战期战斗锁定时长，用于玩家退出时获取不到数据的情况
+  GVG_DEFAULT_BATTLE_CD: 25, // 激战期战斗锁定时长，用于玩家退出时获取不到数据的情况
 };
 export const PLATFORM_CONFIG = {
   OPEN_ANIMATION: 1, // 0关，1开（开场动画视频）