军团活动：修复粮草先行重启问题，诸侯混战宣战问题

game-server/app/servers/guild/handler/cityActivityHandler.ts

@@ -1,6 +1,6 @@
 import { Application, ChannelService, BackendSession, pinus, HandlerService, } from "pinus";
 import { GUILD_ACTIVITY_TYPE, STATUS, REDIS_KEY, CITY_STATUS, TASK_TYPE, ITEM_CHANGE_REASON, PUSH_ROUTE, GUILD_ACTIVITY_STATUS } from "../../../consts";
-import { resResult } from "../../../pubUtils/util";
+import { genCode, resResult } from "../../../pubUtils/util";
 import { getGuildActivityStatus, getCityActivityObj, getCityStatus as pubGetCityStatus, getCities, getCityActivityRank, sendSingleCityActEndMsg, declareCity, autoDeclareMyCity, getGAIndexInPinus, getDeclareIndex } from "../../../services/guildActivity/guildActivityService";
 import { GuildActivityCityModel } from "../../../db/GuildActivityCity";
 import { gameData } from "../../../pubUtils/data";
@@ -18,6 +18,7 @@ import { ServerRecordModel } from "../../../db/ServerRecords";
 import { sendMessageToCityWithSuc } from "../../../services/pushService";
 import { isDebugTime } from "../../../pubUtils/sdkUtil";
 import { GuildActivityCityDeclareModel } from "../../../db/GuildActivityCityDeclare";
+import { GuildModel } from "../../../db/Guild";
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -353,4 +354,53 @@ export class CityActivityHandler {
             challengeTime: myGuildActivityRec.challengeTime
         });
     }
+
+    async debugTestAutoDeclare(msg: {  }, session: BackendSession) {
+        let serverId = session.get('serverId');
+        let roleId = session.get('roleId');
+        let guildCode = session.get('guildCode');
+        let declareIndex = getDeclareIndex();
+        for(let i = 0; i < 1000; i++) {
+            autoDeclareMyCity(serverId, roleId, guildCode, declareIndex);
+        }
+        return resResult(STATUS.SUCCESS)
+    }
+
+    private interval: NodeJS.Timer;
+    async debugStartHitGate(msg: { param: number  }, session: BackendSession) {
+        const roleId = session.get('roleId');
+        const serverId = session.get('serverId');
+        let { param = 1000 } = msg;
+
+
+        let statusResult = getGuildActivityStatus(this.aid);
+        if (!statusResult) return resResult(STATUS.DIC_DATA_NOT_FOUND);
+        if(!statusResult.isOpen) return resResult(STATUS.GUILD_ACTIVITY_NOT_OPEN);
+        if(statusResult.status != GUILD_ACTIVITY_STATUS.START) return resResult(STATUS.GUILD_ACTIVITY_NOT_OPEN);
+
+        if(this.interval) {
+            clearInterval(this.interval);
+        }
+
+        let fun = async () => {
+            for(let [cityId] of gameData.cityActivity) {
+                let guilds = pinus.app.getServersByType('guild');
+                let guild = dispatch(`${cityId}`, guilds);
+                await pinus.app.rpc.guild.guildActivityRemote.debugSendGateHp.toServer(guild.id, serverId, cityId);
+            }
+            await pinus.app.rpc.guild.guildActivityRemote.sendRankToGuilds.broadcast(this.aid);
+        };
+        await fun();
+        this.interval = setInterval(fun, param)
+        return resResult(STATUS.SUCCESS)
+    }
+
+    async debugStopHitGate(msg: { magicWord: string }, session: BackendSession) {
+        
+        if(this.interval) {
+            clearInterval(this.interval);
+        }
+
+        return resResult(STATUS.SUCCESS);
+    }
 }