军团活动：修复活动结束信号发送bug

shared/domain/battleField/guildActivity.ts

@@ -202,6 +202,22 @@ export class CityActivityObject {
     }
 }
 
+
+// 军团诸侯混战等数据
+export class RaceActivityObject {
+    private members: Map<string, Array<Member>> = new Map(); // 每个军团参与的成员 guildCode => [{roleId, job}]
+    private woodenHorses: Map<string, WoodenHorse> = new Map(); // 每个军团的木牛流马 guildCode => WoodenHorse
+    private events: Map<string, Event[]> = new Map(); // 每个军团遇到的事件
+
+    getWoodenHorse(guildCode: string) {
+        if(!this.woodenHorses.has(guildCode)) {
+            // this.woodenHorses.set(guildCode, )
+        }
+        let wh = this.woodenHorses.get(guildCode);
+
+    }
+}
+
 class WoodenHorseMember {
     roleId: string;
     roleName: string;
@@ -248,13 +264,13 @@ export class WoodenHorse {
 
 export class Event {
     id: number;
-    timestamp: number;
     fromGuild: string;
     toGuild: string;
-    startDistance: number;
-    effect: number[];
+    startTime?: number;
+    startDistance?: number;
     endTimestamp?: number;
     endDistance?: number;
+    effect: number[];
 }
 
 export interface GuildGateRankParam {

shared/pubUtils/dictionary/DicGuildActivity.ts

@@ -29,7 +29,8 @@ let arr = JSON.parse(str);
 export const dicGuildActivity = new Map<number, DicGuildActivity>();
 
 arr.forEach(o => {
-    o.openDay = parseNumberList(o.openDay)
+    o.openDay = parseNumberList(o.openDay);
+    if(!o.startMinute) o.startMinute = 0;
     dicGuildActivity.set( o.id, o );
 });
 arr = undefined;

shared/resource/jsons/dic_zyz_guildActivity.json

@@ -2,10 +2,10 @@
     {
         "id": 1,
         "name": "蛮夷入侵",
-        "openDay": "3&0",
+        "openDay": "4",
         "duringTime": 900,
-        "startTime": 20,
-        "startMinute": 0,
+        "startTime": 15,
+        "startMinute": 15,
         "countDown": 5,
         "warid": 7001,
         "honour": 500
@@ -13,10 +13,10 @@
     {
         "id": 2,
         "name": "诸侯混战",
-        "openDay": "2&4&6",
+        "openDay": "2&6",
         "duringTime": 900,
-        "startTime": 20,
-        "startMinute": 0,
+        "startTime": 11,
+        "startMinute": 48,
         "countDown": 5,
         "warid": 7002,
         "honour": 500
@@ -26,8 +26,8 @@
         "name": "粮草先行",
         "openDay": "1&5",
         "duringTime": 600,
-        "startTime": 20,
-        "startMinute": 0,
+        "startTime": 11,
+        "startMinute": 48,
         "countDown": 5,
         "warid": 0,
         "honour": 200

shared/resource/warJsons/7001.json

@@ -387,7 +387,7 @@
         "star": 0,
         "spine": 0,
         "bossStage": 0,
-        "enemyType": 2,
+        "enemyType": 6,
         "dest_oppo": 1001
     },
     {
@@ -422,7 +422,7 @@
         "outIndex": 11,
         "dirction": 1,
         "x": 11,
-        "y": 2,
+        "y": 3,
         "var": 1512,
         "lv": 30,
         "hide": 1,
@@ -433,7 +433,7 @@
         "star": 0,
         "spine": 0,
         "bossStage": 0,
-        "enemyType": 2,
+        "enemyType": 6,
         "dest_oppo": 1001
     },
     {
@@ -537,7 +537,7 @@
         "outIndex": 4,
         "dirction": 1,
         "x": 10,
-        "y": 2,
+        "y": 3,
         "var": 1517,
         "lv": 30,
         "hide": 1,
@@ -560,7 +560,7 @@
         "outIndex": 5,
         "dirction": 1,
         "x": 11,
-        "y": 2,
+        "y": 3,
         "var": 1518,
         "lv": 30,
         "hide": 1,