Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master

weixudong

2020-12-05 24527952cd17dce067a4a6614f855ac3d1e53a64

 Assets/Scripts/Manager/ManagerRoot.cs

@@ -24,7 +24,7 @@
                root.AddComponent<AudioSourceManager>();
                root.AddComponent<JsonDataReader>();
                root.AddComponent<JsonDataInit>();
                root.AddComponent<ErrorLogOnGUIMyTools>();
                // root.AddComponent<ErrorLogOnGUIMyTools>();
            }

            //gameObject.AddComponent<JsonDataReader>();