军团活动：修复粮草先行

game-server/app/services/timeTaskService.ts

@@ -20,7 +20,7 @@ import { STATUS } from '../consts/statusCode';
 import { getMailContent, sendMail } from './mailService';
 import { reportOnline } from '../pubUtils/httpUtil';
 import { UserModel } from '../db/User';
-import { getGuildActivityByDic, setMedianCe, sendEndMsgToAll } from './guildActivityService';
+import { getGuildActivityByDic, setMedianCe, sendEndMsgToAll, autoDeclare } from './guildActivityService';
 import { sendUngotDividendJob, startGuildAuction, startWorldAuction, stopAuction } from './auctionService';
 import { DicGuildActivity } from '../pubUtils/dictionary/DicGuildActivity';
 import { GuildModel } from '../db/Guild';
@@ -357,8 +357,7 @@ async function guildActivitySchedule() {
     }
     await delGuildActivityRank(dicGuildActivity.id, map);
 
-
-    scheduleJob('guildActivityStart', `0 ${dicGuildActivity.startMinute} ${dicGuildActivity.startTime} * * ?`, guildActivityStartSchedule);
+    scheduleJob('guildActivityStart', `${dicGuildActivity.startSeconds} ${dicGuildActivity.startMinute} ${dicGuildActivity.startTime} * * ?`, guildActivityStartSchedule);
 
     let statusResult = getGuildActivityByDic(dicGuildActivity);
     if(!statusResult) return;
@@ -466,6 +465,11 @@ export async function cityActivityEnd() {
         await pinus.app.rpc.guild.guildActivityRemote.guildActivityEnd.toServer(id, GUILD_ACTIVITY_TYPE.CITY_ACTIVITY);
     }
 
+    // 发完之后再做下周自动宣战
+    let serverlists = await getAllServers();
+    for(let serverId of serverlists) {
+        await autoDeclare(serverId);
+    }
     if(guildActSecondsJobId) {
         guildActSecondsJobId.cancel();
         guildActSecondsJobId = undefined;