- [Core] fix issue with parsing types for new entry

RazTools · Nov 28, 2023 · 6945bff · 6945bff
1 parent 6103235
commit 6945bff
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 31 deletions.
diff --git a/AssetStudio.GUI/MainForm.Designer.cs b/AssetStudio.GUI/MainForm.Designer.cs
diff --git a/AssetStudio/BundleFile.cs b/AssetStudio/BundleFile.cs
@@ -161,31 +161,28 @@ private Header ReadBundleHeader(FileReader reader)
             switch (header.signature)
             {
                 case "UnityFS":
-                    if (Game.Type.IsBH3Group())
+                    if (Game.Type.IsBH3Group() || Game.Type.IsBH3PrePre())
                     {
-                        var version = Game.Type.IsBH3PrePre() ? 12 : reader.ReadUInt32();
-                        if (version > 11)
+                        if (Game.Type.IsBH3Group())
                         {
-                            if (Game.Type.IsBH3PrePre())
+                            var key = reader.ReadUInt32();
+                            if (key <= 11)
                             {
-                                Logger.Verbose($"Encrypted bundle header with key {reader.Length}");
-                                XORShift128.InitSeed((uint)reader.Length);
+                                reader.Position -= 4;
+                                goto default;
                             }
-                            else
-                            {
-                                Logger.Verbose($"Encrypted bundle header with key {version}");
-                                XORShift128.InitSeed(version);
-                            }
-
-                            header.version = 6;
-                            header.unityVersion = "5.x.x";
-                            header.unityRevision = "2017.4.18f1";
+                            Logger.Verbose($"Encrypted bundle header with key {key}");
+                            XORShift128.InitSeed(key);
                         }
-                        else
+                        else if (Game.Type.IsBH3PrePre())
                         {
-                            reader.Position -= 4;
-                            goto default;
+                            Logger.Verbose($"Encrypted bundle header with key {reader.Length}");
+                            XORShift128.InitSeed((uint)reader.Length);
                         }
+
+                        header.version = 6;
+                        header.unityVersion = "5.x.x";
+                        header.unityRevision = "2017.4.18f1";
                     }
                     else
                     {
@@ -333,7 +330,7 @@ public void ReadFiles(Stream blocksStream, string path)
 
         private void ReadHeader(FileReader reader)
         {
-            if (Game.Type.IsBH3Group() && XORShift128.Init)
+            if (XORShift128.Init)
             {
                 if (Game.Type.IsBH3PrePre())
                 {

diff --git a/AssetStudio/GameManager.cs b/AssetStudio/GameManager.cs
@@ -194,7 +194,7 @@ public static class GameTypes
 
         public static bool IsBH3Group(this GameType type) => type switch
         {
-            GameType.BH3 or GameType.BH3Pre or GameType.BH3PrePre => true,
+            GameType.BH3 or GameType.BH3Pre => true,
             _ => false,
         };
 
@@ -206,7 +206,7 @@ public static class GameTypes
 
         public static bool IsBlockFile(this GameType type) => type switch
         {
-            GameType.BH3 or GameType.BH3Pre or GameType.BH3PrePre or GameType.SR or GameType.GI_Pack or GameType.TOT or GameType.ArknightsEndfield => true,
+            GameType.BH3 or GameType.BH3Pre or GameType.SR or GameType.GI_Pack or GameType.TOT or GameType.ArknightsEndfield => true,
             _ => false,
         };
 

diff --git a/AssetStudio/SerializedFile.cs b/AssetStudio/SerializedFile.cs
@@ -92,7 +92,7 @@ public SerializedFile(FileReader reader, AssetsManager assetsManager)
                     Logger.Verbose($"Parsed target format {m_TargetPlatform} doesn't match any of supported formats, defaulting to {BuildTarget.UnknownPlatform}");
                     m_TargetPlatform = BuildTarget.UnknownPlatform;
                 }
-                else if (game.Type.IsMhyGroup())
+                else if (m_TargetPlatform == BuildTarget.NoTarget && game.Type.IsMhyGroup())
                 {
                     Logger.Verbose($"Selected game {game.Name} is a mhy game, forcing target format {BuildTarget.StandaloneWindows64}");
                     m_TargetPlatform = BuildTarget.StandaloneWindows64;