From a3ce2548cecad7e41d06f6089d9bee7d93aefaa1 Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 28 Feb 2023 16:41:54 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E4=BA=BA=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/db/GVGTeam.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shared/db/GVGTeam.ts b/shared/db/GVGTeam.ts index 2a695302d..b7573566b 100644 --- a/shared/db/GVGTeam.ts +++ b/shared/db/GVGTeam.ts @@ -214,9 +214,9 @@ export default class GVGTeam extends BaseModel { public static async initRobots(configId: number, groupKey: string, cityId: number, dicPoints: DicGVGAreaPoint[], lv: number) { let teams: GVGTeamType[] = []; for(let { pointId, areaId, name, head, spine, ce, durability } of dicPoints) { - let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ groupKey, cityId, areaId, pointId }, { + let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ configId, groupKey, cityId, areaId, pointId }, { $setOnInsert: {teamCode: genCode(8), maxDurability: durability, roleName: name, head, spine, frame: EXTERIOR.EXTERIOR_FACECASE, lineupCe: ce, isRobot: true, lv, isBroken: false, startMoveTime: 0, stopMoveTime: 0, guildCode: '', leagueCode: '', leagueName: '', fromAreaId: areaId, roleId: GVG_ROBOT, - }, $set: { configId, durability } + }, $set: { durability } }, { new: true, upsert: true }).lean(); teams.push(team); } @@ -232,11 +232,11 @@ export default class GVGTeam extends BaseModel { public static async initCatapult(configId: number, groupKey: string, cityId: number, dicPoints: DicGVGAreaPoint[], leagueCode: string, leagueName: string, atk: number, durability: number, lv: number) { const teams: GVGTeamType[] = []; for(let { pointId, areaId, name, head, spine, ce } of dicPoints) { - let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ groupKey, cityId, areaId, pointId }, { + let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ configId, groupKey, cityId, areaId, pointId }, { $setOnInsert: { teamCode: genCode(8), maxDurability: durability, roleName: name, head, spine, frame: EXTERIOR.EXTERIOR_FACECASE, lineupCe: ce, lv, leagueCode, leagueName, captapultAtk: atk, isRobot: true, isCatapult: true, isBroken: false, startMoveTime: 0, stopMoveTime: 0, guildCode: '', fromAreaId: areaId, roleId: GVG_CATAPULT, - }, $set: { configId, durability } + }, $set: { durability } }, { new: true, upsert: true }).lean(); teams.push(team); }