updated to v2.9.6

michael811125 · Dec 6, 2023 · de6d347 · de6d347
1 parent 3179553
commit de6d347
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,8 @@
 /[Ss]andbox/
 /[Yy]oo/
 /[Hh]ybridCLRData/
+/Assets/_YooAsset/
+/Assets/_YooAsset.meta
 
 # =============== #
 # Unity generated #

diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Editor/Bundle/BundleHelper.cs b/Assets/OxGFrame/AssetLoader/Scripts/Editor/Bundle/BundleHelper.cs
@@ -52,7 +52,7 @@ public static void ExportAppConfig(string productName, string appVersion, string
         /// <param name="appVersion"></param>
         /// <param name="exportPackages"></param>
         /// <param name="groupInfos"></param>
-        /// <param name="packageInfos"></param>
+        /// <param name="packageInfos"> Set package names to export package infos </param>
         /// <param name="activeBuildTarget"></param>
         /// <param name="buildTarget"></param>
         /// <param name="isClearOutputPath"></param>

diff --git a/...ts/OxGFrame/AssetLoader/Scripts/Editor/Bundle/EditorWindow/BundleConfigGeneratorWindow.cs b/...ts/OxGFrame/AssetLoader/Scripts/Editor/Bundle/EditorWindow/BundleConfigGeneratorWindow.cs
@@ -617,27 +617,23 @@ private void _DrawProcessButtonView(OperationType operationType)
                         if (this.autoReveal) EditorUtility.RevealInFinder($"{outputPath}/{appCfgFileName}");
                         break;
                     case OperationType.ExportConfigsAndAppBundlesForCDN:
-                        {
-                            inputPath = this.sourceFolder[(int)this.operationType];
-                            outputPath = $"{this.exportFolder[(int)this.operationType]}/{PatchSetting.setting.rootFolderName}";
-                            List<string> exportDlcPackages = new List<string>();
-                            foreach (var dlcPackage in this.exportIndividualPackages) exportDlcPackages.Add(dlcPackage.packageName);
-                            string[] packageInfos = this.exportAppPackages.Union(exportDlcPackages).ToArray();
-                            BundleHelper.ExportConfigsAndAppBundles(inputPath, outputPath, this.productName, this.appVersion, this.exportAppPackages.ToArray(), this.groupInfos, packageInfos, this.activeBuildTarget, this.buildTarget, true);
-                            BundleHelper.ExportIndividualDlcBundles(inputPath, outputPath, this.productName, this.exportIndividualPackages, this.activeBuildTarget, this.buildTarget, false);
-                            EditorUtility.DisplayDialog("Process Message", "Export Configs And App Bundles For CDN.", "OK");
-                            if (this.autoReveal) EditorUtility.RevealInFinder(outputPath);
-                        }
+                        inputPath = this.sourceFolder[(int)this.operationType];
+                        outputPath = $"{this.exportFolder[(int)this.operationType]}/{PatchSetting.setting.rootFolderName}";
+                        List<string> exportDlcPackages = new List<string>();
+                        foreach (var dlcPackage in this.exportIndividualPackages) exportDlcPackages.Add(dlcPackage.packageName);
+                        string[] packageInfos = this.exportAppPackages.Union(exportDlcPackages).ToArray();
+                        BundleHelper.ExportConfigsAndAppBundles(inputPath, outputPath, this.productName, this.appVersion, this.exportAppPackages.ToArray(), this.groupInfos, packageInfos, this.activeBuildTarget, this.buildTarget, true);
+                        BundleHelper.ExportIndividualDlcBundles(inputPath, outputPath, this.productName, this.exportIndividualPackages, this.activeBuildTarget, this.buildTarget, false);
+                        EditorUtility.DisplayDialog("Process Message", "Export Configs And App Bundles For CDN.", "OK");
+                        if (this.autoReveal) EditorUtility.RevealInFinder(outputPath);
                         break;
                     case OperationType.ExportAppBundlesWithoutConfigsForCDN:
-                        {
-                            inputPath = this.sourceFolder[(int)this.operationType];
-                            outputPath = $"{this.exportFolder[(int)this.operationType]}/{PatchSetting.setting.rootFolderName}";
-                            BundleHelper.ExportAppBundles(inputPath, outputPath, this.productName, this.appVersion, this.exportAppPackages.ToArray(), this.activeBuildTarget, this.buildTarget, true);
-                            BundleHelper.ExportIndividualDlcBundles(inputPath, outputPath, this.productName, this.exportIndividualPackages, this.activeBuildTarget, this.buildTarget, false);
-                            EditorUtility.DisplayDialog("Process Message", "Export App Bundles For CDN Without Configs.", "OK");
-                            if (this.autoReveal) EditorUtility.RevealInFinder(outputPath);
-                        }
+                        inputPath = this.sourceFolder[(int)this.operationType];
+                        outputPath = $"{this.exportFolder[(int)this.operationType]}/{PatchSetting.setting.rootFolderName}";
+                        BundleHelper.ExportAppBundles(inputPath, outputPath, this.productName, this.appVersion, this.exportAppPackages.ToArray(), this.activeBuildTarget, this.buildTarget, true);
+                        BundleHelper.ExportIndividualDlcBundles(inputPath, outputPath, this.productName, this.exportIndividualPackages, this.activeBuildTarget, this.buildTarget, false);
+                        EditorUtility.DisplayDialog("Process Message", "Export App Bundles For CDN Without Configs.", "OK");
+                        if (this.autoReveal) EditorUtility.RevealInFinder(outputPath);
                         break;
                     case OperationType.ExportIndividualDLCBundlesForCDN:
                         inputPath = this.sourceFolder[(int)this.operationType];

diff --git a/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Bundle/PackageManager.cs b/Assets/OxGFrame/AssetLoader/Scripts/Runtime/Bundle/PackageManager.cs
@@ -153,6 +153,9 @@ public static async UniTask<bool> InitPackage(PackageInfoWithBuild packageInfo,
                 var createParameters = new OfflinePlayModeParameters();
                 createParameters.DecryptionServices = _decryption;
                 createParameters.BreakpointResumeFileSize = BundleConfig.breakpointFileSizeThreshold;
+                // Only raw file build pipeline need to append extension
+                if (buildMode.Equals(BundleConfig.BuildMode.RawFileBuildPipeline.ToString()))
+                    createParameters.CacheFileAppendExtension = true;
                 initializationOperation = package.InitializeAsync(createParameters);
             }
 
@@ -166,6 +169,9 @@ public static async UniTask<bool> InitPackage(PackageInfoWithBuild packageInfo,
                 createParameters.DeliveryQueryServices = deliveryQueryService;
                 createParameters.DeliveryLoadServices = deliveryLoadService;
                 createParameters.RemoteServices = new HostServers(hostServer, fallbackHostServer);
+                // Only raw file build pipeline need to append extension
+                if (buildMode.Equals(BundleConfig.BuildMode.RawFileBuildPipeline.ToString()))
+                    createParameters.CacheFileAppendExtension = true;
                 initializationOperation = package.InitializeAsync(createParameters);
             }
 
@@ -177,6 +183,9 @@ public static async UniTask<bool> InitPackage(PackageInfoWithBuild packageInfo,
                 createParameters.BreakpointResumeFileSize = BundleConfig.breakpointFileSizeThreshold;
                 createParameters.BuildinQueryServices = builtinQueryService;
                 createParameters.RemoteServices = new HostServers(hostServer, fallbackHostServer);
+                // Only raw file build pipeline need to append extension
+                if (buildMode.Equals(BundleConfig.BuildMode.RawFileBuildPipeline.ToString()))
+                    createParameters.CacheFileAppendExtension = true;
                 initializationOperation = package.InitializeAsync(createParameters);
             }
 

diff --git a/Assets/OxGFrame/CHANGELOG.md b/Assets/OxGFrame/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## [2.9.6] - 2023-12-06
+- Fixed a bug where the RawFileBuildPipeline download file was missing an extension.
+
 ## [2.9.5] - 2023-12-05
 - Added AppPackageInfoWithBuild and DlcPackageInfoWithBuild (BuildMode can be selected when executing on SimulateMode).
 ```C#

diff --git a/Assets/OxGFrame/package.json b/Assets/OxGFrame/package.json
@@ -2,7 +2,7 @@
   "name": "com.michaelo.oxgframe",
   "displayName": "OxGFrame",
   "description": "The OxGFrame is a framework based on Unity for accelerating game development. Supports multi-platform Win, OSX, Android, iOS, WebGL.",
-  "version": "2.9.5",
+  "version": "2.9.6",
   "unity": "2021.3",
   "license": "MIT",
   "samples": [