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

chenxin

2020-12-25 6baa5a654138a2e0a9871adaef311a74e132dd6e

 Assets/Scripts/Manager/ManagerRoot.cs

@@ -19,6 +19,8 @@
            Application.platform == RuntimePlatform.WindowsPlayer)
                {
                    GameConfig.useSDK = false;
                    GameConfig.OpenDebug = true;

                }
                Application.targetFrameRate = 60;
                //Debug.Log("设置了帧数为60");