Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

liuzhiwei

2020-11-25 925d4b4b286a5d8dff4b62be0ceb25db0c45fedc

 Assets/Scripts/Event/EventType.cs

@@ -33,6 +33,8 @@
        SkillStep,
        //修改步骤为拖拽交换位置
        DragStep,
        //显示大波敌人来袭文字
        ShowWarningTips,
        //第三关小怪5路全出
        CreateThirdWave,
        //第三关小怪5路全出完毕