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/WindowCenter.cs | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/System/WindowBase/WindowCenter.cs b/System/WindowBase/WindowCenter.cs
index e83ff07..0674b98 100644
--- a/System/WindowBase/WindowCenter.cs
+++ b/System/WindowBase/WindowCenter.cs
@@ -6,7 +6,7 @@
{
[XLua.LuaCallCSharp]
public class WindowCenter : Singleton<WindowCenter>
-
+
{
public event Action<Window> windowBeforeOpenEvent;
public event Action<Window> windowAfterOpenEvent;
@@ -24,7 +24,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>();
@@ -716,7 +716,7 @@
}
else
{
- var prefab = _fromLocal ? Resources.Load<GameObject>(StringUtility.Contact("UI/Prefabs/", _name)) : UILoader.LoadWindow(_name);
+ var prefab = _fromLocal ? BuiltInLoader.LoadPrefab(prefabName) : UILoader.LoadWindow(prefabName);
prefab.SetActive(false);
var instance = GameObject.Instantiate(prefab);
if (AssetSource.uiFromEditor)
@@ -724,9 +724,15 @@
prefab.SetActive(true);
}
- UILoader.UnLoadWindowAsset(_name);
- instance.name = _name;
- var window = instance.GetComponent<Window>();
+ if (_fromLocal)
+ {
+ BuiltInLoader.UnLoadPrefab(prefabName);
+ }
+ else
+ {
+ UILoader.UnLoadWindowAsset(prefabName);
+ }
+
if (window != null)
{
windows[_name] = window;
--
Gitblit v1.8.0