活动：删除多余代码

game-server/app/services/yuanbaoService.ts

@@ -73,8 +73,17 @@ export async function makeYuanbaoShopReward(roleId: string, roleName: string, si
         rewardParamArr = rewardParamArr.concat(stringToRewardParam(item.baseReward));
         rewardParamArr = rewardParamArr.concat(stringToRewardParam(item.extraReward));
     }
+    let arr: Array<RewardParam> = [];
+    for (let obj of rewardParamArr) {
+        let index = arr.findIndex(reward => { return reward.type == obj.type && reward.id == obj.id });
+        if (index != -1) {
+            arr[index].count += obj.count;
+        } else {
+            arr.push(obj);
+        }
+    }
 
-    let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
+    let result = await addReward(roleId, roleName, sid, serverId, funcs, arr)
     item.buyCount += 1;
     return Object.assign(result, { item, activityId: activityData.activityId })
 }