From 4ba1dcb722b0b0fd5d316fb18d1bccde31d0246a Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 21 一月 2019 09:43:43 +0800
Subject: [PATCH] Merge branch 'master' into JadeDynastyTower

---
 Core/MapEditor/Data/Event/Evt.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Core/MapEditor/Data/Event/Evt.cs b/Core/MapEditor/Data/Event/Evt.cs
index 8cfa01a..cbfb208 100644
--- a/Core/MapEditor/Data/Event/Evt.cs
+++ b/Core/MapEditor/Data/Event/Evt.cs
@@ -7,7 +7,8 @@
     {
         public enum E_EventType
         {
-            Enemy
+            Enemy,
+            SceneObject
         }
 
         public int id;

--
Gitblit v1.8.0