修改资源为async-await加载，其他有点小bug,先更新

Author: coding2233

Assets/Game/HotFix/HotFix.dll.bytes

@@ -17,6 +17,8 @@
 using UnityEngine.SceneManagement;
 using Object = UnityEngine.Object;
 using UnitySceneManager = UnityEngine.SceneManagement.SceneManager;
+using System.Threading.Tasks;
+using UnityEditor.SceneManagement;
 
 namespace GameFramework.Taurus
 {
@@ -32,42 +34,34 @@ public void SetResourcePath(PathType pathType, string rootAssetBundle = "AssetBu
         /// <typeparam name="T"></typeparam>
         /// <param name="assetName"></param>
         /// <returns></returns>
-        public T LoadAsset<T>(string assetBundleName,string assetName) where T : Object
+        public Task<T> LoadAsset<T>(string assetBundleName,string assetName) where T : Object
         {
-            return AssetDatabase.LoadAssetAtPath<T>(assetName);
+			TaskCompletionSource<T> task = new TaskCompletionSource<T>();
+			task.SetResult(AssetDatabase.LoadAssetAtPath<T>(assetName));
+			return task.Task;
         }
 
-
-        /// <summary>
-        /// 异步加载资源
-        /// </summary>
-        /// <param name="assetName">资源名称</param>
-        public void LoadAssetAsync<T>(string assetBundleName,string assetName, Action<string, UnityEngine.Object> asyncCallback) where T : Object
-        {
-	        asyncCallback.Invoke(assetName,AssetDatabase.LoadAssetAtPath<T>(assetName));
-        }
-
-	    /// <summary>
-	    /// 卸载资源 主要为卸载AssetBundle
-	    /// </summary>
-	    /// <param name="assetName">资源名称</param>
-	    /// <param name="allAssets">是否卸载调所有资源</param>
-	    public void UnloadAsset(string assetBundleName, bool unload)
+		
+		/// <summary>
+		/// 卸载资源 主要为卸载AssetBundle
+		/// </summary>
+		/// <param name="assetName">资源名称</param>
+		/// <param name="allAssets">是否卸载调所有资源</param>
+		public void UnloadAsset(string assetBundleName, bool unload)
 	    {
 	    }
 
 	    /// <summary>
 		/// 异步加载场景
 		/// </summary>
 		/// <param name="sceneName"></param>
-		public AsyncOperation LoadSceneAsync(string assetBundleName,string sceneName, LoadSceneMode mode = LoadSceneMode.Additive)
+		public Task<AsyncOperation> LoadSceneAsync(string assetBundleName,string sceneName, LoadSceneMode mode = LoadSceneMode.Additive)
         {
-            if (mode == LoadSceneMode.Additive)
-                return EditorApplication.LoadLevelAdditiveAsyncInPlayMode(sceneName);
-            else
-                return EditorApplication.LoadLevelAsyncInPlayMode(sceneName);
-            //  return UnitySceneManager.LoadSceneAsync(sceneName, mode);
-        }
+			TaskCompletionSource<AsyncOperation> task = new TaskCompletionSource<AsyncOperation>();
+			task.SetResult(EditorSceneManager.LoadSceneAsyncInPlayMode(sceneName, new LoadSceneParameters(mode)));
+			return task.Task;
+			//  return UnitySceneManager.LoadSceneAsync(sceneName, mode);
+		}
 
         /// <summary>
         /// 卸载场景
@@ -84,7 +78,17 @@ public AsyncOperation UnloadSceneAsync(string sceneName)
         public void Clear()
         {
         }
-    }
+
+		public Task<AssetBundle> LoadAssetBundle(string assetBundleName)
+		{
+			return null;
+		}
+
+		public T LoadAssetSync<T>(string assetBundleName, string assetName) where T : Object
+		{
+			return AssetDatabase.LoadAssetAtPath<T>(assetName);
+		}
+	}
 }
 
 #endif

Assets/Game/Scene/Main.unity

@@ -51,9 +51,9 @@ public override void OnUpdate()
 
 		#region 内部函数
 
-		private void LoadHotFix()
+		private async void LoadHotFix()
 		{
-			byte[] dllDatas = GameMode.Resource.LoadAsset<TextAsset>("hotfix",_dllPath).bytes;
+			byte[] dllDatas =(await GameMode.Resource.LoadAsset<TextAsset>("hotfix",_dllPath)).bytes;
 			byte[] pdbDatas = null;
 #if UNITY_EDITOR
 			//pdbDatas = GameMode.Resource.LoadAsset<TextAsset>("hotfix", _pdbPath)?.bytes;

Assets/Game/Scripts/Resource/EditorResourceHelper.cs

@@ -29,6 +29,9 @@ public override void OnEnter(params object[] parameters)
             GameMode.Resource.SetResourceHelper(new BundleResourceHelper());
             //加载ab包的mainfest文件
 		    GameMode.Resource.SetMainfestAssetBundle(versionInfo.ManifestAssetBundle, versionInfo.IsEncrypt);
+
+			//切换到预加载的状态
+			ChangeState<PreloadState>();
 		}
 
 		public override void OnExit()

Assets/Game/Scripts/State/LoadHotfixState.cs

@@ -8,6 +8,7 @@
 //-----------------------------------------------------------------------
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine;
 
 namespace GameFramework.Taurus
 {
@@ -18,7 +19,7 @@ public class PreloadState : GameState
 		public override void OnEnter(params object[] parameters)
 		{
 			base.OnEnter(parameters);
-
+			
             //测试 直接切换到热更新状态里面去
 		    ChangeState<LoadHotfixState>();
 		}

Assets/Game/Scripts/State/LoadResourceState.cs

@@ -9,6 +9,7 @@
 
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using UnityEngine;
 
 namespace GameFramework.Taurus
@@ -79,15 +80,15 @@ public void AddSoundEffect(string assetBundleName,string audioClipPath)
 		/// 播放在GameObject上的声音
 		/// </summary>
 		/// <param name="audioClipPath"></param>
-		public void PlayGameObjectSound(GameObject go,string assetBundleName,string audioClipPath)
+		public async void PlayGameObjectSound(GameObject go,string assetBundleName,string audioClipPath)
 		{
 			AudioSource audioSource=go.GetComponent<AudioSource>();
 			if (audioSource==null)
 			{
 				audioSource = go.AddComponent<AudioSource>();
 			}
 
-			audioSource.clip = _resourceManager?.LoadAsset<AudioClip>(assetBundleName,audioClipPath);
+			audioSource.clip = await _resourceManager?.LoadAsset<AudioClip>(assetBundleName,audioClipPath);
 			if (audioSource.clip != null)
 				audioSource.Play();
 		}
@@ -190,11 +191,11 @@ public void RemoveSoundEffect(string audioClipPath)
 		#region 内部函数
 
 		//添加音频
-		private bool AddAuioClip(string assetBundleName,string audioClipPath, Dictionary<string, AudioClip> clips)
+		private async Task<bool> AddAuioClip(string assetBundleName,string audioClipPath, Dictionary<string, AudioClip> clips)
 		{
 			if (!clips.ContainsKey(audioClipPath))
 			{
-				AudioClip audioClip = _resourceManager?.LoadAsset<AudioClip>(assetBundleName,audioClipPath);
+				AudioClip audioClip = await _resourceManager?.LoadAsset<AudioClip>(assetBundleName,audioClipPath);
 				if (audioClip != null)
 				{
 					clips.Add(audioClipPath, audioClip);

Assets/Game/Scripts/State/PreloadState.cs

@@ -30,9 +30,9 @@ public DataTableManager()
 	    /// <typeparam name="T"></typeparam>
 	    /// <param name="data">配置表的数据</param>
 	    /// <returns></returns>
-		public void LoadDataTable<T>(string assetBundleName,string dataTablePath) where T :class, IDataTableRow,new()
+		public async void LoadDataTable<T>(string assetBundleName,string dataTablePath) where T :class, IDataTableRow,new()
 	    {
-		    string data= _resource.LoadAsset<TextAsset>(assetBundleName,dataTablePath).text;
+		    string data= (await _resource.LoadAsset<TextAsset>(assetBundleName,dataTablePath)).text;
 		    DataTable<T> dataTable = new DataTable<T>();
 		    string[] rows = data.Split('\n');
 		    foreach (var item in rows)

Assets/GameFramework/Audio/AudioManager.cs

@@ -57,7 +57,12 @@ public static void BuildAssetBundles()
 
 		//保存平台信息
 		SavePlatformVersion(new List<BuildTarget>(){target});
-	}
+
+            //复制资源
+            CopyResource(target);
+            AssetDatabase.Refresh();
+
+    }
 
 	[MenuItem("Tools/Build AssetBundles Targets %#Y")]
 	public static void BuildAssetBundlesAllTargets()
@@ -74,7 +79,13 @@ public static void BuildAssetBundlesAllTargets()
 
 		//保存平台信息
 		SavePlatformVersion(targets);
-	}
+            if (targets.Contains(EditorUserBuildSettings.activeBuildTarget))
+            {
+                //复制资源
+                CopyResource(EditorUserBuildSettings.activeBuildTarget);
+                AssetDatabase.Refresh();
+            }
+        }
 
 	/// <summary>
 	/// OnGUI is called for rendering and handling GUI events.
@@ -103,7 +114,7 @@ void OnGUI()
 		GUILayout.Label("Compression:");
 		_config.CompressOptions = EditorGUILayout.Popup(_config.CompressOptions,_compressionOptionsContent);
 		GUILayout.EndHorizontal();
-
+            
 		GUILayout.BeginHorizontal("Box");
 		GUILayout.Label("BuildPath:");
 		GUILayout.TextArea(string.IsNullOrEmpty(_config.BuildPath)?_rootPath:_config.BuildPath);
@@ -129,9 +140,15 @@ void OnGUI()
 			return;
 		}
 		GUILayout.EndHorizontal();
-		
-		//build targets----------------------------------------------------------------------------
-		GUILayout.BeginVertical("Box");
+
+        //copy------------------------------------
+        GUILayout.BeginHorizontal("Box");
+        GUILayout.FlexibleSpace();
+        _config.Copy2StreamingAssets= GUILayout.Toggle(_config.Copy2StreamingAssets, "Copy to StreamingAssets");
+        GUILayout.EndHorizontal();
+
+        //build targets----------------------------------------------------------------------------
+        GUILayout.BeginVertical("Box");
 		GUILayout.Label("Build Targets:");
 		_scrollViewPos=GUILayout.BeginScrollView(_scrollViewPos,"Box");
 		foreach (var item in _allTargets)
@@ -269,15 +286,30 @@ private static void SavePlatformVersion(List<BuildTarget> targets)
 		EditorUtility.OpenWithDefaultApp(_config.BuildPath);
 	}
 
+    //复制资源
+    private static void CopyResource(BuildTarget target)
+    {
+        //打包路径
+        string buildPath =Path.GetFullPath( Path.Combine(_config.BuildPath, target.ToString()));
+        //获取源文件夹下的所有文件  不考虑子文件夹
+        string[] files = Directory.GetFiles(buildPath);
+        string targetPath = Path.GetFullPath(Application.streamingAssetsPath);
+        for (int i = 0; i < files.Length; i++)
+        {
+            string path = files[i].Replace(buildPath, targetPath);
+            File.Copy(files[i], path, true);
+        }
+    }
+
 		//ab包的配置文件信息
 		[System.Serializable]
 		public class AssetBundleConifgInfo
 		{
 			public int Version=0;
 			public string BuildPath="";
 			public int CompressOptions=1;
+            public bool Copy2StreamingAssets = false;
 			public List<int> BuildTargets=new List<int>();
-
 		}