From 5ee0839ab14045330613654dc841ff05e8cda1a5 Mon Sep 17 00:00:00 2001 From: Oleg Petruny Date: Fri, 25 Apr 2025 22:49:33 +0200 Subject: [PATCH] fix level2 broken asset file --- .../Levels/Level_1/Materials/M_MonsterBodyLevel1Scene4.uasset | 4 ++-- UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap | 4 ++-- .../Content/Levels/Level_2/L_Level2_BuiltData.uasset | 3 --- .../Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset | 4 ++-- .../Levels/Level_2/Sequencers/Seq_Level2_SkillSelect.uasset | 4 ++-- .../Levels/Level_2/Sequencers/Seq_Level2_TreeFall.uasset | 4 ++-- .../Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset | 4 ++-- UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap | 4 ++-- .../Lost_Edge/Content/MaterialsLibrary/M_Moss1.uasset | 4 ++-- .../Lost_Edge/Content/MaterialsLibrary/M_Moss2.uasset | 4 ++-- .../Lost_Edge/Content/MaterialsLibrary/M_Moss3.uasset | 4 ++-- .../Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp | 4 ++-- .../Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.cpp | 4 ++-- .../Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.h | 2 +- 14 files changed, 25 insertions(+), 28 deletions(-) delete mode 100644 UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2_BuiltData.uasset diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/M_MonsterBodyLevel1Scene4.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/M_MonsterBodyLevel1Scene4.uasset index 57e6732..cecad2d 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/M_MonsterBodyLevel1Scene4.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_1/Materials/M_MonsterBodyLevel1Scene4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:094913fd5b91b8b50ef7bcdc96d1371f22e80a685d2623c5f9b794d4eb687e57 -size 13817 +oid sha256:8ad57f1ac1ed19dfeaf9ce2bc9bdf0384e96472d4338fda622d3bb80de376e9c +size 14217 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap index f082dfe..a4a37a3 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef9d23251341723edf0cd4528122a737989f4663c04dc79df5029fa15cdbaa15 -size 43958378 +oid sha256:f53ae615db812cb4b817a33e6e51651690b0288ff1febda9b8e319324fc35b28 +size 38750125 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2_BuiltData.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2_BuiltData.uasset deleted file mode 100644 index 688cb81..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2_BuiltData.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aac6bfa4ce635de35affda8063abd8dd442e6e6cbcee65388844680fa996eb36 -size 2775337 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset index 4780728..fc142ac 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/OnBeginPlay/Seq_Level2_clock.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84d6730afa82823bdb24b965eb917a8ac81c8b4206b3c942f606db9e700a2c45 -size 64196 +oid sha256:00cfb56b207c7e65f0ab88c55b6823a521004da053d74c560d8f7bfc21c648bc +size 62422 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_SkillSelect.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_SkillSelect.uasset index 90c619a..677c0cd 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_SkillSelect.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_SkillSelect.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86f0b344cd247dae785069f2caad53316c39b7d5ad68245319e5acea272b1d0a -size 20746 +oid sha256:b48b3ab3e8cdb2b36cd836a60d614e9270e47af457925e4ea68b7cef4c985331 +size 22858 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_TreeFall.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_TreeFall.uasset index 404c429..09286f0 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_TreeFall.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_TreeFall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea35f9aa4f76ba53c632f7baddd0fd759725ab83aed4f0b5c9357cbd1a9d7270 -size 50864 +oid sha256:9c8aa7448e4ea8b080a66b1ade509e6a959ce474f7a663fff5a2e33cc5d5f6ea +size 45361 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset index 8a0cf0d..62548f0 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Sequencers/Seq_Level2_begin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20de61bc9ca93eb6c67776baffaed11e24c65ea2500c844c4c00245b96f8b073 -size 17370 +oid sha256:9fdd9272cfb4a2c9703b1801cc2fe7fa3e6aa0c2f59cbfd50aa3d72224cf0333 +size 19001 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap b/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap index 662b994..3cdc941 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Test/L_Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92e8ae37575027108becf775def3fbfd4bb4c4d0be781a9a0d912b1e00c66f37 -size 2866900 +oid sha256:71a02ae71fe36f7498bb07ae05661569d7a6e7bca48398126ac8999595eba341 +size 2868318 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss1.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss1.uasset index 5926946..ea095de 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss1.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ca253001e786c12a85b321971e2e27e3a4477623cad9c6584002150b93a696d -size 29632 +oid sha256:62c76b9c9677b41c6547429855901899ae8be24cea06de08498a9b62ae57b3c2 +size 29689 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss2.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss2.uasset index 8da5ade..7d9c72b 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss2.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3b4c4a5f9c937485dc5d924cf42a2ed3d7d9d2c370e22328e06b16805d6d5cd -size 24815 +oid sha256:a6b7d7b9b4396685b92ec93c89ba3e3f00a4689026d2d9f5dfafaf4686feab50 +size 24872 diff --git a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss3.uasset b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss3.uasset index 662d564..b927eb8 100644 --- a/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss3.uasset +++ b/UnrealProject/Lost_Edge/Content/MaterialsLibrary/M_Moss3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa3126b34efed511c0f507dd8d14cffe8826a327510773be9848308ef881efd0 -size 25461 +oid sha256:b543f5e7a1773e3e3ba5e3a53cf7c6be6388422a11c71d84f2ae317b3353fba6 +size 25518 diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp index 9780d95..1658907 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp @@ -22,13 +22,13 @@ ALevelBase* ALevelBase::Get() { if(auto GM = AMainGameModeBase::Get()) - return GM->leadLevel.Get(); + return GM->leadLevel; return nullptr; } void ALevelBase::BeginPlay() { - AMainGameModeBase::leadLevel = TStrongObjectPtr{ this }; + AMainGameModeBase::leadLevel = this; ALevelScriptActor::BeginPlay(); diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.cpp index b54c1ae..891271f 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.cpp @@ -19,7 +19,7 @@ TStrongObjectPtr AMainGameModeBase::widgetsManager = nullptr; TStrongObjectPtr AMainGameModeBase::cutsceneManager = nullptr; TStrongObjectPtr AMainGameModeBase::quickTimeEventManager = nullptr; TStrongObjectPtr AMainGameModeBase::dialogueManager = nullptr; -TStrongObjectPtr AMainGameModeBase::leadLevel = nullptr; +ALevelBase* AMainGameModeBase::leadLevel = nullptr; void AMainGameModeBase::StartPlay() { @@ -38,11 +38,11 @@ void AMainGameModeBase::EndPlay(const EEndPlayReason::Type EndPlayReason) { cutsceneManager->LockCallback(true); cutsceneManager->Clear(); - leadLevel.Reset(); widgetsManager.Reset(); cutsceneManager.Reset(); quickTimeEventManager.Reset(); dialogueManager.Reset(); + leadLevel = nullptr; Super::EndPlay(EndPlayReason); } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.h index a630654..2693913 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/MainGameModeBase.h @@ -44,7 +44,7 @@ public: void SwitchCameraMode(); - static TStrongObjectPtr leadLevel; + static class ALevelBase* leadLevel; FQuestsUpdateDelegate questsUpdateDelegate;