Fix missed bundle size

This doesn't seem to affect the game.
aianlinb · Oct 2, 2020 · 4ae2e8b · 4ae2e8b
1 parent 19f825c
commit 4ae2e8b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/LibBundle/IndexContainer.cs b/LibBundle/IndexContainer.cs
@@ -111,7 +111,7 @@ public override void Save(string path)
             {
                 bw.Write(b.nameLength);
                 bw.Write(Encoding.UTF8.GetBytes(b.Name), 0, b.nameLength);
-                bw.Write(b.Size);
+                bw.Write(b.UncompressedSize);
             }
             bw.Write(Files.Length);
             foreach (var f in Files)

diff --git a/LibBundle/Properties/AssemblyInfo.cs b/LibBundle/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]
diff --git a/LibBundle/Records/BundleRecord.cs b/LibBundle/Records/BundleRecord.cs
@@ -9,7 +9,7 @@ public class BundleRecord
         public int bundleIndex;
         public int nameLength;
         public string Name;
-        public int Size;
+        public int UncompressedSize;
         public List<FileRecord> Files;
         internal Dictionary<FileRecord, byte[]> dataToAdd = new Dictionary<FileRecord, byte[]>();
         private BundleContainer _bundle;
@@ -29,7 +29,7 @@ public BundleRecord(BinaryReader br)
             indexOffset = br.BaseStream.Position;
             nameLength = br.ReadInt32();
             Name = System.Text.Encoding.UTF8.GetString(br.ReadBytes(nameLength)) + ".bundle.bin";
-            Size = br.ReadInt32();
+            UncompressedSize = br.ReadInt32();
             Files = new List<FileRecord>();
         }
 
@@ -59,6 +59,7 @@ public void Save(string path)
                 }
             }
             Bundle.dataToSave = dataToSave.ToArray();
+            UncompressedSize = Bundle.dataToSave.Length;
             Bundle.Save(path);
             dataToAdd = new Dictionary<FileRecord, byte[]>();
             data.Close();

diff --git a/VisualBundle/MainWindow.xaml b/VisualBundle/MainWindow.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="VisualBundle.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="VisualBundle v1.2.0" Height="480" Width="800" Loaded="OnLoaded" Closing="OnWindowClosing">
+        Title="VisualBundle v1.2.1" Height="480" Width="800" Loaded="OnLoaded" Closing="OnWindowClosing">
     <Window.Resources>
         <HierarchicalDataTemplate x:Key="FileViewItemTemplate" DataType="x:Type VisualBundle:ItemModel" ItemsSource="{Binding ChildItems}">
             <StackPanel Orientation="Horizontal">
@@ -13,14 +13,14 @@
     <Grid>
         <TreeView x:Name="View1" VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Recycling" ItemTemplate="{StaticResource FileViewItemTemplate}" SelectedItemChanged="OnTreeView1SelectedChanged" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="250" Margin="0,35,0,0" GotFocus="OnView1GotFocus"/>
         <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="Offset:" VerticalAlignment="Top" Margin="260,10,0,0"/>
-        <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="Size:" VerticalAlignment="Top" Margin="420,10,0,0"/>
-        <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="No:" VerticalAlignment="Top" Margin="580,10,0,0"/>
-        <TextBox x:Name="offsetView" HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="310,6,0,0"/>
-        <TextBox x:Name="sizeView" HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="460,6,0,0"/>
-        <TextBox x:Name="noView" HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="610,6,0,0"/>
+        <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="UncompressedSize:" VerticalAlignment="Top" Margin="420,10,0,0"/>
+        <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="No:" VerticalAlignment="Top" Margin="650,10,0,0"/>
+        <TextBox x:Name="offsetView" HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="305,6,0,0"/>
+        <TextBox x:Name="sizeView" HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="540,6,0,0"/>
+        <TextBox x:Name="noView" HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="90" Margin="680,6,0,0"/>
         <TreeView x:Name="View2" ItemTemplate="{StaticResource FileViewItemTemplate}" SelectedItemChanged="OnTreeView2SelectedChanged" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="250,35,235,0"/>
-        <TextBlock HorizontalAlignment="Right" TextWrapping="Wrap" Text="Offset (Bundle):" VerticalAlignment="Top" Margin="0,60,130,0"/>
-        <TextBlock HorizontalAlignment="Right" TextWrapping="Wrap" Text="Offset (Index):" VerticalAlignment="Top" Margin="0,90,130,0"/>
+        <TextBlock HorizontalAlignment="Right" TextWrapping="Wrap" Text="FileDataOffset:" VerticalAlignment="Top" Margin="0,60,130,0"/>
+        <TextBlock HorizontalAlignment="Right" TextWrapping="Wrap" Text="FileRecordOffset:" VerticalAlignment="Top" Margin="0,90,130,0"/>
         <TextBlock HorizontalAlignment="Right" TextWrapping="Wrap" Text="FileSize:" VerticalAlignment="Top" Margin="0,120,130,0"/>
         <TextBox x:Name="BOffsetView" HorizontalAlignment="Right" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="0,56,25,0"/>
         <TextBox x:Name="IOffsetView" HorizontalAlignment="Right" Height="23" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="100" Margin="0,86,25,0"/>

diff --git a/VisualBundle/MainWindow.xaml.cs b/VisualBundle/MainWindow.xaml.cs
@@ -155,7 +155,7 @@ private void OnTreeView1SelectedChanged(object sender, RoutedPropertyChangedEven
                 if (moveF != null)
                     MoveF(br);
                 offsetView.Text = br.indexOffset.ToString();
-                sizeView.Text = br.Size.ToString();
+                sizeView.Text = br.UncompressedSize.ToString();
                 noView.Text = br.bundleIndex.ToString();
                 var root = new FolderModel("Bundles2");
                 foreach (var f in br.Files)
@@ -554,7 +554,7 @@ private void ButtonReplaceAllClick(object sender, RoutedEventArgs e)
             if (fbd.ShowDialog() == true)
             {
                 if (MessageBox.Show(
-                    "This will replace all files to every loaded bundles." + Environment.NewLine
+                    "This will replace all files to every loaded bundles (doesn't contain which were filtered)." + Environment.NewLine
                     + "And bundles which weren't loaded won't be changed." + Environment.NewLine
                     + "Are you sure you want to do this?",
                     "Replace All Confirm",

diff --git a/VisualBundle/Properties/AssemblyInfo.cs b/VisualBundle/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // 您可以指定所有的值，也可以使用 '*' 將組建和修訂編號
 // 設為預設，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]