Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 fdb2bd928c43e8efa39586b4309ae2b9a892ceef

 Assets/Editor/Tool/PrefabCreateTool.cs

@@ -21,7 +21,7 @@
            var uiroot = GameObject.FindObjectOfType<UIRoot>();
            if (uiroot == null)
            {
                var prefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot");
                var prefab = BuiltInLoader.LoadPrefab("UIRoot");
                var root = GameObject.Instantiate(prefab, Vector3.zero, Quaternion.identity);
                root.name = "UIRoot";
                uiroot = root.GetComponent<UIRoot>();