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

liuzhiwei

2020-10-29 22d482183aa44aa2ffd837d8939a7b0bd15d28b9

 Assets/Scripts/Manager/ManagerRoot.cs

@@ -15,7 +15,7 @@
        {
            gameObject.AddComponent<DoNotDestory>();
            gameObject.AddComponent<MasterSocket>();
            gameObject.AddComponent<GA_SDK_Manager>();
            gameObject.AddComponent<TDAA_SDKManager>();

            //gameObject.AddComponent<ErrorLogOnGUIMyTools>();
            //gameObject.AddComponent<JsonDataReader>();