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

wangguan

2020-12-02 6bc45c691891dac88bece3483fb6f3cf2d7a00a4

 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>();