试炼调试数据

shared/pubUtils/data.ts

@@ -121,7 +121,7 @@ export const gameData = {
     bossBase: dicBossBase,
     trainBase: dicTrainBase,
     donateBase: dicDonateBase,
-    wishPoolBase: dicWishPoolBase,
+    armyWishPool: dicWishPoolBase,
     storeBase: dicStoreBase,
     structureConsume: dicStructureConsume,
     guildActiveDayReward: dicGuildActiveDayReward,
@@ -133,7 +133,7 @@ export const gameData = {
     guildActiveWays: dicGuildActiveWays,
     armyDevelopConsume: dicArmyDevelopConsume,
     armyBossRank: dicArmyBossRank,
-    armyDonateBox: dicArmyDonate
+    armyDonateBox: dicArmyDonate,
 };
 
 // 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据
@@ -395,4 +395,6 @@ export function getArmyDonateBaseByLv(lv: number) {
 export function getArmyDonateBoxBaseById(id: number) {
     return gameData.armyDonateBox.get(id);
 }
-
+export function getArmyWishPoolBaseByLv(lv: number) {
+    return gameData.armyWishPool.get(lv);
+}

shared/pubUtils/dictionary/DicArmy.ts

@@ -0,0 +1,29 @@
+import { readJsonFile, parseGoodStr } from '../util'
+import { FILENAME } from '../../consts'
+type KeysEnum<T> = { [P in keyof Required<T>]: true };
+import { RewardInter } from '../interface';
+const _ = require('lodash');
+
+export interface DicArmyBossRank {
+    readonly id: number;
+    readonly rankMin: number;
+    readonly rankMax: number;
+    readonly reward: Array<RewardInter>;
+}
+
+const DicArmyBossRankKeys: KeysEnum<DicArmyBossRank> = {
+    id: true,
+    rankMin: true,
+    rankMax: true,
+    reward: true,
+};
+
+const str = readJsonFile(FILENAME.DIC_ARMY_BOSS_RANK_REWARD);
+let arr = JSON.parse(str);
+
+export const dicArmyBossRank = new Array<DicArmyBossRank>();
+arr.forEach(o => {
+    o.reward = parseGoodStr(o.reward);
+    dicArmyBossRank.push(_.pick(o, Object.keys(DicArmyBossRankKeys)));
+});
+arr = undefined;

shared/pubUtils/dictionary/DicArmyWishPool.ts

@@ -1,35 +0,0 @@
-import { readJsonFile } from '../util'
-import { FILENAME } from '../../consts'
-type KeysEnum<T> = { [P in keyof Required<T>]: true };
-const _ = require('lodash');
-
-export interface DicArmyWishPool {
-    readonly id: number;
-    readonly wishGoodsEquips: Array<{quality: number, count: number}>;
-    readonly wishGoodsHeros: Array<{quality: number, count: number}>;
-    readonly consume: number;
-}
-
-const DicArmyWishPoolKeys: KeysEnum<DicArmyWishPool> = {
-    id: true,
-    wishGoodsEquips: true,
-    wishGoodsHeros: true,
-    consume: true,
-};
-
-const str = readJsonFile(FILENAME.DIC_ARMY_BOSS_RANK_REWARD);
-let arr = JSON.parse(str);
-
-export const dicArmyWishPool = new Array<DicArmyWishPool>();
-arr.forEach(o => {
-    o.wishGoodsEquips = o.wishGoodsEquip.split('|').map(wishGoodsEquip=>{
-        let wishGoodsEquips =  wishGoodsEquip.split('&');
-        return {quality: parseInt(wishGoodsEquips[0]), count: parseInt(wishGoodsEquips[1])};
-    });
-    o.wishGoodsHeros = o.wishGoodsHero.split('|').map(wishGoodsHero=>{
-        let wishGoodsHeros = wishGoodsHero.split('&');
-        return {quality: parseInt(wishGoodsHeros[0]), count: parseInt(wishGoodsHeros[1])};
-    });
-    dicArmyWishPool.push(_.pick(o, Object.keys(DicArmyWishPoolKeys)));
-});
-arr = undefined;

shared/pubUtils/dictionary/DicStructure.ts

@@ -121,19 +121,18 @@ export interface DicWishPoolBase {
     readonly id: number;
     // 等级
     readonly level: number;
-    // 许愿物品
-    readonly wishGoodsEquip: { quality: number, count: number }[];
-    // 许愿将魂
-    readonly wishGoodsHero: { quality: number, count: number }[];
+    readonly wishGoodsEquips: Array<{quality: number, count: number}>;
+    readonly wishGoodsHeros: Array<{quality: number, count: number}>;
+    readonly consume: number;
 }
 
 const DicWishPoolKeys: KeysEnum<DicWishPoolBase> = {
     id: true,
     level: true,
-    wishGoodsEquip: true,
-    wishGoodsHero: true
+    wishGoodsEquips: true,
+    wishGoodsHeros: true,
+    consume: true,
 };
-
 // 商店
 export interface DicStoreBase {
     // id
@@ -221,8 +220,14 @@ const strWishPool = readJsonFile(FILENAME.DIC_GUILD_WISH_POOL_BASE);
 let arrWishPool = JSON.parse(strWishPool);
 arrWishPool.forEach(o => {
     setStructureConsume(o);
-    o.wishGoodsEquip = parseWishGoods(o.wishgoodsEquip);
-    o.wishGoodsHero = parseWishGoods(o.wishgoodsHero);
+    o.wishGoodsEquips = o.wishgoodsEquip.split('|').map(wishGoodsEquip=>{
+        let wishGoodsEquips =  wishGoodsEquip.split('&');
+        return {quality: parseInt(wishGoodsEquips[0]), count: parseInt(wishGoodsEquips[1])};
+    });
+    o.wishGoodsHeros = o.wishgoodsHero.split('|').map(wishGoodsHero=>{
+        let wishGoodsHeros = wishGoodsHero.split('&');
+        return {quality: parseInt(wishGoodsHeros[0]), count: parseInt(wishGoodsHeros[1])};
+    });
     dicWishPoolBase.set(o.level, _.pick(o, Object.keys(DicWishPoolKeys)));
 });
 arrWishPool = undefined;

shared/pubUtils/timeUtil.ts

@@ -58,7 +58,7 @@ export function getWeekDate(now: Date, day: number, hour: number){ //获得本
 
 export function getCurWeekTime(day: number, hour: number) {
     let data = getWeekDate(new Date(), day, hour);
-    return data.getTime();
+    return Math.floor(data.getTime()/PER_SECOND);
 }
 
 export function getHourPoint(hour: number) {