AlphaaeGameStudio/TEngine
1
0
Fork 0
mirror of https://github.com/Alex-Rachel/TEngine.git synced 2025-08-14 16:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ResourceManager.cs

Browse Source
This commit is contained in:
ALEXTANG
2023-04-11 11:17:52 +08:00
parent 687e767e02
commit 30ab1fbbff
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/TEngine/Runtime/GameFramework/Resource/ResourceManager.cs
View File

@@ -297,6 +297,7 @@ namespace TEngine
/// </summary> /// </summary>
/// <param name="assetName">要加载资源的名称。</param> /// <param name="assetName">要加载资源的名称。</param>
/// <typeparam name="T">要加载资源的类型。</typeparam> /// <typeparam name="T">要加载资源的类型。</typeparam>
/// <remarks>不计入引用计数，直接释放！</remarks>
/// <returns>资源实例。</returns> /// <returns>资源实例。</returns>
public T LoadAsset<T>(string assetName) where T : Object public T LoadAsset<T>(string assetName) where T : Object
{ {
@@ -310,11 +311,14 @@ namespace TEngine
if (typeof(T) == typeof(GameObject)) if (typeof(T) == typeof(GameObject))
{ {
GameObject ret = handle.InstantiateSync(); GameObject ret = handle.InstantiateSync();
handle.Dispose();
return ret as T; return ret as T;
} }
else else
{ {
return handle.AssetObject as T; T ret = handle.AssetObject as T;
handle.Dispose();
return ret;
} }
} }
@@ -324,6 +328,7 @@ namespace TEngine
/// <param name="assetName">要加载资源的名称。</param> /// <param name="assetName">要加载资源的名称。</param>
/// <param name="parent">父节点位置。</param> /// <param name="parent">父节点位置。</param>
/// <typeparam name="T">要加载资源的类型。</typeparam> /// <typeparam name="T">要加载资源的类型。</typeparam>
/// <remarks>不计入引用计数，直接释放！</remarks>
/// <returns>资源实例。</returns> /// <returns>资源实例。</returns>
public T LoadAsset<T>(string assetName, Transform parent) where T : Object public T LoadAsset<T>(string assetName, Transform parent) where T : Object
{ {
@@ -336,12 +341,15 @@ namespace TEngine
if (typeof(T) == typeof(GameObject)) if (typeof(T) == typeof(GameObject))
{ {
GameObject ret = handle.InstantiateSync(parent); GameObject ret = handle.InstantiateSync();
handle.Dispose();
return ret as T; return ret as T;
} }
else else
{ {
return handle.AssetObject as T; T ret = handle.AssetObject as T;
handle.Dispose();
return ret;
} }
} }