事件:修复事件刷新逻辑
This commit is contained in:
@@ -23,11 +23,8 @@ export class EventBattleHandler {
|
||||
let roleId = session.get('roleId');
|
||||
let roleName = session.get('roleName');
|
||||
let eventStatus = session.get('eventStatus');
|
||||
if(eventStatus == EVENT_STATUS.WAITING) {
|
||||
await startEvent(session);
|
||||
}
|
||||
|
||||
let event = await getEvent(eventStatus, roleId, roleName);
|
||||
let event = eventStatus == EVENT_STATUS.WAITING? await startEvent(session): await getEvent(eventStatus, roleId, roleName);
|
||||
|
||||
return resResult(STATUS.SUCCESS, { list: event });
|
||||
}
|
||||
|
||||
@@ -84,8 +84,8 @@ export function getEventTime(now: Date) {
|
||||
export async function startEvent(session: FrontendOrBackendSession) {
|
||||
|
||||
const eventStatus = session.get('eventStatus');
|
||||
console.log('*******startEvent ', eventStatus)
|
||||
if(eventStatus == EVENT_STATUS.WAITING) {
|
||||
// console.log('*******setEventStatus')
|
||||
let roleId = session.get('roleId');
|
||||
let roleName = session.get('roleName');
|
||||
let sid = session.get('sid');
|
||||
@@ -94,6 +94,9 @@ export async function startEvent(session: FrontendOrBackendSession) {
|
||||
session.set('eventStatus', EVENT_STATUS.STARTING);
|
||||
session.push('eventStatus', () => {});
|
||||
pushEventMsg(sid, roleId, { event }); // 推送
|
||||
return event;
|
||||
} else {
|
||||
return []
|
||||
}
|
||||
}
|
||||
|
||||
@@ -152,7 +155,7 @@ export async function refreshEvent(num: number, roleId: string, roleName: string
|
||||
}).map(cur => cur.point);
|
||||
|
||||
let event = new Array();
|
||||
let dicEvent = gameData.eventList;
|
||||
let dicEvent = gameData.eventList.filter(cur => cur.movePointArray && cur.movePointArray.length > 0);
|
||||
let role = await RoleModel.findByRoleId(roleId);
|
||||
dicEvent = dicEvent.filter(cur => { // 筛选适合等级
|
||||
let { suitLevel } = cur;
|
||||
|
||||
Reference in New Issue
Block a user