diff --git a/game-server/app/services/activity/monthlyTicketService.ts b/game-server/app/services/activity/monthlyTicketService.ts index 6683c4da9..c96601890 100644 --- a/game-server/app/services/activity/monthlyTicketService.ts +++ b/game-server/app/services/activity/monthlyTicketService.ts @@ -1,4 +1,4 @@ -import { ACTIVITY_TYPE, HANG_UP_CONSTS, ITEM_CHANGE_REASON, MAIL_TYPE, STATUS } from '../../consts'; +import { ACTIVITY_TYPE, HANG_UP_CONSTS, ITEM_CHANGE_REASON, MAIL_TYPE, REFRESH_TIME, STATUS } from '../../consts'; import { ActivityModel, ActivityModelType } from '../../db/Activity'; import { ActivityMonthlyTicketModel, ActivityMonthlyTicketModelType } from '../../db/ActivityMonthlyTicket'; import { RewardParam } from '../../domain/activityField/rewardField'; @@ -125,7 +125,7 @@ export async function makeMonthlyTicketReward(roleId: string, roleName: string, let serverTime = await getServerCreateTime(serverId); let playerData = new MonthlyTicketData(activityData, createTime, serverTime); - let endTime = playerData.isForever? moment(playerData.endTime).toDate(): moment(new Date()).startOf('d').add(playerData.days, 'day').toDate(); + let endTime = playerData.isForever? moment(playerData.endTime).toDate(): moment(new Date()).startOf('d').add(playerData.days, 'day').add(REFRESH_TIME, 'h').toDate(); console.log('endTime', playerData.isForever, moment(new Date()).startOf('d'), endTime, playerData.days) await ActivityMonthlyTicketModel.buyMonthlyTicket(serverId, roleId, activityId, activityData.type, endTime, playerData.isForever) if(activityData.type == ACTIVITY_TYPE.MONTHLY_TICKET_2) { diff --git a/shared/domain/activityField/monthlyTicketField.ts b/shared/domain/activityField/monthlyTicketField.ts index 9189c30a3..829341b09 100644 --- a/shared/domain/activityField/monthlyTicketField.ts +++ b/shared/domain/activityField/monthlyTicketField.ts @@ -1,5 +1,5 @@ import moment = require('moment'); -import { ACTIVITY_TYPE } from '../../consts'; +import { ACTIVITY_TYPE, REFRESH_TIME } from '../../consts'; import { ActivityModelType } from '../../db/Activity'; import { ActivityMonthlyTicketModelType } from '../../db/ActivityMonthlyTicket'; import { deltaDays } from '../../pubUtils/util'; @@ -62,10 +62,10 @@ export class MonthlyTicketData extends ActivityBase { return; } this.dayIndex = data.dayIndex; - this.cardEndTime = data.isForever? moment(data.endTime).valueOf(): this.endTime; + this.cardEndTime = data.isForever? this.endTime: moment(data.endTime).valueOf(); if (data.isForever || moment(new Date).valueOf() < this.cardEndTime) { this.isOpen = true; - this.todayIndex = deltaDays(moment(data.createdAt).startOf('d').toDate(), new Date) + 1; + this.todayIndex = deltaDays(moment(data.createdAt).startOf('d').add(REFRESH_TIME, 'h').toDate(), new Date) + 1; } else { this.todayIndex = 0; }