From 9115794b823edfd801f7429808c3d9b2cb196e7c Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Tue, 21 Mar 2023 21:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(pvp):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B7=85=E5=B3=B0=E6=BC=94=E6=AD=A6=E5=88=B7=E6=96=B0=E5=AF=B9?=
 =?UTF-8?q?=E6=89=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/pvpService.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/game-server/app/services/pvpService.ts b/game-server/app/services/pvpService.ts
index c6363cbc7..bd8c8d713 100644
--- a/game-server/app/services/pvpService.ts
+++ b/game-server/app/services/pvpService.ts
@@ -229,7 +229,8 @@ async function generPlayerOppHis(pvpdefense: PvpDefenseType, roleId: string, pos
         let h = defenseHeroes.find(cur => cur.actorId == dbHero.hid); // 阵容里是否有这个武将
         let hs = heroScores.find(cur => cur.hid == dbHero.hid); // 这个武将是否有这个得分
         if (!!h) {
-            let mapWarJson = gameData.warJson.get(warId);
+            let dicWar = gameData.war.get(warId);
+            let mapWarJson = gameData.warJson.get(dicWar.dispatchJsonId);
             let warJson = mapWarJson.find(cur => cur.dataId == h.dataId);
             if (warJson && warJson.relation == 2) {
                 let heroInfo = new PvpHeroInfo();