军团活动：修复粮草先行

shared/pubUtils/data.ts

@@ -161,7 +161,7 @@ export const gameData = {
     raceTypes: dicRaceTypes,
     raceActivityEncounter: decodeRaceActivityEncounter(),
     raceNormalItems: decodeRaceNormalItems(),
-    raceEventItems: parseGoodStr(GUILDACTIVITY.RACEACTIVITY_EVENT_ITEMS||"")
+    raceEventItems: decodeRaceEventItems()
 };
 
 // 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据
@@ -528,11 +528,16 @@ function decodeRaceNormalItems() {
     return result
 }
 
+function decodeRaceEventItems() {
+    let str = GUILDACTIVITY.RACEACTIVITY_EVENT_ITEMS||"";
+    return parseGoodStr(str);
+}
+
 export function getRaceEventItems() {
     let items = gameData.raceNormalItems;
     let result = new Array<RewardInter>();
     for(let {id, min, max} of items) {
-        let count = getRandValueByMinMax(min, max);
+        let count = getRandValueByMinMax(min, max, 0);
         result.push({ id, count });
     }
     return result;

shared/pubUtils/dicParam.ts

@@ -114,3 +114,8 @@ export const GUILD_AUCTION = {
 export const BROWSER_DEBUG = {
   UNLIMITED_MOVEMENT: 0, // 无限行动
 };
+export const SHOP = {
+  HERO_SOUL_BULE: 1000, // 蓝将回收军功
+  HERO_SOUL_PURPLE: 5000, // 紫将回收军功
+  HERO_SOUL_GOLDEN: 10000, // 金将回收军功
+};

shared/pubUtils/dictionary/DicGuildActivity.ts

@@ -15,6 +15,8 @@ export interface DicGuildActivity {
     // 开启时间 几点
     startMinute: number;
     // 开始倒计时 几点
+    startSeconds: number;
+    // 开始倒计时 几点
     readonly countDown: number;
     // 对应关卡id
     readonly warid: number;
@@ -30,7 +32,10 @@ export const dicGuildActivity = new Map<number, DicGuildActivity>();
 
 arr.forEach(o => {
     o.openDay = parseNumberList(o.openDay);
-    if(!o.startMinute) o.startMinute = 0;
+    let time = o.startTime.split(':');
+    o.startTime = parseInt(time[0]);
+    o.startMinute = parseInt(time[1]);
+    o.startSeconds = parseInt(time[2]);
     dicGuildActivity.set( o.id, o );
 });
 arr = undefined;

shared/pubUtils/timeUtil.ts

@@ -84,11 +84,11 @@ export function getHourPoint(hour: number) {
     return time;
 }
 
-export function getCurHourPoint(hour: number, minute: number = 0) {
+export function getCurHourPoint(hour: number, minute: number = 0, seconds: number = 0) {
     var date = new Date();
     date.setHours(hour);
     date.setMinutes(minute);
-    date.setSeconds(0);
+    date.setSeconds(seconds);
     var time = Math.floor(date.getTime() / PER_SECOND);
     return time;
 }

shared/pubUtils/util.ts

@@ -499,7 +499,7 @@ export function parseNumberList(str: string) {
     let arr = decodeArrayStr(str, '&');
     for (let g of arr) {
         if (g === "") continue;
-        res.push(parseInt(g));
+        res.push(parseFloat(g));
     }
     return res;
 }