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

刷新：时间的0点设置错误，0-5点会取成当天5点

Browse Source
This commit is contained in:
luying
2022-06-17 13:23:58 +08:00
parent caa1bfbfec
commit ec761bd625
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/pubUtils/timeUtil.ts
+4 -4
View File
@@ -481,14 +481,14 @@ export function getZeroPoint(refreshType: SHOP_REFRESH_TYPE = SHOP_REFRESH_TYPE.
* 获取刷新时间点 Date类型 * 获取刷新时间点 Date类型
* @param refreshType 刷新类型，每天/每周/每月，默认每天 * @param refreshType 刷新类型，每天/每周/每月，默认每天
*/ */
export function getZeroPointD(refreshType: SHOP_REFRESH_TYPE = SHOP_REFRESH_TYPE.DAILY) { export function getZeroPointD(refreshType: SHOP_REFRESH_TYPE = SHOP_REFRESH_TYPE.DAILY, hour = REFRESH_TIME) {
let t = new Time(TIME_OUTPUT_TYPE.DATE); let t = new Time(TIME_OUTPUT_TYPE.DATE);
if(refreshType == SHOP_REFRESH_TYPE.DAILY) { if(refreshType == SHOP_REFRESH_TYPE.DAILY) {
return <Date>t.getDayZeroPoint(); return <Date>t.getDayZeroPoint(hour);
} else if (refreshType == SHOP_REFRESH_TYPE.WEEKLY) { } else if (refreshType == SHOP_REFRESH_TYPE.WEEKLY) {
return <Date>t.getWeekZeroPoint(); return <Date>t.getWeekZeroPoint(hour);
} else if (refreshType == SHOP_REFRESH_TYPE.MONTHLY) { } else if (refreshType == SHOP_REFRESH_TYPE.MONTHLY) {
return <Date>t.getMonthZeroPoint(); return <Date>t.getMonthZeroPoint(hour);
} }
} }
shared/pubUtils/util.ts
+7 -8
View File
@@ -5,10 +5,10 @@ import { isNumber } from 'underscore';
const csprng = require('csprng'); const csprng = require('csprng');
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
import { ABI_STAGE, GACHA_TO_FLOOR, REFRESH_TIME, ROBOT_SYS_TYPE, ITEM_CHANGE_REASON, WAR_TYPE } from '../consts'; import { ABI_STAGE, GACHA_TO_FLOOR, REFRESH_TIME, ROBOT_SYS_TYPE, ITEM_CHANGE_REASON, WAR_TYPE, SHOP_REFRESH_TYPE } from '../consts';
import { findIndex } from 'underscore'; import { findIndex } from 'underscore';
import { getTimeFunM } from './timeUtil'; import { getTimeFunM, getZeroPointD } from './timeUtil';
import { Floor } from '../domain/activityField/gachaField'; import { Floor } from '../domain/activityField/gachaField';
import { WhiteListModel } from '../db/RegionWhiteList'; import { WhiteListModel } from '../db/RegionWhiteList';
import { RewardInter } from './interface'; import { RewardInter } from './interface';
@@ -132,10 +132,8 @@ export function deltaDays(preTime: Date, proTime: Date): number {
export function shouldRefresh(preTime: Date, now: Date, hour: number = REFRESH_TIME, deltaDay = 1): boolean { export function shouldRefresh(preTime: Date, now: Date, hour: number = REFRESH_TIME, deltaDay = 1): boolean {
if (!preTime) return true; if (!preTime) return true;
let curTime = new Date(now.getTime()); let curTime = new Date(now.getTime());
let refreshTime = new Date(now.getTime()); let refreshTime = getZeroPointD(SHOP_REFRESH_TYPE.DAILY, hour);
refreshTime.setHours(hour, 0, 0, 0);
let refeshTime = refreshTime.getTime(); let refeshTime = refreshTime.getTime();
if (refeshTime - preTime.getTime() > (deltaDay >= 1 ? deltaDay - 1 : 0) * 24 * 60 * 60 * 1000 && curTime.getTime() >= refeshTime) { if (refeshTime - preTime.getTime() > (deltaDay >= 1 ? deltaDay - 1 : 0) * 24 * 60 * 60 * 1000 && curTime.getTime() >= refeshTime) {
return true; return true;
} }
@@ -150,12 +148,13 @@ export function shouldRefresh(preTime: Date, now: Date, hour: number = REFRESH_T
* @param hour 几点刷新 * @param hour 几点刷新
* @param deltaDay 间隔几天刷新，默认每天刷新(deltaDay = 1) * @param deltaDay 间隔几天刷新，默认每天刷新(deltaDay = 1)
*/ */
export function shouldRefreshWeek(preTime: Date, now: Date, day: number = 1, hour: number = REFRESH_TIME, deltaWeek = 1): boolean { export function shouldRefreshWeek(preTime: Date, now: Date, hour: number = REFRESH_TIME, deltaWeek = 1): boolean {
if (!preTime) return true; if (!preTime) return true;
let curTime = new Date(now.getTime()); let curTime = new Date(now.getTime());
let refreshTime = <number>getTimeFunM(now).getTimeWithWeek(day, hour); let refreshTime = getZeroPointD(SHOP_REFRESH_TYPE.WEEKLY, hour);
let refeshTime = refreshTime.getTime();
if (refreshTime - preTime.getTime() > (deltaWeek >= 1 ? deltaWeek - 1 : 0) * 7 * 24 * 60 * 60 * 1000 && curTime.getTime() >= refreshTime) { if (refeshTime - preTime.getTime() > (deltaWeek >= 1 ? deltaWeek - 1 : 0) * 7 * 24 * 60 * 60 * 1000 && curTime.getTime() >= refeshTime) {
return true; return true;
} }
return false; return false;