镇念塔：一键跳关

shared/consts/constModules/selectConst.ts

@@ -49,4 +49,4 @@ export enum FRIEND_SHIP_SELECT {
     GET_FRIEND_VALUE = 'friendValue friendLv'
 }
 
-export const ENTERY_ROLE_PICK = ['roleId', 'roleName', 'serverId', 'ce', 'topLineupCe', 'coin', 'lv', 'exp', 'vLv', 'gold', 'heros', 'jewels', 'consumeGoods', 'title', 'teraphs', 'showLineup', 'heads', 'head', 'frames', 'frame', 'spines', 'spine', 'hasGuild', 'guildCode', 'todayZeroPoint', 'apJson', 'skins', 'totalPay', 'guide', 'hasInit', 'renameCnt', 'totalCost', 'guildName'];
+export const ENTERY_ROLE_PICK = ['roleId', 'roleName', 'serverId', 'ce', 'topLineupCe', 'coin', 'lv', 'exp', 'vLv', 'gold', 'heros', 'jewels', 'consumeGoods', 'title', 'teraphs', 'showLineup', 'heads', 'head', 'frames', 'frame', 'spines', 'spine', 'hasGuild', 'guildCode', 'todayZeroPoint', 'apJson', 'skins', 'totalPay', 'guide', 'hasInit', 'renameCnt', 'totalCost', 'guildName', 'isVip'];

shared/consts/statusCode.ts

@@ -104,6 +104,8 @@ export const STATUS = {
     TOWER_HANG_UP_NOT_START: { code: 20518, simStr: '挂机尚未开启' },
     TOWER_REF_CNT_NOT_ENOUGH: { code: 20519, simStr: '派遣刷新次数不足' },
     TOWER_HERO_FORBIDDEN: { code: 20520, simStr: '该武将不可使用' },
+    TOWER_CANNOT_SKIP: { code: 20521, simStr: '该层不可跳过' },
+    TOWER_SKIP_POWER_NOT_ENOUGH: { code: 20522, simStr: '战力不足不可跳过' },
     // 寻宝（共斗） 20600 - 20699
     COM_BATTLE_DUP_ENTER: { code: 20601, simStr: '不能重复加入' },
     COM_BATTLE_BLUEPRT_NOT_FOUND: { code: 20602, simStr: '藏宝图不足' },

shared/db/HangUpRecord.ts

@@ -1,6 +1,5 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
-import * as dicParam from '../pubUtils/dicParam';
 
 class Goods {
   @prop({ required: true })
@@ -38,12 +37,12 @@ export default class HangUpRecord extends BaseModel {
   @prop({ required: true, default: false })
   received: boolean; // 是否已经领取，true-领取，false-未领取
 
-  public static async initRecord(roleId: string, roleName: string, lean = true) {
+  public static async initRecord(roleId: string, roleName: string, towerLv: number) {
     // console.log('****** initRecord before')
     const curTime = new Date();
     const recDoc = new HangUpRecordModel();
-    const update = Object.assign(recDoc.toJSON(), {roleId, roleName, startTime: curTime, startLv: dicParam.TOWER_HANG_UP.TOWER_HANG_UP_ENABLE_LV + 1});
-    const rec: HangUpRecordType = await HangUpRecordModel.findOneAndUpdate({roleId, startLv: dicParam.TOWER_HANG_UP.TOWER_HANG_UP_ENABLE_LV + 1}, { $setOnInsert: update }, {upsert: true, new: true}).lean(lean);
+    const update = Object.assign(recDoc.toJSON(), {roleId, roleName, startTime: curTime, towerLv});
+    const rec: HangUpRecordType = await HangUpRecordModel.findOneAndUpdate({roleId, startLv: towerLv}, { $setOnInsert: update }, {upsert: true, new: true}).lean();
     
     // console.log('****** initRecord after')
     return rec;

shared/db/TowerRecord.ts

@@ -21,7 +21,7 @@ export default class TowerRecord extends BaseModel {
   roleId: string;					// 角色 id
   @prop({ required: true, default: 1 })
   lv: number;                       // 天梯层数
-  @prop({ required: true, default: [] })
+  @prop({ required: true, default: [], type: Number })
   heroes: Array<number>;            // 本层已使用武将
   @prop({ required: true, type: WarStatus, default: [], _id: false })
   warStatus: Array<WarStatus>;
@@ -73,6 +73,13 @@ export default class TowerRecord extends BaseModel {
     }
   }
 
+  // 跳过当前层
+  public static async skipTower(roleId: string, curLv: number, heroes: number[]) {
+    let rec: TowerRecordType = await TowerRecordModel.findOneAndUpdate({ roleId, lv: curLv, 'warStatus.status': false }, { 
+      $set: { 'warStatus.$.status': true, heroes, passed: true },
+    }, { new: true }).lean()
+    return rec;
+  }
 
   public static async getRecordByLv(roleId: string, lv: number, lean = true) {
     const rec: TowerRecordType = await TowerRecordModel.findOne({roleId, lv}).lean(lean);

shared/pubUtils/dictionary/DicTower.ts

@@ -12,6 +12,8 @@ export interface DicTower {
     readonly reward: Array<RewardInter>;
     // 收集奖励
     readonly rewardOfcollect: Array<RewardInter>;
+    // 是否可以一键跳过
+    readonly canSkip: boolean;
 }
 
 
@@ -25,6 +27,7 @@ export function loadTower() {
         o.warArray = parseNumberList(o.warArray);
         o.reward = parseGoodStr(o.reward);
         o.rewardOfcollect = parseGoodStrOfCollect(o.rewardOfcollect);
+        o.canSkip = true;
         dicTower.set(o.towerFloor, o);
     });
     arr = undefined;

shared/pubUtils/dictionary/DicWar.ts

@@ -39,6 +39,8 @@ export interface DicWar {
     readonly teammateReward: Array<{id: number, count: number}>;
     // 镇念塔禁用角色
     readonly fobiddenCharactor: Array<{type: number, id: number}>;
+    // 推荐战力
+    readonly recommendedPower: number;
     // 远征随机buff
     readonly mapseid: number[];
     // 秘境类型
@@ -51,6 +53,8 @@ export interface DicWar {
     readonly winReward: Map<number, number|RewardInter[]>;
     // 练兵场失败奖励
     readonly failReward: Map<number, number|RewardInter[]>;
+    // 上场数量
+    readonly minHeroNum: number;
 }
 
 export const dicWar = new Map<number, DicWar>();
@@ -98,6 +102,7 @@ export function loadWar() {
             }
             dicWar.set(o.war_id, o);
             if(!!o.heroId) dicHeroIdByWar.set(o.war_id, o.heroId);
+            if(o.HeroNum) o.minHeroNum = parseInt(o.HeroNum.split('&')[0]);
         });
     }
 }