fix bugs

Author: carbers

Assets/BundleBuildTool/Src/Editor/BundleHelper/BundleDataManager.cs

@@ -113,7 +113,7 @@ public static bool CanAddPathToBundle(string path, string bundleName)
                 return false;
             }
 
-            string guid = AssetDatabase.AssetPathToGUID(path);
+            string guid = GetPathGUID(path);
             if (m_guidToBundle.ContainsKey(guid))
             {
                 return false;
@@ -134,7 +134,7 @@ public static bool AddPathToBundle(string path, string bundleName, int size)
             }
 
             BundleData bundle = m_dataDict[bundleName];
-            string guid = AssetDatabase.AssetPathToGUID(path);
+            string guid = GetPathGUID(path);
 
             bundle.includs.Add(path);
             m_guidToBundle.Add(guid, bundleName);
@@ -149,7 +149,7 @@ public static void RemovePathFromBundle(string path, string bundleName)
             {
                 return;
             }
-            string guid = AssetDatabase.AssetPathToGUID(path);
+            string guid = GetPathGUID(path);
 
             if (m_guidToBundle.ContainsKey(guid))
             {
@@ -158,7 +158,7 @@ public static void RemovePathFromBundle(string path, string bundleName)
 
             for (int i = 0; i < bundle.includs.Count; ++i)
             {
-                string nGuid = AssetDatabase.AssetPathToGUID(bundle.includs[i]);
+                string nGuid = GetPathGUID(bundle.includs[i]);
                 if (nGuid == guid)
                 {
                     bundle.includs.RemoveAt(i);
@@ -185,7 +185,7 @@ public static bool RemoveBundle(string bundleName)
 
             for (int i = 0; i < bundle.includs.Count; ++i)
             {
-                string nGuid = AssetDatabase.AssetPathToGUID(bundle.includs[i]);
+                string nGuid = GetPathGUID(bundle.includs[i]);
                 m_guidToBundle.Remove(nGuid);
             }
 
@@ -235,17 +235,25 @@ public static string GenBundleNameByType(BundleType type)
         }
         public static string GetPathBundleName(string assetPath)
         {
-            string guid = AssetDatabase.AssetPathToGUID(assetPath);
+            string guid = GetPathGUID(assetPath);
             string ret = string.Empty;
             if (m_guidToBundle.TryGetValue(guid, out ret))
             {
                 return ret;
             }
             return string.Empty;
         }
+        public static string GetPathGUID(string path)
+        {
+            if (path.StartsWith("Assets/", System.StringComparison.OrdinalIgnoreCase))
+            {
+                return AssetDatabase.AssetPathToGUID(path);
+            }
+            return path;
+        }
         public static bool CheckPathInBundle(string path)
         {
-            string guid = AssetDatabase.AssetPathToGUID(path);
+            string guid = GetPathGUID(path);
             return m_guidToBundle.ContainsKey(guid);
         }
         public static bool IsBundleFull(BundleData bundle, int maxCount, int memSize)
@@ -309,7 +317,7 @@ public static void Init()
 
                 for (int i = 0; i < bundleData.includs.Count; ++i)
                 {
-                    string guid = AssetDatabase.AssetPathToGUID(bundleData.includs[i]);
+                    string guid = GetPathGUID(bundleData.includs[i]);
                     if (!m_guidToBundle.ContainsKey(guid))
                     {
                         m_guidToBundle.Add(guid, bundleData.name);

Assets/BundleBuildTool/Src/Editor/BundleImport/BundleAdapter.cs

@@ -88,6 +88,7 @@ public static void BuildBundles()
 
             BundleBuildHelper.PopAssetDependencies();
 
+            BundleDataAccessor.SaveData();
             BundleExport.ExportBundleMainfestToOutput();
 
             AssetDatabase.SaveAssets();
@@ -110,7 +111,7 @@ private static void BuildSingleBundle(string name, BundleImportData data)
                 {
                     continue;
                 }
-                if (m_buildAll && !m_bundleDict.ContainsKey(child.name))
+                if (!m_buildAll && !m_bundleDict.ContainsKey(child.name))
                 {
                     continue;
                 }

Assets/BundleBuildTool/Src/Editor/BundleImport/BundleDataControl.cs

@@ -170,6 +170,7 @@ public void RefreshDataByRootPath(string path)
         }
         private void RefreshList(List<string> list)
         {
+            m_pathInfoList.Clear();
             for (int i = 0; i < list.Count; ++i)
             {
                 string path = EditorPath.FormatAssetPath(list[i]);