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

liuzhiwei

2020-12-15 dd651e6ced907e7856d31fee478db45c7d994ea4

 Assets/Scripts/Event/EventType.cs

@@ -116,6 +116,10 @@
        PlayGetGoldPS,
        // 开启所有塔位
        OpenAllTowerGrid,
        // 关闭了精灵升级界面
        ElfUpgradePanelClosed,
        // gameOver 结束
        GameOverEnd,

    }