Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

client_Hale

2018-12-04 d93e91a289ce7da7e68a7260eeaae40ddebbde93

 Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs

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

                    if (uiroot == null)

                    {

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

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

                        var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity);

                        root.name = "UIRoot";

                        uiroot = root.GetComponent<UIRoot>();

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

                    if (uiroot == null)

                    {

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

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

                        var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity);

                        root.name = "UIRoot";

                        uiroot = root.GetComponent<UIRoot>();