From 0eed7b7dea1049300e0675cbc5bdd907f6644f1a Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 20 May 2022 15:00:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=87=E9=81=87=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E5=85=B3=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/eventSercive.ts | 10 ++++++----
 shared/resource/jsons/dic_zyz_event.json |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/game-server/app/services/eventSercive.ts b/game-server/app/services/eventSercive.ts
index 1963078d4..8612bff93 100644
--- a/game-server/app/services/eventSercive.ts
+++ b/game-server/app/services/eventSercive.ts
@@ -92,10 +92,12 @@ export async function startEvent(session: FrontendOrBackendSession) {
         let roleName = session.get('roleName');
         let sid = session.get('sid');
         let event = await refreshEvent(1, roleId, roleName, 0, []); // 刷新初始的一件
-        await RoleModel.setEventStatus(roleId, EVENT_STATUS.STARTING);
-        session.set('eventStatus', EVENT_STATUS.STARTING);
-        session.push('eventStatus', () => {});
-        pushEventMsg(sid, roleId, { event }); // 推送
+        if(event.length > 0) {
+            await RoleModel.setEventStatus(roleId, EVENT_STATUS.STARTING);
+            session.set('eventStatus', EVENT_STATUS.STARTING);
+            session.push('eventStatus', () => {});
+            pushEventMsg(sid, roleId, { event }); // 推送
+        }
         return event;
     } else {
         return []
diff --git a/shared/resource/jsons/dic_zyz_event.json b/shared/resource/jsons/dic_zyz_event.json
index 1985704b0..a4aa60bb0 100644
--- a/shared/resource/jsons/dic_zyz_event.json
+++ b/shared/resource/jsons/dic_zyz_event.json
@@ -35,7 +35,7 @@
         "winDialogue": "9&",
         "loseDialogue": "8&",
         "group": 0,
-        "previousGk": 107
+        "previousGk": 0
     },
     {
         "eventID": 3,
@@ -54,7 +54,7 @@
         "winDialogue": "14&15",
         "loseDialogue": "16&17",
         "group": 0,
-        "previousGk": 107
+        "previousGk": 0
     },
     {
         "eventID": 4,
@@ -73,7 +73,7 @@
         "winDialogue": "28&",
         "loseDialogue": "27&",
         "group": 1,
-        "previousGk": 107
+        "previousGk": 0
     },
     {
         "eventID": 5,