✨ feat(战场): 保存战阵连携顺序

shared/domain/battleField/ladder.ts

@@ -10,6 +10,7 @@ import { EXTERIOR, LADDER } from "../../pubUtils/dicParam";
 import { DicLadderDifficultRatio } from "../../pubUtils/dictionary/DicLadderDifficultRatio";
 import { DicWarJson } from "../../pubUtils/dictionary/DicWarJson";
 import { RoleRankInfo } from "../rank";
+import { Combo } from "./pvp";
 
 // ladderMatch表
 export class LadderDefenseHero {
@@ -46,10 +47,13 @@ export class LadderDefense {
     warId: number;
     @prop({ required: true, type: LadderDefenseHero, _id: false })
     heroes: LadderDefenseHero[];
+    @prop({ required: true, type: () => Combo, _id: false })
+    combo: Combo[];
     
-    constructor(heroes: LadderDefenseHero[], warId: number) {
+    constructor(heroes: LadderDefenseHero[], warId: number, combo: Combo[]) {
         this.heroes = heroes;
         this.warId = warId;
+        this.combo = combo;
     }
 }
 
@@ -208,6 +212,7 @@ export class LadderDefenseReturn {
     warId: number;
     defCe: number = 0;
     heroes: LadderDefenseHeroReturn[] = [];
+    combo: Combo[] = [];
 
     constructor(defense: LadderDefense) {
         if(!defense) return;
@@ -216,6 +221,7 @@ export class LadderDefenseReturn {
             this.defCe += defenseHero.ce;
             this.heroes.push(new LadderDefenseHeroReturn(defenseHero));
         }
+        this.combo = defense.combo;
     }
 }
 
@@ -429,6 +435,7 @@ export class LadderOppDetailReturn {
     title: number = 1;
     warId: number = 0;
     heroes: LadderOppDetailHeroReturn[] = [];
+    combo: Combo[] = [];
     defCe: number = 0;
 
     constructor(ladderRec: LadderMatchRecType) {
@@ -448,6 +455,7 @@ export class LadderOppDetailReturn {
         this.title = role.title;
         if(ladderMatch.defense) {
             this.warId = ladderMatch.defense.warId;
+            this.combo = ladderMatch.defense.combo||[];
             let heroes = ladderMatch.defense.heroes||[];
             for(let hero of heroes) {
                 let warJson = warJsons.find(cur => cur.dataId == hero.dataId);

shared/domain/battleField/pvp.ts

@@ -43,6 +43,13 @@ export class DefenseHero extends DefenseHeroInSaveData {
 
 }
 
+export class Combo {
+    @prop({ required: true })
+    groupId: number;
+    @prop({ required: true, type: Number })
+    levelList: number[];
+}
+
 // 防守阵容
 export class Defense {
     @prop({ required: true })
@@ -55,8 +62,10 @@ export class Defense {
     score: number;              // 防守阵容的总军功
     @prop({ required: true })
     pLv: number;                // 防守阵容的等级
+    @prop({ required: true, type: () => Combo, _id: false })
+    combo: Combo[];                // 防守阵容的等级
     
-    constructor(heroes: DefenseHero[], scores: number[], warId: number, buff: number) {
+    constructor(heroes: DefenseHero[], scores: number[], warId: number, buff: number, combo: Combo[]) {
         this.heroes = heroes;
         this.score = scores.reduce((pre, cur) => pre + cur, 0);
         let {pLv, score} = getPlvAndScore(scores);
@@ -64,6 +73,7 @@ export class Defense {
         this.score = score;
         this.warId = warId;
         this.buff = buff;
+        this.combo = combo;
     }
 }
 
@@ -176,6 +186,7 @@ export class DefenseLineupReturn {
     score: number;
     pLv: number;
     ce: number;
+    combo: Combo[];
 
     constructor(defense: Defense, defenseCe: number) {
         this.warId = defense.warId;
@@ -184,6 +195,7 @@ export class DefenseLineupReturn {
         this.score = defense.score;
         this.pLv = defense.pLv;
         this.ce = defenseCe;
+        this.combo = defense.combo;
     }
 }