foldcc/YooAsset
1
0
Fork 0
mirror of https://github.com/tuyoogame/YooAsset.git synced 2026-05-26 02:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #410

Browse Source
This commit is contained in:
何冠峰
2024-12-27 12:02:08 +08:00
parent 8944ec0e02
commit 75dd3d0e5e
7 changed files with 30 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Assets/YooAsset/Runtime/ResourceManager/Handle/AllAssetsHandle.cs
View File

@@ -1,9 +1,8 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
namespace YooAsset
{
public sealed class AllAssetsHandle : HandleBase, IDisposable
public sealed class AllAssetsHandle : HandleBase
{
private System.Action<AllAssetsHandle> _callback;
@@ -47,23 +46,6 @@ namespace YooAsset
Provider.WaitForAsyncComplete();
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Release()
{
this.ReleaseInternal();
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Dispose()
{
this.ReleaseInternal();
}
/// <summary>
/// 子资源对象集合
/// </summary>

22
Assets/YooAsset/Runtime/ResourceManager/Handle/AssetHandle.cs
View File

@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine;
namespace YooAsset
{
public sealed class AssetHandle : HandleBase, IDisposable
public sealed class AssetHandle : HandleBase
{
private System.Action<AssetHandle> _callback;
@@ -48,22 +46,6 @@ namespace YooAsset
Provider.WaitForAsyncComplete();
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Release()
{
this.ReleaseInternal();
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Dispose()
{
this.ReleaseInternal();
}
/// <summary>
/// 资源对象

32
Assets/YooAsset/Runtime/ResourceManager/Handle/HandleBase.cs
View File

@@ -3,7 +3,7 @@ using System.Collections;
namespace YooAsset
{
public abstract class HandleBase : IEnumerator
public abstract class HandleBase : IEnumerator, IDisposable
{
private readonly AssetInfo _assetInfo;
internal ProviderOperation Provider { private set; get; }
@@ -15,6 +15,25 @@ namespace YooAsset
}
internal abstract void InvokeCallback();
/// <summary>
/// 释放资源句柄
/// </summary>
public void Release()
{
if (IsValidWithWarning == false)
return;
Provider.ReleaseHandle(this);
Provider = null;
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Dispose()
{
this.Release();
}
/// <summary>
/// 获取资源信息
/// </summary>
@@ -121,17 +140,6 @@ namespace YooAsset
}
}
/// <summary>
/// 释放句柄
/// </summary>
internal void ReleaseInternal()
{
if (IsValidWithWarning == false)
return;
Provider.ReleaseHandle(this);
Provider = null;
}
#region 异步操作相关
/// <summary>
/// 异步操作任务

23
Assets/YooAsset/Runtime/ResourceManager/Handle/RawFileHandle.cs
View File

@@ -1,10 +1,7 @@
using System;
using System.IO;
using System.Text;

namespace YooAsset
{
public class RawFileHandle : HandleBase, IDisposable
public class RawFileHandle : HandleBase
{
private System.Action<RawFileHandle> _callback;
@@ -48,22 +45,6 @@ namespace YooAsset
Provider.WaitForAsyncComplete();
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Release()
{
this.ReleaseInternal();
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Dispose()
{
this.ReleaseInternal();
}
/// <summary>
/// 获取原生文件的二进制数据

21
Assets/YooAsset/Runtime/ResourceManager/Handle/SubAssetsHandle.cs
View File

@@ -1,9 +1,8 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
namespace YooAsset
{
public sealed class SubAssetsHandle : HandleBase, IDisposable
public sealed class SubAssetsHandle : HandleBase
{
private System.Action<SubAssetsHandle> _callback;
@@ -47,22 +46,6 @@ namespace YooAsset
Provider.WaitForAsyncComplete();
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Release()
{
this.ReleaseInternal();
}
/// <summary>
/// 释放资源句柄
/// </summary>
public void Dispose()
{
this.ReleaseInternal();
}
/// <summary>
/// 子资源对象集合

2
Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderOperation.cs
View File

@@ -239,7 +239,7 @@ namespace YooAsset
for (int i = _handles.Count - 1; i >= 0; i--)
{
var handle = _handles[i];
handle.ReleaseInternal();
handle.Release();
}
}

2
Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs
View File

@@ -290,7 +290,7 @@ namespace YooAsset
{
if (sceneHandle.SceneObject == scene)
{
sceneHandle.ReleaseInternal();
sceneHandle.Release();
removeList.Add(sceneHandle);
}
}