diff --git a/game-server/app/services/pushService.ts b/game-server/app/services/pushService.ts index 3c2ac6f72..dff0a6b0d 100644 --- a/game-server/app/services/pushService.ts +++ b/game-server/app/services/pushService.ts @@ -12,13 +12,16 @@ export async function sendMessageToAllWithSuc(route: string, data: any) { export async function sendMessageToAll(route: string, data: any) { let allOnlineUsers = await getAllOnlineRoles(); let n = Math.ceil(allOnlineUsers.length / PUSH_BATCH); // 一共多少批 - + let sendToUser = (i: number) => { + let users = allOnlineUsers.slice(i * PUSH_BATCH, (i + 1) * PUSH_BATCH - 1); + let uids = users.map(cur => ({ uid: cur.roleId, sid: cur.sid })); + sendMessageToUsers(route, data, uids); + } let i = -1; + sendToUser(++i); let interval = setInterval(() => { if (++i < n) { - let users = allOnlineUsers.slice(i * PUSH_BATCH, (i + 1) * PUSH_BATCH - 1); - let uids = users.map(cur => ({ uid: cur.roleId, sid: cur.sid })); - sendMessageToUsers(route, data, uids); + sendToUser(i); } else { clearInterval(interval); } diff --git a/shared/consts/statusCode.ts b/shared/consts/statusCode.ts index 9c11d73df..fbe4c7b92 100644 --- a/shared/consts/statusCode.ts +++ b/shared/consts/statusCode.ts @@ -441,7 +441,7 @@ export const STATUS = { ACTIVITY_UNOPENED: { code: 50007, simStr: '还未开启,不能购买' }, ACTIVITY_RES_NOT_ENOUGH: { code: 50008, simStr: '资源不足' }, ACTIVITY_CLOSED: { code: 50009, simStr: '关闭中' }, - ACTIVITY_DAY_INDEX_OVER: { code: 50010, simStr: '心急吃不了热豆腐' }, + ACTIVITY_DAY_INDEX_OVER: { code: 50010, simStr: '活动时间未开始,无法领取' }, ACTIVITY_EXPIRE: { code: 50011, simStr: '活动到期,刷新' }, ACTIVITY_GROWTH_FUND_END: { code: 50012, simStr: '成长基金活动结束' }, ACTIVITY_NEED_BUY: { code: 50013, simStr: '成长基金需要购买' }, diff --git a/shared/domain/activityField/dailyMealField.ts b/shared/domain/activityField/dailyMealField.ts index eca2d5ed5..5730f49f7 100644 --- a/shared/domain/activityField/dailyMealField.ts +++ b/shared/domain/activityField/dailyMealField.ts @@ -1,6 +1,7 @@ import moment = require('moment'); import { ActivityModelType } from '../../db/Activity'; import { ActivityDailyMealModelType } from '../../db/ActivityDailyMeal'; +import { getZeroPointD } from '../../pubUtils/timeUtil'; import { ActivityBase } from './activityField'; @@ -16,8 +17,9 @@ export class DailyMealItem { isReceive: boolean = false; //是否领取过 constructor(data: any) { - this.beginTime = moment(new Date()).startOf('d').add(data.beginHour, 'h').valueOf(); - this.endTime = moment(new Date()).startOf('d').add(data.endHour, 'h').valueOf(); + let todayZeroPoint = getZeroPointD(); + this.beginTime = moment(todayZeroPoint).startOf('d').add(data.beginHour, 'h').valueOf(); + this.endTime = moment(todayZeroPoint).startOf('d').add(data.endHour, 'h').valueOf(); this.type = data.type; this.reward = data.reward; this.consume = data.consume;