diff --git a/game-server/app/services/guildActivity/guildActivityService.ts b/game-server/app/services/guildActivity/guildActivityService.ts index 2088ee30b..d9121bad7 100644 --- a/game-server/app/services/guildActivity/guildActivityService.ts +++ b/game-server/app/services/guildActivity/guildActivityService.ts @@ -456,7 +456,9 @@ export async function cityActivitySettleReward(cityId: number, serverId: number) if (guildRank == 1) { if (isSuccess) { await GuildActivityCityModel.guard(serverId, cityId, guildCode, name, index + 1); // 占领 - await declareCity(serverId, "", guildCode, dicCity.nextCity, true, index + 1); + if(getCurDay(true) != 6) { + await declareCity(serverId, "", guildCode, dicCity.nextCity, true, index + 1); + } } else { await GuildActivityCityModel.guard(serverId, cityId, "", "", index + 1); // 无人能占领 } @@ -500,7 +502,7 @@ export async function cityActivitySettleReward(cityId: number, serverId: number) } } -export async function autoDeclare(serverId: number) { +export async function autoDeclare() { for(let [ cityId ] of gameData.cityActivity) { let msg = { cityId, declareGuildCode: "", declareCount: 0 }; await sendMessageToCityWithSuc(cityId, PUSH_ROUTE.GUILD_CITY_DECLARE, msg); diff --git a/game-server/app/services/timeTaskService.ts b/game-server/app/services/timeTaskService.ts index 426c64ff3..e63c3be78 100644 --- a/game-server/app/services/timeTaskService.ts +++ b/game-server/app/services/timeTaskService.ts @@ -335,10 +335,7 @@ export async function cityActivityEnd() { await pinus.app.rpc.guild.guildActivityRemote.guildActivityEnd.broadcast(GUILD_ACTIVITY_TYPE.CITY_ACTIVITY); // 发完之后再做下周自动宣战 - let serverlists = await getAllServers(); - for (let serverId of serverlists) { - await autoDeclare(serverId); - } + await autoDeclare(); if (guildActSecondsJobId) { guildActSecondsJobId.cancel(); guildActSecondsJobId = undefined;