diff --git a/CUE4Parse b/CUE4Parse index a8cb8411..d6ef57b1 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit a8cb8411d5a1c95a94a41e41047f3efcaeda4ccf +Subproject commit d6ef57b1c46b22331589c1e0b2cfeaacfc909463 diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index 5414f12a..fb556aba 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -8,7 +8,6 @@ using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; using System.Windows; - using AdonisUI.Controls; using CUE4Parse.Compression; using CUE4Parse.Encryption.Aes; @@ -34,17 +33,15 @@ using CUE4Parse.UE4.Readers; using CUE4Parse.UE4.Shaders; using CUE4Parse.UE4.Versions; using CUE4Parse.UE4.Wwise; - using CUE4Parse_Conversion; using CUE4Parse_Conversion.Animations; using CUE4Parse_Conversion.Meshes; using CUE4Parse_Conversion.Sounds; - using CUE4Parse.GameTypes.UDWN.Encryption.Aes; using CUE4Parse.GameTypes.DBD.Encryption.Aes; using CUE4Parse.GameTypes.PAXDEI.Encryption.Aes; +using CUE4Parse.GameTypes.NetEase.MAR.Encryption.Aes; using EpicManifestParser; - using FModel.Creator; using FModel.Extensions; using FModel.Framework; @@ -53,20 +50,13 @@ using FModel.Settings; using FModel.Views; using FModel.Views.Resources.Controls; using FModel.Views.Snooper; - using Newtonsoft.Json; - using Ookii.Dialogs.Wpf; - using OpenTK.Windowing.Common; using OpenTK.Windowing.Desktop; - using Serilog; - using SkiaSharp; - using UE4Config.Parsing; - using Application = System.Windows.Application; namespace FModel.ViewModels; @@ -190,8 +180,9 @@ public class CUE4ParseViewModel : ViewModel Provider.ReadScriptData = UserSettings.Default.ReadScriptData; Provider.CustomEncryption = Provider.Versions.Game switch { + EGame.GAME_MarvelRivals => MarvelAes.MarvelDecrypt, EGame.GAME_Undawn => ToaaAes.ToaaDecrypt, - EGame.GAME_DeadbyDaylight => DbDAes.DbDDecrypt, + EGame.GAME_DeadByDaylight => DBDAes.DbDDecrypt, EGame.GAME_PaxDei => PaxDeiAes.PaxDeiDecrypt, _ => Provider.CustomEncryption };