updated to v3.2.2

Author: michael811125

Assets/OxGFrame/AssetLoader/Scripts/Editor/Bundle/BundleHelper.cs

@@ -545,7 +545,7 @@ internal static PatchConfig GeneratePatchConfig(List<GroupInfo> groupInfos, stri
                     FileInfo[] files = BundleUtility.GetFilesRecursively(newestVersionPath);
                     foreach (var file in files)
                     {
-                        // 累加檔案大小
+                        // 累加文件大小
                         packageSize += file.Length;
                     }
 

Assets/OxGFrame/AssetLoader/Scripts/Runtime/AssetPatcher.cs

@@ -3,6 +3,7 @@
 using OxGFrame.AssetLoader.Utility;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using YooAsset;
 using static OxGFrame.AssetLoader.Utility.DownloadSpeedCalculator;
@@ -218,7 +219,7 @@ public static string GetAppVersion()
         /// <returns></returns>
         public static string GetPatchVersion(bool encode = false, int encodeLength = 6, string separator = "-")
         {
-            string[] versions = PatchManager.patchVersions;
+            string[] versions = PatchManager.patchVersions.Values.ToArray();
             string newestVersion = BundleUtility.NewestPackageVersion(versions);
             string patchVersion = string.IsNullOrEmpty(newestVersion) ? string.Empty : newestVersion;
 

Assets/OxGFrame/AssetLoader/Scripts/Runtime/Bundle/FileCryptogram.cs

@@ -458,7 +458,7 @@ private void _CreateDownloader()
         }
 
         /// <summary>
-        /// 6. 下載資源檔案
+        /// 6. 下載資源文件
         /// </summary>
         public class FsmBeginDownload : IStateNode
         {
@@ -475,7 +475,7 @@ void IStateNode.OnCreate(StateMachine machine)
 
             void IStateNode.OnEnter()
             {
-                // 下載資源檔案中
+                // 下載資源文件中
                 PackageEvents.PatchFsmState.SendEventMessage(this._hashId, this);
                 (this._machine.Owner as PackageOperation).MarkBeginState();
                 this._StartDownload().Forget();

Assets/OxGFrame/AssetLoader/Scripts/Runtime/Bundle/PatchFsm/PackageFsmStates.cs

@@ -1,11 +1,12 @@
-using OxGFrame.AssetLoader.PatchEvent;
+using Newtonsoft.Json;
+using OxGFrame.AssetLoader.PatchEvent;
+using OxGFrame.AssetLoader.PatchFsm;
+using OxGKit.LoggingSystem;
+using System.Collections.Generic;
 using UniFramework.Event;
 using UniFramework.Machine;
 using UnityEngine;
-using OxGFrame.AssetLoader.PatchFsm;
 using YooAsset;
-using Newtonsoft.Json;
-using OxGKit.LoggingSystem;
 
 namespace OxGFrame.AssetLoader.Bundle
 {
@@ -39,7 +40,7 @@ internal static void DelLastGroupInfo()
 
         internal static string platform = string.Empty;
         internal static string appVersion = string.Empty;
-        internal static string[] patchVersions;
+        internal static Dictionary<string, string> patchVersions;
         internal ResourceDownloaderOperation[] mainDownloaders;
 
         private bool _isCheck = false;

Assets/OxGFrame/AssetLoader/Scripts/Runtime/Bundle/PatchFsm/PatchFsmStates.cs

@@ -1,13 +1,9 @@
-using Cysharp.Threading.Tasks;
-using OxGFrame.AssetLoader.Bundle;
-using OxGKit.LoggingSystem;
+using OxGFrame.AssetLoader.Bundle;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading;
-using UnityEngine.Networking;
 
 namespace OxGFrame.AssetLoader.Utility
 {
@@ -76,7 +72,7 @@ public static string GetMegabytesToString(int megabytes)
 
         #region MD5
         /// <summary>
-        /// 【FilePath】生成檔案的 MD5 碼
+        /// 【FilePath】生成文件的 MD5 碼
         /// </summary>
         /// <param name="filePath"></param>
         /// <returns></returns>
@@ -110,7 +106,7 @@ public static string MakeMd5ForFile(string filePath)
         }
 
         /// <summary>
-        /// 【FileInfo】生成檔案的 MD5 碼
+        /// 【FileInfo】生成文件的 MD5 碼
         /// </summary>
         /// <param name="file"></param>
         /// <returns></returns>
@@ -154,7 +150,7 @@ public static string MakeMd5ForString(string str)
 
         #region Folder
         /// <summary>
-        /// 刪除目錄 (包含底下所有的檔案與資料夾)
+        /// 刪除目錄 (包含底下所有的文件與資料夾)
         /// </summary>
         /// <param name="dir"></param>
         public static void DeleteFolder(string dir)
@@ -174,7 +170,7 @@ public static void DeleteFolder(string dir)
         }
 
         /// <summary>
-        /// 取得路徑目錄下所有檔案
+        /// 取得路徑目錄下所有文件
         /// </summary>
         /// <param name="dir"></param>
         /// <returns></returns>
@@ -184,15 +180,15 @@ public static FileInfo[] GetFilesRecursively(string dir)
             FileInfo[] files;
             List<FileInfo> combineFiles = new List<FileInfo>();
 
-            // STEP1. 先執行來源目錄下的檔案
+            // STEP1. 先執行來源目錄下的文件
             root = new DirectoryInfo(dir); // 取得該路徑目錄
-            files = root.GetFiles();       // 取得該路徑目錄中的所有檔案
+            files = root.GetFiles();       // 取得該路徑目錄中的所有文件
             foreach (var file in files)
             {
                 combineFiles.Add(file);
             }
 
-            // STEP2. 再執行來源目錄下的目錄檔案 (Recursively)
+            // STEP2. 再執行來源目錄下的目錄文件 (Recursively)
             foreach (string dirPath in Directory.GetDirectories(dir, "*", SearchOption.AllDirectories))
             {
                 root = new DirectoryInfo(dirPath);
@@ -246,34 +242,6 @@ public static void OpenFolder(string dir, bool autoCreateFolder = false)
         }
         #endregion
 
-        #region File Request
-        /// <summary>
-        /// 從 StreamingAssets 中複製檔案 (for Android, iOS, WebGL)
-        /// </summary>
-        /// <param name="sourceFile"></param>
-        /// <param name="destFile"></param>
-        /// <returns></returns>
-        public static async UniTask RequestAndCopyFileFromStreamingAssets(string sourceFile, string destFile, CancellationTokenSource cts = null)
-        {
-            using (UnityWebRequest request = UnityWebRequest.Get(sourceFile))
-            {
-                if (cts != null) await request.SendWebRequest().WithCancellation(cts.Token);
-                else await request.SendWebRequest();
-
-                if (request.result == UnityWebRequest.Result.ProtocolError || request.result == UnityWebRequest.Result.ConnectionError)
-                {
-                    Logging.Print<Logger>("<color=#FF0000>Request failed. Cannot find file in StreamingAssets.</color>");
-                    Logging.Print<Logger>(request.error);
-                }
-                else
-                {
-                    string json = request.downloadHandler.text;
-                    File.WriteAllText(destFile, json);
-                }
-            }
-        }
-        #endregion
-
         #region Version
         /// <summary>
         /// Get newest version