diff --git a/Content/Blueprints/BP_CustomGameInstance.uasset b/Content/Blueprints/BP_CustomGameInstance.uasset index 44e8aed..67c869c 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:600a48eed92b2dea4f31a9cd1affdfd72a60b5704ea47a6382db5c23b78f5135 -size 6291 +oid sha256:d9156bfa1fa7a0a42325c5cd1aad5f085d9da75143e46ce9919b54d49270bda2 +size 6180 diff --git a/Content/Blueprints/BP_PlayerController.uasset b/Content/Blueprints/BP_PlayerController.uasset new file mode 100644 index 0000000..a9e9453 --- /dev/null +++ b/Content/Blueprints/BP_PlayerController.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99f94a7ef2c239b485f8383639972b1ffd3c93207656789ef9e941d5666ff14f +size 20270 diff --git a/Content/Blueprints/GameModes/BP_MainGameMode.uasset b/Content/Blueprints/GameModes/BP_MainGameMode.uasset index a5c46c6..30236bf 100644 --- a/Content/Blueprints/GameModes/BP_MainGameMode.uasset +++ b/Content/Blueprints/GameModes/BP_MainGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6677885d76a87a0f8ea90c2fb03db9b9f124dd55a32252c35d411932eac246aa -size 15396 +oid sha256:b465a2ee9ef0c408df71f8f06aa33528244874ba99b451e6d80df511d47518a2 +size 15610 diff --git a/Content/Blueprints/Minigames/Fishing/BP_Minigame_FishingManager.uasset b/Content/Blueprints/Minigames/Fishing/BP_Minigame_FishingManager.uasset index 04534e0..e77246f 100644 --- a/Content/Blueprints/Minigames/Fishing/BP_Minigame_FishingManager.uasset +++ b/Content/Blueprints/Minigames/Fishing/BP_Minigame_FishingManager.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2def02a7252bff3fa56d9c4a82fbbe9d7f586fb2ea3342830c2bb3c7d714eeee -size 105032 +oid sha256:110b0b898f855070d08a99bda4851c0821bb2d5f798fe19db3b42170cd8e299e +size 113638 diff --git a/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset b/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset index 1d37b2f..64dd046 100644 --- a/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset +++ b/Content/Blueprints/Minigames/Fishing/UI_Minigame_Fishing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d0121c429a620566714ef042233852ca244bd607e6232a574f646a526f04c41 -size 495101 +oid sha256:0b21c235dd6368de617fd3183dcc5a5b150bbc193c80b4bdf6aba4a3f5b3d6b6 +size 486905 diff --git a/Content/Input/Actions/IA_CutsceneSkip.uasset b/Content/Input/Actions/IA_CutsceneSkip.uasset index 2d81565..6ec1083 100644 --- a/Content/Input/Actions/IA_CutsceneSkip.uasset +++ b/Content/Input/Actions/IA_CutsceneSkip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ee34df36bbc483535319e2a127b7b5e642d48559707b78652a2846c8c1e26c2 +oid sha256:5530cb6a960c071aefacc3a54818c7a20fda963bc5726cdd2f2af57394c2ee9e size 2182 diff --git a/Content/Input/Actions/IA_DialogueSkip.uasset b/Content/Input/Actions/IA_DialogueSkip.uasset index 1676e77..4a5137a 100644 --- a/Content/Input/Actions/IA_DialogueSkip.uasset +++ b/Content/Input/Actions/IA_DialogueSkip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b1e58f0a9348ed7a8c00382743274dda28abc51b72a98b113cb3bc3dd917d1f +oid sha256:4ef85bdcad6aa0ab3dfd52f6bd547809fd5fced6a3f4674801d891b81594f3e4 size 2185 diff --git a/Content/Input/Actions/IA_FlyUpDown.uasset b/Content/Input/Actions/IA_FlyUpDown.uasset index de5892f..b4473ba 100644 Binary files a/Content/Input/Actions/IA_FlyUpDown.uasset and b/Content/Input/Actions/IA_FlyUpDown.uasset differ diff --git a/Content/Input/Actions/IA_Interact.uasset b/Content/Input/Actions/IA_Interact.uasset index c665631..0b447b7 100644 Binary files a/Content/Input/Actions/IA_Interact.uasset and b/Content/Input/Actions/IA_Interact.uasset differ diff --git a/Content/Input/Actions/IA_Journal.uasset b/Content/Input/Actions/IA_Journal.uasset index 7728aba..8ecaa63 100644 Binary files a/Content/Input/Actions/IA_Journal.uasset and b/Content/Input/Actions/IA_Journal.uasset differ diff --git a/Content/Input/Actions/IA_Jump.uasset b/Content/Input/Actions/IA_Jump.uasset index 9ca67bb..b3eba99 100644 Binary files a/Content/Input/Actions/IA_Jump.uasset and b/Content/Input/Actions/IA_Jump.uasset differ diff --git a/Content/Input/Actions/IA_Look.uasset b/Content/Input/Actions/IA_Look.uasset index 2b1fc7c..19ebc62 100644 Binary files a/Content/Input/Actions/IA_Look.uasset and b/Content/Input/Actions/IA_Look.uasset differ diff --git a/Content/Input/Actions/IA_Move.uasset b/Content/Input/Actions/IA_Move.uasset index e9e730f..5a73650 100644 Binary files a/Content/Input/Actions/IA_Move.uasset and b/Content/Input/Actions/IA_Move.uasset differ diff --git a/Content/Input/Actions/IA_OpenMenu.uasset b/Content/Input/Actions/IA_OpenMenu.uasset index c15951f..70aba1b 100644 --- a/Content/Input/Actions/IA_OpenMenu.uasset +++ b/Content/Input/Actions/IA_OpenMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e62ddef659249dac3bf1d141fd928687f741c357a867236ad0c2527e2546a306 +oid sha256:82aeffed04fc214c4627cef694e4ead022d9454235c6777eee4785b0cd539bc1 size 1756 diff --git a/Content/Input/Actions/IA_Run.uasset b/Content/Input/Actions/IA_Run.uasset index dc53ed3..ed3ae1c 100644 Binary files a/Content/Input/Actions/IA_Run.uasset and b/Content/Input/Actions/IA_Run.uasset differ diff --git a/Content/Input/Actions/IA_ShowInventory.uasset b/Content/Input/Actions/IA_ShowInventory.uasset index ac7286c..1d2eed8 100644 Binary files a/Content/Input/Actions/IA_ShowInventory.uasset and b/Content/Input/Actions/IA_ShowInventory.uasset differ diff --git a/Content/Input/Actions/IA_TurnCameraMode.uasset b/Content/Input/Actions/IA_TurnCameraMode.uasset index 296dba6..383a9bb 100644 Binary files a/Content/Input/Actions/IA_TurnCameraMode.uasset and b/Content/Input/Actions/IA_TurnCameraMode.uasset differ diff --git a/Content/Input/Interactables/Actions/IA_InteractableActivate.uasset b/Content/Input/Interactables/Actions/IA_InteractableActivate.uasset index f879bcb..d775865 100644 Binary files a/Content/Input/Interactables/Actions/IA_InteractableActivate.uasset and b/Content/Input/Interactables/Actions/IA_InteractableActivate.uasset differ diff --git a/Content/Input/Interactables/Actions/IA_InteractableInventoryFirst.uasset b/Content/Input/Interactables/Actions/IA_InteractableInventoryFirst.uasset index 73ef148..71cea09 100644 Binary files a/Content/Input/Interactables/Actions/IA_InteractableInventoryFirst.uasset and b/Content/Input/Interactables/Actions/IA_InteractableInventoryFirst.uasset differ diff --git a/Content/Input/Interactables/Actions/IA_InteractableInventorySecond.uasset b/Content/Input/Interactables/Actions/IA_InteractableInventorySecond.uasset index 44b5cd2..a34a237 100644 Binary files a/Content/Input/Interactables/Actions/IA_InteractableInventorySecond.uasset and b/Content/Input/Interactables/Actions/IA_InteractableInventorySecond.uasset differ diff --git a/Content/Input/Interactables/Actions/IA_InteractableMoveActivateL.uasset b/Content/Input/Interactables/Actions/IA_InteractableMoveActivateL.uasset index a2a9d54..857f45a 100644 --- a/Content/Input/Interactables/Actions/IA_InteractableMoveActivateL.uasset +++ b/Content/Input/Interactables/Actions/IA_InteractableMoveActivateL.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71227460cfed5b8f97f4e2f7a2041b98e2f2ac97d43f9aeeb219e84764f650b8 -size 2207 +oid sha256:9d4703cb24d6799dc45a9ab193e76ad6730a203a52df299a2cf8e6bbf8c5301e +size 2275 diff --git a/Content/Input/Interactables/Actions/IA_InteractableMoveActivateR.uasset b/Content/Input/Interactables/Actions/IA_InteractableMoveActivateR.uasset index 7282b8d..e5ad176 100644 Binary files a/Content/Input/Interactables/Actions/IA_InteractableMoveActivateR.uasset and b/Content/Input/Interactables/Actions/IA_InteractableMoveActivateR.uasset differ diff --git a/Content/Input/Interactables/Actions/IA_InteractableMoveRotate.uasset b/Content/Input/Interactables/Actions/IA_InteractableMoveRotate.uasset index 0425566..b8d026d 100644 Binary files a/Content/Input/Interactables/Actions/IA_InteractableMoveRotate.uasset and b/Content/Input/Interactables/Actions/IA_InteractableMoveRotate.uasset differ diff --git a/Content/Input/Interactables/Actions/IA_InteractableMoveZoom.uasset b/Content/Input/Interactables/Actions/IA_InteractableMoveZoom.uasset index c6ff366..fe54309 100644 Binary files a/Content/Input/Interactables/Actions/IA_InteractableMoveZoom.uasset and b/Content/Input/Interactables/Actions/IA_InteractableMoveZoom.uasset differ diff --git a/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Left.uasset b/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Left.uasset index db20ec0..9d3175f 100644 --- a/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Left.uasset +++ b/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Left.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f23b5381e0b8c2487004e40f338a61205ba6f27ad438d09c41344a6db8eb3df1 +oid sha256:e253faa3ef2ab7961a7ceb28376f922c7cbef52a0813210bf7778f2a8156c837 size 2198 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Right.uasset b/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Right.uasset index ab8203b..9f84d6c 100644 --- a/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Right.uasset +++ b/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Right.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:956d7c11ddc10223214a9a29175bb81eeb690dfe59e6dabd240d5891f36a4591 +oid sha256:7950564e498b3241940d4146daffd56ca1c6a6e8eb1cb7d63e35524a959fac63 size 2207 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Up.uasset b/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Up.uasset index 04000e4..e5f6221 100644 --- a/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Up.uasset +++ b/Content/Input/Minigame/Actions/IA_Minigame_CrossyRoad_Up.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbcff0a1c8cdefe3e642920590a27bcddf8189cd19c18824e42907d04e0788d1 +oid sha256:2bf73ac7c3ca9d199a3dadb839dee41103d7d13a00352f5d2a2ab85cc3634ff0 size 2180 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset b/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset index cc0dd01..f706d0d 100644 --- a/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset +++ b/Content/Input/Minigame/Actions/IA_Minigame_Fishing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66fb2f3f849d58738cd98bf2a0d62d4504f8b5b3dbb83765b5f8851cc9037359 +oid sha256:9ddc9b3965c079552707497e4a675e9f9738be4f5db504495e6dc61b9a3496f5 size 1811 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset index 666d667..5a929bb 100644 --- a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset +++ b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Down.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4705eb236862b3377e2cc97f3eb4438fa77cf7b7d90524e92f3e4cf154229aff +oid sha256:5e6ed511eb9eace0733c6df09838c1884f295f55c3dff4a1cb7e732dc8e639f5 size 2198 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset index 9689e67..6dd562b 100644 --- a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset +++ b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Left.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c05f7239577603b32f00053f23376bc134d350d03478393b13acd318ec53bc3 +oid sha256:103696c1f13750af29a532a4dd858559b28e35a284cc2dbfb6e85e7674d4b8c8 size 2198 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset index b04c64e..0e97a76 100644 --- a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset +++ b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Right.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2f2f94ec6fff94be141264c79c759c53c8158de814eb66a3df5d0fbac8e6488 +oid sha256:63fb621e476a618d72cebbcc9c979ff22178cf9eb5e2a66ed5f454907aa65c95 size 2207 diff --git a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset index 7cb3e25..3234765 100644 --- a/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset +++ b/Content/Input/Minigame/Actions/IA_Minigame_SubwaySurf_Up.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4aaac36b1b70a5ff8ec4f6853e7e526980d2db8684e0dbe93da32e49afc7ba7a +oid sha256:28890a90a260fab0a3e6abeca24b7ee0637536d220ecd7aa2fcd6bbc17e2620b size 2180 diff --git a/Content/Input/Minigame/IMC_Minigame_Fishing.uasset b/Content/Input/Minigame/IMC_Minigame_Fishing.uasset index 18cc9cc..760506a 100644 --- a/Content/Input/Minigame/IMC_Minigame_Fishing.uasset +++ b/Content/Input/Minigame/IMC_Minigame_Fishing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef085e9aefd6187b4db27c0682d3758d7efd0b8490bdac5f0b0e2c4a1283fc8e +oid sha256:a49046323551184fd691b236efda69afa9469d080ac6858ae9d8c68179735fec size 2891 diff --git a/Content/Levels/Level_4/L_Level4.umap b/Content/Levels/Level_4/L_Level4.umap index 003884e..78bf1ea 100644 --- a/Content/Levels/Level_4/L_Level4.umap +++ b/Content/Levels/Level_4/L_Level4.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08a927664516f09f5502fce55f43ae31ba6c3f67e667f0d5bc884245d60f2377 -size 279322 +oid sha256:2bb6e12c174c8d15ef1d7253c48b5603fafc33bdba222203e4d306f23f222d34 +size 281868 diff --git a/Source/Lost_Edge/Private/CutsceneManager.cpp b/Source/Lost_Edge/Private/CutsceneManager.cpp index 1f60ee4..953c846 100644 --- a/Source/Lost_Edge/Private/CutsceneManager.cpp +++ b/Source/Lost_Edge/Private/CutsceneManager.cpp @@ -156,6 +156,9 @@ void UCutsceneManager::OnSequenceEnd() _lastPlayer = nullptr; } + + _lastlySkipped = false; + _holding = false; } void UCutsceneManager::OnInputHold() diff --git a/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.cpp b/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.cpp index 1167c33..b5f5a69 100644 --- a/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.cpp +++ b/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.cpp @@ -3,6 +3,9 @@ #include "FishingManager.h" +#include "EnhancedInputComponent.h" +#include "InputMappingContext.h" + #include "MainGameModeBase.h" #include "PlayerBase.h" @@ -20,10 +23,17 @@ void AFishingManager::Start(APlayerBase* playerPawn, FMinigameEndCallback delega AMinigame::Start(playerPawn, delegate); player->LockPlayer(FPlayerLock::All()); + + auto& mapping = input.LoadSynchronous()->GetMapping(0); + handler1 = player->inputComponent->BindAction(mapping.Action, ETriggerEvent::Started, this, &AFishingManager::OnInputHold).GetHandle(); + handler2 = player->inputComponent->BindAction(mapping.Action, ETriggerEvent::Completed, this, &AFishingManager::OnInputUnhold).GetHandle(); } void AFishingManager::End() { + player->inputComponent->RemoveBindingByHandle(handler1); + player->inputComponent->RemoveBindingByHandle(handler2); + 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 index 2bd69e2..5ba2abe 100644 --- a/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h +++ b/Source/Lost_Edge/Private/Minigame/Fishing/FishingManager.h @@ -43,4 +43,12 @@ public: UFUNCTION(BlueprintImplementableEvent, BlueprintCallable) void CatchFailed(); + +protected: + UFUNCTION(BlueprintImplementableEvent) + void OnInputHold(); + UFUNCTION(BlueprintImplementableEvent) + void OnInputUnhold(); + + int32 handler1, handler2; };