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

chenxin

2020-12-18 7b9712f33f42b14e4d277166fa533a379021312d

 Assets/Scripts/Event/EventType.cs

@@ -118,6 +118,8 @@
        OpenAllTowerGrid,
        // 关闭了精灵升级界面
        ElfUpgradePanelClosed,
        // gameOver 结束
        GameOverEnd,

    }