add bundle support to getdependency

(and other dependency improvements)

Author: nesrak1

AssetTools.NET/Extra/AssetsManager/AssetsFileInstance.cs

@@ -51,8 +51,9 @@ public AssetsFileInstance GetDependency(AssetsManager am, int depIdx)
                 int instIndex = am.files.FindIndex(f => Path.GetFileName(f.path).ToLower() == Path.GetFileName(depPath).ToLower());
                 if (instIndex == -1)
                 {
-                    string absPath = Path.Combine(path, depPath);
-                    string localAbsPath = Path.Combine(path, Path.GetFileName(depPath));
+                    string pathDir = Path.GetDirectoryName(path);
+                    string absPath = Path.Combine(pathDir, depPath);
+                    string localAbsPath = Path.Combine(pathDir, Path.GetFileName(depPath));
                     if (File.Exists(absPath))
                     {
                         dependencies[depIdx] = am.LoadAssetsFile(File.OpenRead(absPath), true);
@@ -61,6 +62,14 @@ public AssetsFileInstance GetDependency(AssetsManager am, int depIdx)
                     {
                         dependencies[depIdx] = am.LoadAssetsFile(File.OpenRead(localAbsPath), true);
                     }
+                    else if (parentBundle != null)
+                    {
+                        dependencies[depIdx] = am.LoadAssetsFileFromBundle(parentBundle, depPath, true);
+                    }
+                    else
+                    {
+                        return null;
+                    }
                 }
                 else
                 {

AssetTools.NET/Extra/AssetsManager/AssetsManager.cs

@@ -27,6 +27,7 @@ public AssetsFileInstance LoadAssetsFile(Stream stream, string path, bool loadDe
             if (index == -1)
             {
                 instance = new AssetsFileInstance(stream, path, root);
+                instance.parentBundle = bunInst;
                 files.Add(instance);
             }
             else
@@ -289,33 +290,52 @@ public void LoadBundleDependencies(AssetsFileInstance ofFile, BundleFileInstance
         #region asset resolving
         public AssetExternal GetExtAsset(AssetsFileInstance relativeTo, int fileId, long pathId, bool onlyGetInfo = false, bool forceFromCldb = false)
         {
-            AssetExternal ext = new AssetExternal();
+            AssetExternal ext = new AssetExternal
+            {
+                info = null,
+                instance = null,
+                file = null
+            };
+
             if (fileId == 0 && pathId == 0)
             {
-                ext.info = null;
-                ext.instance = null;
-                ext.file = null;
+                return ext;
             }
             else if (fileId != 0)
             {
                 AssetsFileInstance dep = relativeTo.GetDependency(this, fileId - 1);
+
+                if (dep == null)
+                    return ext;
+
                 ext.info = dep.table.GetAssetInfo(pathId);
+
+                if (ext.info == null)
+                    return ext;
+
                 if (!onlyGetInfo)
                     ext.instance = GetTypeInstance(dep.file, ext.info, forceFromCldb);
                 else
                     ext.instance = null;
+
                 ext.file = dep;
+                return ext;
             }
             else
             {
                 ext.info = relativeTo.table.GetAssetInfo(pathId);
+
+                if (ext.info == null)
+                    return ext;
+
                 if (!onlyGetInfo)
                     ext.instance = GetTypeInstance(relativeTo.file, ext.info, forceFromCldb);
                 else
                     ext.instance = null;
+
                 ext.file = relativeTo;
+                return ext;
             }
-            return ext;
         }
 
         public AssetExternal GetExtAsset(AssetsFileInstance relativeTo, AssetTypeValueField atvf, bool onlyGetInfo = false, bool forceFromCldb = false)
@@ -389,11 +409,16 @@ public AssetTypeValueField GetMonoBaseFieldCached(AssetsFileInstance inst, Asset
             if (!inst.monoIdToName.ContainsKey(scriptIndex))
             {
                 AssetTypeInstance scriptAti = GetExtAsset(inst, GetTypeInstance(inst.file, info).GetBaseField().Get("m_Script")).instance;
+
+                //couldn't find asset
+                if (scriptAti == null)
+                    return null;
+
                 scriptName = scriptAti.GetBaseField().Get("m_Name").GetValue().AsString();
                 string scriptNamespace = scriptAti.GetBaseField().Get("m_Namespace").GetValue().AsString();
                 string assemblyName = scriptAti.GetBaseField().Get("m_AssemblyName").GetValue().AsString();
 
-                if (scriptNamespace != string.Empty)
+                if (scriptNamespace == string.Empty)
                 {
                     scriptNamespace = "-";
                 }

AssetsView/Winforms/GameObjectViewer.cs

@@ -2,7 +2,6 @@
 using AssetsTools.NET.Extra;
 using AssetsView.Util;
 using System;
-//using System.Data.Entity.Design.PluralizationServices;
 using System.Drawing;
 using System.Globalization;
 using System.IO;
@@ -17,7 +16,6 @@ public partial class GameObjectViewer : Form
         private AssetsFileInstance inst;
         private long selectedId;
         private long selectedGameObjectId;
-        private bool firstTimeMBMessage;
         public GameObjectViewer(AssetsManager helper, AssetsFileInstance inst, long selectedId)
         {
             InitializeComponent();
@@ -169,19 +167,11 @@ private void LoadComponentData(PGProperty root, AssetTypeValueField baseField, A
             AssetTypeValueField targetBaseField = baseField;
             if (className == "MonoBehaviour")
             {
-                if (AssetUtils.AllDependenciesLoaded(helper, inst))
+                className += $" ({GetClassName(helper, inst, targetBaseField)})";
+                string managedPath = Path.Combine(Path.GetDirectoryName(inst.path), "Managed");
+                if (Directory.Exists(managedPath))
                 {
-                    className += $" ({GetClassName(helper, inst, targetBaseField)})";
-                    string managedPath = Path.Combine(Path.GetDirectoryName(inst.path), "Managed");
-                    if (Directory.Exists(managedPath))
-                    {
-                        targetBaseField = helper.GetMonoBaseFieldCached(inst, info, managedPath);
-                    }
-                }
-                else if (!firstTimeMBMessage)
-                {
-                    firstTimeMBMessage = true;
-                    MessageBox.Show("Can't display MonoBehaviour data until dependencies are loaded", "Assets View");
+                    targetBaseField = helper.GetMonoBaseFieldCached(inst, info, managedPath);
                 }
             }
             string category = new string('\t', size - index) + className;

AssetsView/Winforms/StartScreen.cs

@@ -522,6 +522,12 @@ public void OpenAsset(long id)
         {
             GameObjectViewer view = new GameObjectViewer(helper, currentFile, id);
             view.Show();
+            view.FormClosed += GameObjectViewer_FormClosed;
+        }
+
+        private void GameObjectViewer_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            UpdateFileList();
         }
 
         private void RecurseForResourcesInfo(FSDirectory dir, AssetsFileInstance afi)