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

chenxin

2020-12-25 914b0ab6ff4b86a809fb0b6b206504e90612a92a

 Assets/Scripts/Manager/ManagerRoot.cs

@@ -15,16 +15,28 @@
            GameObject root = GameObject.Find("ManagerRoot");
            if (root == null)
            {
                if (Application.platform == RuntimePlatform.WindowsEditor ||
            Application.platform == RuntimePlatform.WindowsPlayer)
                {
                    GameConfig.useSDK = false;
                    GameConfig.OpenDebug = true;

                }
                Application.targetFrameRate = 60;
                //Debug.Log("设置了帧数为60");
                DOTween.Init(true, true, LogBehaviour.Verbose).SetCapacity(200, 10);

                root = new GameObject("ManagerRoot");
                // if (GameConfig.useSDK)
                //     root.AddComponent<SDKCallBack>();
                root.AddComponent<DoNotDestory>();
                root.AddComponent<MasterSocket>();
                root.AddComponent<TDAA_SDKManager>();
                root.AddComponent<AudioSourceManager>();
                root.AddComponent<JsonDataReader>();
                root.AddComponent<JsonDataInit>();
                root.AddComponent<ErrorLogOnGUIMyTools>();
                root.AddComponent<LanguageManager>();
                // root.AddComponent<ErrorLogOnGUIMyTools>();
            }

            //gameObject.AddComponent<JsonDataReader>();