From 7c1610534cdfba19d5e5ae18a4aa342ab5d3e628 Mon Sep 17 00:00:00 2001 From: Oleg Petruny Date: Sat, 21 Sep 2024 22:01:25 +0200 Subject: [PATCH] Fishing, RythmClick minigames, bugfixes --- .../Minigames/SW_Minigame_RythmClick.uasset | 3 -- .../Minigames/SW_Minigame_RythmClick.uasset | 3 ++ .../Blueprints/BP_CustomGameInstance.uasset | 4 +- .../Blueprints/Characters/BP_Player.uasset | 4 +- .../BP_StealthGuardAIController.uasset | 4 +- .../AgeOfWar/BP_Minigame_AgeOfWar.uasset | 3 ++ .../BP_Minigame_CrossyRoadManager.uasset | 3 ++ .../Fishing/BP_Minigame_FishingManager.uasset | 3 ++ .../Fishing/UI_Minigame_Fishing.uasset | 3 ++ .../BP_Minigame_RythmClickManager.uasset | 3 ++ .../T_Minigame_RuthmClick_Button.uasset | 3 -- .../T_Minigame_RuthmClick_ButtonBorder.uasset | 3 -- .../UI/UIC_Minigame_RythmClick_Button.uasset | 3 -- .../UI/UI_Minigame_RythmClick_Canvas.uasset | 3 -- .../UIC_Minigame_RythmClickButton.uasset | 3 ++ .../UI_Minigame_RythmClickCanvas.uasset | 3 ++ .../BP_Minigame_SubwaySurfManager.uasset | 3 ++ .../BP_Minigame_SubwaySurf_ObstacleBig.uasset | 3 ++ ...BP_Minigame_SubwaySurf_ObstacleHigh.uasset | 3 ++ .../BP_Minigame_SubwaySurf_ObstacleLow.uasset | 3 ++ .../SubwaySurf/BP_SubwaySurf_Manager.uasset | 3 -- .../BP_SubwaySurf_ObstacleBig.uasset | 3 -- .../BP_SubwaySurf_ObstacleHigh.uasset | 3 -- .../BP_SubwaySurf_ObstacleLow.uasset | 3 -- .../Actions/IA_Minigame_Fishing.uasset | 3 ++ .../IA_Minigame_SubwaySurf_Down.uasset | 3 ++ .../IA_Minigame_SubwaySurf_Left.uasset | 3 ++ .../IA_Minigame_SubwaySurf_Right.uasset | 3 ++ .../Actions/IA_Minigame_SubwaySurf_Up.uasset | 3 ++ .../Actions/IA_SubwaySurf_Down.uasset | Bin 2135 -> 0 bytes .../Actions/IA_SubwaySurf_Left.uasset | Bin 2135 -> 0 bytes .../Actions/IA_SubwaySurf_Right.uasset | Bin 2144 -> 0 bytes .../Minigame/Actions/IA_SubwaySurf_Up.uasset | Bin 2117 -> 0 bytes .../Minigame/IMC_Minigame_Fishing.uasset | 3 ++ .../Minigame/IMC_Minigame_SubwaySurf.uasset | 3 ++ Content/Input/Minigame/IMC_SubwaySurf.uasset | Bin 4919 -> 0 bytes .../BP_Test_CutsceneMultiple.uasset | 4 +- .../BP_Test_CutsceneSingle.uasset | 4 +- .../Actors/Minigame/BP_Test_AgeOfWar.uasset | 3 ++ .../Actors/Minigame/BP_Test_CrossyRoad.uasset | 3 ++ Content/Levels/Test/L_Test.umap | 4 +- .../UI/Blueprints/MainMenu/UI_MainMenu.uasset | 4 +- .../Blueprints/Overlays/UI_Crosshair.uasset | Bin 15456 -> 130 bytes .../Win64/UnrealEditor-FMODStudio.dll | 4 +- .../Win64/UnrealEditor-FMODStudio.pdb | 4 +- .../Win64/UnrealEditor-FMODStudioEditor.dll | 4 +- .../Win64/UnrealEditor-FMODStudioEditor.pdb | 4 +- .../Win64/UnrealEditor-FMODStudioNiagara.dll | 2 +- .../Win64/UnrealEditor-FMODStudioNiagara.pdb | 4 +- Source/Lost_Edge/Private/CutsceneManager.cpp | 8 +-- Source/Lost_Edge/Private/CutsceneManager.h | 4 +- .../Activators/InteractableScreenCapturer.cpp | 4 +- .../Minigame/AgeOfWar/AgeOfWarManager.cpp | 27 ++++++++++ .../Minigame/AgeOfWar/AgeOfWarManager.h | 19 ++++++++ .../Minigame/CrossyRoad/CrossyRoadManager.cpp | 27 ++++++++++ .../Minigame/CrossyRoad/CrossyRoadManager.h | 19 ++++++++ .../Minigame/Fishing/FishingManager.cpp | 30 ++++++++++++ .../Private/Minigame/Fishing/FishingManager.h | 46 ++++++++++++++++++ .../Lost_Edge/Private/Minigame/Minigame.cpp | 20 ++++++-- Source/Lost_Edge/Private/Minigame/Minigame.h | 9 ++++ .../Minigame/RythmClick/RythmClickManager.cpp | 27 ++++++++++ .../Minigame/RythmClick/RythmClickManager.h | 19 ++++++++ .../Minigame/SubwaySurf/SubwaySurfManager.cpp | 12 ++--- Source/Lost_Edge/Private/PlayerBase.cpp | 8 +++ Source/Lost_Edge/Private/PlayerBase.h | 1 + 65 files changed, 348 insertions(+), 72 deletions(-) delete mode 100644 Content/Audio/Music/Level2/Minigames/SW_Minigame_RythmClick.uasset create mode 100644 Content/Audio/Music/Minigames/SW_Minigame_RythmClick.uasset create mode 100644 Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset create mode 100644 Content/Blueprints/Minigames/CrossyRoad/BP_Minigame_CrossyRoadManager.uasset create mode 100644 Content/Blueprints/Minigames/Fishing/BP_Minigame_FishingManager.uasset create mode 100644 Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset create mode 100644 Content/Blueprints/Minigames/RythmClick/BP_Minigame_RythmClickManager.uasset delete mode 100644 Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_Button.uasset delete mode 100644 Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_ButtonBorder.uasset delete mode 100644 Content/Blueprints/Minigames/RythmClick/UI/UIC_Minigame_RythmClick_Button.uasset delete mode 100644 Content/Blueprints/Minigames/RythmClick/UI/UI_Minigame_RythmClick_Canvas.uasset create mode 100644 Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset create mode 100644 Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset create mode 100644 Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurfManager.uasset create mode 100644 Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleBig.uasset create mode 100644 Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleHigh.uasset create mode 100644 Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleLow.uasset delete mode 100644 Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_Manager.uasset delete mode 100644 Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleBig.uasset delete mode 100644 Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleHigh.uasset delete mode 100644 Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleLow.uasset create mode 100644 Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset create mode 100644 Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset create mode 100644 Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset create mode 100644 Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset create mode 100644 Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset delete mode 100644 Content/Input/Minigame/Actions/IA_SubwaySurf_Down.uasset delete mode 100644 Content/Input/Minigame/Actions/IA_SubwaySurf_Left.uasset delete mode 100644 Content/Input/Minigame/Actions/IA_SubwaySurf_Right.uasset delete mode 100644 Content/Input/Minigame/Actions/IA_SubwaySurf_Up.uasset create mode 100644 Content/Input/Minigame/IMC_Minigame_Fishing.uasset create mode 100644 Content/Input/Minigame/IMC_Minigame_SubwaySurf.uasset delete mode 100644 Content/Input/Minigame/IMC_SubwaySurf.uasset create mode 100644 Content/Levels/Test/Actors/Minigame/BP_Test_AgeOfWar.uasset create mode 100644 Content/Levels/Test/Actors/Minigame/BP_Test_CrossyRoad.uasset create mode 100644 Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.cpp create mode 100644 Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.h create mode 100644 Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp create mode 100644 Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.h create mode 100644 Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.cpp create mode 100644 Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h create mode 100644 Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.cpp create mode 100644 Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.h diff --git a/Content/Audio/Music/Level2/Minigames/SW_Minigame_RythmClick.uasset b/Content/Audio/Music/Level2/Minigames/SW_Minigame_RythmClick.uasset deleted file mode 100644 index 01a4af7..0000000 --- a/Content/Audio/Music/Level2/Minigames/SW_Minigame_RythmClick.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1bd6ee30f0355d0921fc0d75acbd09c95844ceb3e951b7e9d69a1bbc0f1c09bb -size 7428784 diff --git a/Content/Audio/Music/Minigames/SW_Minigame_RythmClick.uasset b/Content/Audio/Music/Minigames/SW_Minigame_RythmClick.uasset new file mode 100644 index 0000000..a32b43b --- /dev/null +++ b/Content/Audio/Music/Minigames/SW_Minigame_RythmClick.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76f3fa2ae8f6d4389b6a1daf56df1fcb27b61e60590c9096d2d9119dce709728 +size 7376077 diff --git a/Content/Blueprints/BP_CustomGameInstance.uasset b/Content/Blueprints/BP_CustomGameInstance.uasset index 005913a..44e8aed 100644 --- a/Content/Blueprints/BP_CustomGameInstance.uasset +++ b/Content/Blueprints/BP_CustomGameInstance.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0de06017dc169ae344130998119b1fef2cea5199f48e6e024474df02958eb1dd -size 6180 +oid sha256:600a48eed92b2dea4f31a9cd1affdfd72a60b5704ea47a6382db5c23b78f5135 +size 6291 diff --git a/Content/Blueprints/Characters/BP_Player.uasset b/Content/Blueprints/Characters/BP_Player.uasset index 3c8986a..1745f1d 100644 --- a/Content/Blueprints/Characters/BP_Player.uasset +++ b/Content/Blueprints/Characters/BP_Player.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f118ff9fd868cc3d2abea7974208e24e16af5b2d403987ebed4c536311184b4 -size 491100 +oid sha256:65401d20c2bdd7a90f808492cb9fc7ffae46c67dc88e6eb46716c7a8dd1966da +size 491639 diff --git a/Content/Blueprints/Characters/StealthGuard/BP_StealthGuardAIController.uasset b/Content/Blueprints/Characters/StealthGuard/BP_StealthGuardAIController.uasset index 924b1ec..9c19083 100644 --- a/Content/Blueprints/Characters/StealthGuard/BP_StealthGuardAIController.uasset +++ b/Content/Blueprints/Characters/StealthGuard/BP_StealthGuardAIController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af8820e0affd49c3bb69483e0c4a3701152e2424bd520c6b957015b974834cb0 -size 74724 +oid sha256:48861b7bdfd09fc89800d6ecd463a4c5623580e6682f89a5f5f4834574822351 +size 87236 diff --git a/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset b/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset new file mode 100644 index 0000000..8a5cdf5 --- /dev/null +++ b/Content/Blueprints/Minigames/AgeOfWar/BP_Minigame_AgeOfWar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:921cf84b1441404bc14b1def272a6ffcb75a515f2f3a45facbff5966a7fcb3f8 +size 22822 diff --git a/Content/Blueprints/Minigames/CrossyRoad/BP_Minigame_CrossyRoadManager.uasset b/Content/Blueprints/Minigames/CrossyRoad/BP_Minigame_CrossyRoadManager.uasset new file mode 100644 index 0000000..434b396 --- /dev/null +++ b/Content/Blueprints/Minigames/CrossyRoad/BP_Minigame_CrossyRoadManager.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2984ab03af8fe924be881f88d9e94170a2d13018fc85161423a594118aa99677 +size 23045 diff --git a/Content/Blueprints/Minigames/Fishing/BP_Minigame_FishingManager.uasset b/Content/Blueprints/Minigames/Fishing/BP_Minigame_FishingManager.uasset new file mode 100644 index 0000000..04534e0 --- /dev/null +++ b/Content/Blueprints/Minigames/Fishing/BP_Minigame_FishingManager.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2def02a7252bff3fa56d9c4a82fbbe9d7f586fb2ea3342830c2bb3c7d714eeee +size 105032 diff --git a/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset b/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset new file mode 100644 index 0000000..1d37b2f --- /dev/null +++ b/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d0121c429a620566714ef042233852ca244bd607e6232a574f646a526f04c41 +size 495101 diff --git a/Content/Blueprints/Minigames/RythmClick/BP_Minigame_RythmClickManager.uasset b/Content/Blueprints/Minigames/RythmClick/BP_Minigame_RythmClickManager.uasset new file mode 100644 index 0000000..c371a8b --- /dev/null +++ b/Content/Blueprints/Minigames/RythmClick/BP_Minigame_RythmClickManager.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f267ba1f4ef5f72ddc44a67bfbe4a0879c1f77076b5c0d1c1738957f3d34b3a +size 67082 diff --git a/Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_Button.uasset b/Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_Button.uasset deleted file mode 100644 index bbdf965..0000000 --- a/Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_Button.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4efd405f5c81799a2f88aa4c252953544ecaa050395b7d6b187293db1f1c0876 -size 18641 diff --git a/Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_ButtonBorder.uasset b/Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_ButtonBorder.uasset deleted file mode 100644 index a067c6a..0000000 --- a/Content/Blueprints/Minigames/RythmClick/UI/Textures/T_Minigame_RuthmClick_ButtonBorder.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eee7e0a5f62d39cd8a1fc7d44b5dc6c90325b5e5a0ec9b8bcd80660773ec406e -size 23580 diff --git a/Content/Blueprints/Minigames/RythmClick/UI/UIC_Minigame_RythmClick_Button.uasset b/Content/Blueprints/Minigames/RythmClick/UI/UIC_Minigame_RythmClick_Button.uasset deleted file mode 100644 index 1b22552..0000000 --- a/Content/Blueprints/Minigames/RythmClick/UI/UIC_Minigame_RythmClick_Button.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d88eee3ac5ad7073bea4c96021a637754f6516ee8585b66fb959e286f508b618 -size 37745 diff --git a/Content/Blueprints/Minigames/RythmClick/UI/UI_Minigame_RythmClick_Canvas.uasset b/Content/Blueprints/Minigames/RythmClick/UI/UI_Minigame_RythmClick_Canvas.uasset deleted file mode 100644 index 67dd672..0000000 --- a/Content/Blueprints/Minigames/RythmClick/UI/UI_Minigame_RythmClick_Canvas.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa9db88ef228ad70a97b6a5e52f7f16890b7e6bc74f22bb98ef6ae4c29e399fa -size 39106 diff --git a/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset b/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset new file mode 100644 index 0000000..a972c64 --- /dev/null +++ b/Content/Blueprints/Minigames/RythmClick/UIC_Minigame_RythmClickButton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a90f2e194848e2aeabe1476bf66c531e909fd915fe7db13695632fd8ea1ad5f5 +size 248722 diff --git a/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset b/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset new file mode 100644 index 0000000..72aed6b --- /dev/null +++ b/Content/Blueprints/Minigames/RythmClick/UI_Minigame_RythmClickCanvas.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:113d1e52f6d9aeebb1a082226fdbbfd7cc0f096f2ab26d87c2b2de4f4133bbf3 +size 140049 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurfManager.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurfManager.uasset new file mode 100644 index 0000000..01bbf81 --- /dev/null +++ b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurfManager.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d64d8cc33d3db551fe17efc28db64f8d8b0ca7e1cea1c1da54b10486a4d61595 +size 36767 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleBig.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleBig.uasset new file mode 100644 index 0000000..f3b7a0b --- /dev/null +++ b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleBig.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:738df64d0db94d2a115ef058c53d98a210d0de5db12e49b0ef55212438b33ea7 +size 42457 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleHigh.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleHigh.uasset new file mode 100644 index 0000000..884aded --- /dev/null +++ b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleHigh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a0194935f0b0fc2b2bf1a3fdda83e0d70d0b460d76c75de5ec9794697b80f56 +size 43013 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleLow.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleLow.uasset new file mode 100644 index 0000000..175b227 --- /dev/null +++ b/Content/Blueprints/Minigames/SubwaySurf/BP_Minigame_SubwaySurf_ObstacleLow.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0d04bc593955f70fe21b252d2638828adde995929858cc5df6bf2384fa571c5 +size 42908 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_Manager.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_Manager.uasset deleted file mode 100644 index 93d9a17..0000000 --- a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_Manager.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:776d26d43766cb7a5e99cdd53a42313fbb5b5cbd5ee7d0c3ee5bb7c758b5d769 -size 36576 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleBig.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleBig.uasset deleted file mode 100644 index bdef5fc..0000000 --- a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleBig.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c427a7a24a284e9a25b16262da1b76ea8e637d11e14911b54eb67ad0538c2eb6 -size 42292 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleHigh.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleHigh.uasset deleted file mode 100644 index 0f70e61..0000000 --- a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleHigh.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f7c288ec878cca02af3530d7b426faa49f05ef0a42ef49ebbe3ca49845c704b -size 42848 diff --git a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleLow.uasset b/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleLow.uasset deleted file mode 100644 index 0092d02..0000000 --- a/Content/Blueprints/Minigames/SubwaySurf/BP_SubwaySurf_ObstacleLow.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb7017f962a6701ff0c21bb1e96326d8a658f51137d785a01b4070a6d4bcf842 -size 42743 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset b/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset new file mode 100644 index 0000000..cc0dd01 --- /dev/null +++ b/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66fb2f3f849d58738cd98bf2a0d62d4504f8b5b3dbb83765b5f8851cc9037359 +size 1811 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset new file mode 100644 index 0000000..666d667 --- /dev/null +++ b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4705eb236862b3377e2cc97f3eb4438fa77cf7b7d90524e92f3e4cf154229aff +size 2198 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset new file mode 100644 index 0000000..9689e67 --- /dev/null +++ b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c05f7239577603b32f00053f23376bc134d350d03478393b13acd318ec53bc3 +size 2198 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset new file mode 100644 index 0000000..b04c64e --- /dev/null +++ b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2f2f94ec6fff94be141264c79c759c53c8158de814eb66a3df5d0fbac8e6488 +size 2207 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset new file mode 100644 index 0000000..7cb3e25 --- /dev/null +++ b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4aaac36b1b70a5ff8ec4f6853e7e526980d2db8684e0dbe93da32e49afc7ba7a +size 2180 diff --git a/Content/Input/Minigame/Actions/IA_SubwaySurf_Down.uasset b/Content/Input/Minigame/Actions/IA_SubwaySurf_Down.uasset deleted file mode 100644 index beed0838077ad1ad372a40358115c871453ac933..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2135 zcmbVOU1$_n6h3ZOttJ|ce+BhHeTX%>KXGHSEmdcCcEiS+#wMvnDRHu1lhw`aGBayj zU;GEr7e%4;K_5!{&_2{a3oQs1g9`nFR;mvz6#OaDq7R}-z@PPecV^ewP2!>-%-nm= zIrp4<&YW}ZTs*Ym>}a7-*!Bj|bPv%(9)U^x+#49a{a@tt!pDX9%zU54tIh82D zqrXiX6#j&s%~}49DLvJXrINH#8Qt_Jl-{mf-;kE?${9O))y$C2JG?Z9-#I8|MA^;~ z9)n7FO;b>fw(d`)+Ai)!5h* zYi|5dq=jaRRn5MT%5{o?&hQcI`yYB)d#e?l{>B?Z-6 z`J>R@E%vXvPpd_AzNRv1;vn z7cZs{XnIm?x4pjh%`bO3%oI&)rb*V&o|E{J<7C_N72)1mu#lg2q^bU`ZM85fX^s<} zhA>UBoqqdw-EsJ~QCOO)SsLBm|J^BkFegl8wjG@}>&3bxcV^`mGOJ`-I*D!<50X2g zwggwV#?+A7)Eo#kheLrtEEJC@@o>0BRRTfkVWC&7B;QzfePeTp^_F3}vqDgSC!Cq^ z2jHSAp;GQKGT7l(lS8%viWSKFMvUsk$(|Bee~si-@BLo YfT=~;>B8=RS~q!r{_$7fa5FU(afDlMiKuFL7t|6`j zLaHjE_Rv-!aVm$FR^kGYK;pmw1@R*lRcaA%pi-p(6+fbl z)W1O=68?B5m$&>|Qkhf|Qzc=gvKiAKSN8Pe2M+0lp1iSl&t|dL;vHUkhkx@>%+T1* zQl^2RvZk{&9EwHPD6Jhzpgq(ch-gYAs78aG!LTY10%4r%oR??@(?>ihV!)_>%l;NK zJu~)X@rzYQHeHT9?r$`WOW(&&4G#ud;wKu`CcheAGyvPsgM-ZA19|AyU9YE!XDuy# z(YBUtA}w@NtZws#B%f$UXnfk_eBLDSLEVi41{>M_vYGZ;>6hbLM8Ib8LbHnpjdrXe z!b}*c9KuGQe|>9gE;xpv7rKpXP8e2!;v)}ISRK$fviTt)Lr#DFqIw#5Rn2D8Wzk0O z$QOu8S2iQ~BCj>f6{UTwNWt88}KYf>%yY<8YJt;P46M8!Jsg475@fDgmJt3&c zDjb9MUNQV~=hd~=ML5!Hq>@Qtm~{W6p)+ri3fm87f1J;X{5{fjzm_#bpM6XkkFWl4 zp^F#I?9(#|F=%^z=j_dA9A?tex@nSiX!sl4Oz zYkNfN=nTX{QAGSLkTtR&w=cYPCciS<@swlhOefPXnN z;Saz?RYtYkKgeK*TT2ev223XRw#|~iB^$Nm>YY7qx&Qb)E>(mq1t5D}j_elY3?~rW zmAo&etg1qnTlk7IdEt`5KKKZVWGUIc%@sZsO18j%l|ASKs%6kA0Pf7B$`R3+%O3Q* zZ8##5RO@o{O7`4q)nn+bE}|*wZ5~&p$2k_ZO(FIkvr1K8QQ1Csp~6?#?c%OAdJI~mkq-)5P6b>crccV8Wjxwd>&4nF-?f^h zUv3z17r?_*fzpFfx?fP|(UWqLk40#37s)FoEQuXxqQFxAYWYK>{1@Tm-#;Any?^yr Xm|B9JE*$(l{IU0^%Pa5}0FeJ5Qi7or diff --git a/Content/Input/Minigame/Actions/IA_SubwaySurf_Right.uasset b/Content/Input/Minigame/Actions/IA_SubwaySurf_Right.uasset deleted file mode 100644 index c099ad0131120e01db7196beda326059cf737735..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2144 zcmbVOU1(HS5T2x)wu!N7G~z@1kd~rt;_gj$Z<1~CXYXcLBAP}Mn+GZ8W<73JH@nNd zccZHaQW28orP9)Z&_YXnu+$Pr#6lm6)KX{(v_bpO(t<`G6a$JP0e|9r_h)l=^Rw82 zyK~OWcV^DanK@@KoqYStnc3Od-WQ0f%84E@2bJ+R-9LKcmh$O?Wq&t*9r`iq-N3T7 zFA+5|_ia-Lgs(l7$r`?$iBuwvX((nS(kb279@^KH?K`aIy0Y4VeY+F!euI~IXf^*1 z!ZK5o9n~>cLjJHEjQC|K+~SWk%7I8Q)D~%uhNPyJ7D-mjodArDUGNZ9FrVg0#fv;( zTE!e+9e?M4*l_y8+T+{5ovK_jEb7LCxwhDMSI#JBzM2jkxHl}pH|$^|6}+Kxn*7UC zUc5R~f9JP;5B_Qn!b852#!pu3{|3fKX&Qc|v zPUfL2J)<8XJss(k;FJ7i`3j!A*LP6Fj65dv&)DtPSlp?`4ykdmBOOzdiK8ku(7|V@ zXVjRW8Y4FZ>)qnW+{(-E7#9&px0Z;tpn%&S1qg?ySRA`Tk>_8vHQYlP3*Du zNi*#mH?MW+BB_2g6%+fdu&;jq`yI|Rg_EkTlX3XSY1mn)-j03NHBt>7O4Q0V)vW8S zHt~?zVRULj*TsICxVdEn(d`t5+NK&R-8eD+369K86zSWBYFEz9^SCb>z7b|kV_#0K zTMdNz4hCDBn*GhuKsXqc<*?KwHAbX>;%`=3TIFaULOl$6-fr?P5V3cDL9yimsoXXU9F_lR*QK~O0iN)EITZk44ne;psCaLep9ZroGekINLHR6)T0YL2Xn z${x;RI4<+Zn6s$@TW;{r_T-5RgLQ}z9QES({+HW)F>-uCzmz}N0~KR%U4Zz0CdC{P z-FEqdeYX!AVzOdeZk^-LEh`?wZgC$i)^oMo0#)|Dux>Hj>#TEnzo5Up?ruf2@Z7(=m^+Vv%Et|ye;`)V>Px^o#p=x^MhLQR?P3ND@kawVDe<~48dXm6>9 z>jU$7E7|^Yw+7+`;eje3=izXU7#!EUL#7@=SaA2r5)(#Z1-ygm_$w6vCPyhe` diff --git a/Content/Input/Minigame/Actions/IA_SubwaySurf_Up.uasset b/Content/Input/Minigame/Actions/IA_SubwaySurf_Up.uasset deleted file mode 100644 index bdfe5e3bcc9717549b8d495e0418b29d6b311097..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2117 zcmb7GTZ~Il6g@`0$7?*|!+hYwqqL(B(|Y&bw$fl8W(J9P+^M5Vr)}=NMSV?zMED_u zFC-ojk;n)Mi4TtqA4D)>K1?F<`XKxuGKoj+b$V~zc80Q(+kN)g>+F5@K6{_j+k0l6 z?9JtJn+7sAyn?YW#6bh-`?$5^%{%Gnml4nBo(|jyJ7&<_&%um2h&z`lZQL12rZc*8 zWjq;=K@3Focq*wmBY}-gnbw_3wke}-+1QdMyp4^cUkzr77Lk`J#JwSxTbAd#{eE8{ z9CZ1@HEv(X!WF=I6{`%4!bj8b%WnEIL@sXDZ0Gs2WcrX>8x2u9u^r zQB@_|pr+DX)w3+p@j8y#R+;jeY2zZ{?DJ!(VkFH9b@Y_fUMM|lAMn5?#R(3 z)VFTqQN4f(^jvvgP16lZbh{GcD^gJ<5#Oy~19fzOT3U&6R;6e6!+JB{^?POKeEk{% zX;$O07*{p+YH8br|1X3Ou?BRNj)`Bj|vNv4l-xDmzzEAA)l$Fu{E+5`dHDMtBg$r$!wI3;mX#K}~VEi3qzA^fml zunsYTqfAWScZQJg2Qqy@{WpKG2P(zjegM&J%p@^l?2*ME>|1>p5Wz}qS#_pA>s;v= zc1zo*-#!~iz4!_JNQ6cGf~Jzf?DV2;c39gJal&UE-9tNgzP}e)R$A@|htN(hYjZk7 z!L3#j8Qz>tbB2b-WyzJKctUW^6p$!Hvg3c#!HJLsu?Rep9wB5fsv&NVN F{uj>Wp2q+H diff --git a/Content/Input/Minigame/IMC_Minigame_Fishing.uasset b/Content/Input/Minigame/IMC_Minigame_Fishing.uasset new file mode 100644 index 0000000..18cc9cc --- /dev/null +++ b/Content/Input/Minigame/IMC_Minigame_Fishing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef085e9aefd6187b4db27c0682d3758d7efd0b8490bdac5f0b0e2c4a1283fc8e +size 2891 diff --git a/Content/Input/Minigame/IMC_Minigame_SubwaySurf.uasset b/Content/Input/Minigame/IMC_Minigame_SubwaySurf.uasset new file mode 100644 index 0000000..5d7bbea --- /dev/null +++ b/Content/Input/Minigame/IMC_Minigame_SubwaySurf.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d7144e86f63dbd76b453fe8cdc83a96728830ac4486d0ddf7d87165d2139ac3 +size 5036 diff --git a/Content/Input/Minigame/IMC_SubwaySurf.uasset b/Content/Input/Minigame/IMC_SubwaySurf.uasset deleted file mode 100644 index 29a4864171755fc4dd1c06dd7b3b499209f54af2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4919 zcmeHLYiv|S6h1(q$onCR0tzVMQQD=nzyh(*ZgLn52->TnwSWv!3R-!1Pn%lr6N@7`DSO9yY1GN$Pa#SlDji= z=9_b7&TFP^cy7YZt1T@pE4mT&>PpneEvO5Bzg6!$d$FXxvG;fRyNW*ws&{h0Kh0M#%|AK6(Cbfuc|TOwlcGj>m>&{(%s{DiD^}bp9=2OrOIoL>d%HsajJi(bs#wxCDJ_R&af$rPHEpy0kU1_V_G?TQ*Lp<88IET&b~=#;y5%6olzro=RBQt$y;`?d;Z!qHRA^X0jR zp|X_T?NK*i0D6WUV`)Ck(Icjnpx2I_Yl1^0znmRU>s~%z@&NPH!IImYt0%AnBO0OY zJ7*R`mp>Y>P3cAC|>ZSOXn=?1_2~E%e0^HiTkX>`sz9w&}-)c$Hx2ji}xa?i&F!i?&iTSxo$XTS7_nYT11~`hP4`Fod!okmL1c=It_9XTVUZfrkWoE(5C&H-rw|KCV;X7eYpP5 zPZ5RbBGmdX?VlII@gX|>LdCOid@CnV(XOM7*nY^d;;!vaqBojx?nV0An`b&Q!#M=w zEwYSA1g83BcI`V5zm&RO&%Q8;dl@T8(owc2SnMh!%S+8QQKEtUm)_#Kd3u#YOV*ov z@^4MwLL*Y`(9i>iit=u4;o=xwiYze=#nn z6SyYEP0WB(=Rlk)8ZA5Sb7aDyf`U52At*r|;l?Ck9pcnpI+7>FrOCU&c2In@xpL5( z+f@h>CS0QJ5iWK4s2~=VCd<91O3G@DnJhu5NF}o0fU8rITfX9{wzVw9M~i^}FM{0m z5+*~=RkFOf(hOLd0fOjMyw)5F~Lq-!64}vb5m2r6jltP@b3_t7bZs zJyr<50S|&uT0ppNLD2k==q39K2fmv|!edx8Omf|eZ~=l^FWL&Ga^L+JNK)E`(ZL&{ zX1Eoxp`up>+rutE%9|p-)Tn)gk~LDwP};HGjJs0L!w!M+QQlU{HI7C^1;}kF#e-_M zwZ;R8stamkj8RE`Dpm1v0pT7>BRp3?h$Rs62yXz8TOG#P_>m+`-cJtjS^;G=jk4w4 zFu0jR)NU9w-_|gIH$ln=cf$bIQ29@HZZ-JlwuZrQoSNxw7_?vVRZz5#P}UnMYIX@Jn|JvpNe}a TgX&Iu7i4|@@p$zI2=M;`v(LJz diff --git a/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneMultiple.uasset b/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneMultiple.uasset index d3b9413..4ec665a 100644 --- a/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneMultiple.uasset +++ b/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneMultiple.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6edfdf50b78e28f1baa750b13088fd8c23418f63aa088964f0fbf988c8ee4547 -size 58926 +oid sha256:8a5985adb1cdaa3637e14156e492d7fe6c3ace823903bf1ab296d05a30b4ffdd +size 60433 diff --git a/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneSingle.uasset b/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneSingle.uasset index a5dcfee..489c795 100644 --- a/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneSingle.uasset +++ b/Content/Levels/Test/Actors/CutsceneTest/BP_Test_CutsceneSingle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba179a3b4e6be96cf310b37a1438592df2c0a2a3a82212460110ae4f0a16162f -size 53448 +oid sha256:20f0dcd7a2c7e3341213a26ff8aa28500f374ad295a3bd878e4f9f12f7ed0f3c +size 54150 diff --git a/Content/Levels/Test/Actors/Minigame/BP_Test_AgeOfWar.uasset b/Content/Levels/Test/Actors/Minigame/BP_Test_AgeOfWar.uasset new file mode 100644 index 0000000..0814872 --- /dev/null +++ b/Content/Levels/Test/Actors/Minigame/BP_Test_AgeOfWar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cae293633cb67098d9bf39d8efd55324dbe2b300001438829ee7abeeec916347 +size 32662 diff --git a/Content/Levels/Test/Actors/Minigame/BP_Test_CrossyRoad.uasset b/Content/Levels/Test/Actors/Minigame/BP_Test_CrossyRoad.uasset new file mode 100644 index 0000000..7e0dadb --- /dev/null +++ b/Content/Levels/Test/Actors/Minigame/BP_Test_CrossyRoad.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1de8241d54ca7d81dc4637201975e3376b16e93df90f4418350bd5a50dddf0bd +size 32698 diff --git a/Content/Levels/Test/L_Test.umap b/Content/Levels/Test/L_Test.umap index 19cce39..9f672ea 100644 --- a/Content/Levels/Test/L_Test.umap +++ b/Content/Levels/Test/L_Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bee5982cdfa964c07d50869118ba2fc8b0152b51e9728ce695e4f4d9e86545bf -size 2141963 +oid sha256:433090460cc57acfafc50ada4b1124657d6a58cb9fd4414050cd8aebcc236f22 +size 2238202 diff --git a/Content/UI/Blueprints/MainMenu/UI_MainMenu.uasset b/Content/UI/Blueprints/MainMenu/UI_MainMenu.uasset index 4bf486e..e12c690 100644 --- a/Content/UI/Blueprints/MainMenu/UI_MainMenu.uasset +++ b/Content/UI/Blueprints/MainMenu/UI_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f318670de51ba318ca39b287f167d8b18c6d4bb6a0e09dc3ebe8e03c8ceb6481 -size 175855 +oid sha256:a4828fea25aee37109fdcb3461fbbd6461bcd59ba8819809d79c88383734b883 +size 172743 diff --git a/Content/UI/Blueprints/Overlays/UI_Crosshair.uasset b/Content/UI/Blueprints/Overlays/UI_Crosshair.uasset index 3d11d25cb032bf78d8a036aeae0b8b2b37eafb22..259987b8836e2b89a748f96f973cb85ea5fd3bff 100644 GIT binary patch literal 130 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 diff --git a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.dll b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.dll index 7cc2365..2de9b36 100644 --- a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.dll +++ b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed34273f38c1975857c0ba80e51f2d563db354bb8c1879832afe63e83be3cd2d -size 863232 +oid sha256:803e28e92d9849384fb3bd65583e1076f7f30c619755123a7f688958ee79e97c +size 862720 diff --git a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.pdb b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.pdb index c3ea015..15a3d38 100644 --- a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.pdb +++ b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudio.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edd333d26226596363e502e4478f06193ee357cec19c055b6e85c31fe65d4949 -size 35491840 +oid sha256:151d329b0436c796b36c32d9c95d91f251f7f2fe4b8c7571b8aab0dc0c51fa90 +size 35295232 diff --git a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.dll b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.dll index 8933d83..c69ade1 100644 --- a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.dll +++ b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcad0eb57f807da98c29312d6db54fbefb5fd9884688172baaff2434b971ced9 -size 1047552 +oid sha256:22c10299585d2e4db1de53f71c98c4904321e70390f5151e3e83de5dbf076d49 +size 1045504 diff --git a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.pdb b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.pdb index 6dbe4e1..672b19d 100644 --- a/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.pdb +++ b/Plugins/FMODStudio/Binaries/Win64/UnrealEditor-FMODStudioEditor.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab2c6770c2042b22842bd008a7189567db9f8654bb1ea7bb5c530cd7883db166 -size 45625344 +oid sha256:1d92ef22bca850ddd1ad620d911e1bcce33d8ddc44480e35d74ec460f14722df +size 45461504 diff --git a/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.dll b/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.dll index c5def2e..e2d169b 100644 --- a/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.dll +++ b/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d27102e4a8e305ba2104785663685b118859ca8b2339251f1e5e29939e0cc22b +oid sha256:d428007df8be4a6ff0a90c3182d8e4ef1e883bf64ce6b5daedc2f4d0710ece4e size 228352 diff --git a/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.pdb b/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.pdb index 028e6a3..2125683 100644 --- a/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.pdb +++ b/Plugins/FMODStudioNiagara/Binaries/Win64/UnrealEditor-FMODStudioNiagara.pdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3362ff072696d4668329206186078750494e35b534dc9e567adc19f9c23b9151 -size 62033920 +oid sha256:1a4d2b3478eaefe6d804cd4092661adab286a6ab05c1f1af5f5fc3a1d782dfa5 +size 61911040 diff --git a/Source/Lost_Edge/Private/CutsceneManager.cpp b/Source/Lost_Edge/Private/CutsceneManager.cpp index 132bb2c..1f60ee4 100644 --- a/Source/Lost_Edge/Private/CutsceneManager.cpp +++ b/Source/Lost_Edge/Private/CutsceneManager.cpp @@ -29,9 +29,9 @@ UCutsceneManager::UCutsceneManager() } } -void UCutsceneManager::EnqueueSequence(TSoftObjectPtr sequence, FCutsceneEndCallback endCallback) +void UCutsceneManager::EnqueueSequence(ULevelSequence* sequence, FCutsceneEndCallback endCallback) { - if(!sequence.LoadSynchronous()) + if(!sequence) return; FScopeLock lock1(&_sequencesLock); @@ -81,9 +81,9 @@ void UCutsceneManager::PlayNextSequence() FScopeLock lock(&_sequencesLock); - TSoftObjectPtr sequence; + ULevelSequence* sequence; _nextSequences.Dequeue(sequence); - _sequencePlayer = ULevelSequencePlayer::CreateLevelSequencePlayer(GetWorld(), sequence.LoadSynchronous(), FMovieSceneSequencePlaybackSettings{}, _sequencePlayerActor); + _sequencePlayer = ULevelSequencePlayer::CreateLevelSequencePlayer(GetWorld(), sequence, FMovieSceneSequencePlaybackSettings{}, _sequencePlayerActor); _sequencePlayer->OnStop.AddDynamic(this, &UCutsceneManager::OnSequenceEnd); _sequencePlayer->Play(); } diff --git a/Source/Lost_Edge/Private/CutsceneManager.h b/Source/Lost_Edge/Private/CutsceneManager.h index fc21fde..708cde2 100644 --- a/Source/Lost_Edge/Private/CutsceneManager.h +++ b/Source/Lost_Edge/Private/CutsceneManager.h @@ -17,7 +17,7 @@ public: UCutsceneManager(); UFUNCTION(BlueprintCallable) - void EnqueueSequence(TSoftObjectPtr sequence, FCutsceneEndCallback endCallback); + void EnqueueSequence(class ULevelSequence* sequence, FCutsceneEndCallback endCallback); UFUNCTION(BlueprintCallable) void SkipSequence(); @@ -38,7 +38,7 @@ private: class ULevelSequencePlayer* _sequencePlayer = nullptr; class ALevelSequenceActor* _sequencePlayerActor = nullptr; - TQueue> _nextSequences; + TQueue _nextSequences; FCriticalSection _sequencesLock; TQueue _endCallbacks; FCriticalSection _callbacksLock; diff --git a/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp b/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp index ea2fd42..5f37b19 100644 --- a/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp +++ b/Source/Lost_Edge/Private/Interactable/Activators/InteractableScreenCapturer.cpp @@ -284,5 +284,5 @@ void UInteractableScreenCapturer::Process() running = false; } ); - } -} \ No newline at end of file + } + } \ No newline at end of file diff --git a/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.cpp b/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.cpp new file mode 100644 index 0000000..e1976ad --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.cpp @@ -0,0 +1,27 @@ +// Oleg Petruny proprietary. + + +#include "AgeOfWarManager.h" + +#include "MainGameModeBase.h" +#include "PlayerBase.h" + +AAgeOfWarManager::AAgeOfWarManager() +{} + +void AAgeOfWarManager::Start(APlayerBase* playerPawn, FMinigameEndCallback delegate) +{ + if(!playerPawn) + return; + + AMinigame::Start(playerPawn, delegate); + + player->LockPlayer(FPlayerLock::All()); +} + +void AAgeOfWarManager::End() +{ + player->UnlockPlayer(FPlayerLock::All()); + + AMinigame::End(); +} diff --git a/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.h b/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.h new file mode 100644 index 0000000..b414c2f --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/AgeOfWar/AgeOfWarManager.h @@ -0,0 +1,19 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "Minigame/Minigame.h" + +#include "AgeOfWarManager.generated.h" + +UCLASS(Blueprintable, BlueprintType, MinimalAPI) +class AAgeOfWarManager : public AMinigame +{ + GENERATED_BODY() + +public: + AAgeOfWarManager(); + + virtual void Start(class APlayerBase* playerPawn, FMinigameEndCallback delegate) override; + virtual void End() override; +}; diff --git a/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp b/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp new file mode 100644 index 0000000..d36902f --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.cpp @@ -0,0 +1,27 @@ +// Oleg Petruny proprietary. + + +#include "CrossyRoadManager.h" + +#include "MainGameModeBase.h" +#include "PlayerBase.h" + +ACrossyRoadManager::ACrossyRoadManager() +{} + +void ACrossyRoadManager::Start(APlayerBase* playerPawn, FMinigameEndCallback delegate) +{ + if(!playerPawn) + return; + + AMinigame::Start(playerPawn, delegate); + + player->LockPlayer(FPlayerLock::All()); +} + +void ACrossyRoadManager::End() +{ + player->UnlockPlayer(FPlayerLock::All()); + + AMinigame::End(); +} diff --git a/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.h b/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.h new file mode 100644 index 0000000..35acae1 --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/CrossyRoad/CrossyRoadManager.h @@ -0,0 +1,19 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "Minigame/Minigame.h" + +#include "CrossyRoadManager.generated.h" + +UCLASS(Blueprintable, BlueprintType, MinimalAPI) +class ACrossyRoadManager : public AMinigame +{ + GENERATED_BODY() + +public: + ACrossyRoadManager(); + + virtual void Start(class APlayerBase* playerPawn, FMinigameEndCallback delegate) override; + virtual void End() override; +}; diff --git a/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.cpp b/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.cpp new file mode 100644 index 0000000..1167c33 --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.cpp @@ -0,0 +1,30 @@ +// Oleg Petruny proprietary. + + +#include "FishingManager.h" + +#include "MainGameModeBase.h" +#include "PlayerBase.h" + +AFishingManager::AFishingManager() +{ + static ConstructorHelpers::FObjectFinder asset{ TEXT("/Script/EnhancedInput.InputMappingContext'/Game/Input/Minigame/IMC_Minigame_Fishing.IMC_Minigame_Fishing'") }; + input = asset.Object; +} + +void AFishingManager::Start(APlayerBase* playerPawn, FMinigameEndCallback delegate) +{ + if(!playerPawn) + return; + + AMinigame::Start(playerPawn, delegate); + + player->LockPlayer(FPlayerLock::All()); +} + +void AFishingManager::End() +{ + player->UnlockPlayer(FPlayerLock::All()); + + AMinigame::End(); +} diff --git a/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h b/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h new file mode 100644 index 0000000..2bd69e2 --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h @@ -0,0 +1,46 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "Minigame/Minigame.h" + +#include "FishingManager.generated.h" + +USTRUCT(BlueprintType) +struct FFishVariation +{ + GENERATED_BODY() + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + float difficulty; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + float size; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + float duration; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + int32 price; + + UPROPERTY(EditAnywhere, BlueprintReadWrite) + FLinearColor color; +}; + +UCLASS(Blueprintable, BlueprintType, MinimalAPI) +class AFishingManager : public AMinigame +{ + GENERATED_BODY() + +public: + AFishingManager(); + + virtual void Start(class APlayerBase* playerPawn, FMinigameEndCallback delegate) override; + virtual void End() override; + + UFUNCTION(BlueprintImplementableEvent, BlueprintCallable) + void CatchSucceed(int32 price); + + UFUNCTION(BlueprintImplementableEvent, BlueprintCallable) + void CatchFailed(); +}; diff --git a/Source/Lost_Edge/Private/Minigame/Minigame.cpp b/Source/Lost_Edge/Private/Minigame/Minigame.cpp index 1d563de..eb49fc5 100644 --- a/Source/Lost_Edge/Private/Minigame/Minigame.cpp +++ b/Source/Lost_Edge/Private/Minigame/Minigame.cpp @@ -3,17 +3,24 @@ #include "Minigame.h" +#include "EnhancedInputSubsystems.h" #include "InputMappingContext.h" +#include "PlayerBase.h" + AMinigame::AMinigame() - : AActor() { PrimaryActorTick.bStartWithTickEnabled = false; PrimaryActorTick.bCanEverTick = true; } void AMinigame::End() -{} +{ + if(callback.IsBound()) + callback.Execute(result, score); + + OnEnd(); +} void AMinigame::Restart() {} @@ -23,8 +30,15 @@ UInputMappingContext* AMinigame::GetInputMappings() return input.LoadSynchronous(); } -void AMinigame::Start(class APlayerBase* playerPawn, FMinigameEndCallback delegate) +void AMinigame::Start(APlayerBase* playerPawn, FMinigameEndCallback delegate) { player = playerPawn; callback = delegate; + + if(input) + if(auto PC = Cast(playerPawn->GetController())) + if(auto inputSubsystem = ULocalPlayer::GetSubsystem(PC->GetLocalPlayer())) + inputSubsystem->AddMappingContext(input.LoadSynchronous(), 0); + + OnStart(); } diff --git a/Source/Lost_Edge/Private/Minigame/Minigame.h b/Source/Lost_Edge/Private/Minigame/Minigame.h index 4f4d580..e103c50 100644 --- a/Source/Lost_Edge/Private/Minigame/Minigame.h +++ b/Source/Lost_Edge/Private/Minigame/Minigame.h @@ -26,12 +26,18 @@ public: UFUNCTION(BlueprintCallable) virtual void Start(class APlayerBase* playerPawn, FMinigameEndCallback delegate); + UFUNCTION(BlueprintImplementableEvent) + void OnStart(); + UFUNCTION(BlueprintCallable) virtual void End(); UFUNCTION(BlueprintCallable) virtual void Restart(); + UFUNCTION(BlueprintImplementableEvent) + void OnEnd(); + UFUNCTION(BlueprintPure) class UInputMappingContext* GetInputMappings(); @@ -42,6 +48,9 @@ protected: UPROPERTY(EditAnywhere, BlueprintReadWrite) int32 score = 0; + UPROPERTY(EditAnywhere, BlueprintReadWrite) + EMinigameResult result = EMinigameResult::Loss; + UPROPERTY(EditAnywhere, BlueprintReadWrite) bool ended = false; diff --git a/Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.cpp b/Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.cpp new file mode 100644 index 0000000..297e092 --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.cpp @@ -0,0 +1,27 @@ +// Oleg Petruny proprietary. + + +#include "RythmClickManager.h" + +#include "MainGameModeBase.h" +#include "PlayerBase.h" + +ARythmClickManager::ARythmClickManager() +{} + +void ARythmClickManager::Start(APlayerBase* playerPawn, FMinigameEndCallback delegate) +{ + if(!playerPawn) + return; + + AMinigame::Start(playerPawn, delegate); + + player->LockPlayer(FPlayerLock::All()); +} + +void ARythmClickManager::End() +{ + player->UnlockPlayer(FPlayerLock::All()); + + AMinigame::End(); +} diff --git a/Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.h b/Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.h new file mode 100644 index 0000000..23fc800 --- /dev/null +++ b/Source/Lost_Edge/Private/Minigame/RythmClick/RythmClickManager.h @@ -0,0 +1,19 @@ +// Oleg Petruny proprietary. + +#pragma once + +#include "Minigame/Minigame.h" + +#include "RythmClickManager.generated.h" + +UCLASS(Blueprintable, BlueprintType, MinimalAPI) +class ARythmClickManager : public AMinigame +{ + GENERATED_BODY() + +public: + ARythmClickManager(); + + virtual void Start(class APlayerBase* playerPawn, FMinigameEndCallback delegate) override; + virtual void End() override; +}; diff --git a/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp b/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp index a904839..2350786 100644 --- a/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp +++ b/Source/Lost_Edge/Private/Minigame/SubwaySurf/SubwaySurfManager.cpp @@ -18,7 +18,7 @@ ASubwaySurfManager::ASubwaySurfManager() : AMinigame() { - static ConstructorHelpers::FObjectFinder asset{ TEXT("/Script/EnhancedInput.InputMappingContext'/Game/Input/Minigame/IMC_SubwaySurf.IMC_SubwaySurf'") }; + static ConstructorHelpers::FObjectFinder asset{ TEXT("/Script/EnhancedInput.InputMappingContext'/Game/Input/Minigame/IMC_Minigame_SubwaySurf.IMC_Minigame_SubwaySurf'") }; input = asset.Object; auto root = CreateDefaultSubobject(TEXT("Scene")); @@ -40,8 +40,6 @@ void ASubwaySurfManager::Start(APlayerBase* playerPawn, FMinigameEndCallback del AMinigame::Start(playerPawn, delegate); - AMainGameModeBase::GetWidgetsManager()->HideInteractionHints(nullptr); - player->LockPlayer(FPlayerLock::All()); player->SwitchToView(this); @@ -70,8 +68,6 @@ void ASubwaySurfManager::End() for(int32 handler : inputHandlers) player->inputComponent->RemoveActionBindingForHandle(handler); - AMainGameModeBase::GetWidgetsManager()->ShowInteractionHints(nullptr); - player->UnlockPlayer(FPlayerLock::All()); player->ReturnPlayerView(); @@ -91,15 +87,13 @@ void ASubwaySurfManager::Hit() return; } - if(callback.IsBound()) - callback.Execute(EMinigameResult::Loss, score); + result = EMinigameResult::Loss; End(); } void ASubwaySurfManager::Finish() { - if(callback.IsBound()) - callback.Execute(EMinigameResult::Win, score); + result = EMinigameResult::Win; End(); } diff --git a/Source/Lost_Edge/Private/PlayerBase.cpp b/Source/Lost_Edge/Private/PlayerBase.cpp index 07dda52..a4b058b 100644 --- a/Source/Lost_Edge/Private/PlayerBase.cpp +++ b/Source/Lost_Edge/Private/PlayerBase.cpp @@ -141,6 +141,9 @@ void APlayerBase::LockPlayer(FPlayerLock lock) interactionLocked += lock.interaction; cameraLocked += lock.camera; inventoryLocked += lock.inventory; + + if(interactionLocked) + ResetIntractions(); } void APlayerBase::UnlockPlayer(FPlayerLock lock) @@ -158,6 +161,11 @@ void APlayerBase::FlyMode(bool on) GetCharacterMovement()->GravityScale = on ? 0.0f : 1.0f; } +void APlayerBase::ResetIntractions() +{ + InteractableDeactivated(lastInteractable, static_cast(0xFF)); +} + FVector APlayerBase::GetCameraDirection() { return camera->GetForwardVector(); diff --git a/Source/Lost_Edge/Private/PlayerBase.h b/Source/Lost_Edge/Private/PlayerBase.h index d612b0d..a07f7ee 100644 --- a/Source/Lost_Edge/Private/PlayerBase.h +++ b/Source/Lost_Edge/Private/PlayerBase.h @@ -48,6 +48,7 @@ public: void LockPlayer(const FPlayerLock lock); void UnlockPlayer(const FPlayerLock lock); void FlyMode(bool on); + void ResetIntractions(); UFUNCTION(BlueprintCallable, Category = Character) void SwitchToView(class AActor* target);