优化下ResourcesLoaderComponent

Unity/Assets/Scripts/ModelView/Client/Module/Resource/ResourcesLoaderComponent.cs

@@ -26,7 +26,27 @@ namespace ET.Client
         {
             foreach (var kv in self.handlers)
             {
-                kv.Value.Dispose();
+                switch (kv.Value)
+                {
+                    case AssetOperationHandle handle:
+                        handle.Release();
+                        break;
+                    case AllAssetsOperationHandle handle:
+                        handle.Release();
+                        break;
+                    case SubAssetsOperationHandle handle:
+                        handle.Release();
+                        break;
+                    case RawFileOperationHandle handle:
+                        handle.Release();
+                        break;
+                    case SceneOperationHandle handle:
+                        if (!handle.IsMainScene())
+                        {
+                            handle.UnloadAsync();
+                        }
+                        break;
+                }
             }
         }
 
@@ -34,47 +54,34 @@ namespace ET.Client
         {
             using CoroutineLock coroutineLock = await self.Fiber().CoroutineLockComponent.Wait(CoroutineLockType.ResourcesLoader, location.GetHashCode());
             
-            AssetOperationHandle assetOperationHandle;
-            ResourceHandler handler;
+            OperationHandleBase handler;
             if (!self.handlers.TryGetValue(location, out handler))
             {
-                assetOperationHandle = self.package.LoadAssetAsync<T>(location);
+                handler = self.package.LoadAssetAsync<T>(location);
             
-                await assetOperationHandle.Task;
+                await handler.Task;
 
-                handler = new ResourceHandler(assetOperationHandle);
                 self.handlers.Add(location, handler);
             }
-            else
-            {
-                assetOperationHandle = handler.GetHandler<AssetOperationHandle>();
-            }
             
-            return (T)assetOperationHandle.AssetObject;
+            return (T)((AssetOperationHandle)handler).AssetObject;
         }
         
         public static async ETTask<Dictionary<string, T>> LoadAllAssetsAsync<T>(this ResourcesLoaderComponent self, string location) where T: UnityEngine.Object
         {
             using CoroutineLock coroutineLock = await self.Fiber().CoroutineLockComponent.Wait(CoroutineLockType.ResourcesLoader, location.GetHashCode());
 
-            AllAssetsOperationHandle allAssetsOperationHandle;
-            ResourceHandler handler;
+            OperationHandleBase handler;
             if (!self.handlers.TryGetValue(location, out handler))
             {
-                allAssetsOperationHandle = self.package.LoadAllAssetsAsync<T>(location);
+                handler = self.package.LoadAllAssetsAsync<T>(location);
             
-                await allAssetsOperationHandle.Task;
-
-                handler = new ResourceHandler(allAssetsOperationHandle);
+                await handler.Task;
                 self.handlers.Add(location, handler);
             }
-            else
-            {
-                allAssetsOperationHandle = handler.GetHandler<AllAssetsOperationHandle>();
-            }
 
             Dictionary<string, T> dictionary = new Dictionary<string, T>();
-            foreach(UnityEngine.Object assetObj in allAssetsOperationHandle.AllAssetObjects)
+            foreach(UnityEngine.Object assetObj in ((AllAssetsOperationHandle)handler).AllAssetObjects)
             {    
                 T t = assetObj as T;
                 dictionary.Add(t.name, t);
@@ -86,97 +93,19 @@ namespace ET.Client
         {
             using CoroutineLock coroutineLock = await self.Fiber().CoroutineLockComponent.Wait(CoroutineLockType.ResourcesLoader, location.GetHashCode());
 
-            ResourceHandler handler;
+            OperationHandleBase handler;
             if (self.handlers.TryGetValue(location, out handler))
             {
                 return;
             }
 
-            SceneOperationHandle sceneOperationHandle = self.package.LoadSceneAsync(location);
+            handler = self.package.LoadSceneAsync(location);
 
-            await sceneOperationHandle.Task;
-
-            handler = new ResourceHandler(sceneOperationHandle);
+            await handler.Task;
             self.handlers.Add(location, handler);
         }
     }
     
-    public struct ResourceHandler: IDisposable
-    {
-        private enum ResourceHandlerType
-        {
-            AssetOperationHandle,
-            AllAssetsOperationHandle,
-            RawFileOperationHandle,
-            SubAssetsOperationHandle,
-            SceneOperationHandle,
-        }
-
-        private readonly ResourceHandlerType type;
-
-        private readonly OperationHandleBase handler;
-
-        public ResourceHandler(AssetOperationHandle handler)
-        {
-            this.type = ResourceHandlerType.AssetOperationHandle;
-            this.handler = handler;
-        }
-        
-        public ResourceHandler(AllAssetsOperationHandle handler)
-        {
-            this.type = ResourceHandlerType.AllAssetsOperationHandle;
-            this.handler = handler;
-        }
-        
-        public ResourceHandler(RawFileOperationHandle handler)
-        {
-            this.type = ResourceHandlerType.RawFileOperationHandle;
-            this.handler = handler;
-        }
-        
-        public ResourceHandler(SubAssetsOperationHandle handler)
-        {
-            this.type = ResourceHandlerType.SubAssetsOperationHandle;
-            this.handler = handler;
-        }
-        
-        public ResourceHandler(SceneOperationHandle handler)
-        {
-            this.type = ResourceHandlerType.SceneOperationHandle;
-            this.handler = handler;
-        }
-
-
-        public T GetHandler<T>() where T: OperationHandleBase
-        {
-            return this.handler as T;
-        }
-
-        public void Dispose()
-        {
-            switch (this.type)
-            {
-                case ResourceHandlerType.AssetOperationHandle:
-                    ((AssetOperationHandle)handler).Release();
-                    break;
-                case ResourceHandlerType.AllAssetsOperationHandle:
-                    ((AllAssetsOperationHandle)handler).Release();
-                    break;
-                case ResourceHandlerType.RawFileOperationHandle:
-                    ((RawFileOperationHandle)handler).Release();
-                    break;
-                case ResourceHandlerType.SubAssetsOperationHandle:
-                    ((SubAssetsOperationHandle)handler).Release();
-                    break;
-                case ResourceHandlerType.SceneOperationHandle:
-                    ((SceneOperationHandle)handler).UnloadAsync();
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-        }
-    }
-
     /// <summary>
     /// 用来管理资源，生命周期跟随Parent，比如CurrentScene用到的资源应该用CurrentScene的ResourcesLoaderComponent来加载
     /// 这样CurrentScene释放后，它用到的所有资源都释放了
@@ -185,6 +114,6 @@ namespace ET.Client
     public class ResourcesLoaderComponent: Entity, IAwake, IAwake<string>, IDestroy
     {
         public ResourcePackage package;
-        public Dictionary<string, ResourceHandler> handlers = new();
+        public Dictionary<string, OperationHandleBase> handlers = new();
     }
 }