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

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;
 }
 
 // 蛮夷入侵