From 20baf61378585ba4e390601ced6e6b1cc5370309 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 25 十月 2018 11:20:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowBase/WindowCenter.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/System/WindowBase/WindowCenter.cs b/System/WindowBase/WindowCenter.cs
index 05cbf5a..b22a5b8 100644
--- a/System/WindowBase/WindowCenter.cs
+++ b/System/WindowBase/WindowCenter.cs
@@ -22,7 +22,7 @@
get {
if (m_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";
m_UIRoot = instance.GetComponent<UIRoot>();
@@ -615,7 +615,7 @@
}
else
{
- var prefab = _fromLocal ? Resources.Load<GameObject>(StringUtility.Contact("UI/Prefabs/", prefabName)) : UILoader.LoadWindow(prefabName);
+ var prefab = _fromLocal ? BuiltInLoader.LoadPrefab(prefabName) : UILoader.LoadWindow(prefabName);
prefab.SetActive(false);
var instance = GameObject.Instantiate(prefab);
if (AssetSource.uiFromEditor)
@@ -623,7 +623,15 @@
prefab.SetActive(true);
}
- UILoader.UnLoadWindowAsset(prefabName);
+ if (_fromLocal)
+ {
+ BuiltInLoader.UnLoadPrefab(prefabName);
+ }
+ else
+ {
+ UILoader.UnLoadWindowAsset(prefabName);
+ }
+
instance.name = prefabName;
var window = instance.GetComponent<T>();
if (window != null)
--
Gitblit v1.8.0