diff --git a/game-server/app/servers/activity/handler/firstGiftHandler.ts b/game-server/app/servers/activity/handler/firstGiftHandler.ts index 6fe174975..8234148cf 100644 --- a/game-server/app/servers/activity/handler/firstGiftHandler.ts +++ b/game-server/app/servers/activity/handler/firstGiftHandler.ts @@ -75,16 +75,15 @@ export class FirstGiftHandler { for (let item of items) { rewardArray.push(...stringToRewardParam(item.reward)); indexArray.push(item.index) - item.isReceive = true; } let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.FIRST_GIFT); let isOver = playerPageData.isComplete(); - - await ActivityFirstGiftModel.addRecord(activityId, roleId, pageIndex, indexArray, isOver); + let playerRecord = await ActivityFirstGiftModel.addRecord(activityId, roleId, pageIndex, indexArray, isOver); + playerPageData.setPlayerRecord(playerRecord); return resResult(STATUS.SUCCESS, Object.assign(result, { - param: { activityId, pageIndex }, + param: { activityId, pageIndex, state: playerPageData.state }, items: items })); } diff --git a/shared/domain/activityField/signInField.ts b/shared/domain/activityField/signInField.ts index c34aa333e..ffc9534d5 100644 --- a/shared/domain/activityField/signInField.ts +++ b/shared/domain/activityField/signInField.ts @@ -94,6 +94,7 @@ export class SignInData extends ActivityBase { this.signEndTime = moment().endOf('M').valueOf(); this.roundIndex = parseInt(moment().format('YYYYMM')); + this.todayIndex = 1; } else if (this.type == ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN) { this.roundIndex = 0;