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

chenxin

2020-12-22 d185e655cd926e45ed7f7ce3f59af7dc23b4c372

 Assets/Scripts/Event/EventType.cs

@@ -118,8 +118,8 @@
        OpenAllTowerGrid,
        // 关闭了精灵升级界面
        ElfUpgradePanelClosed,
        // 不够开塔，也不够买塔
        SetTowerGridOpenRed,
        // gameOver 结束
        GameOverEnd,

    }