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

River Jiang

2020-10-27 24f59b89e9eabcfe948fc0ba304a8dbec2deda14

 Assets/Scripts/Event/EventType.cs

@@ -37,6 +37,8 @@
        SkillReleaseDone,
        // 火元素塔充能使用结束
        FireTowerChargeEnd,
        //新手引导结束
        GuideFinish
    }

}