军团活动：修复蛮夷入侵结束后城门血条恢复bug

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

@@ -2,8 +2,6 @@ import { Application, BackendSession, ChannelService, pinus } from "pinus";
 import { getMedianCe, getGuildActivityStatus, getRecordScore, getGateActivityObj, sendSingleGateActEndMsg, participants, getGateActivityRank, getCityActivityObj } from "../../../services/guildActivityService";
 import { resResult } from "../../../pubUtils/util";
 import { STATUS, GUILD_ACTIVITY_TYPE, GUILD_POINT_WAYS, ENEMIES_TYPE, GET_POINT_WAYS } from "../../../consts";
-import { GameModel } from "../../../db/Game";
-import { ServerlistModel } from "../../../db/Serverlist";
 import { UserGuildActivityRecModel } from "../../../db/UserGuildActivityRec";
 import { GUILDACTIVITY } from "../../../pubUtils/dicParam";
 import { GuildActivityRecordModel } from "../../../db/GuildActivityRec";
@@ -17,7 +15,6 @@ import { gameData } from "../../../pubUtils/data";
 import { getGuildChannelSid } from "../../../services/chatService";
 import { guildActivityStart, gateActivityEnd, cityActivityEnd } from "../../../services/timeTaskService";
 import { UserGuildModel } from "../../../db/UserGuild";
-import { GuildActivityCityModel } from "../../../db/GuildActivityCity";
 
 export default function (app: Application) {
     return new GateActivityHandler(app);
@@ -301,7 +298,10 @@ export class GateActivityHandler {
     async debugStartActivity(msg: { aid: number }, session: BackendSession) {
         let { aid } = msg;
         let dic = gameData.guildActivity.get(aid);
-        await guildActivityStart(dic);
+        let result = await guildActivityStart(dic);
+        if(!result) {
+            return resResult(STATUS.GUILD_ACTIVITY_IS_OPEN)
+        }
 
         let map = new Map<number, string[]>();
         let guilds = await GuildModel.findAllGuild('serverId code');

game-server/app/services/guildActivityService.ts

@@ -247,6 +247,7 @@ export async function sendGuildActEndMsg(aid: number) {
                 await gateActivitySettleReward(guildCode, serverId);
             }
         }
+        gateActivityObj = new GateActivityObject();
     } else if (aid == GUILD_ACTIVITY_TYPE.CITY_ACTIVITY) {
         let obj = getCityActivityObj();
         let { cities, serverlists} = obj.getAllCities();
@@ -257,6 +258,7 @@ export async function sendGuildActEndMsg(aid: number) {
         for(let serverId of serverlists) {
             await autoDeclare(serverId);
         }
+        cityActivityObj = new CityActivityObject();
     }
 }
 

game-server/app/services/timeTaskService.ts

@@ -373,6 +373,9 @@ export async function guildActivityStart(dicGuildActivity?: DicGuildActivity) {
     if(!dicGuildActivity) dicGuildActivity = getTodayGuildActivity();
     if(!dicGuildActivity) return;
 
+    if(guildActSecondsJobId||guildActEndJobId) {
+        return false
+    }
 
     if(dicGuildActivity.id == GUILD_ACTIVITY_TYPE.GATE_ACTIVITY) {
         guildActSecondsJobId = scheduleJob('guildActivitySeconds', '*/10 * * * * *', gateActivitySeconds);
@@ -385,6 +388,7 @@ export async function guildActivityStart(dicGuildActivity?: DicGuildActivity) {
     } else if (dicGuildActivity.id == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {
 
     }
+    return true;
 }
 
 // 蛮夷入侵

shared/consts/statusCode.ts

@@ -206,6 +206,7 @@ export const STATUS = {
     HAS_DECLARED: { code: 21103, simStr: '已宣战过' },
     CHALLENGE_TIME_NOT_REACH: { code: 21104, simStr: '挑战冷却中' },
     HAS_NOT_DECLARED: { code: 21105, simStr: '军团还未宣战过' },
+    GUILD_ACTIVITY_IS_OPEN: { code: 21106, simStr: '活动已开启' },
 
     // 通用 30000 - 30099
     DIC_DATA_NOT_FOUND: { code: 30000, simStr: '数据表未找到' },

shared/domain/battleField/guildActivity.ts

@@ -87,7 +87,6 @@ export class GateActivityObject {
             let index = guildList.indexOf(guildCode);
             guildList.splice(index, 1);
         }
-        this.gateHp.delete(guildCode);
         this.members.delete(guildCode);
     }
 }
@@ -199,7 +198,6 @@ export class CityActivityObject {
             this.members.delete(guildCode);
             this.guilds.delete(guildCode);
         }
-        this.gateHp.delete(key);
         this.cities.delete(key);
     }
 }