修复异步加载读取同一个文件的问题

Author: wanderer

GameFramework/Editor/AssetBundleEditor/AssetBundleBuildEditor.cs

@@ -29,7 +29,7 @@ public class AssetBundleBuildEditor : EditorWindow
         //压缩内容
         string[] _compressionOptionsContent = new string[] { "No Compression", "Standard Compression (LZMA)", "Chunk Based Compression (LZ4)" };
 
-        [MenuItem("Tools/Asset Bundle/AssetBundle Build Options %#O")]
+        [MenuItem("Tools/Asset Bundle/AssetBundle Build Options #&O")]
         public static void AssetBundilesOptions()
         {
             _rootPath = Path.GetDirectoryName(Path.GetFullPath(Application.dataPath));

GameFramework/Editor/AssetBundleEditor/AssetBundleEditor.cs

@@ -51,7 +51,8 @@ public bool _haspopupFoldersWindow
 		[MenuItem("Tools/Asset Bundle/Asset Bundle Editor")]
 		private static void MainWindow()
 		{
-			GetWindowWithRect<AssetBundleEditor>(new Rect(100, 100, 1200, 600), false, "Asset Bundle Editor");
+			//GetWindowWithRect<AssetBundleEditor>(new Rect(100, 100, 1200, 600), false, "Asset Bundle Editor");
+			GetWindow<AssetBundleEditor>("Asset Bundle Editor");
 		}
 
 

GameFramework/Runtime/Resource/BundleAssetsHelper.cs

@@ -429,17 +429,28 @@ private IEnumerator LoadAssetBundleFromPathAsync(string path, Action<AssetBundle
 
             using (Stream abStream = _isEncrypt ? new EncryptFileStream(path, FileMode.Open, FileAccess.Read, FileShare.None, 1024 * 4, false) : new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.None, 1024 * 4, false))
             {
-                float loadTime = Time.realtimeSinceStartup;
-                var ablfsa = AssetBundle.LoadFromStreamAsync(abStream);
-                while (!ablfsa.isDone)
+                while (!abStream.CanRead)
                 {
-                    progress?.Invoke(ablfsa.progress);
                     yield return null;
                 }
+                string fileName = Path.GetFileNameWithoutExtension(path);
                 yield return null;
-                loadTime = Time.realtimeSinceStartup - loadTime;
-                Debug.Log($"LoadAssetBundleFromPath Async time spent: {loadTime} {path} ");
-                callback?.Invoke(ablfsa.assetBundle);
+                AssetBundle assetBundle;
+                if (!_liveAssetBundle.TryGetValue(fileName, out assetBundle))
+                {
+                    float loadTime = Time.realtimeSinceStartup;
+                    var ablfsa = AssetBundle.LoadFromStreamAsync(abStream);
+                    while (!ablfsa.isDone)
+                    {
+                        progress?.Invoke(ablfsa.progress);
+                        yield return null;
+                    }
+                    yield return null;
+                    loadTime = Time.realtimeSinceStartup - loadTime;
+                    Debug.Log($"LoadAssetBundleFromPath Async time spent: {loadTime} {path} ");
+                    assetBundle = ablfsa.assetBundle;
+                }
+                callback?.Invoke(assetBundle);
             }
         }
         #endregion