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