任务:任务去除funcs的判断,直接达成
This commit is contained in:
@@ -83,9 +83,8 @@ export function getEventTime(now: Date) {
|
||||
*/
|
||||
export async function startEvent(session: FrontendOrBackendSession) {
|
||||
|
||||
// const funcs = session.get('funcs');
|
||||
// const eventStatus = session.get('eventStatus')||EVENT_STATUS.WAITING;
|
||||
// if(funcs && funcs.includes(FUNCS_ID.EVENT) && eventStatus == EVENT_STATUS.WAITING) {
|
||||
const eventStatus = session.get('eventStatus');
|
||||
if(eventStatus == EVENT_STATUS.WAITING) {
|
||||
// console.log('*******setEventStatus')
|
||||
let roleId = session.get('roleId');
|
||||
let roleName = session.get('roleName');
|
||||
@@ -95,52 +94,8 @@ export async function startEvent(session: FrontendOrBackendSession) {
|
||||
session.set('eventStatus', EVENT_STATUS.STARTING);
|
||||
session.push('eventStatus', () => {});
|
||||
pushEventMsg(sid, roleId, { event }); // 推送
|
||||
// }
|
||||
}
|
||||
|
||||
/**
|
||||
* 从filter调用,用于每次检查时间,获取事件并推送
|
||||
*
|
||||
* @param session
|
||||
* @param isForce 即使不是12点和18点也强制刷新
|
||||
*/
|
||||
export async function checkEvent(session: FrontendOrBackendSession, isForce:boolean = false) {
|
||||
|
||||
try {
|
||||
|
||||
let roleId = session.get('roleId');
|
||||
let serverId = session.get('serverId');
|
||||
let funcs = session.get('funcs');
|
||||
let sid = session.get('sid');
|
||||
if(roleId) {
|
||||
|
||||
let roleName = session.get('roleName');
|
||||
let eventStatus = session.get('eventStatus')||EVENT_STATUS.WAITING;
|
||||
|
||||
if(funcs && funcs.includes(FUNCS_ID.EVENT) && eventStatus == EVENT_STATUS.WAITING) {
|
||||
await startEvent(session);
|
||||
} else {
|
||||
let eventTime = session.get('getEventTime')||0;
|
||||
let now = new Date();
|
||||
let t = getEventTime(now);
|
||||
|
||||
if(eventTime < t || isForce) { // 第一次登陆后可以刷新了
|
||||
|
||||
let event = await getEvent(eventStatus, roleId, roleName);
|
||||
if (eventStatus == EVENT_STATUS.STARTING || eventStatus == EVENT_STATUS.OPEN) {
|
||||
pushEventMsg(sid, roleId, { event }); // 推送
|
||||
session.set('getEventTime', t);
|
||||
session.push('getEventTime', () => {});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}catch(err) {
|
||||
console.log(err.stack);
|
||||
throw err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前的奇遇事件
|
||||
|
||||
Reference in New Issue
Block a user