军团：试炼表修改

shared/pubUtils/data.ts

@@ -49,7 +49,7 @@ import { dicGuildActiveWeekReward, loadGuildActiveWeekReward } from './dictionar
 import { dicGuildActiveWays, loadGuildActiveWays } from './dictionary/DicGuildActiveWays';
 import { dicGuildPosition, loadGuildPosition } from "./dictionary/DicGuildPosition";
 import { dicMail, loadMail } from "./dictionary/DicMail";
-import { dicArmyTrainJuDian, loadArmyTrainJuDian } from './dictionary/DicArmyTrainJuDian';
+import { dicArmyTrainJuDian, loadArmyTrainJuDian, dicLastGuildTrainIdOfLv, dicFirstGuildTrainIdOfLv } from './dictionary/DicArmyTrainJuDian';
 import { dicTrainSoloReward, loadTrainSoloReward } from './dictionary/DicTrainSoloReward';
 import { RewardInter } from "./interface";
 import { dicArmyDevelopConsume, loadArmyDevelopConsume } from './dictionary/DicArmyDevelopConsume';
@@ -93,6 +93,7 @@ import { dicQuenchConsume, loadQuenchConsume } from './dictionary/DicQuenchConsu
 import { dicHoliday, loadHoliday } from './dictionary/DicHoliday';
 import { dicExpeditionSubAttr, loadExpeditionSubAttr } from './dictionary/DicExpeditionSubAttr';
 import { dicAuctionPool, loadAuctionReward } from './dictionary/DicAuctionReward';
+import { dicGuildTrainInfo, loadGuildTrainInfo } from './dictionary/DicGuildTrainInfo';
 import { pick } from "underscore";
 
 export const gameData = {
@@ -166,11 +167,14 @@ export const gameData = {
     donateBase: dicDonateBase,
     armyWishPool: dicWishPoolBase,
     storeBase: dicStoreBase,
+    guildTrainInfo: dicGuildTrainInfo,
     structureConsume: dicStructureConsume,
     guildActiveDayReward: dicGuildActiveDayReward,
     guildActiveWeekReward: dicGuildActiveWeekReward,
     guildPosition: dicGuildPosition,
     armyTrainJuDian: dicArmyTrainJuDian,
+    lastGuildTrainIdOfLv: dicLastGuildTrainIdOfLv,
+    firstGuildTrainIdOfLv: dicFirstGuildTrainIdOfLv,
     trainSoloReward: dicTrainSoloReward,
     mail: dicMail,
     guildActiveWays: dicGuildActiveWays,
@@ -779,6 +783,15 @@ export function getQuenchConsume(lvLimited: number, quality: number) {
     return gameData.quenchConsume.get(`${lvLimited}_${quality}`);
 }
 
+/**
+ * 根据TrainJuDian的id和武将id，获得信息（包括多个难度）
+ * @param trainId 据点id
+ * @param heroId 武将id
+ */
+export function getGuildTrainGkInfo(trainId: number, heroId: number) {
+    return gameData.guildTrainInfo.get(`${trainId}_${heroId}`);
+}
+
 function loadEquipAttributeRatio() {
     let arr = decodeArrayListStr(param.ATTRIBUTE.ATTRIBUTE_EQUIP_RATIO);
     for(let [id, ratio] of arr) {
@@ -894,6 +907,7 @@ function loadDatas() {
     loadHoliday();
     loadExpeditionSubAttr();
     loadAuctionReward();
+    loadGuildTrainInfo();
 }
 
 // 重载dicParam

shared/pubUtils/dictionary/DicArmyTrainJuDian.ts

@@ -4,40 +4,58 @@ type KeysEnum<T> = { [P in keyof Required<T>]: true };
 import { RewardInter } from '../interface';
 const _ = require('lodash');
 
+
 export interface DicArmyTrainJuDian {
 
     readonly id: number;
-    // 目标品质
-    readonly trainInstances: Array<{hid: number, warId: number, progress: number}>;
-    readonly heroRewards: Array<{id: number, count: number}>;
-      // 进阶奖励
+    readonly trainLv: number;
+    // 训练场多个难度组成的gk，每个难度一个warId，而这个gkId指trainGk_info这张表的id
+    readonly trainInstances: Array<{hid: number, gkId: number, progress: number}>;
+    // 进阶奖励
     readonly jinjieReward: RewardInter[];
     readonly soloRewardRatio: number;
 }
 
 const DicArmyTrainJuDianKeys: KeysEnum<DicArmyTrainJuDian> = {
     id: true,
+    trainLv: true,
     trainInstances: true,
-    heroRewards: true,
     jinjieReward: true,
     soloRewardRatio: true
 };
 
 export const dicArmyTrainJuDian = new Map<number, DicArmyTrainJuDian>();
+export const dicLastGuildTrainIdOfLv = new Map<number, number>(); // 每级试炼场等级的最后据点id
+export const dicFirstGuildTrainIdOfLv = new Map<number, number>(); // 每级试炼场等级的最先据点id
 export function loadArmyTrainJuDian() {
+    dicLastGuildTrainIdOfLv.clear();
+    dicFirstGuildTrainIdOfLv.clear();
 
     let arr = readFileAndParse(FILENAME.DIC_ARMY_TRAIN_JU_DIAN);
-
     arr.forEach(o => {
+
         o.trainInstances = o.gkid.split('|').map(element => {
             let arr = element.split('&');
-            return {hid: parseInt(arr[0]), warId: parseInt(arr[1]), progress: parseInt(arr[2])};
+            return {hid: parseInt(arr[0]), gkId: parseInt(arr[1]), progress: parseInt(arr[2])};
         });
         o.jinjieReward = parseGoodStr(o.jinjieReward);
-    
-        o.heroRewards = parseGoodStr(o.shilianReward);
-    
         dicArmyTrainJuDian.set(o.id,_.pick(o, Object.keys(DicArmyTrainJuDianKeys)));
+
+        if(!dicLastGuildTrainIdOfLv.has(o.trainLv)) {
+            dicLastGuildTrainIdOfLv.set(o.trainLv, o.id);
+        } else {
+            if(dicLastGuildTrainIdOfLv.get(o.trainLv) < o.id) {
+                dicLastGuildTrainIdOfLv.set(o.trainLv, o.id);
+            }
+        }
+
+        if(!dicFirstGuildTrainIdOfLv.has(o.trainLv)) {
+            dicFirstGuildTrainIdOfLv.set(o.trainLv, o.id);
+        } else {
+            if(dicFirstGuildTrainIdOfLv.get(o.trainLv) > o.id) {
+                dicLastGuildTrainIdOfLv.set(o.trainLv, o.id);
+            }
+        }
     });
     arr = undefined;
 }

shared/pubUtils/dictionary/DicGuildTrainInfo.ts

@@ -0,0 +1,38 @@
+import { readFileAndParse, 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 DicGuildTrainInfo {
+
+    readonly id: number;
+    readonly trainId: number;
+    readonly trainLv: number; // 试炼场等级
+    readonly heroId: number;
+    readonly heroRewards: RewardInter[]; // 翻牌子的奖励，随机其中一个
+
+}
+
+const DicGuildTrainInfoKeys: KeysEnum<DicGuildTrainInfo> = {
+    id: true,
+    trainId: true,
+    trainLv: true,
+    heroId: true,
+    heroRewards: true
+};
+
+export const dicGuildTrainInfo = new Map<string, DicGuildTrainInfo>();
+export function loadGuildTrainInfo() {
+
+    let arr = readFileAndParse(FILENAME.DIC_ARMY_TRAIN_INFO);
+
+    arr.forEach(o => {
+        o.heroId = o.heroid;
+        o.heroRewards = parseGoodStr(o.shilianReward); // TODO 这个改到
+    
+        dicGuildTrainInfo.set(`${o.trainId}_${o.heroId}`,_.pick(o, Object.keys(DicGuildTrainInfoKeys)));
+    });
+    arr = undefined;
+}

shared/pubUtils/dictionary/DicStructure.ts

@@ -83,8 +83,6 @@ export interface DicTrainBase {
     readonly difficultyRatio: number;
     // 据点奖励增长系数
     readonly judianRewardRatio: number;
-
-    readonly shilianRewardRatio: number;
 }
 
 const DicTrainKeys: KeysEnum<DicTrainBase> = {
@@ -92,8 +90,7 @@ const DicTrainKeys: KeysEnum<DicTrainBase> = {
     level: true,
     trainLevel: true,
     difficultyRatio: true,
-    judianRewardRatio: true,
-    shilianRewardRatio: true
+    judianRewardRatio: true
 };
 
 // 捐献所