From e91650f11c8ec06d809f7da3f5939bc28d742211 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 21 May 2021 17:46:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=9A=E8=A3=85=E5=A4=87bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/taskService.ts | 34 +++++++++++++------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/game-server/app/services/taskService.ts b/game-server/app/services/taskService.ts
index d30fe0db0..86f60a2ff 100644
--- a/game-server/app/services/taskService.ts
+++ b/game-server/app/services/taskService.ts
@@ -248,25 +248,27 @@ export async function checkTaskConditionEquipSuitJewelStage(hero: HeroType) {
     let jewelLevel = -1;//宝石阶数
     for (let i = 0; i < hero.ePlace.length; i++) {
         let equipObj = <EquipType>hero.ePlace[i].equip;
-        let equipObjInfo = getGoodById(equipObj.id);
-        if (equipObj.holes.length == equipObjInfo.hole && equipObjInfo.hole > 0) {
-            for (let j = 0; j < equipObj.holes.length; j++) {
-                let jewel = equipObj.holes[j].jewel;
-                let jewelInfo = getGoodById(jewel);
-                if (jewelInfo) {
-                    if (jewelLevel == -1) {
-                        jewelLevel = jewelInfo.lvLimited;
-                    } else if (jewelInfo.lvLimited != jewelLevel) {
-                        //宝石阶数不同
-                        isTask = false;
-                        break;
+        if(equipObj) {
+            let equipObjInfo = getGoodById(equipObj.id);
+            if (equipObj.holes.length == equipObjInfo.hole && equipObjInfo.hole > 0) {
+                for (let j = 0; j < equipObj.holes.length; j++) {
+                    let jewel = equipObj.holes[j].jewel;
+                    let jewelInfo = getGoodById(jewel);
+                    if (jewelInfo) {
+                        if (jewelLevel == -1) {
+                            jewelLevel = jewelInfo.lvLimited;
+                        } else if (jewelInfo.lvLimited != jewelLevel) {
+                            //宝石阶数不同
+                            isTask = false;
+                            break;
+                        }
                     }
                 }
+            } else {
+                //宝石没有镶满
+                isTask = false;
+                break;
             }
-        } else {
-            //宝石没有镶满
-            isTask = false;
-            break;
         }
     }
     return { isTask, jewelLevel };