updated to v3.5.0 (massively optimize)

Author: michael811125

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

@@ -151,16 +151,16 @@ public static BundlePack LoadAdditiveScene(string packageName, string assetName,
         /// </summary>
         /// <param name="assetName"></param>
         /// <param name="recursively"></param>
-        public async static UniTask UnloadScene(string assetName, bool recursively = false)
+        public static void UnloadScene(string assetName, bool recursively = false)
         {
             if (!AssetPatcher.IsReleased())
-                await CacheBundle.GetInstance().UnloadScene(assetName, recursively);
+                CacheBundle.GetInstance().UnloadScene(assetName, recursively);
         }
 
-        public async static UniTask ReleaseBundleScenes()
+        public static void ReleaseBundleScenes()
         {
             if (!AssetPatcher.IsReleased())
-                await CacheBundle.GetInstance().ReleaseScenes();
+                CacheBundle.GetInstance().ReleaseScenes();
         }
         #endregion
 
@@ -202,7 +202,7 @@ public static async UniTask<string> GetRawFilePathAsync(string assetName)
                 // Get path from operation handle
                 var operation = pack.GetOperationHandle<RawFileHandle>();
                 string filePath = operation.GetRawFilePath();
-                await UnloadRawFile(assetName, true);
+                UnloadRawFile(assetName, true);
                 return filePath;
             }
 
@@ -225,7 +225,7 @@ public static async UniTask<string> GetRawFilePathAsync(string packageName, stri
                 // Get path from operation handle
                 var operation = pack.GetOperationHandle<RawFileHandle>();
                 string filePath = operation.GetRawFilePath();
-                await UnloadRawFile(assetName, true);
+                UnloadRawFile(assetName, true);
                 return filePath;
             }
 
@@ -247,7 +247,7 @@ public static string GetRawFilePath(string assetName)
                 var operation = pack.GetOperationHandle<RawFileHandle>();
                 // Get path from operation handle
                 string filePath = operation.GetRawFilePath();
-                UnloadRawFile(assetName, true).Forget();
+                UnloadRawFile(assetName, true);
                 return filePath;
             }
 
@@ -270,7 +270,7 @@ public static string GetRawFilePath(string packageName, string assetName)
                 var operation = pack.GetOperationHandle<RawFileHandle>();
                 // Get path from operation handle
                 string filePath = operation.GetRawFilePath();
-                UnloadRawFile(assetName, true).Forget();
+                UnloadRawFile(assetName, true);
                 return filePath;
             }
 
@@ -438,18 +438,18 @@ public static T LoadRawFile<T>(string packageName, string assetName, Progression
             return CacheBundle.GetInstance().LoadRawFile<T>(packageName, assetName, progression, maxRetryCount);
         }
 
-        public async static UniTask UnloadRawFile(string assetName, bool forceUnload = false)
+        public static void UnloadRawFile(string assetName, bool forceUnload = false)
         {
             if (RefineResourcesPath(ref assetName))
                 Logging.PrintError<Logger>("【Error】Only supports the bundle type.");
             else if (!AssetPatcher.IsReleased())
-                await CacheBundle.GetInstance().UnloadRawFileAsync(assetName, forceUnload);
+                CacheBundle.GetInstance().UnloadRawFile(assetName, forceUnload);
         }
 
-        public async static UniTask ReleaseBundleRawFiles()
+        public static void ReleaseBundleRawFiles()
         {
             if (!AssetPatcher.IsReleased())
-                await CacheBundle.GetInstance().ReleaseRawFilesAsync();
+                CacheBundle.GetInstance().ReleaseRawFiles();
         }
         #endregion
 
@@ -962,23 +962,23 @@ public static T InstantiateAsset<T>(string packageName, string assetName, Transf
             }
         }
 
-        public async static UniTask UnloadAsset(string assetName, bool forceUnload = false)
+        public static void UnloadAsset(string assetName, bool forceUnload = false)
         {
             if (RefineResourcesPath(ref assetName))
                 CacheResource.GetInstance().UnloadAsset(assetName, forceUnload);
             else if (!AssetPatcher.IsReleased())
-                await CacheBundle.GetInstance().UnloadAsset(assetName, forceUnload);
+                CacheBundle.GetInstance().UnloadAsset(assetName, forceUnload);
         }
 
         public static void ReleaseResourceAssets()
         {
             CacheResource.GetInstance().ReleaseAssets();
         }
 
-        public async static UniTask ReleaseBundleAssets()
+        public static void ReleaseBundleAssets()
         {
             if (!AssetPatcher.IsReleased())
-                await CacheBundle.GetInstance().ReleaseAssets();
+                CacheBundle.GetInstance().ReleaseAssets();
         }
         #endregion
         #endregion
@@ -1699,9 +1699,16 @@ public static void ReleaseBundleAssets(int groupId)
         #endregion
         #endregion
 
+        /// <summary>
+        /// 解析區分 Resources 或 Bundle 加載名稱規則
+        /// </summary>
+        /// <param name="assetName"></param>
+        /// <returns></returns>
         internal static bool RefineResourcesPath(ref string assetName)
         {
-            if (string.IsNullOrEmpty(assetName)) return false;
+            if (string.IsNullOrEmpty(assetName))
+                return false;
+
             string prefix = "res#";
             if (assetName.Length > prefix.Length)
             {

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

@@ -98,6 +98,24 @@ public static string GetRequestStreamingAssetsPath()
         {
             return BundleConfig.GetRequestStreamingAssetsPath();
         }
+
+        /// <summary>
+        /// Get defualt bundle decryption services
+        /// </summary>
+        /// <returns></returns>
+        public static DecryptionServices GetBundleDecryptionServices()
+        {
+            return PackageManager.bundleDecryptionServices;
+        }
+
+        /// <summary>
+        /// Get default manifest decryption services
+        /// </summary>
+        /// <returns></returns>
+        public static DecryptionServices GetManifestDecryptionServices()
+        {
+            return PackageManager.manifestDecryptionServices;
+        }
         #endregion
 
         #region Patch Status
@@ -148,6 +166,25 @@ public static bool IsDone()
         #endregion
 
         #region Patch Operation
+        /// <summary>
+        /// Custom app packages and dlc packages to bundle config at runtime
+        /// </summary>
+        /// <param name="appPackages"></param>
+        /// <param name="dlcPackages"></param>
+        public static void SetPresetPackages(List<AppPackageInfoWithBuild> appPackages, List<DlcPackageInfoWithBuild> dlcPackages)
+        {
+            PatchLauncher.SetPresetPackages(appPackages, dlcPackages);
+        }
+
+        /// <summary>
+        /// Init and setup preset packages
+        /// </summary>
+        /// <returns></returns>
+        public static async UniTask InitSetupPresetPackages()
+        {
+            await PatchLauncher.InitializePresetPackages();
+        }
+
         /// <summary>
         /// Start patch update
         /// </summary>
@@ -215,17 +252,29 @@ public static string GetAppVersion()
         /// <summary>
         /// Get newest patch version (Recommend use encode to display)
         /// <para> Min and Max length = 11 to 32 </para>
+        /// <para> Note: The newest patch version from preset packages </para>
         /// </summary>
         /// <returns></returns>
         public static string GetPatchVersion(bool encode = false, int length = 16, string separator = "-")
         {
             string[] versions = PatchManager.patchVersions.Values.ToArray();
+            return GetPatchVersion(versions, encode, length, separator);
+        }
+
+        /// <summary>
+        /// Get newest patch version by custom (Recommend use encode to display)
+        /// <para> Min and Max length = 11 to 32 </para>
+        /// </summary>
+        /// <returns></returns>
+        public static string GetPatchVersion(string[] customPatchVersions, bool encode = false, int length = 16, string separator = "-")
+        {
+            string[] versions = customPatchVersions;
             string newestVersion = BundleUtility.NewestPackageVersion(versions);
             string patchVersion = string.IsNullOrEmpty(newestVersion) ? string.Empty : newestVersion;
 
             // For simulate mode
             if (string.IsNullOrEmpty(patchVersion))
-                patchVersion = BundleUtility.GetDefaultPackageVersion();
+                patchVersion = BundleUtility.GetPackageVersionForNow();
 
             if (encode)
             {
@@ -259,7 +308,7 @@ public static ulong GetPackageSizeInLocal(string packageName)
         }
 
         /// <summary>
-        /// Unload package and clear package files from local sandbox
+        /// Unload (Destroy) package and clear package files from local sandbox
         /// </summary>
         /// <param name="packageName"></param>
         /// <param name="destroyPackage">Remove package from cache memory</param>
@@ -284,17 +333,17 @@ public static async UniTask<bool> UnloadPackage(string packageName)
         /// Init package by type
         /// </summary>
         /// <param name="packageInfo"></param>
-        /// <param name="autoUpdate"></param>
+        /// <param name="updatePackage"></param>
         /// <returns></returns>
-        public static async UniTask<bool> InitPackage(PackageInfoWithBuild packageInfo, bool autoUpdate = false)
+        public static async UniTask<bool> InitPackage(PackageInfoWithBuild packageInfo, bool updatePackage = false)
         {
             if (packageInfo is AppPackageInfoWithBuild)
             {
-                return await InitAppPackage(packageInfo as AppPackageInfoWithBuild, autoUpdate);
+                return await InitAppPackage(packageInfo as AppPackageInfoWithBuild, updatePackage);
             }
             else if (packageInfo is DlcPackageInfoWithBuild)
             {
-                return await InitDlcPackage(packageInfo as DlcPackageInfoWithBuild, autoUpdate);
+                return await InitDlcPackage(packageInfo as DlcPackageInfoWithBuild, updatePackage);
             }
 
             return false;
@@ -305,23 +354,20 @@ public static async UniTask<bool> InitPackage(PackageInfoWithBuild packageInfo,
         /// Init app package (If PlayMode is HostMode will request from default host path)
         /// </summary>
         /// <param name="packageInfo"></param>
-        /// <param name="autoUpdate"></param>
+        /// <param name="updatePackage"></param>
         /// <returns></returns>
-        public static async UniTask<bool> InitAppPackage(AppPackageInfoWithBuild packageInfo, bool autoUpdate = false)
+        public static async UniTask<bool> InitAppPackage(AppPackageInfoWithBuild packageInfo, bool updatePackage = false)
         {
             string hostServer = null;
             string fallbackHostServer = null;
 
-            // Host Mode or WebGL Mode
-            if (BundleConfig.playMode == BundleConfig.PlayMode.HostMode ||
-                BundleConfig.playMode == BundleConfig.PlayMode.WeakHostMode ||
-                BundleConfig.playMode == BundleConfig.PlayMode.WebGLRemoteMode)
+            if (BundleConfig.playModeParameters.autoConfigureServerEndpoints)
             {
                 hostServer = await BundleConfig.GetHostServerUrl(packageInfo.packageName);
                 fallbackHostServer = await BundleConfig.GetFallbackHostServerUrl(packageInfo.packageName);
             }
 
-            return await PackageManager.InitPackage(packageInfo, autoUpdate, hostServer, fallbackHostServer);
+            return await PackageManager.InitPackage(packageInfo, updatePackage, hostServer, fallbackHostServer);
         }
         #endregion
 
@@ -330,30 +376,27 @@ public static async UniTask<bool> InitAppPackage(AppPackageInfoWithBuild package
         /// Init dlc package (If PlayMode is HostMode will request from default host dlc path)
         /// </summary>
         /// <param name="packageInfo"></param>
-        /// <param name="autoUpdate"></param>
+        /// <param name="updatePackage"></param>
         /// <returns></returns>
-        public static async UniTask<bool> InitDlcPackage(DlcPackageInfoWithBuild packageInfo, bool autoUpdate = false)
+        public static async UniTask<bool> InitDlcPackage(DlcPackageInfoWithBuild packageInfo, bool updatePackage = false)
         {
             string hostServer = packageInfo.hostServer;
             string fallbackHostServer = packageInfo.fallbackHostServer;
 
-            // Host Mode or WebGL Mode
-            if (BundleConfig.playMode == BundleConfig.PlayMode.HostMode ||
-                BundleConfig.playMode == BundleConfig.PlayMode.WeakHostMode ||
-                BundleConfig.playMode == BundleConfig.PlayMode.WebGLRemoteMode)
+            if (BundleConfig.playModeParameters.autoConfigureServerEndpoints)
             {
                 hostServer = string.IsNullOrEmpty(hostServer) ? await BundleConfig.GetDlcHostServerUrl(packageInfo.packageName, packageInfo.dlcVersion, packageInfo.withoutPlatform) : hostServer;
                 fallbackHostServer = string.IsNullOrEmpty(fallbackHostServer) ? await BundleConfig.GetDlcFallbackHostServerUrl(packageInfo.packageName, packageInfo.dlcVersion, packageInfo.withoutPlatform) : fallbackHostServer;
             }
 
-            return await PackageManager.InitPackage(packageInfo, autoUpdate, hostServer, fallbackHostServer);
+            return await PackageManager.InitPackage(packageInfo, updatePackage, hostServer, fallbackHostServer);
         }
         #endregion
         #endregion
 
         #region Update Package
         /// <summary>
-        /// Update package manifest by package name
+        /// Update package version and manifest by package name
         /// </summary>
         /// <param name="packageName"></param>
         /// <returns></returns>
@@ -421,6 +464,15 @@ public static ResourcePackage[] GetPackages(params string[] packageNames)
         {
             return PackageManager.GetPackages(packageNames);
         }
+
+        /// <summary>
+        /// Get all packages
+        /// </summary>
+        /// <returns></returns>
+        public static ResourcePackage[] GetAllPackages()
+        {
+            return PackageManager.GetAllPackages();
+        }
         #endregion
 
         #region Get Preset Package
@@ -481,30 +533,6 @@ public static DlcPackageInfoWithBuild[] GetPresetDlcPackageInfos()
         }
         #endregion
 
-        #region AssetInfo
-        /// <summary>
-        /// Get specific package assetInfos (Tags)
-        /// </summary>
-        /// <param name="package"></param>
-        /// <param name="tags"></param>
-        /// <returns></returns>
-        public static AssetInfo[] GetPackageAssetInfosByTags(ResourcePackage package, params string[] tags)
-        {
-            return PackageManager.GetPackageAssetInfosByTags(package, tags);
-        }
-
-        /// <summary>
-        /// Get specific package assetInfos (AssetNames)
-        /// </summary>
-        /// <param name="package"></param>
-        /// <param name="assetNames"></param>
-        /// <returns></returns>
-        public static AssetInfo[] GetPackageAssetInfosByAssetNames(ResourcePackage package, params string[] assetNames)
-        {
-            return PackageManager.GetPackageAssetInfosByAssetNames(package, assetNames);
-        }
-        #endregion
-
         #region Downloader
         /// <summary>
         /// Get specific package downloader