From 138755c88fa55e2ddf93bbfc9155cddafd9d4da4 Mon Sep 17 00:00:00 2001 From: Liang Zhao Date: Tue, 8 Feb 2022 10:53:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91=E7=A8=8B=E5=BA=8F=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=97=B6=EF=BC=8C=E5=8A=A0=E8=BD=BDAB=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E3=80=81=E4=BD=93=E7=A7=AF=E3=80=82=20?= =?UTF-8?q?=E5=87=8F=E5=B0=91=E5=89=8D=EF=BC=9A=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=EF=BC=88=E6=B8=B8=E6=88=8F=E5=85=AC=E5=91=8A=EF=BC=89610MB/205?= =?UTF-8?q?=E4=B8=AAAB=EF=BC=9B=E6=89=93=E6=80=AA=EF=BC=9A816MB/393?= =?UTF-8?q?=E4=B8=AAAB=20=E5=87=8F=E5=B0=91=E5=90=8E=EF=BC=9A=20=E7=99=BB?= =?UTF-8?q?=E5=BD=95=EF=BC=88=E6=B8=B8=E6=88=8F=E5=85=AC=E5=91=8A=EF=BC=89?= =?UTF-8?q?100MB/136=E4=B8=AAAB=EF=BC=9B=E6=89=93=E6=80=AA=EF=BC=9A457MB/3?= =?UTF-8?q?46=E4=B8=AAAB=20=E5=85=B7=E4=BD=93=E6=94=B9=E5=8A=A8=EF=BC=9A?= =?UTF-8?q?=20-=20=E4=B8=8D=E6=89=93=E5=8C=85mat.unity3d=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E4=BE=9D=E8=B5=96=E7=88=86=E7=82=B8=E3=80=82=20-=20?= =?UTF-8?q?=E6=8F=90=E5=89=8D=E6=89=93UI=E4=B8=8Eeffect=20AB=EF=BC=8C?= =?UTF-8?q?=E5=87=8F=E5=B0=91=E4=BB=96=E4=BB=AC=E5=AF=B9=E5=88=AB=E7=9A=84?= =?UTF-8?q?AB=E7=9A=84=E4=BE=9D=E8=B5=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AssetBundle/AssetBundleMap.cs | 35 +++++++++++++++------ 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/Assets/Editor/AssetBundle/AssetBundleMap.cs b/Assets/Editor/AssetBundle/AssetBundleMap.cs index e6c3fe4d6..b83168ce9 100644 --- a/Assets/Editor/AssetBundle/AssetBundleMap.cs +++ b/Assets/Editor/AssetBundle/AssetBundleMap.cs @@ -353,6 +353,14 @@ public class AssetBundleMap : EditorWindow addBuildAssetsCommon(maps, "config.unity3d", Constants.CsvConfig, "*.csv"); addBuildAssetsCommon(maps, "xml.unity3d", Constants.XmlConfig, "*.xml"); + if (showProcessBar) + EditorUtility.DisplayProgressBar("Generate Bundle Build Map", "UI...", 0.35f); + addBuildAssetsUI(maps); + + if (showProcessBar) + EditorUtility.DisplayProgressBar("Generate Bundle Build Map", "Effect...", 0.37f); + addBuildAssetsEffect(maps); + // audio if (showProcessBar) EditorUtility.DisplayProgressBar("Generate Bundle Build Map", "Audio...", 0.4f); @@ -378,15 +386,6 @@ public class AssetBundleMap : EditorWindow EditorUtility.DisplayProgressBar("Generate Bundle Build Map", "Actor...", 0.7f); addBuildAssetsActor(maps); - if (showProcessBar) - EditorUtility.DisplayProgressBar("Generate Bundle Build Map", "Effect...", 0.75f); - - addBuildAssetsEffect(maps); - - if (showProcessBar) - EditorUtility.DisplayProgressBar("Generate Bundle Build Map", "UI...", 0.8f); - addBuildAssetsUI(maps); - if (showProcessBar) EditorUtility.DisplayProgressBar("Generate Bundle Build Map", "Scene...", 0.85f); addBuildAssetsScene(maps); @@ -596,10 +595,12 @@ public class AssetBundleMap : EditorWindow { addData(maps, ShaderAbName, dependencyAssetName); } + #if false else if (fileType == "mat") { addData(maps, MatAbName, dependencyAssetName); } + #endif else if (fileType != "cs") { addData(maps, abName, dependencyAssetName); @@ -639,10 +640,12 @@ public class AssetBundleMap : EditorWindow { addData(maps, ShaderAbName, dependencyAssetName); } + #if false else if (fileType == "mat") { addData(maps, MatAbName, dependencyAssetName); } + #endif else if (fileType != "cs") { addData(maps, abName, dependencyAssetName); @@ -681,10 +684,12 @@ public class AssetBundleMap : EditorWindow { addData(maps, ShaderAbName, dependencyAssetName); } + #if false else if (fileType == "mat") { addData(maps, MatAbName, dependencyAssetName); } + #endif else if (fileType == "jpg" || fileType == "png" || fileType == "tga" || fileType == "tif" || fileType == "psd") { @@ -725,10 +730,12 @@ public class AssetBundleMap : EditorWindow { addData(maps, ShaderAbName, dependencyAssetName); } + #if false else if (fileType == "mat") { addData(maps, MatAbName, dependencyAssetName); } + #endif else if (fileType != "cs") { addData(maps, abName, dependencyAssetName); @@ -767,10 +774,12 @@ public class AssetBundleMap : EditorWindow { addData(maps, ShaderAbName, dependencyAssetName); } + #if false else if (fileType == "mat") { addData(maps, MatAbName, dependencyAssetName); } + #endif else if (fileType == "jpg" || fileType == "png" || fileType == "tga" || fileType == "tif" || fileType == "psd") { @@ -825,10 +834,12 @@ public class AssetBundleMap : EditorWindow { addData(maps, ShaderAbName, dependencyAssetName); } + #if false else if (fileType == "mat") { addData(maps, MatAbName, dependencyAssetName); } + #endif else if (fileType == "jpg" || fileType == "png" || fileType == "tga" || fileType == "tif" || fileType == "psd") { @@ -888,10 +899,12 @@ public class AssetBundleMap : EditorWindow { addData(maps, ShaderAbName, dependencyAssetName); } + #if false else if (fileType == "mat") { addData(maps, MatAbName, dependencyAssetName); } + #endif else if (fileType == "jpg" || fileType == "png" || fileType == "tga" || fileType == "tif" || fileType == "psd") { @@ -985,10 +998,14 @@ public class AssetBundleMap : EditorWindow { addData(maps, ShaderAbName, dependencyAssetName); } + // Unity: + // Do not collect all materials into one AssetBundle, otherwise the dependencies will explode and the streaming experience will be terrible. + #if false else if (fileType == "mat") { addData(maps, MatAbName, dependencyAssetName); } + #endif else if (fileType == "prefab") { if (dependencyAssetName.Contains("Scenes/Scene_common"))