diff --git a/game-server/app/servers/activity/handler/growthFundHandler.ts b/game-server/app/servers/activity/handler/growthFundHandler.ts index 6bcd8fd29..dbb25ab9c 100644 --- a/game-server/app/servers/activity/handler/growthFundHandler.ts +++ b/game-server/app/servers/activity/handler/growthFundHandler.ts @@ -65,7 +65,8 @@ export class GrowthFundHandler { if (!growthFundItemData.isComplete) {//未完成任务 return resResult(STATUS.ACTIVITY_TASK_UNCOMPLETED); } - if (playerData.isReceive(pageIndex, cellIndex)) {//已经领取过 + let hasReceive = await ActivityGrowthFundModel.exists({ roleId, activityId, pageIndex, cellIndex }); + if (hasReceive) {//已经领取过 return resResult(STATUS.ACTIVITY_REWARDED); } diff --git a/shared/domain/activityField/growthFundField.ts b/shared/domain/activityField/growthFundField.ts index 5075de1e3..ff0609eda 100644 --- a/shared/domain/activityField/growthFundField.ts +++ b/shared/domain/activityField/growthFundField.ts @@ -121,7 +121,8 @@ export class GrowthFundData extends ActivityBase { //是否领取过 public isReceive(pageIndex: number, cellIndex: number) { - let index = this.receiveRecords.findIndex(obj => { obj && obj.pageIndex == pageIndex && cellIndex == obj.cellIndex }) + let index = this.receiveRecords.findIndex(obj => { return obj && obj.pageIndex == pageIndex && cellIndex == obj.cellIndex }) + return (index !== -1); } @@ -130,7 +131,7 @@ export class GrowthFundData extends ActivityBase { for (let i = 0; i < this.list.length; i++) { let page = this.list[i]; for (let item of page.items) { - let index = this.receiveRecords.findIndex(obj => { obj && obj.pageIndex == page.pageIndex && item.cellIndex == obj.cellIndex }) + let index = this.receiveRecords.findIndex(obj => { return obj && obj.pageIndex == page.pageIndex && item.cellIndex == obj.cellIndex }) if (index == -1) { return false }