From bef0ceab9d335a00498dc03e129864d6e0465dbc Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Thu, 5 May 2022 15:04:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E5=9B=A2=EF=BC=9A=E6=BC=94=E6=AD=A6?=
 =?UTF-8?q?=E5=8F=B0=E5=87=BA=E5=85=B5=E8=A1=A8=E8=AF=BB=E5=8F=96=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/guildBossService.ts |  3 ++-
 shared/resource/jsons/dic_army_bossBase.json | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/game-server/app/services/guildBossService.ts b/game-server/app/services/guildBossService.ts
index 625a2f792..bf513a90c 100644
--- a/game-server/app/services/guildBossService.ts
+++ b/game-server/app/services/guildBossService.ts
@@ -184,7 +184,8 @@ export async function getBossHp(serverId: number, guildCode: string, dicBossBase
     let serverRecord = await ServerRecordModel.findTodayData(serverId);
     if(!serverRecord) return minBossHp;
 
-    let dicWarJson = gameData.warJson.get(warId);
+    let dicWar = gameData.war.get(warId);
+    let dicWarJson = gameData.warJson.get(dicWar.dispatchJsonId);
     let actorId = gameData.heroIdByWar.get(warId);
     let dicBoss = dicWarJson.find(cur => cur.actorId == actorId);
     let attribute = dicBoss?.attribute||[];
diff --git a/shared/resource/jsons/dic_army_bossBase.json b/shared/resource/jsons/dic_army_bossBase.json
index cf506869c..7bc8ed4fc 100644
--- a/shared/resource/jsons/dic_army_bossBase.json
+++ b/shared/resource/jsons/dic_army_bossBase.json
@@ -4,7 +4,7 @@
         "structureId": 3,
         "level": 1,
         "bossLevel": 10,
-        "warIdHP": "8001&10000000&10|8002&10000000&10",
+        "warIdHP": "8001&10000000&10|8008&10000000&10",
         "rewards": 1,
         "consume": 50000,
         "buildWords": "&",
@@ -22,7 +22,7 @@
         "structureId": 3,
         "level": 2,
         "bossLevel": 20,
-        "warIdHP": "8001&20000000&20|8002&20000000&20",
+        "warIdHP": "8009&20000000&20|8010&20000000&20|8016&20000000&20",
         "rewards": 1,
         "consume": 125000,
         "buildWords": "&",
@@ -40,7 +40,7 @@
         "structureId": 3,
         "level": 3,
         "bossLevel": 30,
-        "warIdHP": "8001&30000000&30|8002&30000000&30",
+        "warIdHP": "8017&30000000&30|8018&30000000&30|8024&30000000&30",
         "rewards": 2,
         "consume": 350000,
         "buildWords": "&",
@@ -58,7 +58,7 @@
         "structureId": 3,
         "level": 4,
         "bossLevel": 40,
-        "warIdHP": "8001&40000000&40|8002&40000000&40",
+        "warIdHP": "8025&40000000&40|8026&40000000&40|8027&40000000&40|8032&40000000&40",
         "rewards": 2,
         "consume": 800000,
         "buildWords": "&",
@@ -76,7 +76,7 @@
         "structureId": 3,
         "level": 5,
         "bossLevel": 50,
-        "warIdHP": "8001&50000000&50|8002&50000000&50",
+        "warIdHP": "8033&50000000&50|8034&50000000&50|8035&50000000&50|8040&50000000&50",
         "rewards": 2,
         "consume": 1700000,
         "buildWords": "&",
@@ -94,7 +94,7 @@
         "structureId": 3,
         "level": 6,
         "bossLevel": 60,
-        "warIdHP": "8001&60000000&60|8002&60000000&60",
+        "warIdHP": "8041&60000000&60|8042&60000000&60|8043&60000000&60|8044&60000000&60|8048&60000000&60",
         "rewards": 2,
         "consume": 3500000,
         "buildWords": "&",
@@ -112,7 +112,7 @@
         "structureId": 3,
         "level": 7,
         "bossLevel": 70,
-        "warIdHP": "8001&70000000&65|8002&70000000&65",
+        "warIdHP": "8049&70000000&65|8050&70000000&65|8051&70000000&65|8052&70000000&65|8056&70000000&65",
         "rewards": 3,
         "consume": 6125000,
         "buildWords": "&",
@@ -130,7 +130,7 @@
         "structureId": 3,
         "level": 8,
         "bossLevel": 80,
-        "warIdHP": "8001&80000000&70|8002&80000000&70",
+        "warIdHP": "8057&80000000&70|8058&80000000&70|8059&80000000&70|8060&80000000&70|8061&80000000&70|8064&80000000&70",
         "rewards": 3,
         "consume": 9125000,
         "buildWords": "&",
@@ -148,7 +148,7 @@
         "structureId": 3,
         "level": 9,
         "bossLevel": 90,
-        "warIdHP": "8001&90000000&75|8002&90000000&75",
+        "warIdHP": "8065&90000000&75|8066&90000000&75|8067&90000000&75|8068&90000000&75|8069&90000000&75|8070&90000000&75|8072&90000000&75",
         "rewards": 3,
         "consume": 13625000,
         "buildWords": "&",
@@ -166,7 +166,7 @@
         "structureId": 3,
         "level": 10,
         "bossLevel": 100,
-        "warIdHP": "8001&100000000&80|8002&100000000&80",
+        "warIdHP": "8073&100000000&80|8074&100000000&80|8075&100000000&80|8076&100000000&80|8077&100000000&80|8078&100000000&80|8079&100000000&80|8080&100000000&80",
         "rewards": 3,
         "consume": 0,
         "buildWords": "&",