军团：炼器堂

shared/pubUtils/dictionary/DicArmyDevelopConsume.ts

@@ -5,22 +5,30 @@ import { RewardInter } from '../interface';
 const _ = require('lodash');
 
 export interface DicArmyDevelopConsume {
-
+    // 科技树唯一id
     readonly id: number;
     // 目标品质
     readonly quality: number;
-    readonly starLevel: number;
-    readonly prePositions: Array<number>;
-    readonly honourConsume: Array<RewardInter>;
+    // 相同品质下细分等级
+    readonly qualityLevel: number;
+    // 前置点需求
+    readonly prePositions: number[];
+    // 图纸最多张数
+    readonly max: number;
+    // 需要的功勋
+    readonly honourConsume: RewardInter[];
+    // 研发需要的资金
     readonly fundConsume: number;
+    // 研发需要的时间
     readonly timeConsume: number;
 }
 
 const DicArmyDevelopConsumeKeys: KeysEnum<DicArmyDevelopConsume> = {
     id: true,
     quality: true,
-    starLevel: true,
+    qualityLevel: true,
     prePositions: true,
+    max: true,
     honourConsume: true,
     fundConsume: true,
     timeConsume: true

shared/pubUtils/dictionary/DicStructure.ts

@@ -30,17 +30,17 @@ export interface DicEquipProduceBase {
     readonly id: number;
     // 等级
     readonly level: number;
+    // 可以研发的品质
+    readonly quality: number;
     // 开启炼器及研发等级
-    readonly levelProduce: number;
-    // 可研发的碎片的品质
-    readonly qualityProduce: number[];
+    readonly levelProduce: number[];
 }
 
 const DicEquipProduceKeys: KeysEnum<DicEquipProduceBase> = {
     id: true,
     level: true,
+    quality: true,
     levelProduce: true,
-    qualityProduce: true
 };
 
 // 演武台
@@ -130,7 +130,7 @@ export interface DicWishPoolBase {
     readonly id: number;
     // 等级
     readonly level: number;
-    readonly wishGoodsEquips: Array<{quality: number, count: number}>;
+    readonly wishgoodsDrawings: Array<{quality: number, count: number}>;
     readonly wishGoodsHeros: Array<{quality: number, count: number}>;
     readonly consume: number;
 }
@@ -138,7 +138,7 @@ export interface DicWishPoolBase {
 const DicWishPoolKeys: KeysEnum<DicWishPoolBase> = {
     id: true,
     level: true,
-    wishGoodsEquips: true,
+    wishgoodsDrawings: true,
     wishGoodsHeros: true,
     consume: true,
 };
@@ -194,7 +194,7 @@ export function loadStructure() {
     let arrEquip = readFileAndParse(FILENAME.DIC_GUILD_EQUIP_PRODUCE_BASE);
     arrEquip.forEach(o => {
         setStructureConsume(o);
-        o.qualityProduce = parseNumberList(o.qualityProduce);
+        o.levelProduce = parseNumberList(o.levelProduce);
         dicEquipPriduceBase.set(o.level, _.pick(o, Object.keys(DicEquipProduceKeys)));
     });
     arrEquip = undefined;
@@ -239,9 +239,9 @@ export function loadStructure() {
     let arrWishPool = readFileAndParse(FILENAME.DIC_GUILD_WISH_POOL_BASE);
     arrWishPool.forEach(o => {
         setStructureConsume(o);
-        o.wishGoodsEquips = o.wishgoodsEquip.split('|').map(wishGoodsEquip=>{
-            let wishGoodsEquips =  wishGoodsEquip.split('&');
-            return {quality: parseInt(wishGoodsEquips[0]), count: parseInt(wishGoodsEquips[1])};
+        o.wishgoodsDrawings = o.wishgoodsDrawing.split('|').map(wishgoodsDrawing=>{
+            let wishgoodsDrawings =  wishgoodsDrawing.split('&');
+            return {quality: parseInt(wishgoodsDrawings[0]), count: parseInt(wishgoodsDrawings[1])};
         });
         o.wishGoodsHeros = o.wishgoodsHero.split('|').map(wishGoodsHero=>{
             let wishGoodsHeros = wishGoodsHero.split('&');