From 5108dcf59c03440d77aeda9219ca6bffdd678507 Mon Sep 17 00:00:00 2001 From: Oleg Petruny Date: Thu, 1 May 2025 18:09:59 +0200 Subject: [PATCH] level fixes --- UnrealProject/Lost_Edge/Content/Audio/Sounds/Knock.uasset | 3 --- .../Content/Levels/Level_2/Blueprints/BP_Level2_Tree.uasset | 4 ++-- .../Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset | 3 --- .../Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset | 3 --- .../Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset | 3 --- .../Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset | 3 --- .../Content/Levels/Level_2/Blueprints/SM_Level2_Tree.uasset | 3 --- UnrealProject/Lost_Edge/Content/Levels/Level_2/L_Level2.umap | 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/Level_3/L_Level3.umap | 4 ++-- .../Lost_Edge/Content/UI/Blueprints/UI_CutsceneSkip.uasset | 4 ++-- .../Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp | 1 - .../Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.cpp | 1 + .../Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h | 3 +++ 15 files changed, 16 insertions(+), 31 deletions(-) delete mode 100644 UnrealProject/Lost_Edge/Content/Audio/Sounds/Knock.uasset delete mode 100644 UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset delete mode 100644 UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset delete mode 100644 UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset delete mode 100644 UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset delete mode 100644 UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Tree.uasset diff --git a/UnrealProject/Lost_Edge/Content/Audio/Sounds/Knock.uasset b/UnrealProject/Lost_Edge/Content/Audio/Sounds/Knock.uasset deleted file mode 100644 index 9bac2eb..0000000 --- a/UnrealProject/Lost_Edge/Content/Audio/Sounds/Knock.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fe1f29d2b08e8ab4a89d8fd9ca90fee07045422efc18103ceacd81e499a2e10 -size 1459 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Tree.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Tree.uasset index bf91fa6..94728c5 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Tree.uasset +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/BP_Level2_Tree.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:242e7b3d8a80a16a9f5b74f93a28d5dcbd2ccf14fb0821f5cb4f396242a6a511 -size 45071 +oid sha256:875fbf46a52c2ad248739d8456d601e845b78dc08a8ca3b2c9f351c521cb8883 +size 52610 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset deleted file mode 100644 index dee35f6..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_CrossyRoad.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32e2f4e2718431ebfc6c7ed89715683f574777bc643abdde224fc103775008f2 -size 2774 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset deleted file mode 100644 index ad307b3..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Fishing.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6745bf6fcfa3161cdf15ad4b308f9bc008a1db07d4a5c4b64b81be71c75f4c4 -size 2705 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset deleted file mode 100644 index a696415..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_RythmClick.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6407b0d7ae05d0ce97e676bc9acbba5c107dc948c59a700753b4c9474e3398c7 -size 2702 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset deleted file mode 100644 index 9b05d81..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_SubwaySurf.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c599d34d32f5f5fa8c40795f5a2b5a60330037923dfbac602ada2b604d1e36e2 -size 2774 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Tree.uasset b/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Tree.uasset deleted file mode 100644 index ba5cab0..0000000 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_2/Blueprints/SM_Level2_Tree.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15131c28c4abd3d64ce0547e1f00df38864c1a39899c7f8fe46d1a052d27cf9d -size 2636 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 978bb3c..a4b9bd9 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:0a63ffd047526f10d338c768d43168a818bde8d1eb1ba11a51e447ec80bb29b6 -size 38742958 +oid sha256:e9b76bb84eef4e930e0789adb42b5853fd5c024dc483119fbc9fcda93240b564 +size 38742261 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 cee1fce..707bec1 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:cec3a20c766bf5830abc08cd154e35248adb57eb252020fbdee5a1761a5bf384 -size 50799 +oid sha256:1efb0628464ab2d89f9e98cb2ea390c219b90a96cc238a193782cf1444627c1c +size 45709 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 62548f0..951f0d7 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:9fdd9272cfb4a2c9703b1801cc2fe7fa3e6aa0c2f59cbfd50aa3d72224cf0333 -size 19001 +oid sha256:2e01c85451c9b69b3226ae7c88415a41f28768098ebf0f294c8f477bae1b04e2 +size 20916 diff --git a/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3.umap b/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3.umap index 09021ec..e5681fe 100644 --- a/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3.umap +++ b/UnrealProject/Lost_Edge/Content/Levels/Level_3/L_Level3.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc8123353f751e03e15ecda6ec7984dffae82055b81ec48cf8dc341b77893108 -size 2404910 +oid sha256:7d3271efaeb1c80fffe888881f52c68cc0c519354b8a4fd870a6a285e09f498a +size 2404056 diff --git a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CutsceneSkip.uasset b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CutsceneSkip.uasset index 2b47b5a..a427b4a 100644 --- a/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CutsceneSkip.uasset +++ b/UnrealProject/Lost_Edge/Content/UI/Blueprints/UI_CutsceneSkip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1593e8c6d047caf9a6d150cd1ee3169cfdb72bebe74a7ee7b53e434ce4a2f589 -size 128443 +oid sha256:46a8f5e26eff8288bea6b3c4a81992fa29c5f71a6ad9e4b58dbf997e22a858aa +size 125903 diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp index 076716b..effbed2 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CutsceneManager.cpp @@ -159,7 +159,6 @@ void UCutsceneManager::OnFirstCutsceneInit() // most first sequence, so widgets static FSkipCutsceneDelegate skipCutsceneDelegate; if(!skipCutsceneDelegate.IsBound()) skipCutsceneDelegate.BindDynamic(this, &UCutsceneManager::SkipSequence); - WM->AnimateCutsceneWidget(EInputAnimatedWidgetAnimation::Reset); WM->EnableCutsceneWidget(skipCutsceneDelegate); } } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.cpp b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.cpp index 5e36fbb..7b54bed 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.cpp +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.cpp @@ -4,5 +4,6 @@ void UCutsceneSkipWidget::SetVisibility(ESlateVisibility InVisibility) { if(InVisibility == ESlateVisibility::Hidden) RunAnimation(EInputAnimatedWidgetAnimation::Reset); + PlayAnimation(unHide, 0.0f, 1, (InVisibility == ESlateVisibility::Visible ? EUMGSequencePlayMode::Forward : EUMGSequencePlayMode::Reverse)); Super::SetVisibility(InVisibility); } diff --git a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h index 57725b5..92893f2 100644 --- a/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h +++ b/UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Widgets/CutsceneSkipWidget.h @@ -22,6 +22,9 @@ public: UPROPERTY(meta = (BindWidget)) class UTextBlock* keyText; + UPROPERTY(Transient, meta = (BindWidgetAnim)) + class UWidgetAnimation* unHide; + protected: UFUNCTION(BlueprintCallable) void SkipCutscene() { skipCutsceneDelegate.Execute(); }