From 8b4d1b91e604e100c2bcc9b525379f65abc3bb7f Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Tue, 1 Aug 2023 20:51:08 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E6=88=98=E5=9C=BA):=20gvg?=
 =?UTF-8?q?=E6=BF=80=E6=88=98=E6=9C=9F=E9=98=B5=E5=AE=B9=E6=88=98=E9=98=B5?=
 =?UTF-8?q?=E8=BF=9E=E6=90=BA=E5=8F=AF=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/guild/handler/gvgBattleHandler.ts | 3 ++-
 shared/domain/gvgField/gvgDb.ts                           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/game-server/app/servers/guild/handler/gvgBattleHandler.ts b/game-server/app/servers/guild/handler/gvgBattleHandler.ts
index e3dd8abec..5426ac737 100644
--- a/game-server/app/servers/guild/handler/gvgBattleHandler.ts
+++ b/game-server/app/servers/guild/handler/gvgBattleHandler.ts
@@ -79,7 +79,7 @@ export class GVGBattleHandler {
 
         let groupKey = await getGroupKey(serverId);
         let role = await RoleModel.findByRoleId(roleId, 'lv title');
-        let updateParam: SaveTeamUpdateParam = { index, head, spine, frame, roleName, serverId, leagueCode, leagueName, lv: role.lv, title: role.title, combo }
+        let updateParam: SaveTeamUpdateParam = { index, head, spine, frame, roleName, serverId, leagueCode, leagueName, lv: role.lv, title: role.title }
         if(lineup) {
             let hids: number[] = [];
             for(let { actorId, subHid } of lineup) {
@@ -98,6 +98,7 @@ export class GVGBattleHandler {
             updateParam.cityId = cityId;
             updateParam.areaId = getBirthAreaOfCity(city, leagueCode)
         }
+        if(combo) updateParam.combo = combo;
         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 db403e629..0b5e0a4f9 100644
--- a/shared/domain/gvgField/gvgDb.ts
+++ b/shared/domain/gvgField/gvgDb.ts
@@ -280,7 +280,7 @@ export interface SaveTeamUpdateParam {
     frame: number;
     spine: number;
     lineup?: GVGHeroInfo[];
-    combo: Combo[];
+    combo?: Combo[];
     lineupCe?: number;
     cityId?: number;
     areaId?: number;