粮草先行：结束活动

game-server/app/services/guildActivity/guildActivityService.ts

@@ -310,6 +310,7 @@ export async function settleGuildActivityReward(aid: number) {
         }
     } else if (aid == GUILD_ACTIVITY_TYPE.RACE_ACTIVITY) {
         let obj = getRaceActivityObj();
+        obj.stopRace();
 
         for (let { guildCode, serverId } of obj.guildList) {
             let woodenHorse = await obj.getWoodenHorse(guildCode, serverId);

game-server/app/services/guildActivity/raceActivityObj.ts

@@ -162,6 +162,13 @@ export class RaceActivityObject {
         return guildCodes;
     }
 
+    public stopRace() {
+        this.status = RACE_ACTIVITY_STATUS.END;
+        for(let [_, woodenHorse] of this.woodenHorses) {
+            woodenHorse.stopRace();
+        }
+    }
+
     private woodenHorseStartRace(woodenHorse: WoodenHorse) {
         woodenHorse.startRace(this.allStartTime);
         let members = woodenHorse.members;

shared/domain/battleField/guildActivity.ts

@@ -109,6 +109,10 @@ export class WoodenHorse {
         this.allStartTime = allStartTime;
     }
 
+    public stopRace() {
+        this.status = RACE_ACTIVITY_STATUS.END;
+    }
+
     /**
      * 根据时间计算当前木马速度距离耐久等
      * @param events