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, bags: Array, currencysMap: any, equips: Array) { for (let good of goods) { + if(good.count == 0) continue; let goodInfo = getGoodById(good.id); let { type, table } = ITID.get(goodInfo.itid);