From b3573fc29a1951bf7bc16a631077b451cf476255 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 20 Mar 2023 13:29:28 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E4=BF=AE=E5=A4=8Dgv?=
 =?UTF-8?q?g=E6=BF=80=E6=88=98=E6=9C=9F=E9=98=9F=E4=BC=8D=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E4=B8=8D=E5=91=A8=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/servers/guild/handler/gvgBattleHandler.ts    |  6 +++---
 shared/domain/gvgField/gvgDb.ts                      | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/game-server/app/servers/guild/handler/gvgBattleHandler.ts b/game-server/app/servers/guild/handler/gvgBattleHandler.ts
index 8b39afda0..77b8c0bdf 100644
--- a/game-server/app/servers/guild/handler/gvgBattleHandler.ts
+++ b/game-server/app/servers/guild/handler/gvgBattleHandler.ts
@@ -73,7 +73,8 @@ export class GVGBattleHandler {
         let durability = gameData.gvgTeamDurability.get(index)||0;
 
         let groupKey = await getGroupKey(serverId);
-        let updateParam: SaveTeamUpdateParam = { index, head, spine, frame, configId, groupKey }
+        let role = await RoleModel.findByRoleId(roleId, 'lv');
+        let updateParam: SaveTeamUpdateParam = { index, head, spine, frame, roleName, serverId, leagueCode, leagueName, lv: role.lv }
         if(lineup) {
             let { isOK, heroes } = await checkBattleHeroesByHid(roleId, lineup.map(cur => cur.actorId));
             if(!isOK) return resResult(STATUS.BATTLE_HERO_NOT_FOUND);
@@ -87,8 +88,7 @@ export class GVGBattleHandler {
             updateParam.cityId = cityId;
             updateParam.areaId = getBirthAreaOfCity(city, leagueCode)
         }
-        let role = await RoleModel.findByRoleId(roleId, 'lv');
-        const team = await GVGTeamModel.saveTeam(roleId, index, updateParam, { roleName, serverId, leagueCode, leagueName, durability, maxDurability: durability, lv: role.lv });
+        const team = await GVGTeamModel.saveTeam(roleId, index, updateParam, { configId, groupKey, durability, maxDurability: durability  });
         if (!team) {
             return resResult(STATUS.GVG_SAVE_TEAM_FAILED);
         }
diff --git a/shared/domain/gvgField/gvgDb.ts b/shared/domain/gvgField/gvgDb.ts
index b488f8279..9e3b8b4fe 100644
--- a/shared/domain/gvgField/gvgDb.ts
+++ b/shared/domain/gvgField/gvgDb.ts
@@ -264,20 +264,20 @@ export interface SaveTeamUpdateParam {
     head: number;
     frame: number;
     spine: number;
-    configId: number;
-    groupKey: string;
     lineup?: GVGHeroInfo[];
     lineupCe?: number;
     cityId?: number;
     areaId?: number;
-}
-
-export interface InitTeamParam {
     roleName: string;
     serverId: number;
     leagueCode: string;
     leagueName: string;
+    lv: number;
+}
+
+export interface InitTeamParam {
+    configId: number;
+    groupKey: string;
     durability: number;
     maxDurability: number;
-    lv: number;
 }
\ No newline at end of file