diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/AssetReference.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/AssetReference.cs index f29b0712..44a749d2 100644 --- a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/AssetReference.cs +++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/AssetReference.cs @@ -62,7 +62,7 @@ namespace TEngine private void OnDestroy() { - if (_operationHandle != null) + if (_operationHandle is { IsValid: true }) { _operationHandle.Release(); _operationHandle = null; diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/AssetsLogger.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/AssetsLogger.cs new file mode 100644 index 00000000..799b8624 --- /dev/null +++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/AssetsLogger.cs @@ -0,0 +1,28 @@ +namespace TEngine +{ + /// + /// 资源管理日志实现器。 + /// + internal class AssetsLogger : YooAsset.ILogger + { + public void Log(string message) + { + TEngine.Log.Info(message); + } + + public void Warning(string message) + { + TEngine.Log.Warning(message); + } + + public void Error(string message) + { + TEngine.Log.Error(message); + } + + public void Exception(System.Exception exception) + { + TEngine.Log.Fatal(exception.Message); + } + } +} \ No newline at end of file diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/AssetsLogger.cs.meta b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/AssetsLogger.cs.meta new file mode 100644 index 00000000..9126c7ff --- /dev/null +++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/AssetsLogger.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: fb010b07ce0e492dae9f04e18a1af2e2 +timeCreated: 1698250627 \ No newline at end of file diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs index 548a4dc3..f768c5d3 100644 --- a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs +++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs @@ -2,7 +2,6 @@ using System.Threading; using Cysharp.Threading.Tasks; using UnityEngine; -using UnityEngine.SceneManagement; using YooAsset; namespace TEngine @@ -369,7 +368,7 @@ namespace TEngine while (iter.MoveNext()) { AssetOperationHandle handle = iter.Current; - if (handle != null) + if (handle is { IsValid: true }) { handle.Dispose(); handle = null; @@ -882,30 +881,4 @@ namespace TEngine return cancelOrFailed ? null : handle.GetSubAssetObjects(); } } - - /// - /// 资源管理日志实现器。 - /// - internal class AssetsLogger : YooAsset.ILogger - { - public void Log(string message) - { - TEngine.Log.Info(message); - } - - public void Warning(string message) - { - TEngine.Log.Warning(message); - } - - public void Error(string message) - { - TEngine.Log.Error(message); - } - - public void Exception(System.Exception exception) - { - TEngine.Log.Fatal(exception.Message); - } - } } \ No newline at end of file