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

liuzhiwei

2020-12-26 56d95fa59a9f6dc12d0fc0723ea449e5b317f994

 Assets/Scripts/Event/EventType.cs

@@ -122,7 +122,8 @@
        PlayBuffPS,
        // gameOver 结束
        GameOverEnd,

        //加载场景
        ChangeScene,

    }