Merge branch 'master' into packman_setup

Author: alffanclub

Editor/AssetBundleBuildTab.cs

@@ -44,6 +44,8 @@ internal ToggleData(bool s,
             internal BuildAssetBundleOptions option;
         }
 
+        private AssetBundleInspectTab m_InspectTab;
+
         [SerializeField]
         private BuildTabData m_UserData;
 
@@ -90,6 +92,7 @@ internal void OnDisable()
         }
         internal void OnEnable(Rect pos, EditorWindow parent)
         {
+            m_InspectTab = (parent as AssetBundleBrowserMain).m_InspectTab;
 
             //LoadData...
             var dataPath = System.IO.Path.GetFullPath(".");
@@ -346,6 +349,7 @@ private void ExecuteBuild()
             buildInfo.outputDirectory = m_UserData.m_OutputPath;
             buildInfo.options = opt;
             buildInfo.buildTarget = (BuildTarget)m_UserData.m_BuildTarget;
+            buildInfo.onBuild = (assetBundleName) => { m_InspectTab.AddBundleFolder(buildInfo.outputDirectory); m_InspectTab.RefreshBundles(); };
 
             AssetBundleModel.Model.DataSource.BuildAssetBundles (buildInfo);
 

Editor/AssetBundleDataSource/AssetDatabaseABDataSource.cs

@@ -78,8 +78,14 @@ public bool CanSpecifyBuildOptions {
         }
 
         public bool BuildAssetBundles (ABBuildInfo info) {
-            BuildPipeline.BuildAssetBundles(info.outputDirectory, info.options, info.buildTarget);
-
+            var buildManifest = BuildPipeline.BuildAssetBundles(info.outputDirectory, info.options, info.buildTarget);
+            foreach(var assetBundleName in buildManifest.GetAllAssetBundles())
+            {
+                if (info.onBuild != null)
+                {
+                    info.onBuild(assetBundleName);
+                }
+            }
             return true;
         }
     }