diff --git a/game-server/app/servers/guild/handler/gvgFightHandler.ts b/game-server/app/servers/guild/handler/gvgFightHandler.ts index ea61b92ac..ad6e00938 100644 --- a/game-server/app/servers/guild/handler/gvgFightHandler.ts +++ b/game-server/app/servers/guild/handler/gvgFightHandler.ts @@ -123,6 +123,7 @@ export class GVGProduceHandler { async getOppLineup(msg: { vestigeId: number, roleId: string, rank: number }, session: BackendSession) { const roleId: string = session.get('roleId'); const serverId: number = session.get('serverId'); + const guildCode = session.get('guildCode'); let { vestigeId, roleId: targetRoleId, rank } = msg; @@ -139,6 +140,9 @@ export class GVGProduceHandler { let dicGVGVestige = gameData.gvgVestige.get(vestigeId)?.get(rank); if(!dicGVGVestige) return resResult(STATUS.DIC_DATA_NOT_FOUND); + const myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode); + if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST); + if(isRobot) { let dicWar = gameData.war.get(dicGVGVestige?.warId); let dicWarJson = gameData.warJson.get(dicWar.dispatchJsonId); @@ -152,7 +156,8 @@ export class GVGProduceHandler { let hids = hisVestigeRank.lineup?.map(cur => cur.actorId)||[]; let heroes = await HeroModel.findByHidRange(hids, roleId, 'hid skinId quality star colorStar lv'); - result.setPlayer(dicGVGVestige, role, heroes, serverNames); + const { leagueCode, name } = myLeague; + result.setPlayer(dicGVGVestige, role, heroes, serverNames, name, leagueCode); } return resResult(STATUS.SUCCESS, result); } diff --git a/shared/domain/gvgField/returnData.ts b/shared/domain/gvgField/returnData.ts index 0d0d3b510..2b4771d8a 100644 --- a/shared/domain/gvgField/returnData.ts +++ b/shared/domain/gvgField/returnData.ts @@ -483,6 +483,8 @@ export class GVGVestigeOppLineupHero { } class OppData { + leagueCode: string; + leagueName: string; rank: number; score: number; isRobot: boolean; @@ -513,6 +515,8 @@ class OppData { this.frame = EXTERIOR.EXTERIOR_FACECASE; this.spine = dic.spine; this.title = 1; + this.leagueName = '遗迹守卫军'; + this.leagueCode = 'robot'; for(let warJson of warJsons) { if(warJson.relation == 2) { @@ -523,7 +527,7 @@ class OppData { } } - setPlayer(dic: DicGVGVestige, role: RoleType, heroes: HeroType[], serverNames: any) { + setPlayer(dic: DicGVGVestige, role: RoleType, heroes: HeroType[], serverNames: any, leagueName: string, leagueCode: string) { this.isRobot = false; this.rank = dic.rank; this.score = dic.score; @@ -536,6 +540,8 @@ class OppData { this.head = role.head; this.frame = role.frame; this.spine = role.spine; + this.leagueName = leagueName; + this.leagueCode = leagueCode; for(let hero of heroes) { this.lineupCe += hero.ce; @@ -564,8 +570,8 @@ export class GVGVestigeOppLineup { this.opp.setRobot(dic, warJsons, serverName); } - setPlayer(dic: DicGVGVestige, role: RoleType, heroes: HeroType[], serverNames: any) { - this.opp.setPlayer(dic, role, heroes, serverNames); + setPlayer(dic: DicGVGVestige, role: RoleType, heroes: HeroType[], serverNames: any, leagueName: string, leagueCode: string) { + this.opp.setPlayer(dic, role, heroes, serverNames, leagueName, leagueCode); } }