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

chenxin

2020-11-25 554eda43e00d5817cd3e06a60e39d4bd882ee584

 Assets/Scripts/Event/EventType.cs

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