From 0271ac726aa83abe43af42de934143b7509f9fe5 Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 24 Feb 2023 15:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=9F=8E=E6=B1=A0=E9=A9=BB=E5=AE=88=E5=92=8C=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E4=BA=BA=E5=88=B7=E6=96=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../servers/guild/handler/gvgBattleHandler.ts | 16 ++-- .../app/services/gvg/gvgBattleService.ts | 74 +++++++++++++++++-- game-server/app/services/timeTaskService.ts | 40 +++++----- shared/consts/statusCode.ts | 2 + shared/db/GVGCity.ts | 13 +++- shared/db/GVGLeague.ts | 5 ++ shared/db/GVGTeam.ts | 26 +++---- shared/pubUtils/dictionary/DicGVGAreaPoint.ts | 2 +- 8 files changed, 126 insertions(+), 52 deletions(-) diff --git a/game-server/app/servers/guild/handler/gvgBattleHandler.ts b/game-server/app/servers/guild/handler/gvgBattleHandler.ts index 73eff07ac..3e7156ccc 100644 --- a/game-server/app/servers/guild/handler/gvgBattleHandler.ts +++ b/game-server/app/servers/guild/handler/gvgBattleHandler.ts @@ -7,7 +7,7 @@ import { Application, BackendSession, ChannelService, HandlerService, pinus } fr import { resResult, genCode } from "../../../pubUtils/util"; import { GVGLeagueModel } from '../../../db/GVGLeague'; import { getGroupKey, getGVGConfig, getGVGPeriodData, getGVGServerType } from '../../../services/gvg/gvgService'; -import { redisAddBattleScore, battleEndSendMessage, calBattleScoreByCe, checkAreaIsInCity, checkGVGBattleStart, checkMoveStatus, getBattleRanksByCity, getBirthAreaOfCity, getGVGWarId, getOppHeroes, getTechKnifeHurt, getTechReviveMinus, initRobots, pushTeamMoveMessage, getGVGCitiesInfo, leaveCity, refreshTeams } from '../../../services/gvg/gvgBattleService'; +import { redisAddBattleScore, battleEndSendMessage, calBattleScoreByCe, checkAreaIsInCity, checkGVGBattleStart, checkMoveStatus, getBattleRanksByCity, getBirthAreaOfCity, getGVGWarId, getOppHeroes, getTechKnifeHurt, getTechReviveMinus, initRobots, pushTeamMoveMessage, getGVGCitiesInfo, leaveCity, refreshTeams, checkEnterCityTime } from '../../../services/gvg/gvgBattleService'; import { getGVGBattleData } from '../../../services/gvg/gvgBattleMemory'; import { GVGBattleRecModel } from '../../../db/GVGBattleRec'; import { getFightTimeByPeriod } from '../../../services/gvg/gvgFightService'; @@ -182,19 +182,21 @@ export class GVGBattleHandler { if (period != GVG_PERIOD.BATTLE) return resResult(STATUS.GVG_NOT_BATTLE_PERIOD); let groupKey = await getGroupKey(serverId); + let city = await GVGCityModel.findByCityId(configId, groupKey, cityId); let myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode); if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST); + if(!checkEnterCityTime(city, myLeague.leagueCode)) return resResult(STATUS.GVG_NOT_ENTER_CITY_TIME); + // 初始化本城池的守擂机器人 - await initRobots(configId, groupKey, cityId); + await initRobots(configId, groupKey, city||{ cityId, guardLeague: '' }); // 每赛季初自己的几支队伍恢复耐久、城市、顺便更新一下自己的玩家名、联军 let teams = await refreshTeams(configId, groupKey, roleId, roleName, guildCode, myLeague); let gvgUserData = await GVGUserDataModel.findByRole(configId, myLeague.leagueCode, roleId); let originCityId = gvgUserData?.cityId||0; // 检测是否已经在城池中，玩家不在这个城池中时进行处理 - let city: GVGCityType; if (originCityId != cityId) { let gvgUserData = await GVGUserDataModel.findByRole(configId, myLeague.leagueCode, roleId); if(gvgUserData?.cityId > 0) { // 如果leaveCity没有退出成功，玩家还遗留在上一座城中，做一下处理 @@ -213,7 +215,6 @@ export class GVGBattleHandler { teamResult.push(new MyTeamInfo(team)); continue; }; - if(!city) city = await GVGCityModel.findByCityId(configId, groupKey, cityId); let areaId = getBirthAreaOfCity(city, myLeague.leagueCode); team = await GVGTeamModel.enterCity(team.teamCode, cityId, areaId, groupKey); if(!team) continue; @@ -299,12 +300,13 @@ export class GVGBattleHandler { const { cityId, teamCode } = msg; let groupKey = await getGroupKey(serverId); + let { configId } = getGVGPeriodData(); let myTeam = await GVGTeamModel.findMyTeamByCode(roleId, teamCode); if(!myTeam) return resResult(STATUS.GVG_TEAM_NOT_FOUND); if(myTeam.cityId != cityId) return resResult(STATUS.GVG_BATTLE_IS_NOT_IN_CITY); - let teams = await GVGTeamModel.findByAreaId(groupKey, cityId, myTeam.areaId); + let teams = await GVGTeamModel.findByAreaId(configId, groupKey, cityId, myTeam.areaId); let points: GVGTeamInListOnPoint[] = [], players: GVGTeamInList[] = []; let pointIds = gameData.gvgPointByAreaId.get(myTeam.areaId)||[]; for(let pointId of pointIds) { @@ -439,6 +441,8 @@ export class GVGBattleHandler { let { configId, period } = getGVGPeriodData(); if (period != GVG_PERIOD.BATTLE) return resResult(STATUS.GVG_NOT_BATTLE_PERIOD); + let { startFightTime } = getFightTimeByPeriod(period); + if(startFightTime > nowSeconds()) return resResult(STATUS.GVG_NOT_BATTLE_TIME); let groupKey = await getGroupKey(serverId); @@ -636,7 +640,7 @@ export class GVGBattleHandler { let groupKey = await getGroupKey(serverId); let serverType = await getGVGServerType(serverId); - const cities = await GVGCityModel.findByConfig(configId, groupKey); + const cities = await GVGCityModel.findByConfigAndGroup(configId, groupKey); const points = await GVGCityAreaPointModel.findByConfig(configId, groupKey); let result: { cityId: number, guardLeagueName: string, areas: { areaId: number, points: { pointId: number, guardLeagueName: string }[] }[] }[] = []; diff --git a/game-server/app/services/gvg/gvgBattleService.ts b/game-server/app/services/gvg/gvgBattleService.ts index 524307efb..fd40f8aa3 100644 --- a/game-server/app/services/gvg/gvgBattleService.ts +++ b/game-server/app/services/gvg/gvgBattleService.ts @@ -3,7 +3,7 @@ import { GVGLeagueModel, GVGLeagueType } from "../../db/GVGLeague"; import { GVGTeamModel, GVGTeamType, GVGTeamUpdate } from "../../db/GVGTeam"; import { GVGCityModel, GVGCityType } from "../../db/GVGCity"; import { gameData, getGVGBattleRankReward } from "../../pubUtils/data"; -import { GVG_AREA_TYPE, GVG_BATTLE_RANK_TYPE, GVG_TECH_TYPE, MAIL_TYPE, PUSH_ROUTE, REDIS_KEY, STATUS } from "../../consts"; +import { GVG_AREA_TYPE, GVG_BATTLE_RANK_TYPE, GVG_PERIOD, GVG_TECH_TYPE, MAIL_TYPE, PUSH_ROUTE, REDIS_KEY, STATUS } from "../../consts"; import { getTimeFun, nowSeconds } from "../../pubUtils/timeUtil"; import { DicGVGAreaPoint } from "../../pubUtils/dictionary/DicGVGAreaPoint"; import { getGVGBattleData, getGVGBattleMap } from "./gvgBattleMemory"; @@ -23,6 +23,7 @@ import { GVGCityAreaPointModel } from "../../db/GVGCityAreaPoint"; import { addCityGuardMessage } from "./gvgRecService"; import { GVGUserDataModel } from "../../db/GVGUserData"; import { RoleModel } from "../../db/Role"; +import { getFightTimeByPeriod } from "./gvgFightService"; /** * 获取本联军上周占领的城池 @@ -67,12 +68,33 @@ export function getGVGTeamMemInfo(team: GVGTeamType): GVGTeamMem { return teamMem; } +/** + * 获取 重新进入城池/复活 所在的区域 + * @param city GVGCity + * @param leagueCode 联军id + * @returns + */ export function getBirthAreaOfCity(city: GVGCityType, leagueCode: string) { let isGuard = city.guardLeague == leagueCode; let dicGVGCity = gameData.gvgCity.get(city.cityId); return isGuard? dicGVGCity.defenseBirth: dicGVGCity.attackBirth; } +/** + * 玩家是否可以进入城池 + * @param city + * @param leagueCode + * @returns + */ +export function checkEnterCityTime(city: GVGCityType, leagueCode: string) { + let isGuard = city?.guardLeague == leagueCode; + let { startFightTime, endFightTime } = getFightTimeByPeriod(GVG_PERIOD.BATTLE); + if(isGuard && startFightTime - GVG.GVG_GUARD_START_TIME > nowSeconds()) return false; + if(!isGuard && startFightTime > nowSeconds()) return false; + if(endFightTime < nowSeconds()) return false; + return true +} + // guild.gvgBattleHandler.startMove 检测 export function checkMoveStatus(team: GVGTeamType, cityId: number, areaId: number) { if(!team) return STATUS.GVG_BATTLE_TEAM_NOT_FOUND; @@ -86,7 +108,9 @@ export function checkMoveStatus(team: GVGTeamType, cityId: number, areaId: numbe return STATUS.SUCCESS; } -export async function initRobots(configId: number, groupKey: string, cityId: number) { +export async function initRobots(configId: number, groupKey: string, city: GVGCityType | { cityId: number, guardLeague: string }) { + let { cityId, guardLeague = '' } = city; + if(guardLeague) return []; let robotTeams = await GVGTeamModel.findRobotTeams(groupKey, cityId); let updateDicPoints: DicGVGAreaPoint[] = []; let { areaIds = []} = gameData.gvgCity.get(cityId); @@ -138,6 +162,16 @@ export async function refreshTeams(configId: number, groupKey: string, roleId: s return teams } +/** + * 离开城池 + * 当玩家占领据点的时候，可以保留据点；不占领的时候，不保留；退出游戏的时候，全不保留 + * @param isForce 是否是玩家关闭游戏的那种离开 + * @param roleId + * @param serverId + * @param guildCode + * @param myLeague + * @returns + */ export async function leaveCity(isForce: boolean, roleId: string, serverId: number, guildCode: string, myLeague?: GVGLeagueType) { if(!myLeague) myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode); if(!myLeague) return; @@ -388,6 +422,7 @@ export async function gvgBattleSeconds() { } export async function gvgBattleEnd() { + console.log('######### gvgBattleEnd #######') let { configId } = getGVGConfig(); let guardLeagueCnt = new Map(); @@ -397,6 +432,11 @@ export async function gvgBattleEnd() { let [,, groupKey, _cityId] = key.split(':'); return { groupKey, cityId: parseInt(_cityId) }; }).sort((a, b) => b.cityId - a.cityId); + let lastCities = await GVGCityModel.findByConfig(configId); + for(let { cityId, groupKey } of lastCities) { + let hasKey = rankKeys.find(cur => cur.cityId == cityId && cur.groupKey == groupKey); + if(!hasKey) rankKeys.push({ cityId, groupKey }); + } for(let { groupKey, cityId } of rankKeys) { let dicCity = gameData.gvgCity.get(cityId); @@ -409,15 +449,25 @@ export async function gvgBattleEnd() { let rankInfo = obj; let cnt = guardLeagueCnt.get(rankInfo.code)||0; if(cnt < GVG.GVG_CITY_OCCUPIED_NUMBER) { - await GVGCityModel.guardCity(configId, groupKey, cityId, rankInfo); - let dicCityAdd = gameData.gvgCityAdd.get(dicCity.cityType); - let league = await GVGLeagueModel.findByCodeWithoutPopulate(rankInfo.code); - await sendMailToLeagueByContent(MAIL_TYPE.GVG_GUARD_CITY_REWARD, rankInfo.code, { params: [dicCity.cityName], goods: dicCityAdd.occupyReward }, league); - await addCityGuardMessage(league, cityId); + await addGuardCity(configId, groupKey, cityId, rankInfo.code); guardLeagueCnt.set(rankInfo.code, cnt + 1); break; } } + + let guardCity = lastCities.find(city => city.cityId == cityId && city.groupKey == groupKey); + if(guardCity) { + let cnt = guardLeagueCnt.get(guardCity.guardLeague)||0; + if(cnt < GVG.GVG_CITY_OCCUPIED_NUMBER) { + await addGuardCity(configId, groupKey, cityId, guardCity.guardLeague); + guardLeagueCnt.set(guardCity.guardLeague, cnt + 1); + } + } + } + for(let { cityId, groupKey, guardLeague } of lastCities) { + let hasKey = rankKeys.find(cur => cur.cityId == cityId && cur.groupKey == groupKey); + if(hasKey) continue; + await addGuardCity(configId, groupKey, cityId, guardLeague); } // 联军排行榜发放奖励 @@ -450,6 +500,16 @@ export async function gvgBattleEnd() { } +async function addGuardCity(configId: number, groupKey: string, cityId: number, leagueCode: string) { + let dicCity = gameData.gvgCity.get(cityId); + let dicCityAdd = gameData.gvgCityAdd.get(dicCity.cityType); + let league = await GVGLeagueModel.findByCodeWithoutPopulate(leagueCode); + await GVGCityModel.guardCity(configId, groupKey, cityId, league); + await sendMailToLeagueByContent(MAIL_TYPE.GVG_GUARD_CITY_REWARD, leagueCode, { params: [dicCity.cityName], goods: dicCityAdd.occupyReward }, league); + await addCityGuardMessage(league, cityId); + await GVGLeagueModel.removeAuto(leagueCode); +} + // —————————— 定时器相关 end —————————— // // —————————— 推送相关 —————————— // diff --git a/game-server/app/services/timeTaskService.ts b/game-server/app/services/timeTaskService.ts index d7d39e1bb..cac9fe3b2 100644 --- a/game-server/app/services/timeTaskService.ts +++ b/game-server/app/services/timeTaskService.ts @@ -899,57 +899,59 @@ export async function initHiddenDataSchedule(isInit: boolean, data?: HiddenDataM // —————————————— 配表兼容 end —————————————— // // —————————————— gvg start —————————————— // +let gvgBattleSecondJob: Job; // gvg每5秒的定时器 +let gvgBattleCatapultJob: Job; // gvg投石车定时器 + export async function initGVGConfigSchedule() { let config = await GVGConfigModel.findConfig(); if(!config || nowSeconds() > config.scheduleTime) { config = await createNewGVGConfig(); } + if(scheduledJobs[`gvgTeam`]) scheduledJobs[`gvgTeam`].cancel(); scheduleJob(`gvgTeam`, config.teamTime * 1000, async () => { await pinus.app.rpc.guild.guildRemote.setGVGConfig.broadcast(config); }) + if(scheduledJobs[`gvgConfig`]) scheduledJobs[`gvgConfig`].cancel(); scheduleJob(`gvgConfig`, config.scheduleTime * 1000, createNewGVGConfig); if(nowSeconds() > config.prepareTime) { initLeaguePrepare(); } else { + if(scheduledJobs[`gvgPrepare`]) scheduledJobs[`gvgPrepare`].cancel(); scheduleJob(`gvgPrepare`, config.prepareTime * 1000, initLeaguePrepare); } - scheduleJob('gvgFightSchedule', '0 0 22 * * ?', saveVestigeRankSchedule); + if(scheduledJobs[`gvgFight`]) scheduledJobs[`gvgFight`].cancel(); + scheduleJob(`gvgFight`, '0 0 22 * * ?', saveVestigeRankSchedule); let { startFightTime, endFightTime } = getFightTimeByPeriod(GVG_PERIOD.BATTLE, config.battleTime); - if(nowSeconds() > startFightTime && nowSeconds() < endFightTime) { + if(nowSeconds() > startFightTime - GVG.GVG_GUARD_START_TIME && nowSeconds() < endFightTime) { if(gvgBattleSecondJob) gvgBattleSecondJob.cancel(); - gvgBattleSecondJob = scheduleJob('gvgBattleSecondJob', '*/5 * * * * *', gvgBattleSecondSchedule); + gvgBattleSecondJob = scheduleJob('gvgBattleSecond', '*/5 * * * * *', gvgBattleSecondSchedule); if(gvgBattleCatapultJob) gvgBattleCatapultJob.cancel(); - gvgBattleCatapultJob = scheduleJob('gvgBattleCatapultJob', `*/${GVG.GVG_CATAPULT_TIME} * * * * *`, gvgBattleCatapult); + gvgBattleCatapultJob = scheduleJob('gvgBattleCatapult', `*/${GVG.GVG_CATAPULT_TIME} * * * * *`, gvgBattleCatapult); } else { scheduleJob(`gvgBattleStartSchedule`, (startFightTime - GVG.GVG_GUARD_START_TIME) * 1000, gvgBattleStartSchedule); } + if(scheduledJobs[`gvgBattleEndSchedule`]) scheduledJobs[`gvgBattleEndSchedule`].cancel(); scheduleJob(`gvgBattleEndSchedule`, endFightTime * 1000, gvgBattleEndSchedule); } -let gvgBattleSecondJob: Job; // gvg每5秒的定时器 -let gvgBattleCatapultJob: Job; // gvg投石车定时器 - // gvg激战期开始定时器 export async function gvgBattleStartSchedule() { + console.log('##### gvgBattleStartSchedule', Date.now()) if(gvgBattleSecondJob) gvgBattleSecondJob.cancel(); - gvgBattleSecondJob = scheduleJob('gvgBattleSecondJob', '*/5 * * * * *', gvgBattleSecondSchedule); + gvgBattleSecondJob = scheduleJob('gvgBattleSecond', '*/5 * * * * *', gvgBattleSecondSchedule); - setTimeout(async () => { - console.log('############') - if(gvgBattleCatapultJob) gvgBattleCatapultJob.cancel(); - gvgBattleCatapultJob = scheduleJob('gvgBattleCatapultJob', `*/${GVG.GVG_CATAPULT_TIME} * * * * *`, gvgBattleCatapult); - // 初始化投石车 - let guildServers = pinus.app.getServersByType('guild'); - if(guildServers.length > 0) { - pinus.app.rpc.guild.guildRemote.gvgBattleStart.toServer(getRandSingleEelm(guildServers).id); - } - - }, 60); + // 初始化投石车 + let guildServers = pinus.app.getServersByType('guild'); + if(guildServers.length > 0) { + pinus.app.rpc.guild.guildRemote.gvgBattleStart.toServer(getRandSingleEelm(guildServers).id); + } + if(gvgBattleCatapultJob) gvgBattleCatapultJob.cancel(); + gvgBattleCatapultJob = scheduleJob('gvgBattleCatapult', `*/${GVG.GVG_CATAPULT_TIME} * * * * *`, gvgBattleCatapult); } diff --git a/shared/consts/statusCode.ts b/shared/consts/statusCode.ts index 0ea11d586..c0ff90191 100644 --- a/shared/consts/statusCode.ts +++ b/shared/consts/statusCode.ts @@ -345,6 +345,8 @@ export const STATUS = { GVG_NOT_BATTLE_PERIOD: { code: 21339, simStr: '您只能在激战期进行此操作' }, GVG_FIELD_HAS_PLANT: { code: 21340, simStr: '该田已种植' }, GVG_NOT_JOIN_LEAGUE: { code: 21341, simStr: '您未加入联军' }, + GVG_NOT_ENTER_CITY_TIME: { code: 21342, simStr: '您此时不可进入城池' }, + GVG_NOT_BATTLE_TIME: { code: 21343, simStr: '您此时只能进驻据点不可挑战' }, // GVG征战中原 GVG_VESTIGE_ERR: { code: 21350, simStr: '今日未开放该遗迹' }, diff --git a/shared/db/GVGCity.ts b/shared/db/GVGCity.ts index 4d5636956..7a078a753 100644 --- a/shared/db/GVGCity.ts +++ b/shared/db/GVGCity.ts @@ -1,6 +1,6 @@ import BaseModel from "./BaseModel"; import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose'; -import { LeagueRankInfo } from "../domain/rank"; +import { GVGLeagueType } from "./GVGLeague"; class Player { @prop({ required: true }) @@ -96,17 +96,22 @@ export default class GVGCity extends BaseModel { } // 占领城池 - public static async guardCity(configId: number, groupKey: string, cityId: number, league: LeagueRankInfo) { + public static async guardCity(configId: number, groupKey: string, cityId: number, league: GVGLeagueType) { const city: GVGCityType = await GVGCityModel.findOneAndUpdate({ configId: configId + 1, cityId, groupKey }, { $set: { - hasGuard: true, guardLeague: league.code, guardLeagueName: league.name, guardLeagueIcon: league.icon + hasGuard: true, guardLeague: league.leagueCode, guardLeagueName: league.name, guardLeagueIcon: league.icon }, $setOnInsert: { userCnt: 0, players: [] } }, { upsert: true, new: true }).lean(); return city; } - public static async findByConfig(configId: number, groupKey: string) { + public static async findByConfigAndGroup(configId: number, groupKey: string) { const cities: GVGCityType[] = await GVGCityModel.find({ configId, groupKey, hasGuard: true }).lean(); return cities } + + public static async findByConfig(configId: number) { + const cities: GVGCityType[] = await GVGCityModel.find({ configId, hasGuard: true }).lean(); + return cities + } } diff --git a/shared/db/GVGLeague.ts b/shared/db/GVGLeague.ts index cf6c15536..cda64a91e 100644 --- a/shared/db/GVGLeague.ts +++ b/shared/db/GVGLeague.ts @@ -199,6 +199,11 @@ export default class GVGLeague extends BaseModel { let leagues: GVGLeagueType[] = await GVGLeagueModel.find({ isAuto: true, status: 1 }).lean(); return leagues } + + public static async removeAuto(leagueCode: string) { + let league: GVGLeagueType = await GVGLeagueModel.findOneAndUpdate({ leagueCode }, { $set: { isAuto: false } }).lean(); + return league + } } export const GVGLeagueModel = getModelForClass(GVGLeague); diff --git a/shared/db/GVGTeam.ts b/shared/db/GVGTeam.ts index b2c592024..e1551a7ca 100644 --- a/shared/db/GVGTeam.ts +++ b/shared/db/GVGTeam.ts @@ -212,19 +212,15 @@ export default class GVGTeam extends BaseModel { // 每赛季初刷新机器人 public static async initRobots(configId: number, groupKey: string, cityId: number, dicPoints: DicGVGAreaPoint[], lv: number) { - await GVGTeamModel.bulkWrite(dicPoints.map(({ pointId, areaId, name, head, spine, ce, durability }) => { - return { - updateOne: { - filter: { groupKey, cityId, areaId, pointId }, - update: { $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, - }, $set: { configId, durability } }, - upsert: true - } - } - })); - return await this.findRobotTeams(groupKey, cityId); + let teams: GVGTeamType[] = []; + for(let { pointId, areaId, name, head, spine, ce, durability } of dicPoints) { + let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ 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, + }, $set: { configId, durability } + }, { new: true, upsert: true }).lean(); + teams.push(team); + } + return teams; } public static async findCatapultTeams(groupKey: string, cityId: number) { @@ -304,8 +300,8 @@ export default class GVGTeam extends BaseModel { } } - public static async findByAreaId(groupKey: string, cityId: number, areaId: number) { - const team: GVGTeamType[] = await GVGTeamModel.find({ groupKey, cityId, areaId, stopMoveTime: { $lte: nowSeconds() }, isBroken: false }).lean(); + public static async findByAreaId(configId: number, groupKey: string, cityId: number, areaId: number) { + const team: GVGTeamType[] = await GVGTeamModel.find({ configId, groupKey, cityId, areaId, stopMoveTime: { $lte: nowSeconds() }, isBroken: false }).lean(); return team; } diff --git a/shared/pubUtils/dictionary/DicGVGAreaPoint.ts b/shared/pubUtils/dictionary/DicGVGAreaPoint.ts index 20af05614..e578f1c28 100644 --- a/shared/pubUtils/dictionary/DicGVGAreaPoint.ts +++ b/shared/pubUtils/dictionary/DicGVGAreaPoint.ts @@ -12,7 +12,7 @@ export interface DicGVGAreaPoint { // 位置 readonly pointPosition: string; // 守卫名 - readonly name: number; + readonly name: string; // 守卫头像 readonly head: number; // 守卫形象