奇遇：修改奇遇打开时机

game-server/app/servers/battle/handler/eventBattleHandler.ts

@@ -2,7 +2,7 @@ import { Application, BackendSession, HandlerService, } from 'pinus';
 import { EventRecordModel } from '../../../db/EventRecord';
 import { RoleModel } from '../../../db/Role';
 import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_ANSWER_STATUS, TASK_TYPE } from '../../../consts';
-import { checkEvent, checkEventStatus, getEventSuccessStatus, getEvent, checkQuiz } from '../../../services/eventSercive';
+import { checkEvent, checkEventStatus, getEventSuccessStatus, getEvent, checkQuiz, startEvent } from '../../../services/eventSercive';
 import { addItems } from '../../../services/rewardService';
 import { STATUS } from '../../../consts/statusCode';
 import { resResult } from '../../../pubUtils/util';
@@ -23,6 +23,9 @@ 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);
 
@@ -121,7 +124,7 @@ export class EventBattleHandler {
             session.push('eventStatus', () => { });
         }
         // 推送消息刷新
-        await checkEvent(session, true);
+        // await checkEvent(session, true);
         // 任务
         await checkTask(roleId, sid, funcs, TASK_TYPE.BATTLE_EVENT, 1, true, { eventType: dicEvent.eventType })
         // 活动任务

game-server/app/servers/connector/filter/global.ts

@@ -1,5 +1,5 @@
 import {Application, RouteRecord, FrontendOrBackendSession, HandlerCallback, pinus} from "pinus";
-import { checkEvent } from '../../../services/eventSercive';
+// import { checkEvent } from '../../../services/eventSercive';
 import { refresh } from '../../../services/refreshService';
 import { checkFilterWords, getWorldChannelSid } from "../../../services/chatService";
 import { resResult, checkWhiteListWithUid } from "../../../pubUtils/util";

game-server/app/services/eventSercive.ts

@@ -51,7 +51,7 @@ export async function setBattleStatus(session: FrontendOrBackendSession, roleId:
     if (!result) {
         return { status: -1, resResult: resResult(STATUS.EVENT_INFO_NOT_FOUND) };
     } 
-    await checkEvent(session, true);
+    // await checkEvent(session, true);
     return { status: 0, data: result };
 }
 
@@ -83,9 +83,9 @@ export function getEventTime(now: Date) {
  */
 export async function startEvent(session: FrontendOrBackendSession) {
 
-    const funcs = session.get('funcs');
+    // const funcs = session.get('funcs');
-    const eventStatus = session.get('eventStatus')||EVENT_STATUS.WAITING;
+    // const eventStatus = session.get('eventStatus')||EVENT_STATUS.WAITING;
-    if(funcs && funcs.includes(FUNCS_ID.EVENT) && eventStatus == EVENT_STATUS.WAITING) {
+    // if(funcs && funcs.includes(FUNCS_ID.EVENT) && eventStatus == EVENT_STATUS.WAITING) {
         // console.log('*******setEventStatus')
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
@@ -95,7 +95,7 @@ export async function startEvent(session: FrontendOrBackendSession) {
         session.set('eventStatus', EVENT_STATUS.STARTING);
         session.push('eventStatus', () => {});
         pushEventMsg(sid, roleId, { event }); // 推送
-    }
+    // }
 }
 
 /**

game-server/app/services/refreshService.ts

@@ -4,8 +4,8 @@ import { resResult, shouldRefresh, shouldRefreshWeek } from '../pubUtils/util';
 import { nowSeconds } from "../pubUtils/timeUtil";
 // import { RoleModel } from '../db/Role';
 import { refDailyTask, refDailyTaskBox } from './taskService'
-import { EVENT_STATUS, FUNCS_ID } from "../consts";
+// import { EVENT_STATUS, FUNCS_ID } from "../consts";
-import { startEvent } from "./eventSercive";
+// import { startEvent } from "./eventSercive";
 
 /**
  * 刷新
@@ -18,7 +18,7 @@ export async function refresh(session: FrontendOrBackendSession) {
     let uids = [{uid: roleId, sid}];
     pinus.app.get('channelService').pushMessageByUids('onPushCurrentTime', resResult(STATUS.SUCCESS, {time: Date.now()}), uids);
     await refreshDaily(session);
-    await startEvent(session);
+    // await startEvent(session);
 }
 
 /**