From 32e720d627d86d003cbf6739e2a6e0c2cdf5196e Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 29 Mar 2023 18:56:42 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E9=81=97=E8=BF=B9?=
 =?UTF-8?q?=E9=98=B5=E5=AE=B9=E4=BF=9D=E5=AD=98=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/guild/handler/gvgFightHandler.ts | 4 ++--
 shared/db/GVGVestigeRank.ts                              | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/game-server/app/servers/guild/handler/gvgFightHandler.ts b/game-server/app/servers/guild/handler/gvgFightHandler.ts
index feeca38fe..65a6816b9 100644
--- a/game-server/app/servers/guild/handler/gvgFightHandler.ts
+++ b/game-server/app/servers/guild/handler/gvgFightHandler.ts
@@ -87,7 +87,7 @@ export class GVGProduceHandler {
     }
 
     // 编辑阵容
-    async saveLineup(msg: { vestigeId: number, lineup: [{ actorId: number, dataId: number, order: number }] }, session: BackendSession) {
+    async saveLineup(msg: { vestigeId: number, lineup: [{ actorId: number, dataId: number, order: number, correspondingVar: number }] }, session: BackendSession) {
 
         const roleId = session.get('roleId');
         const serverId = session.get('serverId');
@@ -113,7 +113,7 @@ export class GVGProduceHandler {
 
         let lineup = heroes.map(hero => {
             let curHero = dbHeroes.find(cur => cur.hid == hero.actorId);
-            return { actorId: curHero.hid, dataId: hero.dataId, order: hero.order, ce: curHero.ce }
+            return { actorId: curHero.hid, dataId: hero.dataId, order: hero.order, correspondingVar: hero.correspondingVar, ce: curHero.ce }
         });
         let vestigeRank = await GVGVestigeRankModel.updateByRoleId(vestigeId, roleId, { lineup, hasDefense: true });
 
diff --git a/shared/db/GVGVestigeRank.ts b/shared/db/GVGVestigeRank.ts
index 794df398d..14593b08d 100644
--- a/shared/db/GVGVestigeRank.ts
+++ b/shared/db/GVGVestigeRank.ts
@@ -12,6 +12,8 @@ export class Lineup {
     order: number;   // 行动顺序
     @prop({ required: true })
     ce: number;      // 战力
+    @prop({ required: true })
+    correspondingVar?: number;
 }
 
 @index({ day: 1, groupKey: 1, vestigeId: 1, rank: 1 })