添加json

shared/pubUtils/dictionary/DicStructure.ts

@@ -119,13 +119,16 @@ export interface DicWishPoolBase {
     // 等级
     readonly level: number;
     // 许愿物品
-    readonly wishGoods: {type: number, quality: number, count: number}[];
+    readonly wishGoodsEquip: { quality: number, count: number }[];
+    // 许愿将魂
+    readonly wishGoodsHero: { quality: number, count: number }[];
 }
 
 const DicWishPoolKeys: KeysEnum<DicWishPoolBase> = {
     id: true,
     level: true,
-    wishGoods: true
+    wishGoodsEquip: true,
+    wishGoodsHero: true
 };
 
 // 商店
@@ -208,7 +211,8 @@ const strWishPool = readJsonFile(FILENAME.DIC_GUILD_WISH_POOL_BASE);
 let arrWishPool = JSON.parse(strWishPool);
 arrWishPool.forEach(o => {
     setStructureConsume(o);
-    o.wishGoods = parseWishGoods(o.wishgoods);
+    o.wishGoodsEquip = parseWishGoods(o.wishgoodsEquip);
+    o.wishGoodsHero = parseWishGoods(o.wishgoodsHero);
     dicWishPoolBase.set(o.level, _.pick(o, Object.keys(DicWishPoolKeys)));
 });
 arrWishPool = undefined;
@@ -259,16 +263,16 @@ export function parseDonateReward(str: string) {
     return result
 }
 
-// {"type": number, "quality": number, "count": number}
+// { "quality": number, "count": number}
 export function parseWishGoods(str: string) {
-    let result = new Array<{ type: number, quality: number, count: number }>();
+    let result = new Array<{ quality: number, count: number }>();
     if (!str) return result;
     let decodeArr = decodeArrayListStr(str);
-    for (let [type, quality, count] of decodeArr) {
-        if (isNaN(parseInt(type)) || isNaN(parseInt(quality))|| isNaN(parseInt(count))) {
+    for (let [quality, count] of decodeArr) {
+        if ( isNaN(parseInt(quality))|| isNaN(parseInt(count))) {
             throw new Error('data table format wrong');
         }
-        result.push({ type: parseInt(type), quality: parseInt(quality), count: parseInt(count) });
+        result.push({ quality: parseInt(quality), count: parseInt(count) });
     }
     return result
 }