From 4d5db3b8516e8c494409720352ca61a026f71c9c Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 26 Apr 2021 17:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E8=A3=85=E5=A4=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/equipService.ts  | 5 -----
 game-server/app/services/rewardService.ts | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/game-server/app/services/equipService.ts b/game-server/app/services/equipService.ts
index 41f8985c1..b12d6c9dc 100644
--- a/game-server/app/services/equipService.ts
+++ b/game-server/app/services/equipService.ts
@@ -75,11 +75,6 @@ export async function changeEquip(roleId: string, sid: string, equipA: EquipType
             }
             let res = await dressEquip(roleId, sid, heroB, equipA, funcs);//替换给武将，并计算战力
             return res;
-        } else {
-            if(equipB) {
-                let res = await takeOffEquipAndCalPlayerCe(roleId, sid, heroB, equipB, id, funcs);//卸下装备并重算战力
-                return res;
-            }
         }
     } else if (!!heroB) {//从穿戴装备的武将上卸下装备
         await takeOffEquipAndCalPlayerCe(roleId, sid, heroB, equipB, id, funcs);//卸下装备并重算战力
diff --git a/game-server/app/services/rewardService.ts b/game-server/app/services/rewardService.ts
index 0ca32e669..f1ca2ce2a 100644
--- a/game-server/app/services/rewardService.ts
+++ b/game-server/app/services/rewardService.ts
@@ -74,6 +74,7 @@ export async function handleCost(roleId: string, sid: string, goods: Array<ItemI
 
 function sortConsumes(goods: Array<ItemInter>, bags: Array<ItemInter>, currencysMap: any, equips: Array<number>) {
     for (let good of goods) {
+        if(good.count == 0) continue;
         let goodInfo = getGoodById(good.id);
         let { type, table } = ITID.get(goodInfo.itid);