fixing silly mistakes

Author: nesrak1

AssetTools.NET/Extra/AssetHelper.cs

@@ -57,7 +57,7 @@ public static Type_0D FindTypeTreeTypeByScriptIndex(TypeTree typeTree, ushort sc
         {
             foreach (Type_0D type in typeTree.unity5Types)
             {
-                if (type.classId < 0 && type.scriptIndex == scriptIndex)
+                if (type.scriptIndex == scriptIndex)
                     return type;
             }
             return null;

AssetTools.NET/Extra/AssetsManager/AssetsManager.cs

@@ -215,17 +215,10 @@ public AssetTypeTemplateField GetTemplateBaseField(AssetsFile file, AssetFileInf
                 baseField = new AssetTypeTemplateField();
                 if (hasTypeTree && !forceFromCldb)
                 {
-                    if (file.header.format < 0x10)
-                    {
-                        if (scriptIndex == 0xFFFF)
-                            baseField.From0D(AssetHelper.FindTypeTreeTypeByID(file.typeTree, fixedId), 0);
-                        else
-                            baseField.From0D(AssetHelper.FindTypeTreeTypeByScriptIndex(file.typeTree, scriptIndex), 0);
-                    }
-                    else
-                    {
+                    if (scriptIndex == 0xFFFF)
                         baseField.From0D(AssetHelper.FindTypeTreeTypeByID(file.typeTree, fixedId), 0);
-                    }
+                    else
+                        baseField.From0D(AssetHelper.FindTypeTreeTypeByScriptIndex(file.typeTree, scriptIndex), 0);
                 }
                 else
                 {

AssetTools.NET/Extra/BundleHelper.cs

@@ -23,11 +23,9 @@ public static byte[] LoadAssetDataFromBundle(AssetBundleFile bundle, int index)
         public static AssetsFile LoadAssetFromBundle(AssetBundleFile bundle, int index)
         {
             byte[] data = LoadAssetDataFromBundle(bundle, index);
-            using (MemoryStream ms = new MemoryStream(data))
-            using (AssetsFileReader r = new AssetsFileReader(ms))
-            {
-                return new AssetsFile(r);
-            }
+            MemoryStream ms = new MemoryStream(data);
+            AssetsFileReader r = new AssetsFileReader(ms);
+            return new AssetsFile(r);
         }
         public static AssetsFile LoadAssetFromBundle(AssetBundleFile bundle, string name)
         {

AssetsView/Winforms/MonoBehaviourScanner.Designer.cs

@@ -225,6 +225,8 @@ private void LoadResources(AssetsFileInstance ggm)
 
                         AssetExternal assetExt = helper.GetExtAsset(ggm, pointerField, true);
                         AssetFileInfoEx assetInfo = assetExt.info;
+                        if (assetInfo == null)
+                            continue;
                         ClassDatabaseType assetType = AssetHelper.FindAssetClassByID(helper.classFile, assetInfo.curFileType);
                         if (assetType == null)
                             continue;