From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/WindowBase/WindowInfo.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/System/WindowBase/WindowInfo.cs b/System/WindowBase/WindowInfo.cs
index 6e2dc44..cf9b7ea 100644
--- a/System/WindowBase/WindowInfo.cs
+++ b/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>();
--
Gitblit v1.8.0