diff --git a/game-server/app/servers/chat/handler/chatHandler.ts b/game-server/app/servers/chat/handler/chatHandler.ts index 68764a496..cca1e9e19 100644 --- a/game-server/app/servers/chat/handler/chatHandler.ts +++ b/game-server/app/servers/chat/handler/chatHandler.ts @@ -222,7 +222,7 @@ export class ChatHandler { if(!dic) return resResult(STATUS.WRONG_PARMS); // let result = await pushMsg37(Date.now(), dic, SDK_PUSH_TARGET_TYPE.SINGLE, `${msg.uid}`); - pushClientMsg(SDK_PUSH_MSG_TYPE.GVG_BATTLE_START); + await pushClientMsg(SDK_PUSH_MSG_TYPE.AFK_ATTENTION); return resResult(STATUS.SUCCESS); } diff --git a/game-server/app/services/pushService.ts b/game-server/app/services/pushService.ts index 0924f86b2..f420c26e7 100644 --- a/game-server/app/services/pushService.ts +++ b/game-server/app/services/pushService.ts @@ -282,6 +282,7 @@ export async function pushClientMsg(type: SDK_PUSH_MSG_TYPE) { let { target, audiences } = targetObj; let t = Date.now(); for(let audience of audiences) { + // console.log(target, audience) if(audience) await pushMsg37(t, dicPushMessage, target, audience); } } @@ -295,7 +296,7 @@ async function getPushTarget(playerType: number): Promise<{ target: SDK_PUSH_TAR { uids = await getHasLeaguePlayers(); break; } case SDK_PUSH_MSG_PLAYER_TYPE.AFK: { uids = await getAfkPlayers(); break; } - case SDK_PUSH_MSG_PLAYER_TYPE.HAS_LEAGUE: + case SDK_PUSH_MSG_PLAYER_TYPE.ACTIVE_PLAYER: { uids = await getActivePlayers(); break; } } let len = uids.length; diff --git a/shared/db/Role.ts b/shared/db/Role.ts index 5dd3795d8..68c6d27b5 100644 --- a/shared/db/Role.ts +++ b/shared/db/Role.ts @@ -826,20 +826,20 @@ export default class Role extends BaseModel { public static async findHasGuildPlayers(createdAt?: Date) { let filter = createdAt? { createdAt: { $gt: createdAt } }: {}; - let roles: RoleType[] = await RoleModel.find({ loginTime: { $gte: nowSeconds() - 24 * 60 * 60 }, ...filter, hasGuild: true }).sort({ createdAt: 1 }).select('userInfo.channelInfo createdAt').lean(); + let roles: RoleType[] = await RoleModel.find({ loginTime: { $gte: nowSeconds() - 24 * 60 * 60 }, ...filter, hasGuild: true }).sort({ createdAt: 1 }).select('userInfo.channelInfo quitTime loginTime createdAt').lean(); return roles; } public static async findAfkPlayers(createdAt?: Date) { let filter = createdAt? { createdAt: { $gt: createdAt } }: {}; - let roles: RoleType[] = await RoleModel.find({ loginTime: { $lt: nowSeconds() - 48 * 60 * 60 }, lv: { $gte: 20 }, hasPushMsg: { $exists: false }, ...filter }).sort({ createdAt }).select('userInfo.channelInfo createdAt').lean(); + let roles: RoleType[] = await RoleModel.find({ loginTime: { $lt: nowSeconds() - 48 * 60 * 60 }, lv: { $gte: 20 }, hasPushMsg: { $exists: false }, ...filter }).sort({ createdAt: 1 }).select('userInfo.channelInfo quitTime loginTime createdAt').lean(); await RoleModel.updateMany({ _id: roles.map(cur => cur._id) }, { $set: { hasPushMsg: true } }); return roles; } public static async findActivePlayers(createdAt?: Date) { let filter = createdAt? { createdAt: { $gt: createdAt } }: {}; - let roles: RoleType[] = await RoleModel.find({ loginTime: { $gte: nowSeconds() - 24 * 60 * 60 }, ...filter }).sort({ createdAt: 1 }).select('userInfo.channelInfo createdAt').lean(); + let roles: RoleType[] = await RoleModel.find({ loginTime: { $gte: nowSeconds() - 24 * 60 * 60 }, ...filter }).sort({ createdAt: 1 }).select('userInfo.channelInfo quitTime loginTime createdAt').lean(); return roles; } }