From 7b8a53d338bbc701e1b54ee157e0ba218cf0d82b Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 20 Feb 2023 20:05:36 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E5=86=9C=E5=BA=84?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=8A=A0=E6=88=90=E6=A0=BC=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/guild/handler/gvgProduceHandler.ts | 2 +- shared/db/GVGLeagueFarm.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/game-server/app/servers/guild/handler/gvgProduceHandler.ts b/game-server/app/servers/guild/handler/gvgProduceHandler.ts index 999d3884d..a69ccc864 100644 --- a/game-server/app/servers/guild/handler/gvgProduceHandler.ts +++ b/game-server/app/servers/guild/handler/gvgProduceHandler.ts @@ -233,7 +233,7 @@ export class GVGProduceHandler { // 活跃 const active = await addGVGActive(myLeague.leagueCode, roleId, GVG_ACTIVE_TYPE.COST_PRODUCE_COIN, activeSum); // 收获后再次预锁定一批田 - await lockField(myLeague.leagueCode, roleId, roleName, farmId); + // await lockField(myLeague.leagueCode, roleId, roleName, farmId); await GVGLeagueFarmRecModel.updateRecs(myResultFields, roleId); return resResult(STATUS.SUCCESS, { diff --git a/shared/db/GVGLeagueFarm.ts b/shared/db/GVGLeagueFarm.ts index d96075871..2379ab5d0 100644 --- a/shared/db/GVGLeagueFarm.ts +++ b/shared/db/GVGLeagueFarm.ts @@ -153,7 +153,7 @@ export default class GVGLeagueFarm extends BaseModel { } public static async releaseLock(configId: number, leagueCode: string, farmId: number, roleId: string) { - await GVGLeagueFarmModel.updateMany({ configId, leagueCode, farmId, lockRoleId: roleId, index: 0 }, { $set: { unlockTime: 0, lockRoleId: '', lockRoleName: '' } }); + await GVGLeagueFarmModel.updateMany({ configId, leagueCode, farmId, lockRoleId: roleId, index: 0 }, { $set: { unlockTime: 0, lockRoleId: '', lockRoleName: '', addType: 0 }, $pull: { addTypes: { roleId } } }); } public static async lockMineOrForestry(configId: number, leagueCode: string, farmId: number, type: number, roleId: string, fieldId: number, itemId: number) {