战场：扫荡奖励

game-server/app/services/rewardService.ts

@@ -293,6 +293,25 @@ export function combineItems(items: { id?: number, count?: number }[]) {
     return result;
 }
 
+export function combineItemAndEquips(items: { id?: number, count?: number }[]) {
+    let result: { id: number, count: number }[] = [];
+    for(let { id, count = 1 } of items) {
+        let dicGoods = gameData.goods.get(id);
+        let dicItid = ITID.get(dicGoods.itid);
+        if(dicItid.table != 'equip') {
+            let index = result.findIndex(cur => cur.id == id);
+            if(index == -1) {
+                result.push({ id, count });
+            } else {
+                result[index].count += count;
+            }
+        } else {
+            result.push({ id, count });
+        }
+    }
+    return result;
+}
+
 function sortItems(goods: ItemInter[], handleType: HANDLE_REWARD_TYPE) {
     let items: { id: number, count: number }[] = [];  // 可叠加道具
     let equips: { seqId?: number, id?: number, hid?: number }[] = []; // 不可叠加装备