From 19fbf31ea30da7088462c49ce7b59c2aa6f751cd Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 9 May 2022 19:58:21 +0800 Subject: [PATCH] =?UTF-8?q?pvp=EF=BC=9A=E4=BF=AE=E5=A4=8D=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E9=98=B2=E5=AE=88=E9=98=B5=E5=AE=B9=E6=88=98=E5=8A=9B?= =?UTF-8?q?=E5=B0=91=E6=8E=89=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/battle/handler/pvpHandler.ts | 4 ++-- game-server/app/services/pvpService.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/game-server/app/servers/battle/handler/pvpHandler.ts b/game-server/app/servers/battle/handler/pvpHandler.ts index fa5286376..de6334a9a 100644 --- a/game-server/app/servers/battle/handler/pvpHandler.ts +++ b/game-server/app/servers/battle/handler/pvpHandler.ts @@ -368,7 +368,7 @@ export class PvpHandler { } } let attack = new Attack(heroes, scores); - let lineupCe = await generPvpLineupCe(roleId, pvpDefense.lineupCe, attack.heroes, []); + let lineupCe = await generPvpLineupCe(roleId, pvpDefense.lineupCe, attack.heroes, pvpDefense.defense.heroes, []); // 刷对手 let role = pvpDefense.role; let oppPlayers = await refreshEnemies(role, seasonNum, pvpDefense.score, attack?.score||0, attack?.pLv||1); @@ -424,7 +424,7 @@ export class PvpHandler { return new DefenseHero(cur, heroIdMap.get(cur.actorId)); }); let defense = new Defense(defenseHeroes, scores, warId, buff); - let lineupCe = await generPvpLineupCe(roleId, pvpDefense.lineupCe, defense.heroes, dbHeroes); + let lineupCe = await generPvpLineupCe(roleId, pvpDefense.lineupCe, pvpDefense.attack.heroes, defense.heroes, dbHeroes); pvpDefense = await PvpDefenseModel.updateInfoAndInclude(roleId, { ...refChallengeObj, defense, lineupCe }); // 返回 diff --git a/game-server/app/services/pvpService.ts b/game-server/app/services/pvpService.ts index 76d3e159d..a5e0b5d11 100644 --- a/game-server/app/services/pvpService.ts +++ b/game-server/app/services/pvpService.ts @@ -626,10 +626,10 @@ export async function savePvpSeasonResult(pvpDefense: PvpDefenseType, seasonNum: return pvpSeasonResult; } -export async function generPvpLineupCe(roleId: string, lineupCe: LineupCe[], newHeroes: AttackHero[]|DefenseHero[], dbHeroes: HeroType[]) { +export async function generPvpLineupCe(roleId: string, lineupCe: LineupCe[], attackHero: AttackHero[], defenseHero: DefenseHero[], dbHeroes: HeroType[]) { let newHids: number[] = []; // 本次新增武将 let newLineupCe: { hid: number, ce: number }[] = []; // 新生成的lineupCe字段 - for(let { actorId } of newHeroes) { + for(let { actorId } of [...attackHero, ...defenseHero]) { let n = newLineupCe.find(cur => cur.hid == actorId); if(!n) { let lineup = lineupCe.find(cur => cur.hid == actorId);