From e59402e8a78c8f603f10b48a19b1a89abcf18d79 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 2 Aug 2021 15:55:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=89=A9=E5=93=81=E8=A1=A8=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/equipService.ts | 4 ++--
 shared/pubUtils/dictionary/DicGoods.ts   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/game-server/app/services/equipService.ts b/game-server/app/services/equipService.ts
index 17281347e..54ff98335 100644
--- a/game-server/app/services/equipService.ts
+++ b/game-server/app/services/equipService.ts
@@ -140,8 +140,8 @@ export function checkEquipCanPut(hid: number, id: number) {
     let dicGood = gameData.goods.get(id);
     let dicHero = gameData.hero.get(hid);
     let dicJob = gameData.job.get(dicHero.jobid);
-    if(dicGood.jobLimited != 0 && dicGood.jobLimited != dicJob.job_class) return false;
-    if(dicGood.charLimited != 0 && dicGood.charLimited != hid) return false;
+    if(dicGood.jobLimited.indexOf(0) == -1 && dicGood.jobLimited.indexOf(dicJob.job_class) == -1) return false;
+    if(dicGood.charLimited.indexOf(0) == -1 && dicGood.charLimited.indexOf(hid) != -1) return false;
     return true 
 }
 
diff --git a/shared/pubUtils/dictionary/DicGoods.ts b/shared/pubUtils/dictionary/DicGoods.ts
index 31c448daa..b1bc59b60 100644
--- a/shared/pubUtils/dictionary/DicGoods.ts
+++ b/shared/pubUtils/dictionary/DicGoods.ts
@@ -20,9 +20,9 @@ export interface DicGoods {
     // 星级
     readonly equipLvl: number;
     // 职业限制
-    readonly jobLimited: number;
+    readonly jobLimited: number[];
     // 武将限制
-    readonly charLimited: number;
+    readonly charLimited: number[];
     // 合成装备需要的碎片数
     readonly pieces: number;
     // 对应的碎片id
@@ -137,6 +137,8 @@ export function loadGoods() {
             figureCondition.set(type, mapArr);
         }
         o.condition = condition;
+        o.jobLimited = parseNumberList(o.jobLimited);
+        o.charLimited = parseNumberList(o.charLimited);
         dicGoods.set(o.good_id, _.pick(o, Object.keys(DicGoodsKeys)));
 
         if (o.itid == IT_TYPE.BLUEPRT) {