From a1f0653ec48d7787e0d57cabef0600b2a07355eb Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 31 Oct 2020 17:03:14 +0800
Subject: [PATCH] 解决冲突

---
 Assets/Scripts/Event/EventType.cs |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Assets/Scripts/Event/EventType.cs b/Assets/Scripts/Event/EventType.cs
index e5cef6b..ca53715 100644
--- a/Assets/Scripts/Event/EventType.cs
+++ b/Assets/Scripts/Event/EventType.cs
@@ -47,6 +47,8 @@
         PlayAppearEffect,
         //新手引导合成特效
         GuidePlayUpgradeEffect,
+        // 无尽模式boss召唤结束
+        EndlessBossSummonEnd,
     }
 
 }

--
Gitblit v1.9.1