From 554eda43e00d5817cd3e06a60e39d4bd882ee584 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 25 Nov 2020 10:33:33 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

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

diff --git a/Assets/Scripts/Event/EventType.cs b/Assets/Scripts/Event/EventType.cs
index e24d908..6e05738 100644
--- a/Assets/Scripts/Event/EventType.cs
+++ b/Assets/Scripts/Event/EventType.cs
@@ -31,6 +31,14 @@
         CreateSecondWave,
         //当第二关第8波怪物生成后或玩家塔位收到第一次伤害后
         SkillStep,
+        //修改步骤为拖拽交换位置
+        DragStep,
+        //第三关小怪5路全出
+        CreateThirdWave,
+        //第三关小怪5路全出完毕
+        CreateThirdWaveDone,
+        //新手引导增加能量
+        GuideEnergyUp,
         //释放技能
         SkillRelease,
         //释放技能完毕

--
Gitblit v1.9.1