Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/Debug/DebugUtility.cs

@@ -71,7 +71,7 @@
    {

        if (debugRoot == null)

        {

            var prefab = Resources.Load<GameObject>("UI/Prefabs/UIRootDebug");

            var prefab = BuiltInLoader.LoadPrefab("UIRootDebug");

            debugRoot = GameObject.Instantiate(prefab);

            MonoBehaviour.DontDestroyOnLoad(debugRoot);

            debugRoot.name = "UIRootDebug";