From 47a5843bdbd892df6670ac8ae43e65178094f97b Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 19 Oct 2020 17:52:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E8=8D=A1=E5=A5=96=E5=8A=B1=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=93=AA=E4=B8=80=E6=AC=A1=E6=8E=89=E8=90=BD=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/rewardService.ts | 4 ++-- game-server/app/services/warRewardService.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/game-server/app/services/rewardService.ts b/game-server/app/services/rewardService.ts index 0929c3823..cddf0f16e 100644 --- a/game-server/app/services/rewardService.ts +++ b/game-server/app/services/rewardService.ts @@ -13,7 +13,7 @@ export async function handleFixedReward(roleId: string, roleName: string, reward return result; } -export async function handleReward(roleId: string, roleName: string, rewards: Array<{type: number, gid: number, count: number}>) { +export async function handleReward(roleId: string, roleName: string, rewards: Array<{type: number, gid: number, count: number, times: number}>) { let returnGoods = new Array(); for(let goods of rewards) { @@ -21,7 +21,7 @@ export async function handleReward(roleId: string, roleName: string, rewards: Ar if(goodInfo.goodType == GOOD_TYPE.EQUIP) { // 装备 let result = await rewardWeapons(roleId, roleName, goodInfo, {id: goods.gid, cnt: goods.count }); for(let obj of result) { - returnGoods.push({dropType: goods.type, ...obj}) + returnGoods.push({dropType: goods.type, times: goods.times, ...obj}) } } } diff --git a/game-server/app/services/warRewardService.ts b/game-server/app/services/warRewardService.ts index 92208c67d..e66108f97 100644 --- a/game-server/app/services/warRewardService.ts +++ b/game-server/app/services/warRewardService.ts @@ -16,7 +16,7 @@ export class WarReward { condition: Map; warInfo: any; isSuccess: boolean; - rewards: Array<{type: number, gid: number, count: number}>; + rewards: Array<{type: number, gid: number, count: number, times: number}>; constructor(roleId: string, roleName: string, battleId: number, isSuccess: boolean) { this.roleId = roleId; @@ -97,6 +97,7 @@ export class WarReward { this.handleConditionReward(num); await this.handleRandomReward(num); + console.log(this.rewards) let returnGoods = await handleReward(this.roleId, this.roleName, this.rewards); return returnGoods; }