From da2a690c8237166251f286854855b270b78ca82c Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Thu, 5 Aug 2021 14:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=EF=BC=9A=E5=90=88=E6=88=90?=
 =?UTF-8?q?=E6=B6=88=E8=80=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/equipService.ts  | 3 ++-
 game-server/app/services/rewardService.ts | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/game-server/app/services/equipService.ts b/game-server/app/services/equipService.ts
index 9a98c451a..bf768e8cc 100644
--- a/game-server/app/services/equipService.ts
+++ b/game-server/app/services/equipService.ts
@@ -51,10 +51,11 @@ export function checkMaterialEnough(consumes: Array<{ id: number, count: number
             } else {
                 if(consumeCount < count * targetCount) {
                     comJewelMap.set(id, 0);
+                    needConsumes.push({ id, count: consumeCount });
                     isEnough = checkCurMeterial(id, count * targetCount - consumeCount);
                 } else {
                     comJewelMap.set(id, consumeCount - count * targetCount);
-                    needConsumes.push({ id, count: consumeCount - count * targetCount });
+                    needConsumes.push({ id, count: count * targetCount });
                 }
 
             }
diff --git a/game-server/app/services/rewardService.ts b/game-server/app/services/rewardService.ts
index 664f65863..60e3266d3 100644
--- a/game-server/app/services/rewardService.ts
+++ b/game-server/app/services/rewardService.ts
@@ -195,6 +195,7 @@ function sortItems(goods: ItemInter[], handleType: HANDLE_REWARD_TYPE) {
     let figures: number[] = [];
 
     for(let good of goods) {
+        if(good.count == 0) continue;
         let dicGood = gameData.goods.get(good.id);
         if(!dicGood) {
             errlogger.error(`物品 ${good.id} 未配置`);