From 6289c593aef5e04790afc9f74edacae4263d8dca Mon Sep 17 00:00:00 2001 From: qiaoxin Date: Wed, 26 May 2021 16:24:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=9A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/activity/handler/limitPackageHandler.ts | 7 ++++++- .../app/servers/activity/handler/monthlyTicketHandler.ts | 4 +++- shared/domain/activityField/growthField.ts | 8 ++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/game-server/app/servers/activity/handler/limitPackageHandler.ts b/game-server/app/servers/activity/handler/limitPackageHandler.ts index 8a9b4d3fa..9a8a32055 100644 --- a/game-server/app/servers/activity/handler/limitPackageHandler.ts +++ b/game-server/app/servers/activity/handler/limitPackageHandler.ts @@ -102,7 +102,12 @@ export class LimitPackageHandler { let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardArray); await ActivityShopModel.addRecord(activityId, roleId, roundIndex, id); - return resResult(STATUS.SUCCESS, Object.assign(result, {})); + + item.buyCount += 1; + return resResult(STATUS.SUCCESS, Object.assign(result, { + param: { activityId, roundIndex, id }, + item: item + })); } } diff --git a/game-server/app/servers/activity/handler/monthlyTicketHandler.ts b/game-server/app/servers/activity/handler/monthlyTicketHandler.ts index b86781460..01e80373f 100644 --- a/game-server/app/servers/activity/handler/monthlyTicketHandler.ts +++ b/game-server/app/servers/activity/handler/monthlyTicketHandler.ts @@ -45,7 +45,9 @@ export class MonthlyTicketHandler { let result = await getPlayerMonthlyTicketDayReward(roleId, roleName, sid, serverId, funcs, activityId) if (result) { - return resResult(STATUS.SUCCESS, result); + return resResult(STATUS.SUCCESS, Object.assign(result, { + param: { activityId }, + })); } return resResult(STATUS.NO_MOTHLY_TICKET_REWARD); } diff --git a/shared/domain/activityField/growthField.ts b/shared/domain/activityField/growthField.ts index 6169bb71f..bb27133a0 100644 --- a/shared/domain/activityField/growthField.ts +++ b/shared/domain/activityField/growthField.ts @@ -181,11 +181,11 @@ export class GrowthData extends ActivityBase { let index = data.findIndex(record => { return obj.dayIndex == record.dayIndex && obj.cellIndex == record.cellIndex }) if (index != -1) { obj.totalCount = data[index].totalCount ? data[index].totalCount : 0; + obj.receiveRewardCount = data[index].receiveRewardCount ? data[index].receiveRewardCount : 0; - } else { - if (obj.taskType === TASK_TYPE.HERO_NUM) { - obj.totalCount = heroNum; - } + } + if (obj.taskType === TASK_TYPE.HERO_NUM) { + obj.totalCount = heroNum; } } }