diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index f97773e8..dfeb4c66 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -133,10 +133,10 @@ - + - + @@ -146,7 +146,7 @@ - + diff --git a/FModel/PakReader/Parsers/Class/UObject.cs b/FModel/PakReader/Parsers/Class/UObject.cs index e68491aa..3e487c6c 100644 --- a/FModel/PakReader/Parsers/Class/UObject.cs +++ b/FModel/PakReader/Parsers/Class/UObject.cs @@ -46,6 +46,9 @@ namespace FModel.PakReader.Parsers.Class var (val, isNonZero) = it.Current; if (properties.TryGetValue(val, out var propertyInfo)) { + if (propertyInfo.Name == "AuthoredVFXData_ByPart" || propertyInfo.Name == "RequestedDataStores") + continue; + if (isNonZero) { var obj = BaseProperty.ReadAsObject(reader, new FPropertyTag(propertyInfo), new FName(propertyInfo.Type), ReadType.NORMAL); diff --git a/FModel/PakReader/Parsers/Objects/FByteBulkData.cs b/FModel/PakReader/Parsers/Objects/FByteBulkData.cs index 2c460688..9665067b 100644 --- a/FModel/PakReader/Parsers/Objects/FByteBulkData.cs +++ b/FModel/PakReader/Parsers/Objects/FByteBulkData.cs @@ -8,11 +8,15 @@ namespace FModel.PakReader.Parsers.Objects internal FByteBulkData(BinaryReader reader, Stream ubulk, long ubulkOffset) { - var BulkDataFlags = reader.ReadUInt32(); + var BulkDataFlags = reader.ReadInt32(); var ElementCount = reader.ReadInt32(); _ = reader.ReadInt32(); //BulkDataSizeOnDisk var BulkDataOffsetInFile = reader.ReadInt64(); + if ((BulkDataFlags & (uint)EBulkDataFlags.BULKDATA_NoOffsetFixUp) == 0) // UE4.26 flag + { + BulkDataOffsetInFile += ubulkOffset; + } Data = null; if ((BulkDataFlags & 0x20) != 0 || ElementCount == 0) @@ -21,7 +25,6 @@ namespace FModel.PakReader.Parsers.Objects return; if ((BulkDataFlags & (uint)EBulkDataFlags.BULKDATA_PayloadAtEndOfFile) != 0 && - BulkDataOffsetInFile > 0 && ElementCount > 0 && BulkDataOffsetInFile + ElementCount <= reader.BaseStream.Length) //.uasset { long rememberMe = reader.BaseStream.Position; @@ -33,13 +36,9 @@ namespace FModel.PakReader.Parsers.Objects { Data = reader.ReadBytes(ElementCount); } - else if ((BulkDataFlags & (uint)EBulkDataFlags.BULKDATA_PayloadInSeperateFile) != 0 && - ubulk != null && BulkDataOffsetInFile + ubulkOffset >= 0) //.ubulk + else if ((BulkDataFlags & (uint)EBulkDataFlags.BULKDATA_PayloadInSeperateFile) != 0 && ubulk != null) //.ubulk { - if ((BulkDataFlags & (uint)EBulkDataFlags.BULKDATA_NoOffsetFixUp) == 0) // UE4.26 flag - { - ubulk.Position = BulkDataOffsetInFile + ubulkOffset; - } + ubulk.Position = BulkDataOffsetInFile; Data = new byte[ElementCount]; ubulk.Read(Data, 0, (int)ElementCount); } diff --git a/FModel/Properties/Resources.Designer.cs b/FModel/Properties/Resources.Designer.cs index 5ae4b8da..5329e4df 100644 --- a/FModel/Properties/Resources.Designer.cs +++ b/FModel/Properties/Resources.Designer.cs @@ -775,9 +775,10 @@ namespace FModel.Properties { /// Recherche une chaîne localisée semblable à • Maiky ♥ • HYPEX ♥ ///• VenomLeaks ♥ • JayKeyFN ♥ ///• Fevers ♥ • Netu ♥ - ///• Quentin • Yanteh - ///• Shiina • SexyNutella - ///• Alexander • imatrix + ///• TheGameVlog ♥ • Quentin + ///• Yanteh • Shiina + ///• SexyNutella • Alexander + ///• Jinx • imatrix ///• Frenzy Leaks • LlamaLeaks ///• XTigerHyperX • FunGames ///• WeLoveFortnite. diff --git a/FModel/Properties/Resources.resx b/FModel/Properties/Resources.resx index cff3dc24..763e276b 100644 --- a/FModel/Properties/Resources.resx +++ b/FModel/Properties/Resources.resx @@ -354,9 +354,10 @@ It's now the most used free software to leak on Fortnite. • Maiky ♥ • HYPEX ♥ • VenomLeaks ♥ • JayKeyFN ♥ • Fevers ♥ • Netu ♥ -• Quentin • Yanteh -• Shiina • SexyNutella -• Alexander • imatrix +• TheGameVlog ♥ • Quentin +• Yanteh • Shiina +• SexyNutella • Alexander +• Jinx • imatrix • Frenzy Leaks • LlamaLeaks • XTigerHyperX • FunGames • WeLoveFortnite diff --git a/FModel/Windows/DarkMessageBox/DarkMessageBox.xaml b/FModel/Windows/DarkMessageBox/DarkMessageBox.xaml index 2dabf76a..c47c7205 100644 --- a/FModel/Windows/DarkMessageBox/DarkMessageBox.xaml +++ b/FModel/Windows/DarkMessageBox/DarkMessageBox.xaml @@ -25,9 +25,13 @@ - + +