diff --git a/UnrealProject/Lost_Edge/Config/DefaultGame.ini b/UnrealProject/Lost_Edge/Config/DefaultGame.ini index 528ef25..2ef8df0 100644 --- a/UnrealProject/Lost_Edge/Config/DefaultGame.ini +++ b/UnrealProject/Lost_Edge/Config/DefaultGame.ini @@ -62,10 +62,13 @@ InternationalizationPreset=English LocalizationTargetCatchAllChunkId=0 bCookAll=False bCookMapsOnly=False +bTreatWarningsAsErrorsOnCook=False bSkipEditorContent=True bSkipMovies=False -IniKeyDenylist=KeyStorePassword -IniKeyDenylist=KeyPassword +-IniKeyDenylist=DebugKeyStorePassword +-IniKeyDenylist=DebugKeyPassword -IniKeyDenylist=rsa.privateexp -IniKeyDenylist=rsa.modulus -IniKeyDenylist=rsa.publicexp @@ -81,6 +84,8 @@ bSkipMovies=False -IniKeyDenylist=MobileProvision -IniKeyDenylist=IniKeyDenylist -IniKeyDenylist=IniSectionDenylist ++IniKeyDenylist=DebugKeyStorePassword ++IniKeyDenylist=DebugKeyPassword +IniKeyDenylist=KeyStorePassword +IniKeyDenylist=KeyPassword +IniKeyDenylist=rsa.privateexp @@ -100,6 +105,8 @@ bSkipMovies=False +IniKeyDenylist=IniSectionDenylist -IniSectionDenylist=HordeStorageServers -IniSectionDenylist=StorageServers +-IniSectionDenylist=/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings ++IniSectionDenylist=/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings +IniSectionDenylist=HordeStorageServers +IniSectionDenylist=StorageServers +DirectoriesToAlwaysCook=(Path="/Game/Misc/Interactables") @@ -115,6 +122,7 @@ bSkipMovies=False +DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/Reverbs") +DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/Snapshots") +DirectoriesToAlwaysCook=(Path="/Game/Audio/FMOD/VCAs") ++DirectoriesToAlwaysCook=(Path="/NNEDenoiser") +DirectoriesToAlwaysStageAsNonUFS=(Path="Audio/FMOD/Desktop") bRetainStagedDirectory=False CustomStageCopyHandler= diff --git a/UnrealProject/Lost_Edge/Config/DefaultGameUserSettings.ini b/UnrealProject/Lost_Edge/Config/DefaultGameUserSettings.ini index 0b9dddb..d9f51a0 100644 --- a/UnrealProject/Lost_Edge/Config/DefaultGameUserSettings.ini +++ b/UnrealProject/Lost_Edge/Config/DefaultGameUserSettings.ini @@ -37,3 +37,5 @@ HDRDisplayOutputNits=1000 [/Script/Engine.GameUserSettings] bUseDesiredScreenHeight=False +[ScalabilityGroups] +sg.ResolutionQuality=100 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1.umap index c78e195..d75aea6 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61afaaef1086eeaeb7001340e054f34b1b0656024d5f2538e4a735fadeda928f -size 388221891 +oid sha256:c627870ba26cd1adffdccddf584e3e07f0bd226c0c2cb16b5cda930af8e8b595 +size 388223074 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1_BuiltData.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1_BuiltData.uasset index 0b5dd5a..4279412 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1_BuiltData.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/L_Level1_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bf777eed3d2ac3c4cda56fc90a1fbb70d5f0b737236557811f92b468d62380f -size 1587465 +oid sha256:c44d469fc6d570cfe47e4729ccc4a068ed3ba261873bc32b9cf8edda0bc40f5f +size 1437298 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Graphics.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Graphics.uasset index 5951c6e..0bfecce 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Graphics.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/MainMenu/Pages/UI_MainMenu_Page_Options_Graphics.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1370ea26a0c7ea1bbccf45fb4ac9a0a153717bfb0a179bf00489bed808003463 -size 504314 +oid sha256:c58568acd509b8d59e4f3a6b82546db2846e0453aded05447e3f91d595e8d23c +size 597919 diff --git a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_ComboBox.uasset b/UnrealProject/Lost_Edge/Content/UI/Components/UIC_ComboBox.uasset index ce88df7..3de3162 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Components/UIC_ComboBox.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Components/UIC_ComboBox.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ec78da0d043e7360e94e96bd38f4e14aa4fa8d4a13bd9743585a49898202c83 -size 203180 +oid sha256:b5547ed103e9745a3f0a214e2baca5e9568c1665d20ea015dad9f52d52a4a78a +size 200629 diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.cpp index bc7223c..2a95101 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/GraphicsSettingsHelper.cpp @@ -361,8 +361,9 @@ FIntPoint UGraphicsSettingsHelper::FilterClosestResolution(const TArray 1 && c < coefficient) - || (coefficient < 1 && c > coefficient && c < 1)) + if((coefficient > 1 && c < coefficient) // 1 < new result < old result + || (c < 1 && c > coefficient) // old result < new result < 1 + || UCommonFunctions::FloatIsZero(c - 1)) // new result == Omega(1) { coefficient = c; resultId = i; diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.cpp index fe4b8b6..e46fd96 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.cpp @@ -56,3 +56,9 @@ void AMinigame::Restart() OnRestart_Internal(); OnRestart(); } + +void AMinigame::EndPlay(const EEndPlayReason::Type EndPlayReason) +{ + if(instance == this) + instance = nullptr; +} diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.h index 6244a0f..aecc48c 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Minigame/Minigame.h @@ -47,6 +47,8 @@ public: TSoftObjectPtr GetInputMappings() { return context; } protected: + virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override; + virtual void OnStart_Internal() {} UFUNCTION(BlueprintImplementableEvent) void OnStart();