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

chenxin

2020-12-25 6baa5a654138a2e0a9871adaef311a74e132dd6e

 Assets/Scripts/Event/EventType.cs

@@ -118,8 +118,12 @@
        OpenAllTowerGrid,
        // 关闭了精灵升级界面
        ElfUpgradePanelClosed,
        //播放buff生效特效
        PlayBuffPS,
        // gameOver 结束
        GameOverEnd,
        //加载场景
        ChangeScene,

    }