diff --git a/Content/Widgets/LevelUp/BP_LevelUpWidget.uasset b/Content/Widgets/LevelUp/BP_LevelUpWidget.uasset index ee95c85..ab263ac 100644 --- a/Content/Widgets/LevelUp/BP_LevelUpWidget.uasset +++ b/Content/Widgets/LevelUp/BP_LevelUpWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2aec733a3e03e637a9014bb156af250f4dcd48ba8ef55a4b2351c6098a2076f8 -size 63822 +oid sha256:7083fe7a51ccfef735467876a13f136cd22cd8cc9afe12a5b2359505cdf0f05a +size 64818 diff --git a/Source/vampires/Widgets/LevelUpWidget.cpp b/Source/vampires/Widgets/LevelUpWidget.cpp index 201635a..8f58255 100644 --- a/Source/vampires/Widgets/LevelUpWidget.cpp +++ b/Source/vampires/Widgets/LevelUpWidget.cpp @@ -20,6 +20,8 @@ void ULevelUpWidget::NativeConstruct() if (ResumeButton) { ResumeButton->OnClicked.AddUniqueDynamic(this, &ULevelUpWidget::ResumeButtonClicked); + ResumeButton->OnHovered.AddUniqueDynamic(this, &ULevelUpWidget::ResumeButtonOnHovered); + ResumeButton->OnUnhovered.AddUniqueDynamic(this, &ULevelUpWidget::ResumeButtonOnUnhovered); } if (UpgradesListView) @@ -91,6 +93,8 @@ void ULevelUpWidget::NativeConstruct() void ULevelUpWidget::ResumeButtonClicked() { + PlayClickedSound(); + RemoveFromParent(); if (APlayerController* PlayerController = UGameplayStatics::GetPlayerController(GetWorld(), 0)) @@ -102,3 +106,15 @@ void ULevelUpWidget::ResumeButtonClicked() SetIsFocusable(false); } + +void ULevelUpWidget::ResumeButtonOnHovered() +{ + SetTextBlockHovered(ResumeTextBlock); + PlayHoveredSound(); +} + +void ULevelUpWidget::ResumeButtonOnUnhovered() +{ + SetTextBlockUnhovered(ResumeTextBlock); + PlayUnhoveredSound(); +} diff --git a/Source/vampires/Widgets/LevelUpWidget.h b/Source/vampires/Widgets/LevelUpWidget.h index 8537ef0..d8ae9d1 100644 --- a/Source/vampires/Widgets/LevelUpWidget.h +++ b/Source/vampires/Widgets/LevelUpWidget.h @@ -3,7 +3,7 @@ #pragma once #include "CoreMinimal.h" -#include "Blueprint/UserWidget.h" +#include "VampireInteractiveWidget.h" #include "LevelUpWidget.generated.h" class UUpgradeButtonDataObject; @@ -13,13 +13,16 @@ class UButton; * */ UCLASS(Blueprintable) -class VAMPIRES_API ULevelUpWidget : public UUserWidget +class VAMPIRES_API ULevelUpWidget : public UVampireInteractiveWidget { GENERATED_BODY() protected: UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) - UButton* ResumeButton; + TObjectPtr ResumeButton; + + UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) + TObjectPtr ResumeTextBlock; UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) UListView* UpgradesListView; @@ -29,4 +32,10 @@ protected: private: UFUNCTION() void ResumeButtonClicked(); + + UFUNCTION() + void ResumeButtonOnHovered(); + + UFUNCTION() + void ResumeButtonOnUnhovered(); };