added ExtendBuildAssetBundleOptions

Author: michael811125

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog (unofficial)
 
+## [1.7.0] - 2022-10-12
+- Added ExtendBuildAssetBundleOptions for Advenced Settings (most convenient).
+- Modified BuildAssetBundles method in BundleBuildMap (changed extend options param).
+
 ## [1.6.2] - 2022-10-06
 - Fixed replace by hash feature has load manifest file from local error issue.
 

Editor/AssetBundleBuildTab.cs

@@ -29,20 +29,23 @@ internal ToggleData(
                 string title,
                 string tooltip,
                 List<string> onToggles,
-                BuildAssetBundleOptions opt = BuildAssetBundleOptions.None)
+                BuildAssetBundleOptions opt = BuildAssetBundleOptions.None,
+                ExtendBuildAssetBundleOptions extdOpt = ExtendBuildAssetBundleOptions.None)
             {
                 if (onToggles.Contains(title))
                     state = true;
                 else
                     state = s;
                 content = new GUIContent(title, tooltip);
                 option = opt;
+                extdOption = extdOpt;
             }
             //internal string prefsKey
             //{ get { return k_BuildPrefPrefix + content.text; } }
             internal bool state;
             internal GUIContent content;
             internal BuildAssetBundleOptions option;
+            internal ExtendBuildAssetBundleOptions extdOption;
         }
 
         private AssetBundleInspectTab m_InspectTab;
@@ -165,8 +168,9 @@ internal void OnEnable(EditorWindow parent)
                 false,
                 "Without Manifest",
                 "When build finished do remove menifest files.",
-                m_UserData.m_OnToggles
-                ));
+                m_UserData.m_OnToggles,
+                BuildAssetBundleOptions.None,
+                ExtendBuildAssetBundleOptions.WithoutManifest));
 
             m_ForceRebuild = new ToggleData(
                 false,
@@ -380,9 +384,8 @@ private void ExecuteBuild()
             }
 
             BuildAssetBundleOptions opt = BuildAssetBundleOptions.None;
+            ExtendBuildAssetBundleOptions extdOpt = ExtendBuildAssetBundleOptions.None;
 
-            bool withoutMenifest = false;
-            bool replaceByHash = false;
             if (AssetBundleModel.Model.DataSource.CanSpecifyBuildOptions)
             {
                 // compression
@@ -395,12 +398,14 @@ private void ExecuteBuild()
                 if (m_UserData.m_BundleNameOption == BundleNameOptions.AppendHash)
                     opt |= BuildAssetBundleOptions.AppendHashToAssetBundleName;
                 else if (m_UserData.m_BundleNameOption == BundleNameOptions.ReplaceByHash)
-                    replaceByHash = true;
+                    extdOpt |= ExtendBuildAssetBundleOptions.ReplaceByHash;
 
                 // toggle options
                 foreach (var tog in m_ToggleData)
                 {
-                    if (tog.content.text == "Without Manifest") withoutMenifest = tog.state;
+                    // for extend options
+                    if (tog.extdOption != ExtendBuildAssetBundleOptions.None && tog.state) extdOpt |= tog.extdOption;
+                    // for options
                     else if (tog.state) opt |= tog.option;
                 }
             }
@@ -409,6 +414,7 @@ private void ExecuteBuild()
 
             buildInfo.outputDirectory = m_UserData.m_OutputPath;
             buildInfo.options = opt;
+            buildInfo.extdOptions = extdOpt;
             buildInfo.buildTarget = (BuildTarget)m_UserData.m_BuildTarget;
             buildInfo.onBuild = (assetBundleName) =>
             {
@@ -417,8 +423,6 @@ private void ExecuteBuild()
                 m_InspectTab.AddBundleFolder(buildInfo.outputDirectory);
                 m_InspectTab.RefreshBundles();
             };
-            buildInfo.withoutManifest = withoutMenifest;
-            buildInfo.replaceByHash = replaceByHash;
 
             AssetBundleModel.Model.DataSource.BuildAssetBundles(buildInfo);
 

Editor/AssetBundleDataSource/ABDataSource.cs

@@ -57,21 +57,27 @@ public List<AssetBundleBuild> buildMap
         /// <summary>
         /// Remove manifest from build folder
         /// </summary>
-        public bool withoutManifest
-        {
-            get { return m_withoutManifest; }
-            set { m_withoutManifest = value; }
-        }
-        private bool m_withoutManifest;
+        //public bool withoutManifest
+        //{
+        //    get { return m_withoutManifest; }
+        //    set { m_withoutManifest = value; }
+        //}
+        //private bool m_withoutManifest;
         /// <summary>
         /// Replace by hash
         /// </summary>
-        public bool replaceByHash
+        //public bool replaceByHash
+        //{
+        //    get { return m_replaceByHash; }
+        //    set { m_replaceByHash = value; }
+        //}
+        //private bool m_replaceByHash;
+        public ExtendBuildAssetBundleOptions extdOptions
         {
-            get { return m_replaceByHash; }
-            set { m_replaceByHash = value; }
+            get { return m_extdOptions; }
+            set { m_extdOptions = value; }
         }
-        private bool m_replaceByHash;
+        private ExtendBuildAssetBundleOptions m_extdOptions;
     }
 
     /// <summary>

Editor/BundleBuildMap.cs

@@ -509,7 +509,7 @@ public bool BuildAssetBundles(ABBuildInfo info)
                         string buildName = string.IsNullOrEmpty(this.customBuildMaps[i].buildName) ? this.customBuildMaps[i].bundleBuildMap.sourceName : this.customBuildMaps[i].buildName;
                         string outputDirectory = $"{info.outputDirectory}/{this.customBuildMaps[i].bundleBuildMap.sourceName}/{buildName}";
 
-                        if (BuildAssetBundles(outputDirectory, this.customBuildMaps[i].bundleBuildMap.GetBuildMap(), info.options, info.buildTarget, info.withoutManifest, info.replaceByHash, null))
+                        if (BuildAssetBundles(outputDirectory, this.customBuildMaps[i].bundleBuildMap.GetBuildMap(), info.options, info.buildTarget, info.extdOptions, null))
                         {
                             stringBuilder.Append($"<color=#9DFF42>[Source Name: {this.customBuildMaps[i].bundleBuildMap.sourceName}, Build Name: {buildName}] Build Result => Success</color>\n");
                         }
@@ -526,7 +526,7 @@ public bool BuildAssetBundles(ABBuildInfo info)
             }
             else
             {
-                return BuildAssetBundles(info.outputDirectory, this.GetBuildMap(), info.options, info.buildTarget, info.withoutManifest, info.replaceByHash, info.onBuild);
+                return BuildAssetBundles(info.outputDirectory, this.GetBuildMap(), info.options, info.buildTarget, info.extdOptions, info.onBuild);
             }
 
             return false;
@@ -543,10 +543,19 @@ public bool BuildAssetBundles(ABBuildInfo info)
         /// <param name="replaceByHash"></param>
         /// <param name="onBuild"></param>
         /// <returns></returns>
-        public static bool BuildAssetBundles(string outputDirectory, AssetBundleBuild[] buildMap, BuildAssetBundleOptions options, BuildTarget buildTarget, bool withoutManifest, bool replaceByHash, Action<string> onBuild)
+        public static bool BuildAssetBundles(string outputDirectory, AssetBundleBuild[] buildMap, BuildAssetBundleOptions options, BuildTarget buildTarget, ExtendBuildAssetBundleOptions extdOptions, Action<string> onBuild)
         {
             if (!Directory.Exists(outputDirectory)) Directory.CreateDirectory(outputDirectory);
 
+            // if use replaceByHash must remove AppendHashToAssetBundleName option (priority)
+            if (Convert.ToBoolean(extdOptions & ExtendBuildAssetBundleOptions.ReplaceByHash))
+            {
+                if (Convert.ToBoolean(options & BuildAssetBundleOptions.AppendHashToAssetBundleName))
+                {
+                    options ^= BuildAssetBundleOptions.AppendHashToAssetBundleName;
+                }
+            }
+
             var buildManifest = BuildPipeline.BuildAssetBundles(outputDirectory, buildMap, options, buildTarget);
             if (buildManifest == null)
             {
@@ -555,15 +564,15 @@ public static bool BuildAssetBundles(string outputDirectory, AssetBundleBuild[]
             }
 
             // after build (without manifest)
-            if (withoutManifest)
+            if (Convert.ToBoolean(extdOptions & ExtendBuildAssetBundleOptions.WithoutManifest))
             {
                 bool completes = AssetBundleBuildTab.WithoutManifestFile(outputDirectory);
                 if (!completes) Debug.Log("<color=#FF0000>Error in process remove manifest.</color>");
                 else Debug.Log($"<color=#60ffb0>Remove all manifest file completes.</color>");
             }
 
             // after build (replace by hash)
-            if (replaceByHash)
+            if (Convert.ToBoolean(extdOptions & ExtendBuildAssetBundleOptions.ReplaceByHash))
             {
                 bool completes = AssetBundleBuildTab.ReplaceBundleNameByHash(outputDirectory);
                 if (!completes) Debug.Log("<color=#FF0000>Error in process replace by hash.</color>");

Editor/ExtendBuildAssetBundleOptions.cs

@@ -0,0 +1,9 @@
+namespace AssetBundleBrowser
+{
+    public enum ExtendBuildAssetBundleOptions
+    {
+        None = 0x0,
+        WithoutManifest = 0x1,
+        ReplaceByHash = 0x2,
+    }
+}

Editor/ExtendBuildAssetBundleOptions.cs.meta

@@ -61,18 +61,19 @@ When enabled sync feature can sync asset data to other BuildMap <font color=#FF0
     BuildTarget target = BuildTarget.StandaloneWindows;
 	
     // LZ4
-    BuildAssetBundleOptions bundleOptions = BuildAssetBundleOptions.ChunkBasedCompression;
+    BuildAssetBundleOptions options = BuildAssetBundleOptions.ChunkBasedCompression;
     
     // regular
-    BundleBuildMap.BuildAssetBundles(outputDirectory, bundleBuildMap.GetBuildMap(), bundleOptions, target, null);
+    BundleBuildMap.BuildAssetBundles(outputDirectory, bundleBuildMap.GetBuildMap(), options, target, null);
     
-    // including withoutManifest and replaceByHash params
-    bool withoutManifest = true;
-    bool replaceByHash = true;
-    BundleBuildMap.BuildAssetBundles(outputDirectory, bundleBuildMap.GetBuildMap(), bundleOptions, target, withoutManifest, replaceByHash, null);
+    // including extend options
+    ExtendBuildAssetBundleOptions extdOptions = ExtendBuildAssetBundleOptions.None;
+    extdOptions |= ExtendBuildAssetBundleOptions.WithoutManifest;
+    extdOptions |= ExtendBuildAssetBundleOptions.ReplaceByHash;
+    BundleBuildMap.BuildAssetBundles(outputDirectory, bundleBuildMap.GetBuildMap(), options, target, extdOptions, null);
 ```
 
-### Extension Advenced Settings
+### Advenced Settings Extension
 
 - WithoutManifest : after build remove manifest file from build folder.
 

README.md

@@ -2,7 +2,7 @@
 {
 	"name": "com.unity.assetbundlebrowser.plus",
 	"displayName": "Asset Bundle Browser Plus",
-	"version": "1.6.2",
+	"version": "1.7.0",
 	"unity": "2018.1",
 	"description": "The Asset Bundle Browser tool enables the user to view and edit the configuration of asset bundles for their Unity project. It will block editing that would create invalid bundles, and inform you of any issues with existing bundles. It also provides basic build functionality.\n\nUse this tool as an alternative to selecting assets and setting their asset bundle manually in the inspector. It can be dropped into any Unity project with a version of 5.6 or greater. It will create a new menu item in Window > AssetBundle Browser. The bundle configuration, build functionality, and built-bundle inspection are split into three tabs within the new window.",
 	"keywords": ["asset", "bundle", "bundles", "assetbundles"],