Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/WindowBase/WindowInfo.cs

@@ -77,7 +77,7 @@
            var uiroot = GameObject.FindObjectOfType<UIRoot>();

            if (uiroot == null)

            {

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

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

                var instance = GameObject.Instantiate(prefab, Vector3.zero, Quaternion.identity);

                instance.name = "UIRoot";

                uiroot = instance.GetComponent<UIRoot>();