改Resource为异步方法类

Editor/UserInfo/UserData.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: be8d41c132cdeb04bbf228513b4e7f03
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Runtime/Scripts/Main/Main.cs

@@ -1,6 +1,8 @@
+using Cysharp.Threading.Tasks;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using TMPro;
 using UnityEngine;
 
@@ -99,6 +101,7 @@ namespace TFramework
     public delegate void TAction<in T1, in T2, in T3>(T1 arg0, T2 arg1, T3 arg2);
     public delegate TRes TFunc<out TRes>();
     public delegate TRes TFunc<in T1, out TRes>(T1 arg0);
+    public delegate UniTask<TRes> TFuncAsync<in T1, TRes>(T1 arg0);
     public delegate TRes TFunc<in T1, in T2, out TRes>(T1 arg0, T2 arg1);
 
     public enum ResLoadMode

Runtime/Scripts/Resource/LoadResHandle.cs

@@ -34,14 +34,14 @@ namespace TFramework
         /// <summary>
         /// ¼ÓÔØÍê³Éʼþ
         /// </summary>
-        public TAction<T> OnLoadOver;
+        public TFuncAsync<T,bool> OnLoadOver;
 
         public LoadResHandle()
         {
 
         }
 
-        public LoadResHandle(ResLoadMode resLoadMode, string resourePath, string assetbundleName, string assetPath, TAction<float> onLoading = null, TAction<T> onLoadOver = null)
+        public LoadResHandle(ResLoadMode resLoadMode, string resourePath, string assetbundleName, string assetPath, TAction<float> onLoading = null, TFuncAsync<T, bool> onLoadOver = null)
         {
             LoadMode = resLoadMode;
             ResourcePath = resourePath;
@@ -57,7 +57,7 @@ namespace TFramework
         /// <param name="resourePath"></param>
         /// <param name="onLoading"></param>
         /// <param name="onLoadOver"></param>
-        public LoadResHandle(string resourePath, TAction<float> onLoading = null, TAction<T> onLoadOver = null)
+        public LoadResHandle(string resourePath, TAction<float> onLoading = null, TFuncAsync<T, bool> onLoadOver = null)
         {
             LoadMode = ResLoadMode.Resourece;
             ResourcePath = resourePath;
@@ -73,7 +73,7 @@ namespace TFramework
         /// <param name="assetPath"></param>
         /// <param name="onLoading"></param>
         /// <param name="onLoadOver"></param>
-        public LoadResHandle(string assetbundleName, string assetPath, TAction<float> onLoading = null, TAction<T> onLoadOver = null)
+        public LoadResHandle(string assetbundleName, string assetPath, TAction<float> onLoading = null, TFuncAsync<T, bool> onLoadOver = null)
         {
             LoadMode = ResLoadMode.AssetBundle;
             AssetBundleName = assetbundleName;
@@ -82,7 +82,7 @@ namespace TFramework
             OnLoadOver = onLoadOver;
         }
 
-        public LoadResHandle(UIResourceAttribute attribute, TAction<float> onLoading = null, TAction<T> onLoadOver = null)
+        public LoadResHandle(UIResourceAttribute attribute, TAction<float> onLoading = null, TFuncAsync<T, bool> onLoadOver = null)
         {
             LoadMode = attribute.LoadMode;
             ResourcePath = attribute.ResourcePath;

Runtime/Scripts/Resource/ResourceManager.cs

@@ -101,23 +101,22 @@ namespace TFramework
         /// <param name="onLoading">加载中事件</param>
         /// <param name="onLoadDone">加载完成事件</param>
         /// <returns></returns>
-        public Coroutine LoadAssetAsync<T>(LoadResHandle<T> resHandle) where T : UnityEngine.Object
+        public async UniTask<T> LoadAssetAsync<T>(LoadResHandle<T> resHandle) where T : UnityEngine.Object
         {
-            return StartCoroutine(LoadAsync(resHandle));
+            return await LoadAsync(resHandle);
         }
 
-        private IEnumerator LoadAsync<T>(LoadResHandle<T> resHandle) where T : UnityEngine.Object
+        private async UniTask<T> LoadAsync<T>(LoadResHandle<T> resHandle) where T : UnityEngine.Object
         {
             UnityEngine.Object asset = null;
             if (resHandle.LoadMode == ResLoadMode.Resourece)
             {
                 ResourceRequest request = Resources.LoadAsync<T>(resHandle.ResourcePath);
-                while (!request.isDone)
+
+                await request.ToUniTask(Progress.Create<float>(pro =>
                 {
-                    resHandle.OnLoading?.Invoke(request.progress);
-                    yield return null;
-                }
-                resHandle.OnLoading?.Invoke(1);
+                    resHandle.OnLoading?.Invoke(pro);
+                }));
                 if (!request.asset)
                     throw new UnityException($"资源加载失败：Resources文件夹中不存在资源 {resHandle.ResourcePath}!");
                 else
@@ -138,35 +137,33 @@ namespace TFramework
                 else
                 {
                     //等待相关依赖资源的加载
-                    yield return LoadDependenciesAssetBundleAsync(resHandle.AssetBundleName.ToLower());
-                    yield return LoadAssetBundleAsync(resHandle.AssetBundleName.ToLower(), resHandle.OnLoading);
+                    await LoadDependenciesAssetBundleAsync(resHandle.AssetBundleName.ToLower());
+                    await LoadAssetBundleAsync(resHandle.AssetBundleName.ToLower(), resHandle.OnLoading);
                     if (AssetBundles.ContainsKey(resHandle.AssetBundleName.ToLower()))
                     {
                         //asset = AssetBundles[resHandle.AssetBundleName].LoadAsset<T>(resHandle.AssetPath);
                         AssetBundleRequest request = AssetBundles[resHandle.AssetBundleName.ToLower()].LoadAssetAsync<T>(resHandle.AssetPath);
-                        yield return request;
-                        while (!request.isDone)
+                        await request;
+                        await request.ToUniTask(Progress.Create<float>(pro =>
                         {
-                            resHandle.OnLoading(request.progress / 2 + 0.5f);
-                            yield return null;
-                        }
+                            resHandle.OnLoading?.Invoke(pro);
+                        }));
                         asset = request.asset;
                         if (!asset)
                             throw new UnityException(string.Format("加载资源失败：AB包 {0} 中不存在资源 {1}！", resHandle.AssetBundleName, resHandle.AssetPath));
                     }
                 }
 #else
-                yield return LoadDependenciesAssetBundleAsync(resHandle.AssetBundleName);
-                    yield return LoadAssetBundleAsync(resHandle.AssetBundleName, resHandle.OnLoading);
+                await LoadDependenciesAssetBundleAsync(resHandle.AssetBundleName.ToLower());
+                    await LoadAssetBundleAsync(resHandle.AssetBundleName.ToLower(), resHandle.OnLoading);
                     if (AssetBundles.ContainsKey(resHandle.AssetBundleName.ToLower()))
                     {
                         AssetBundleRequest request = AssetBundles[resHandle.AssetBundleName.ToLower()].LoadAssetAsync<T>(resHandle.AssetPath);
-                        yield return request;
-                        while(!request.isDone)
+                        await request;
+                        await request.ToUniTask(Progress.Create<float>(pro =>
                         {
-                            resHandle.OnLoading(request.progress / 2+0.5f);
-                            yield return null;
-                        }
+                            resHandle.OnLoading?.Invoke(pro);
+                        }));
                         asset = request.asset;
                         if (!asset)
                             throw new UnityException(string.Format("加载资源失败：AB包 {0} 中不存在资源 {1}！", resHandle.AssetBundleName, resHandle.AssetPath));
@@ -181,6 +178,8 @@ namespace TFramework
             else
                 resHandle.OnLoadOver?.Invoke(null);
 
+            return asset as T;
+
         }
 
         /// <summary>
@@ -190,9 +189,9 @@ namespace TFramework
         /// <param name="onLoading">加载中事件</param>
         /// <param name="onLoadDone">加载完成事件</param>
         /// <returns></returns>
-        public Coroutine LoadSceneAsync(string scenePath, TAction<float> OnLoading, TAction<Scene> OnLoadOver, LoadSceneMode loadSceneMode = LoadSceneMode.Single)
+        public async UniTask<Scene> LoadSceneAsync(string scenePath, TAction<float> OnLoading, TFuncAsync<Scene, bool> OnLoadOver, LoadSceneMode loadSceneMode = LoadSceneMode.Single)
         {
-            return StartCoroutine(LoadScene(scenePath, ResLoadMode.Resourece, "", OnLoading, OnLoadOver, loadSceneMode));
+           return  await LoadScene(scenePath, ResLoadMode.Resourece, "", OnLoading, OnLoadOver, loadSceneMode);
         }
 
 
@@ -203,30 +202,26 @@ namespace TFramework
         /// <param name="onLoading">加载中事件</param>
         /// <param name="onLoadDone">加载完成事件</param>
         /// <returns></returns>
-        public Coroutine LoadSceneAsync(LoadResHandle<Scene> resHandle, LoadSceneMode loadSceneMode = LoadSceneMode.Single)
+        public async UniTask<Scene> LoadSceneAsync(LoadResHandle<Scene> resHandle, LoadSceneMode loadSceneMode = LoadSceneMode.Single)
         {
-            return StartCoroutine(LoadScene(resHandle.AssetPath,resHandle.LoadMode,resHandle.AssetBundleName,resHandle.OnLoading,resHandle.OnLoadOver, loadSceneMode));
+            return await LoadScene(resHandle.AssetPath,resHandle.LoadMode,resHandle.AssetBundleName,resHandle.OnLoading,resHandle.OnLoadOver, loadSceneMode);
         }
 
-        private IEnumerator LoadScene(string scenePath, ResLoadMode loadMode ,string assetBundleName ,TAction<float> OnLoading,TAction<Scene> OnLoadOver, LoadSceneMode loadSceneMode)
+        private async UniTask<Scene> LoadScene(string scenePath, ResLoadMode loadMode ,string assetBundleName ,TAction<float> OnLoading,TFuncAsync<Scene, bool> OnLoadOver, LoadSceneMode loadSceneMode)
         {
             if (SceneManager.GetSceneByPath(scenePath) == CurrentScene)
             {
                 Debug.LogWarning($"场景{scenePath}已加载！");
-                yield break;
+                return CurrentScene;
             }
+            AsyncOperation ao;
             if (loadMode == ResLoadMode.Resourece)
             {
-                AsyncOperation ao = SceneManager.LoadSceneAsync(scenePath, loadSceneMode);
-                while (!ao.isDone)
-                {
-                    OnLoading?.Invoke(ao.progress);
-                    yield return null;
-                }
+                ao = SceneManager.LoadSceneAsync(scenePath, loadSceneMode);
             }
             else
             {
-                yield return LoadDependenciesAssetBundleAsync(assetBundleName.ToLower());
+                await LoadDependenciesAssetBundleAsync(assetBundleName.ToLower());
 #if UNITY_EDITOR
                 if (AssetConfig.RuntimeMode == UpdateMode.Editor)
                 {
@@ -235,58 +230,59 @@ namespace TFramework
                         loadSceneMode = LoadSceneMode.Single,
                         localPhysicsMode = LocalPhysicsMode.None
                     };
-                    AsyncOperation ao = UnityEditor.SceneManagement.EditorSceneManager.LoadSceneAsyncInPlayMode(scenePath, parameters);
-                    while (!ao.isDone)
-                    {
-                        OnLoading?.Invoke(ao.progress);
-                        yield return null;
-                    }
+                    ao = UnityEditor.SceneManagement.EditorSceneManager.LoadSceneAsyncInPlayMode(scenePath, parameters);
                 }
                 else
                 {
-                    yield return LoadAssetBundleAsync(assetBundleName.ToLower(), OnLoading);
-                    AsyncOperation ao = SceneManager.LoadSceneAsync(scenePath, loadSceneMode);
-                    while (!ao.isDone)
-                    {
-                        Debug.Log($"加载场景=={ao.isDone}==完成");
-                        OnLoading?.Invoke(ao.progress);
-                        yield return null;
-                    }
-                    Debug.Log($"加载场景{scenePath}完成");
+                    await LoadAssetBundleAsync(assetBundleName.ToLower(), OnLoading);
+                    ao = SceneManager.LoadSceneAsync(scenePath, loadSceneMode);
                 }
 #else
-                    yield return LoadAssetBundleAsync(assetBundleName, OnLoading);
-                    AsyncOperation ao = SceneManager.LoadSceneAsync(scenePath, loadSceneMode);
-                    while (!ao.isDone)
-                    {
-                        OnLoading?.Invoke(ao.progress);
-                        yield return null;
-                    }
+                    await LoadAssetBundleAsync(assetBundleName, OnLoading);
+                    ao = SceneManager.LoadSceneAsync(scenePath, loadSceneMode);
 #endif
             }
+            ao.allowSceneActivation = false;
+            while (ao.progress < 0.9f)
+            {
+                OnLoading?.Invoke(ao.progress);
+                await UniTask.Yield();
+            }
             Debug.Log($"加载场景{scenePath}完成");
             OnLoading?.Invoke(1);
-            OnLoadOver?.Invoke(SceneManager.GetSceneByPath(scenePath));
+            if(OnLoadOver != null)
+            {
+                if (await OnLoadOver.Invoke(SceneManager.GetSceneByPath(scenePath)))
+                {
+                    ao.allowSceneActivation = true;
+                }
+            }
+            else
+                ao.allowSceneActivation = true;
+
+            await ao.ToUniTask();
+
+            SceneManager.SetActiveScene(SceneManager.GetSceneByPath(scenePath));
             CurrentScene = SceneManager.GetActiveScene();
-            //SceneManager.SetActiveScene(CurrentScene);
+            return CurrentScene;
         }
 
         /// <summary>
         /// 异步清理内存 回收垃圾
         /// </summary>
         /// <returns></returns>
-        public Coroutine ClearMemoryAsync()
+        public async UniTask ClearMemoryAsync()
         {
-            return StartCoroutine(ClearMemory());
+            await ClearMemory();
         }
 
         /// <summary>
         /// 清理内存，释放空闲内存（异步）
         /// </summary>
         /// <returns>协程迭代器</returns>
-        private IEnumerator ClearMemory()
+        private async UniTask ClearMemory()
         {
-            yield return Resources.UnloadUnusedAssets();
+            await Resources.UnloadUnusedAssets();
             GC.Collect();
             GC.WaitForPendingFinalizers();
         }
@@ -295,14 +291,14 @@ namespace TFramework
         /// 异步卸载资源
         /// </summary>
         /// <returns></returns>
-        public Coroutine UnLoadAsstAsync(ResLoadMode resLoadMode, string assetBundleName, bool unloadAllLoadedObjects = false)
+        public async UniTask UnLoadAsstAsync(ResLoadMode resLoadMode, string assetBundleName, bool unloadAllLoadedObjects = false)
         {
-            return StartCoroutine(UnLoadAsst(resLoadMode, assetBundleName, unloadAllLoadedObjects));
+            await UnLoadAsst(resLoadMode, assetBundleName, unloadAllLoadedObjects);
         }
 
-        private IEnumerator UnLoadAsst(ResLoadMode resLoadMode, string assetBundleName, bool unloadAllLoadedObjects = false)
+        private async UniTask UnLoadAsst(ResLoadMode resLoadMode, string assetBundleName, bool unloadAllLoadedObjects = false)
         {
-            yield return UnLoadAsset(ResLoadMode.Resourece, assetBundleName, unloadAllLoadedObjects);
+            await UnLoadAsset(ResLoadMode.Resourece, assetBundleName, unloadAllLoadedObjects);
         }
 
         /// <summary>
@@ -310,30 +306,30 @@ namespace TFramework
         /// </summary>
         /// <param name="scene"></param>
         /// <returns></returns>
-        public Coroutine UnloadSceneAsync(Scene scene, TAction<float> OnUnloading = null, TAction OnUnloadOver = null)
+        public async UniTask UnloadSceneAsync(Scene scene, TAction<float> OnUnloading = null, TAction OnUnloadOver = null)
         {
             Debug.Log($"卸载场景{scene.name}");
-            return StartCoroutine(UnloadScene(scene, OnUnloading, OnUnloadOver));
+            await UnloadScene(scene, OnUnloading, OnUnloadOver);
         }
 
-        private IEnumerator UnloadScene(Scene scene, TAction<float> OnUnloading, TAction OnUnloadOver)
+        private async UniTask UnloadScene(Scene scene, TAction<float> OnUnloading, TAction OnUnloadOver)
         {
             AsyncOperation ao = SceneManager.UnloadSceneAsync(scene);
             while (!ao.isDone)
             {
                 OnUnloading?.Invoke(ao.progress);
-                yield return null;
+                await UniTask.Yield();
             }
             OnUnloadOver?.Invoke();
             CurrentScene = SceneManager.GetActiveScene();
 
         }
 
-        public IEnumerator UnLoadAsset(ResLoadMode resLoadMode, string assetBundleName, bool unloadAllLoadedObjects = false)
+        public async UniTask UnLoadAsset(ResLoadMode resLoadMode, string assetBundleName, bool unloadAllLoadedObjects = false)
         {
             if (resLoadMode == ResLoadMode.Resourece)
             {
-                yield return Resources.UnloadUnusedAssets();
+                await Resources.UnloadUnusedAssets();
             }
             else
             {
@@ -343,7 +339,7 @@ namespace TFramework
                     AssetBundles[assetBundleName].Unload(unloadAllLoadedObjects);
                     AssetBundles.Remove(assetBundleName);
                 }
-                yield return null;
+                await UniTask.Yield();
             }
         }
 
@@ -362,7 +358,7 @@ namespace TFramework
         /// 异步加载AB包清单
         /// </summary>
         /// <returns>协程迭代器</returns>
-        private IEnumerator LoadAssetBundleManifestAsync()
+        private async UniTask LoadAssetBundleManifestAsync()
         {
             if (string.IsNullOrEmpty(AssetConfig.AssetBundleManifestName))
             {
@@ -372,15 +368,14 @@ namespace TFramework
             {
                 if (AssetBundleManifest == null)
                 {
-                    yield return LoadAssetBundleAsync(AssetConfig.AssetBundleManifestName, null);
+                    await LoadAssetBundleAsync(AssetConfig.AssetBundleManifestName, null);
                     if (AssetBundles.ContainsKey(AssetConfig.AssetBundleManifestName))
                     {
                         AssetBundleManifest = AssetBundles[AssetConfig.AssetBundleManifestName].LoadAsset<AssetBundleManifest>("AssetBundleManifest");
-                        UnLoadAsset(ResLoadMode.AssetBundle, AssetConfig.AssetBundleManifestName);
+                        await UnLoadAsset(ResLoadMode.AssetBundle, AssetConfig.AssetBundleManifestName);
                     }
                 }
             }
-            yield return null;
         }
 
         /// <summary>
@@ -390,18 +385,18 @@ namespace TFramework
         /// <param name="onLoading">加载中事件</param>
         /// <param name="isManifest">是否是加载清单</param>
         /// <returns>协程迭代器</returns>
-        private IEnumerator LoadAssetBundleAsync(string assetBundleName, TAction<float> onLoading)
+        private async UniTask LoadAssetBundleAsync(string assetBundleName, TAction<float> onLoading)
         {
             if (!AssetBundles.ContainsKey(assetBundleName))
             {
                 AssetBundleCreateRequest abRequst = AssetBundle.LoadFromFileAsync(AssetConfig.AssetBundleRootPath + assetBundleName);
 
-                yield return abRequst;
+                await abRequst;
 
                 while (!abRequst.isDone)
                 {
                     onLoading?.Invoke(abRequst.progress / 2);
-                    yield return null;
+                    await UniTask.Yield();
                 }
 
                 if (abRequst.assetBundle)
@@ -417,12 +412,12 @@ namespace TFramework
         /// </summary>
         /// <param name="assetBundleName">AB包名称</param>
         /// <returns>协程迭代器</returns>
-        private IEnumerator LoadDependenciesAssetBundleAsync(string assetBundleName)
+        private async UniTask LoadDependenciesAssetBundleAsync(string assetBundleName)
         {
 #if UNITY_EDITOR
             if (AssetConfig.RuntimeMode != UpdateMode.Editor)
             {
-                yield return LoadAssetBundleManifestAsync();
+                await LoadAssetBundleManifestAsync();
                 if (AssetBundleManifest != null)
                 {
                     string[] dependencies = AssetBundleManifest.GetAllDependencies(assetBundleName);
@@ -431,27 +426,24 @@ namespace TFramework
                         if (AssetBundles.ContainsKey(item))
                             continue;
 
-                        yield return LoadAssetBundleAsync(item, null);
+                       await LoadAssetBundleAsync(item, null);
                     }
                 }
             }
 #else
-                yield return LoadAssetBundleManifestAsync();
+                await LoadAssetBundleManifestAsync();
                 if (AssetBundleManifest != null)
                 {
                     string[] dependencies = AssetBundleManifest.GetAllDependencies(assetBundleName);
                     foreach (string item in dependencies)
                     {
                         if (AssetBundles.ContainsKey(item))
-                        {
                             continue;
-                        }
 
-                        yield return LoadAssetBundleAsync(item,null);
+                       await LoadAssetBundleAsync(item, null);
                     }
                 }
 #endif
-            yield return null;
         }
     }
 }