xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：修改月卡刷新时间为5点

Browse Source
This commit is contained in:
luying
2022-05-21 21:30:56 +08:00
parent 5f423d6667
commit bf33ec10bc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
game-server/app/services/activity/monthlyTicketService.ts
View File

@@ -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) {

6
shared/domain/activityField/monthlyTicketField.ts
View File

@@ -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;
}