fix #410

Assets/YooAsset/Runtime/ResourceManager/Handle/AllAssetsHandle.cs

@@ -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>

Assets/YooAsset/Runtime/ResourceManager/Handle/AssetHandle.cs

@@ -1,10 +1,8 @@
-using System;
+using UnityEngine;
-using System.Collections.Generic;
-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>
         /// 资源对象

Assets/YooAsset/Runtime/ResourceManager/Handle/HandleBase.cs

@@ -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>
         /// 异步操作任务

Assets/YooAsset/Runtime/ResourceManager/Handle/RawFileHandle.cs

@@ -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>
         /// 获取原生文件的二进制数据

Assets/YooAsset/Runtime/ResourceManager/Handle/SubAssetsHandle.cs

@@ -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>
         /// 子资源对象集合

Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderOperation.cs

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

Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs

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