From bc2b5dd5a12faf2c18d7a5cc6c4f6847037226ec Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Sun, 26 Dec 2021 12:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=B7=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/servers/battle/handler/eventBattleHandler.ts       | 5 +----
 game-server/app/services/eventSercive.ts                   | 7 +++++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/game-server/app/servers/battle/handler/eventBattleHandler.ts b/game-server/app/servers/battle/handler/eventBattleHandler.ts
index 802a37275..dc9f473cd 100644
--- a/game-server/app/servers/battle/handler/eventBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/eventBattleHandler.ts
@@ -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 });
     }
diff --git a/game-server/app/services/eventSercive.ts b/game-server/app/services/eventSercive.ts
index 83ab25a0e..a5852e69f 100644
--- a/game-server/app/services/eventSercive.ts
+++ b/game-server/app/services/eventSercive.ts
@@ -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;