名将擂台：修复多处bug

shared/db/LadderMatch.ts

@@ -41,15 +41,10 @@ export default class LadderMatch extends BaseModel {
         return result;
     }
 
-    public static async checkByRank(rank: number) {
-        const result = await LadderMatchModel.exists({ rank });
-        return result;
-    }
-
     public static async findByRoleIdAndInclude(roleId: string) {
         const result: LadderMatchType = await LadderMatchModel.findOne({ roleId })
             .populate('role', 'roleId roleName head frame spine heads frames spines title lv updatedAt')
-            .populate('defense.heroes', 'hid skinId quality star colorStar lv')
+            .populate('defense.heroes.hero', 'hid skinId quality star colorStar lv')
             .lean();
         return result;
     }
@@ -71,7 +66,7 @@ export default class LadderMatch extends BaseModel {
     public static async updateByRoleIdAndInclude(roleId: string, params: LadderUpdateInter) {
         const defense: LadderMatchType = await LadderMatchModel.findOneAndUpdate({ roleId }, { $set: params}, { new: true })
         .populate('role', 'roleId roleName head frame spine heads frames spines title lv updatedAt')
-        .populate('defense.heroes', 'hid skinId quality star colorStar lv')
+        .populate('defense.heroes.hero', 'hid skinId quality star colorStar lv')
         .lean();
         return defense;
     }
@@ -89,7 +84,15 @@ export default class LadderMatch extends BaseModel {
     }
 
     public static async lock(roleId: string, rank: number) {
-        const defense: LadderMatchType = await LadderMatchModel.findOneAndUpdate({ roleId, rank, locked: 0 }, { $set: { locked: 1 }}, { new: true }).lean();
+        const defense: LadderMatchType = await LadderMatchModel.findOneAndUpdate({ roleId, rank, locked: 0 }, { $set: { locked: 1 }}, { new: true })
+        .populate('role', 'roleId roleName head frame spine heads frames spines title lv updatedAt')
+        .populate('defense.heroes.hero', 'hid skinId quality star colorStar lv')
+        .lean();
+        return defense;
+    }
+
+    public static async unlock(roleId: string) {
+        const defense: LadderMatchType = await LadderMatchModel.findOneAndUpdate({ roleId }, { $set: { locked: 0 }}, { new: true }).lean();
         return defense;
     }
 
@@ -132,6 +135,10 @@ export default class LadderMatch extends BaseModel {
             { arrayFilters: [{"t.actorId": hid}] }).lean();
         return rec
     }
+
+    public static async clearLock() {
+        await LadderMatchModel.updateMany({ locked: 1 }, { $set: { locked: 0 } })
+    }
 }
 
 export const LadderMatchModel = getModelForClass(LadderMatch);

shared/db/LadderMatchRec.ts

@@ -4,6 +4,7 @@ import { LADDER_STATUS } from '../consts';
 import { LadderDefense, LadderOppPlayerInfo, LadderOppPlayerHeroInfo } from '../domain/battleField/ladder';
 import { genCode } from '../pubUtils/util';
 import { nowSeconds } from '../pubUtils/timeUtil';
+import { LADDER } from '../pubUtils/dicParam';
 
 @index({ battleCode: 1 })
 export default class LadderMatchRec extends BaseModel {
@@ -96,6 +97,20 @@ export default class LadderMatchRec extends BaseModel {
         }).select({ battleCode: 1, roleId1: 1, roleId2: 1,  _id: -1, endTime: 1, attackInfo: 1, defenseInfo: 1 }).limit(1000).lean();
         return recs;
     }
+
+    public static async checkByRank(roleId2: string) {
+        const result = await LadderMatchRecModel.exists({ roleId2, status: { $in: [LADDER_STATUS.BATTLE, LADDER_STATUS.CHECK] } });
+        return result;
+    }
+
+    public static async clearLock() {
+        await LadderMatchRecModel.updateMany({ 
+            $or: [
+                { status: LADDER_STATUS.CHECK, checkTime: { $lt: nowSeconds() - LADDER.LADDER_BATTLE_PREPARE_COUNTDOWN } },
+                { status: LADDER_STATUS.BATTLE, checkTime: { $lt: nowSeconds() - LADDER.LADDER_BATTLE_COUNTDOWN } }
+            ]
+         }, { $set: { status: LADDER_STATUS.COMPLETE, timeout: true } })
+    }
 }
 
 export const LadderMatchRecModel = getModelForClass(LadderMatchRec);

shared/domain/battleField/ladder.ts

@@ -234,6 +234,7 @@ export class LadderDataReturn {
     defense: LadderDefenseReturn = null;
     status: LADDER_STATUS = LADDER_STATUS.NO;
     time: number = 0;
+    battleCode: string = '';
     oppPlayers: LadderOppPlayerReturn[] = []
 
     setLadderData(ladderData: LadderMatchType, ladderRec?: LadderMatchRecType) {
@@ -246,6 +247,7 @@ export class LadderDataReturn {
             this.defense = new LadderDefenseReturn(ladderData.defense);
         }
         if(ladderRec) {
+            this.battleCode = ladderRec.battleCode;
             this.status = ladderRec.status;
             if(this.status == LADDER_STATUS.BATTLE) {
                 this.time = ladderRec.battleTime + LADDER.LADDER_BATTLE_COUNTDOWN;
@@ -336,7 +338,7 @@ export class LadderOppDetailHeroReturn {
     spine: string = '';                    // 动画
 
     constructor(warJson: DicWarJson, defensHero: LadderDefenseHero) {
-        this.dataId = warJson.actorId;
+        this.dataId = warJson.dataId;
         this.relation = warJson.relation;
         this.dirction = warJson.dirction;
         this.x = warJson.x;

shared/pubUtils/dicParam.ts

@@ -320,4 +320,6 @@ export const LADDER = {
   LADDER_CHALLENGE_BUY_TIMES_COST: '31002&20&20|31002&50&10|31002&100&10|31002&200&10', // 名将擂台每天购买挑战次数花费 物品id&数量&购买次数
   LADDER_ROBOT_NAME: '擂台守卫者', // 机器人默认名
   LADDER_INITIAL_CHALLENGE_TIMES: 5, // 战5次
+  LADDER_LINEUP_HEROS: 6, // 名将擂台最多上阵人数
+  LADDER_BGMAP_GKID: 60001, // 名将擂台防守阵容地图所用的关卡id
 };