diff --git a/Content/Blueprints/Combat_UI/CombatCharacterRT.uasset b/Content/Blueprints/Combat_UI/CombatCharacterRT.uasset index 18ed00b..9d7ce0b 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacterRT.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacterRT.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb9e9774ca5001eacae0a2919ae15d6f4feffb15b01b76c4dd2dd413a74f104c -size 81249 +oid sha256:a8d38fdd110d147c0c3f803aea14a2a947637755a8af299ff997f89340175e80 +size 2380 diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index b98df6e..aeebd00 100644 --- a/Content/Blueprints/Combat_UI/Combat_UI.uasset +++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08b5f888ae7390e84c48c0f1a7052afafbc7307b430b2dd31a573786019be399 -size 56768 +oid sha256:1f42716c7e52f59d5e57aabb8ff5699d656b0a43c6f95ad8802a31c9e13e0765 +size 77433 diff --git a/Content/Blueprints/Combat_UI/Combat_UI_RT.uasset b/Content/Blueprints/Combat_UI/Combat_UI_RT.uasset index 1b63b25..ff5951f 100644 --- a/Content/Blueprints/Combat_UI/Combat_UI_RT.uasset +++ b/Content/Blueprints/Combat_UI/Combat_UI_RT.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ec8d329493de386a95db2adaedb1cfe41cdc130cd29b33aa986a1f96a15c2fc -size 46215 +oid sha256:1e6f705982f4b4e342cd180c761c55c1ff71de0e8ee4163655d7dd12c6857ced +size 2337 diff --git a/Content/Blueprints/Combat_UI/RealTimeCombatTest.uasset b/Content/Blueprints/Combat_UI/RealTimeCombatTest.uasset index 118519c..0db64be 100644 --- a/Content/Blueprints/Combat_UI/RealTimeCombatTest.uasset +++ b/Content/Blueprints/Combat_UI/RealTimeCombatTest.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d00d1720eb719f3914871999a65884b498ab425ecfbe7bf4c423af8cd1a64f21 -size 29659 +oid sha256:1bfec71ded924f1eda99556ed24253fb3a703a474d5078c33286bd5f810bdeb1 +size 2398 diff --git a/Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset b/Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset new file mode 100644 index 0000000..d1d4ede --- /dev/null +++ b/Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc9eb13d6d72b8b0ed0e1ffa48c052e1a6d579087fd566fd400dbe2b4d9636f8 +size 79436 diff --git a/Content/Blueprints/Combat_UI/__RealTime/Combat_UI_RT.uasset b/Content/Blueprints/Combat_UI/__RealTime/Combat_UI_RT.uasset new file mode 100644 index 0000000..4e9640d --- /dev/null +++ b/Content/Blueprints/Combat_UI/__RealTime/Combat_UI_RT.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8dfba51c1e874efc1e3d3d04fb94601fde10f98bde12c05080fd5461107d74f3 +size 46237 diff --git a/Content/Blueprints/Combat_UI/__RealTime/RealTimeCombatTest.uasset b/Content/Blueprints/Combat_UI/__RealTime/RealTimeCombatTest.uasset new file mode 100644 index 0000000..d573236 --- /dev/null +++ b/Content/Blueprints/Combat_UI/__RealTime/RealTimeCombatTest.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8eea345343389a3c9c52ae3ff4f51e0b8c0d2083650e05e1596db4d065ec42ae +size 29452 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index dc87f2c..6a565ef 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -43,6 +43,16 @@ void ATurnBaseCombatV2::EndCombat() PlayerPawn->bUseControllerRotationPitch = true; } +void ATurnBaseCombatV2::FKeyPressed() +{ + FButtonOnClick(); +} + +void ATurnBaseCombatV2::WKeyPressed() +{ + WButtonOnClick(); +} + void ATurnBaseCombatV2::BeginPlay() { Super::BeginPlay(); diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h index 2ea2d96..ad63f52 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.h @@ -16,7 +16,7 @@ class THE_TWILIGHT_ABYSS_API ATurnBaseCombatV2 : public AGameStateBase public: ATurnBaseCombatV2(); - + UPROPERTY(EditDefaultsOnly) int PlayerHealth = 100; UPROPERTY(EditDefaultsOnly) @@ -59,6 +59,10 @@ public: void StartCombat(AActor* Enemy); UFUNCTION(BlueprintCallable) void EndCombat(); + UFUNCTION(BlueprintCallable) + void FKeyPressed(); + UFUNCTION(BlueprintCallable) + void WKeyPressed(); protected: virtual void BeginPlay() override;