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

liuzhiwei

2020-11-06 f44ad64eff5c66b711e2b8d28c44c85a92cbc393

 Assets/Scripts/Event/EventType.cs

@@ -59,6 +59,12 @@
        EndlessBubbleBombBeDizzinessed,
        // 闪烁boss技能title
        EndlessBossSkillGlintTitle,
        // 闪烁boss技能title完成
        EndlessBossSkillGlintTitleCompleted,
        // 无尽模式爱心减少
        EndlessLoseHeart,
        // 爱心为0
        EndlessHeartAllLose,
    }

}