添加百家学宫和名将谱，未计算战力

shared/pubUtils/data.ts

@@ -32,6 +32,8 @@ import { dicHeroEquip } from './dictionary/DicHeroEquip';
 import { dicSuit } from './dictionary/DicSuit';
 import { dicTitle } from './dictionary/DicTitle';
 import { dicTeraph } from './dictionary/DicTeraph';
+import { dicSchool } from './dictionary/DicSchool';
+
 export const gameData = {
     blurprtCompose: dicBlueprtCompose,
     blueprtPossibility: dicBlueprtPossibility,
@@ -74,7 +76,8 @@ export const gameData = {
     dicHeroEquip: dicHeroEquip,
     suit: dicSuit,
     title: dicTitle,
-    teraphs: dicTeraph
+    teraphs: dicTeraph,
+    school: dicSchool
 };
 
 // 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据
@@ -210,4 +213,4 @@ export function getTitle(titleLv: number) {
 export function getTeraph(id: number, grade: number) {
     const teraphInfo = gameData.teraphs.get(id +'_'+ grade);
     return teraphInfo;
-}
+}

shared/pubUtils/dicParam.ts

@@ -2,12 +2,28 @@ export const EQUIP = {
   EQUIP_ONE_HOLE: '17038&1', // 装备孔1号位消耗
   EQUIP_TWO_HOLE: '17038&2', // 装备孔2号位消耗
   EQUIP_THREE_HOLE: '17038&4', // 装备孔3号位消耗
-  EQUIP_ONE_REFORGED: '17040&1', // 装备位洗练词条第一次消耗
-  EQUIP_TWO_REFORGED: '17040&2', // 装备位洗练词条第二次消耗
-  EQUIP_THREE_REFORGED: '17040&4', // 装备位洗练词条第三次消耗
-  EQUIP_FOUR_REFORGED: '17040&8', // 装备位洗练词条第四次消耗
-  EQUIP_ONE_LOCKED: '17041&1', // 装备位洗练词条不锁住钥匙消耗
-  EQUIP_TWO_LOCKED: '17041&2', // 装备位洗练词条锁住一条钥匙消耗
-  EQUIP_THREE_LOCKED: '17041&4', // 装备位洗练词条锁住二条钥匙消耗
-  EQUIP_FOUR_LOCKED: '17041&8', // 装备位洗练词条锁住三条钥匙消耗
+  EQUIP_ONE_REFORGED: '17040&1', // 装备位洗练四条词条消耗
+  EQUIP_TWO_REFORGED: '17040&2', // 装备位洗练三条词条消耗
+  EQUIP_THREE_REFORGED: '17040&4', // 装备位洗练二条词条消耗
+  EQUIP_FOUR_REFORGED: '17040&8', // 装备位洗练一条词条消耗
+  EQUIP_ONE_LOCKED: '17041&1', // 装备锁定第一条词条锁消耗
+  EQUIP_TWO_LOCKED: '17041&2', // 装备锁定第二条词条锁消耗
+  EQUIP_THREE_LOCKED: '17041&4', // 装备锁定第三条词条锁消耗
+};
+export const JOB = {
+  JOB_CLASS_1: '步兵', // 大兵种名称
+  JOB_CLASS_2: '枪兵', // 大兵种名称
+  JOB_CLASS_3: '骑兵', // 大兵种名称
+  JOB_CLASS_4: '弓兵', // 大兵种名称
+  JOB_CLASS_5: '游侠', // 大兵种名称
+  JOB_CLASS_6: '策士', // 大兵种名称
+  JOB_CLASS_7: '道士', // 大兵种名称
+  JOB_CLASS_8: '医者', // 大兵种名称
+};
+export const SCHOOL = {
+  SCHOOL_POSITION: '1&1|2&1|3&1|4&0|5&0', // 百家学宫位置锁定
+  SCHOOL_UNLOCK_COIN: '31001&100', // 百家学宫解锁位置消耗
+};
+export const SCROLL = {
+  SCROLL_ACTIVE_FAVOUR: '50', // 首次激活增加的好感度
 };

shared/pubUtils/dictionary/DicSchool.ts

@@ -0,0 +1,26 @@
+// 百家学宫列表
+import { readJsonFile, parseNumberList } from '../util'
+import { FILENAME } from '../../consts'
+
+export interface DicSchool {
+
+    // 学宫id
+    readonly id: number;
+    // 学宫名
+    readonly name: string;
+    // 提升属性
+    readonly upAttribute: Array<number>;
+}
+
+
+const str = readJsonFile(FILENAME.DIC_SCHOOL);
+let arr = JSON.parse(str);
+
+export const dicSchool = new Map<number, DicSchool>();
+
+arr.forEach(o => {
+    o.upAttribute = parseNumberList(o.upAttribute)
+    dicSchool.set(o.id, o);
+});
+
+arr = undefined;

shared/pubUtils/interface.ts

@@ -41,3 +41,16 @@ export interface EquipInter {
 
 export interface BagInter {id: number, itemName: string, count: number, type: number, hid:number, times?: number};
 export interface ItemInter {id?: number, count?: number, seqId?: number, type?: number};
+
+// 百家学宫，布阵武将位置
+export interface SclPosInter {
+    id: number;
+    hid: number;
+    isOpen: boolean;
+}
+
+// 百家学宫返回
+export interface SclResultInter {
+    id: number;
+    position: SclPosInter[]
+}

shared/pubUtils/itemUtils.ts

@@ -14,7 +14,7 @@ export async function addSkins(roleId: string, id: number) {
     let skinInfo = gameData.fashion.get(id);
     if (!skinInfo)
         return false;
-    let hero = await HeroModel.findByHidAndRole(skinInfo.actorId, roleId, false);
+    let hero = await HeroModel.findByHidAndRole(skinInfo.actorId, roleId);
     if (!hero)
         return false;
     if (!!_.findWhere(hero.skins, { id }))