From a8051b9767f21da7544de95c22f6897753de5352 Mon Sep 17 00:00:00 2001
From: xichaoyin <xcy@.qx.com>
Date: Thu, 11 Jan 2024 14:19:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:npc=E6=B7=BB=E5=8A=A0=E7=9A=AE=E8=82=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jsonType.ts                     | 2 ++
 src/shared/fightControl/fightFun.ts | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/jsonType.ts b/src/jsonType.ts
index c6edbea..4823cba 100644
--- a/src/jsonType.ts
+++ b/src/jsonType.ts
@@ -800,6 +800,8 @@ type gc_npc = k_v<{
     'ghname': string
     /**npc名称 */
     'npcname': string
+    /**怪物皮肤*/ 
+    'skin': number[]
 }>;
 
 type gc_openCond = k_v<{
diff --git a/src/shared/fightControl/fightFun.ts b/src/shared/fightControl/fightFun.ts
index 3230eca..ea85f64 100644
--- a/src/shared/fightControl/fightFun.ts
+++ b/src/shared/fightControl/fightFun.ts
@@ -121,7 +121,7 @@ export function createNpc(npcId: string | number, fixData: Partial<ResLogin['gud
             isNpc: true
         },
         roles: Object.fromEntries(dataArr.map((d, i) => [i + 1, function () {
-
+            d['skin'] = (npcConf.skin?.[i] || '');
             let { id, atk, def, mindps, maxdps, hp, speed, ...ops } = G.gc.armyattr[d.countId];
             let buff = HeroShared.getHeroBasicAttr({ heroId: d.heroId, lv: d.lv });
 
@@ -149,9 +149,9 @@ export function createNpc(npcId: string | number, fixData: Partial<ResLogin['gud
             return {
                 attr: buff,
                 ...d,
-                lv: (npcConf.npcLv ? npcConf.npcLv[i]: 0) || d.lv,
+                lv: (npcConf.npcLv ? npcConf.npcLv[i] : 0) || d.lv,
                 isBoss: !!npcConf.isboss,
-                trueLv: d.lv || (npcConf.npcLv ? npcConf.npcLv[i]: 0)
+                trueLv: d.lv || (npcConf.npcLv ? npcConf.npcLv[i] : 0)
             };
 
         }()]))