军团活动：粮草先行部分计算逻辑

shared/pubUtils/data.ts

@@ -65,6 +65,10 @@ import { getCutDay } from "./timeUtil";
 import { dicCityActivity } from "./dictionary/DicCityActivity";
 import { dicChatAccuse } from "./dictionary/DicChatAccuse";
 import { dicCityActivityReward } from "./dictionary/DicCityActivityReward";
+import { dicRaceActivity, dicRaceTypes } from './dictionary/DicRaceActivity';
+import { GUILDACTIVITY } from "./dicParam";
+import { decodeIdCntArrayStr } from "./util";
+import { GUILD_SELECT, RACE_EVENT_TYPE } from "../consts";
 
 export const gameData = {
     blurprtCompose: dicBlueprtCompose,
@@ -152,7 +156,10 @@ export const gameData = {
     guildAuction: dicGuildAuction,
     cityActivity: dicCityActivity,
     chatAccuse: dicChatAccuse,
-    cityActivityReward: dicCityActivityReward
+    cityActivityReward: dicCityActivityReward,
+    raceActivityEvents: dicRaceActivity,
+    raceTypes: dicRaceTypes,
+    raceActivityEncounter: decodeRaceActivityEncounter(),
 };
 
 // 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据
@@ -490,4 +497,16 @@ export function getCityActivityRewards(type: number, guildRank: number, rank: nu
         return cur.guildRank == guildRank && (rank >= cur.min && (rank <= cur.max || cur.max == 0));
     });
     return dic?dic.honour: 0;
+}
+
+function decodeRaceActivityEncounter() {
+    let str = GUILDACTIVITY.RACEACTIVITY_ENCOUNTER;
+    let map = decodeIdCntArrayStr(str, 1);
+    let newMap = new Map<number, number>();
+    let eventNum = 0;
+    for(let [key, value] of map) {
+        if(value == RACE_EVENT_TYPE.EVENT) eventNum ++;
+        newMap.set(parseInt(key), parseInt(value));
+    }
+    return { events: newMap, eventNum };
 }