Merge 60fe96fb9c into cdaa45e163

1.主要是如果在同时下载包的时候且注册到统一的返回事件的时候无法识别当前是什么包下载的返回结果.这样给开发者有一定的操作成本.需要独立的去记录包和下载列表的关系

Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs

@@ -98,7 +98,7 @@ namespace YooAsset
             throw new System.NotImplementedException(this.GetType().Name);
         }
 
-        internal string GetPackageName()
+        public string GetPackageName()
         {
             return _packageName;
         }

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

@@ -15,6 +15,14 @@ namespace YooAsset
         }
         internal abstract void InvokeCallback();
 
+        /// <summary>
+        /// 是否成功
+        /// </summary>
+        public bool IsSucceed
+        {
+            get { return IsDone && Status == EOperationStatus.Succeed; }
+        }
+
         /// <summary>
         /// 获取资源信息
         /// </summary>

Assets/YooAsset/Runtime/ResourcePackage/Operation/DownloaderOperation.cs

@@ -15,10 +15,10 @@ namespace YooAsset
 
         private const int MAX_LOADER_COUNT = 64;
 
-        public delegate void OnDownloadOver(bool isSucceed);
+        public delegate void OnDownloadOver(string packageName, bool isSucceed);
-        public delegate void OnDownloadProgress(int totalDownloadCount, int currentDownloadCount, long totalDownloadBytes, long currentDownloadBytes);
+        public delegate void OnDownloadProgress(string packageName, int totalDownloadCount, int currentDownloadCount, long totalDownloadBytes, long currentDownloadBytes);
-        public delegate void OnDownloadError(string fileName, string error);
+        public delegate void OnDownloadError(string packageName, string fileName, string error);
-        public delegate void OnStartDownloadFile(string fileName, long sizeBytes);
+        public delegate void OnStartDownloadFile(string packageName, string fileName, long sizeBytes);
 
         private readonly string _packageName;
         private readonly int _downloadingMaxNumber;
@@ -160,7 +160,7 @@ namespace YooAsset
                     _lastDownloadBytes = downloadBytes;
                     _lastDownloadCount = _cachedDownloadCount;
                     Progress = (float)_lastDownloadBytes / TotalDownloadBytes;
-                    OnDownloadProgressCallback?.Invoke(TotalDownloadCount, _lastDownloadCount, TotalDownloadBytes, _lastDownloadBytes);
+                    OnDownloadProgressCallback?.Invoke(GetPackageName(), TotalDownloadCount, _lastDownloadCount, TotalDownloadBytes, _lastDownloadBytes);
                 }
 
                 // 动态创建新的下载器到最大数量限制
@@ -177,7 +177,7 @@ namespace YooAsset
                         var downloader = bundleInfo.CreateDownloader(_failedTryAgain, _timeout);
                         _downloaders.Add(downloader);
                         _bundleInfoList.RemoveAt(index);
-                        OnStartDownloadFileCallback?.Invoke(bundleInfo.Bundle.BundleName, bundleInfo.Bundle.FileSize);
+                        OnStartDownloadFileCallback?.Invoke(GetPackageName(), bundleInfo.Bundle.BundleName, bundleInfo.Bundle.FileSize);
                     }
                 }
 
@@ -191,15 +191,15 @@ namespace YooAsset
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
                         Error = $"Failed to download file : {bundleName}";
-                        OnDownloadErrorCallback?.Invoke(bundleName, failedDownloader.Error);
+                        OnDownloadErrorCallback?.Invoke(GetPackageName(), bundleName, failedDownloader.Error);
-                        OnDownloadOverCallback?.Invoke(false);
+                        OnDownloadOverCallback?.Invoke(GetPackageName(), false);
                     }
                     else
                     {
                         // 结算成功
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Succeed;
-                        OnDownloadOverCallback?.Invoke(true);
+                        OnDownloadOverCallback?.Invoke(GetPackageName(), true);
                     }
                 }
             }

Assets/YooAsset/Runtime/Utility/YooUtility.cs

@@ -1,377 +1,87 @@
-using System;
+using System;
-using System.IO;
+using System.Diagnostics;
-using System.Security.Cryptography;
-using System.Text;
 
 namespace YooAsset
 {
     /// <summary>
-    /// 路径工具类
+    /// 自定义日志处理
     /// </summary>
-    internal static class PathUtility
+    public interface ILogger
     {
-        /// <summary>
+        void Log(string message);
-        /// 路径归一化
+        void Warning(string message);
-        /// 注意：替换为Linux路径格式
+        void Error(string message);
-        /// </summary>
+        void Exception(System.Exception exception);
-        public static string RegularPath(string path)
-        {
-            return path.Replace('\\', '/').Replace("\\", "/");
     }
 
-        /// <summary>
+    internal static class YooLogger
-        /// 移除路径里的后缀名
-        /// </summary>
-        public static string RemoveExtension(string str)
     {
-            if (string.IsNullOrEmpty(str))
+        public static ILogger Logger = null;
-                return str;
 
-            int index = str.LastIndexOf('.');
+        /// <summary>
-            if (index == -1)
+        /// 日志
-                return str;
+        /// </summary>
+        [Conditional("DEBUG")]
+        public static void Log(string info)
+        {
+            if (Logger != null)
+            {
+                Logger.Log(GetTime() + info);
+            }
             else
-                return str.Remove(index); //"assets/config/test.unity3d" --> "assets/config/test"
-        }
-
-        /// <summary>
-        /// 合并路径
-        /// </summary>
-        public static string Combine(string path1, string path2)
             {
-            return StringUtility.Format("{0}/{1}", path1, path2);
+                UnityEngine.Debug.Log(GetTime() + info);
-        }
-
-        /// <summary>
-        /// 合并路径
-        /// </summary>
-        public static string Combine(string path1, string path2, string path3)
-        {
-            return StringUtility.Format("{0}/{1}/{2}", path1, path2, path3);
-        }
-
-        /// <summary>
-        /// 合并路径
-        /// </summary>
-        public static string Combine(string path1, string path2, string path3, string path4)
-        {
-            return StringUtility.Format("{0}/{1}/{2}/{3}", path1, path2, path3, path4);
             }
         }
 
         /// <summary>
-    /// 字符串工具类
+        /// 警告
         /// </summary>
-    internal static class StringUtility
+        public static void Warning(string info)
         {
-        [ThreadStatic]
+            if (Logger != null)
-        private static StringBuilder _cacheBuilder = new StringBuilder(2048);
-
-        public static string Format(string format, object arg0)
             {
-            if (string.IsNullOrEmpty(format))
+                Logger.Warning(GetTime() + info);
-                throw new ArgumentNullException();
-
-            _cacheBuilder.Length = 0;
-            _cacheBuilder.AppendFormat(format, arg0);
-            return _cacheBuilder.ToString();
             }
-        public static string Format(string format, object arg0, object arg1)
+            else
             {
-            if (string.IsNullOrEmpty(format))
+                UnityEngine.Debug.LogWarning(GetTime() + info);
-                throw new ArgumentNullException();
-
-            _cacheBuilder.Length = 0;
-            _cacheBuilder.AppendFormat(format, arg0, arg1);
-            return _cacheBuilder.ToString();
-        }
-        public static string Format(string format, object arg0, object arg1, object arg2)
-        {
-            if (string.IsNullOrEmpty(format))
-                throw new ArgumentNullException();
-
-            _cacheBuilder.Length = 0;
-            _cacheBuilder.AppendFormat(format, arg0, arg1, arg2);
-            return _cacheBuilder.ToString();
-        }
-        public static string Format(string format, params object[] args)
-        {
-            if (string.IsNullOrEmpty(format))
-                throw new ArgumentNullException();
-
-            if (args == null)
-                throw new ArgumentNullException();
-
-            _cacheBuilder.Length = 0;
-            _cacheBuilder.AppendFormat(format, args);
-            return _cacheBuilder.ToString();
             }
         }
 
         /// <summary>
-    /// 文件工具类
+        /// 错误
         /// </summary>
-    internal static class FileUtility
+        public static void Error(string info)
         {
-        /// <summary>
+            if (Logger != null)
-        /// 读取文件的文本数据
-        /// </summary>
-        public static string ReadAllText(string filePath)
             {
-            if (File.Exists(filePath) == false)
+                Logger.Error(GetTime() + info);
-                return null;
+            }
-            return File.ReadAllText(filePath, Encoding.UTF8);
+            else
+            {
+                UnityEngine.Debug.LogError(GetTime() + info);
+            }
+        }
+
+        private static string GetTime()
+        {
+            return $"[YooAsset]:[{DateTime.Now:HH:mm:ss.fff}]:";
         }
 
         /// <summary>
-        /// 读取文件的字节数据
+        /// 异常
         /// </summary>
-        public static byte[] ReadAllBytes(string filePath)
+        public static void Exception(System.Exception exception)
         {
-            if (File.Exists(filePath) == false)
+            if (Logger != null)
-                return null;
-            return File.ReadAllBytes(filePath);
-        }
-
-        /// <summary>
-        /// 写入文本数据（会覆盖指定路径的文件）
-        /// </summary>
-        public static void WriteAllText(string filePath, string content)
             {
-            // 创建文件夹路径
+                Logger.Exception(exception);
-            CreateFileDirectory(filePath);
-
-            byte[] bytes = Encoding.UTF8.GetBytes(content);
-            File.WriteAllBytes(filePath, bytes); //避免写入BOM标记
             }
-
+            else
-        /// <summary>
-        /// 写入字节数据（会覆盖指定路径的文件）
-        /// </summary>
-        public static void WriteAllBytes(string filePath, byte[] data)
             {
-            // 创建文件夹路径
+                UnityEngine.Debug.LogException(exception);
-            CreateFileDirectory(filePath);
-
-            File.WriteAllBytes(filePath, data);
-        }
-
-        /// <summary>
-        /// 创建文件的文件夹路径
-        /// </summary>
-        public static void CreateFileDirectory(string filePath)
-        {
-            // 获取文件的文件夹路径
-            string directory = Path.GetDirectoryName(filePath);
-            CreateDirectory(directory);
-        }
-
-        /// <summary>
-        /// 创建文件夹路径
-        /// </summary>
-        public static void CreateDirectory(string directory)
-        {
-            // If the directory doesn't exist, create it.
-            if (Directory.Exists(directory) == false)
-                Directory.CreateDirectory(directory);
-        }
-
-        /// <summary>
-        /// 获取文件大小（字节数）
-        /// </summary>
-        public static long GetFileSize(string filePath)
-        {
-            FileInfo fileInfo = new FileInfo(filePath);
-            return fileInfo.Length;
             }
         }
-
-    /// <summary>
-    /// 哈希工具类
-    /// </summary>
-    public static class HashUtility
-    {
-        private static string ToString(byte[] hashBytes)
-        {
-            string result = BitConverter.ToString(hashBytes);
-            result = result.Replace("-", "");
-            return result.ToLower();
-        }
-
-        #region SHA1
-        /// <summary>
-        /// 获取字符串的Hash值
-        /// </summary>
-        public static string StringSHA1(string str)
-        {
-            byte[] buffer = Encoding.UTF8.GetBytes(str);
-            return BytesSHA1(buffer);
-        }
-
-        /// <summary>
-        /// 获取文件的Hash值
-        /// </summary>
-        public static string FileSHA1(string filePath)
-        {
-            using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read))
-            {
-                return StreamSHA1(fs);
-            }
-        }
-
-        /// <summary>
-        /// 获取文件的Hash值
-        /// </summary>
-        public static string FileSHA1Safely(string filePath)
-        {
-            try
-            {
-                return FileSHA1(filePath);
-            }
-            catch (Exception e)
-            {
-                YooLogger.Exception(e);
-                return string.Empty;
-            }
-        }
-
-        /// <summary>
-        /// 获取数据流的Hash值
-        /// </summary>
-        public static string StreamSHA1(Stream stream)
-        {
-            // 说明：创建的是SHA1类的实例，生成的是160位的散列码
-            HashAlgorithm hash = HashAlgorithm.Create();
-            byte[] hashBytes = hash.ComputeHash(stream);
-            return ToString(hashBytes);
-        }
-
-        /// <summary>
-        /// 获取字节数组的Hash值
-        /// </summary>
-        public static string BytesSHA1(byte[] buffer)
-        {
-            // 说明：创建的是SHA1类的实例，生成的是160位的散列码
-            HashAlgorithm hash = HashAlgorithm.Create();
-            byte[] hashBytes = hash.ComputeHash(buffer);
-            return ToString(hashBytes);
-        }
-        #endregion
-
-        #region MD5
-        /// <summary>
-        /// 获取字符串的MD5
-        /// </summary>
-        public static string StringMD5(string str)
-        {
-            byte[] buffer = Encoding.UTF8.GetBytes(str);
-            return BytesMD5(buffer);
-        }
-
-        /// <summary>
-        /// 获取文件的MD5
-        /// </summary>
-        public static string FileMD5(string filePath)
-        {
-            using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read))
-            {
-                return StreamMD5(fs);
-            }
-        }
-
-        /// <summary>
-        /// 获取文件的MD5
-        /// </summary>
-        public static string FileMD5Safely(string filePath)
-        {
-            try
-            {
-                return FileMD5(filePath);
-            }
-            catch (Exception e)
-            {
-                YooLogger.Exception(e);
-                return string.Empty;
-            }
-        }
-
-        /// <summary>
-        /// 获取数据流的MD5
-        /// </summary>
-        public static string StreamMD5(Stream stream)
-        {
-            MD5CryptoServiceProvider provider = new MD5CryptoServiceProvider();
-            byte[] hashBytes = provider.ComputeHash(stream);
-            return ToString(hashBytes);
-        }
-
-        /// <summary>
-        /// 获取字节数组的MD5
-        /// </summary>
-        public static string BytesMD5(byte[] buffer)
-        {
-            MD5CryptoServiceProvider provider = new MD5CryptoServiceProvider();
-            byte[] hashBytes = provider.ComputeHash(buffer);
-            return ToString(hashBytes);
-        }
-        #endregion
-
-        #region CRC32
-        /// <summary>
-        /// 获取字符串的CRC32
-        /// </summary>
-        public static string StringCRC32(string str)
-        {
-            byte[] buffer = Encoding.UTF8.GetBytes(str);
-            return BytesCRC32(buffer);
-        }
-
-        /// <summary>
-        /// 获取文件的CRC32
-        /// </summary>
-        public static string FileCRC32(string filePath)
-        {
-            using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read))
-            {
-                return StreamCRC32(fs);
-            }
-        }
-
-        /// <summary>
-        /// 获取文件的CRC32
-        /// </summary>
-        public static string FileCRC32Safely(string filePath)
-        {
-            try
-            {
-                return FileCRC32(filePath);
-            }
-            catch (Exception e)
-            {
-                YooLogger.Exception(e);
-                return string.Empty;
-            }
-        }
-
-        /// <summary>
-        /// 获取数据流的CRC32
-        /// </summary>
-        public static string StreamCRC32(Stream stream)
-        {
-            CRC32Algorithm hash = new CRC32Algorithm();
-            byte[] hashBytes = hash.ComputeHash(stream);
-            return ToString(hashBytes);
-        }
-
-        /// <summary>
-        /// 获取字节数组的CRC32
-        /// </summary>
-        public static string BytesCRC32(byte[] buffer)
-        {
-            CRC32Algorithm hash = new CRC32Algorithm();
-            byte[] hashBytes = hash.ComputeHash(buffer);
-            return ToString(hashBytes);
-        }
-        #endregion
     }
 }