添加json

shared/pubUtils/data.ts

@@ -46,7 +46,8 @@ import { dicPvpBoxs }  from './dictionary/DicPvpBox';
 import { dicGuildAuth } from './dictionary/DicGuildAuth';
 import { dicCenterBase, dicEquipPriduceBase, dicBossBase, dicTrainBase, dicDonateBase, dicWishPoolBase, dicStoreBase, dicStructureConsume } from "./dictionary/DicStructure";
 import { dicGuildActiveDayReward } from './dictionary/DicGuildActiveDayReward';
-import { RewardInter } from "./interface";
+import { dicGuildActiveWeekReward } from './dictionary/DicGuildActiveWeekReward';
+import { dicGuildPosition } from "./dictionary/DicGuildPosition";
 
 export const gameData = {
     blurprtCompose: dicBlueprtCompose,
@@ -116,7 +117,9 @@ export const gameData = {
     wishPoolBase: dicWishPoolBase,
     storeBase: dicStoreBase,
     structureConsume: dicStructureConsume,
-    guildActiveDayReward: dicGuildActiveDayReward
+    guildActiveDayReward: dicGuildActiveDayReward,
+    guildActiveWeekReward: dicGuildActiveWeekReward,
+    guildPosition: dicGuildPosition
 };
 
 // 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据

shared/pubUtils/dictionary/DicGuildActiveWeekReward.ts

@@ -0,0 +1,28 @@
+// 每周总活跃
+import { readJsonFile, parseGoodStr } from '../util'
+import { FILENAME } from '../../consts'
+import { RewardInter } from '../interface';
+
+export interface DicGuildActiveWeekReward {
+
+    // id
+    readonly id: number;
+    // 周最低点数
+    readonly weekPointMin: number;
+    // 周最高点数
+    readonly weekPointMax: number;
+    // 奖励
+    readonly reward: RewardInter[];
+
+}
+
+const str = readJsonFile(FILENAME.DIC_ACTIVE_DAY_REWARD);
+let arr = JSON.parse(str);
+
+export const dicGuildActiveWeekReward = new Map<number, DicGuildActiveWeekReward>();
+
+arr.forEach(o => {
+    o.reward = parseGoodStr(o.Reward)
+    dicGuildActiveWeekReward.set(o.id, o);
+});
+arr = undefined;

shared/pubUtils/dictionary/DicGuildPosition.ts

@@ -0,0 +1,25 @@
+// 军团职位表
+import { readJsonFile } from '../util'
+import { FILENAME } from '../../consts'
+
+export interface DicGuildPosition {
+
+    // 职位id
+    readonly id: number;
+    // 职位名
+    readonly name: string;
+    // 排名比例
+    readonly rankProportion: number;
+    // 拍卖行额外分成占比
+    readonly sellRatio: number;
+    // 周活跃额外分成比例
+    readonly activeRatio: number;
+}
+
+const str = readJsonFile(FILENAME.DIC_BLUEPRT_COMPOSE);
+let arr = JSON.parse(str);
+
+export const dicGuildPosition = new Map<number, DicGuildPosition>();
+arr.forEach(o => {
+    dicGuildPosition.set(o.id, o);
+});

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
 }

shared/pubUtils/itemUtils.ts

@@ -9,6 +9,7 @@ import { RANDOM_SE_COUNT, FIX_ATTRIBUTES_RAN, ITID, CURRENCY_BY_TYPE, CURRENCY_T
 import { getRandValueByMinMax, getRandEelm } from './util';
 
 import { findWhere } from 'underscore';
+import { UserGuildModel } from '../db/UserGuild';
 
 export async function addSkins(roleId: string, id: number) {
     let skinInfo = gameData.fashion.get(id);
@@ -27,6 +28,10 @@ export async function addSkins(roleId: string, id: number) {
 export async function addBags(roleId: string, roleName: string, data: BagInter) {
     let { id, count, itemName, type, hid } = data;
     let item = await ItemModel.increaseItem(roleId, id, count, { roleId, roleName, itemName, id, type, hid });
+
+    if(item.id == CURRENCY_BY_TYPE.get(CURRENCY_TYPE.HONOUR) ) {
+        await UserGuildModel.addHonourWeekly(roleId, count);
+    }
     return { id: item.id, count: item.count };
 }