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

liuzhiwei

2020-11-13 adf4e32c75f0886b330c6ad449f6a2a46b3d3771

 Assets/Scripts/Manager/ManagerRoot.cs

@@ -18,7 +18,7 @@
            gameObject.AddComponent<TDAA_SDKManager>();
            gameObject.AddComponent<AudioSourceManager>();

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

        }