From bd54f3050778730bce7483f58b2875def997c43f Mon Sep 17 00:00:00 2001 From: baz Date: Fri, 4 Jul 2025 02:23:29 +0100 Subject: [PATCH] Lots of little UI adjustments --- Content/Levels/MainMenu/MainMenu.umap | 4 ++-- .../LightningRing/BP_LightningRingWeapon.uasset | 4 ++-- Content/Widgets/HUD/BP_HUDWidget.uasset | 4 ++-- .../Widgets/LevelUp/BP_UpgradeButtonTemplate.uasset | 4 ++-- Content/Widgets/LevelUp/T_GoldIcon.uasset | 3 +++ Content/Widgets/LevelUp/T_HealthIcon.uasset | 3 +++ Content/Widgets/LevelUp/T_NewWeaponIcon.uasset | 3 +++ Content/Widgets/LevelUp/T_UpgradeIcon.uasset | 3 +++ Content/Widgets/MainMenu/BP_MainMenuWidget.uasset | 4 ++-- .../Widgets/MainMenu/BP_SelectWeaponWidget.uasset | 4 ++-- .../Widgets/MainMenu/BP_StarterButtonWIdget.uasset | 4 ++-- Source/vampires/Widgets/SelectWeaponWidget.cpp | 7 +++++++ Source/vampires/Widgets/SelectWeaponWidget.h | 12 ++++++++++-- .../vampires/Widgets/StarterWeaponButtonWidget.cpp | 6 ++++++ Source/vampires/Widgets/StarterWeaponButtonWidget.h | 10 +++++++++- Source/vampires/Widgets/UpgradeButtonWidget.cpp | 6 ++++++ Source/vampires/Widgets/UpgradeButtonWidget.h | 10 +++++++++- 17 files changed, 73 insertions(+), 18 deletions(-) create mode 100644 Content/Widgets/LevelUp/T_GoldIcon.uasset create mode 100644 Content/Widgets/LevelUp/T_HealthIcon.uasset create mode 100644 Content/Widgets/LevelUp/T_NewWeaponIcon.uasset create mode 100644 Content/Widgets/LevelUp/T_UpgradeIcon.uasset diff --git a/Content/Levels/MainMenu/MainMenu.umap b/Content/Levels/MainMenu/MainMenu.umap index 9073b56..3ba65b3 100644 --- a/Content/Levels/MainMenu/MainMenu.umap +++ b/Content/Levels/MainMenu/MainMenu.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce8d40b08b68d129bbbde8ac4fd8db652c26e4760492ffb875f7ab9ff1177631 -size 39425 +oid sha256:8d9fac3727e6cf999ba78aa0c847a5e8967fce2ab1173092bffe79d4fde653a6 +size 39751 diff --git a/Content/Weapons/LightningRing/BP_LightningRingWeapon.uasset b/Content/Weapons/LightningRing/BP_LightningRingWeapon.uasset index ddab065..30140b8 100644 --- a/Content/Weapons/LightningRing/BP_LightningRingWeapon.uasset +++ b/Content/Weapons/LightningRing/BP_LightningRingWeapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95dac707ee8972b91a8b681634f9fd15431674266e5ec31566efe46e543c8384 -size 25195 +oid sha256:d8c224b4d46a271bf4012f41b19ff5e7504e5dd8e83a31e59808dbf39968ad22 +size 25159 diff --git a/Content/Widgets/HUD/BP_HUDWidget.uasset b/Content/Widgets/HUD/BP_HUDWidget.uasset index 54526a4..0d60713 100644 --- a/Content/Widgets/HUD/BP_HUDWidget.uasset +++ b/Content/Widgets/HUD/BP_HUDWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:980c308ff5ed086a352fccb4a51db5d05ab692027a48edc2d091580c719204dd -size 42877 +oid sha256:bb9f649627c820d1e053a977b2a87726a1a5e8dbddc5e13b92ec9e5833dce117 +size 42833 diff --git a/Content/Widgets/LevelUp/BP_UpgradeButtonTemplate.uasset b/Content/Widgets/LevelUp/BP_UpgradeButtonTemplate.uasset index 2d2f103..68efffb 100644 --- a/Content/Widgets/LevelUp/BP_UpgradeButtonTemplate.uasset +++ b/Content/Widgets/LevelUp/BP_UpgradeButtonTemplate.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae1b6fcace4f2168c00cb57569422bee910b313f4e4d2ef7964bde187696287b -size 35553 +oid sha256:7340d7ba4bc5979ad1299ad6fce465c6b6cbdfabdaa95b0b089e4dfdb95c55e5 +size 38281 diff --git a/Content/Widgets/LevelUp/T_GoldIcon.uasset b/Content/Widgets/LevelUp/T_GoldIcon.uasset new file mode 100644 index 0000000..2d2a68b --- /dev/null +++ b/Content/Widgets/LevelUp/T_GoldIcon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95bf4b560cf4d694a8587d13cb3070e66e15cd18ae2f747e48d6f60692394e78 +size 19142 diff --git a/Content/Widgets/LevelUp/T_HealthIcon.uasset b/Content/Widgets/LevelUp/T_HealthIcon.uasset new file mode 100644 index 0000000..fea27a5 --- /dev/null +++ b/Content/Widgets/LevelUp/T_HealthIcon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0eda7d7c4b6c219cfe0c881f75027da52aa55e449c41076eaeb22da056f5ce7b +size 13144 diff --git a/Content/Widgets/LevelUp/T_NewWeaponIcon.uasset b/Content/Widgets/LevelUp/T_NewWeaponIcon.uasset new file mode 100644 index 0000000..e47e74e --- /dev/null +++ b/Content/Widgets/LevelUp/T_NewWeaponIcon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b5f606e5f6fe285b1643e704f85f153db51ec2a9f2592006c2a0bbd06ab9ac1 +size 13005 diff --git a/Content/Widgets/LevelUp/T_UpgradeIcon.uasset b/Content/Widgets/LevelUp/T_UpgradeIcon.uasset new file mode 100644 index 0000000..a5674e4 --- /dev/null +++ b/Content/Widgets/LevelUp/T_UpgradeIcon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dbf0d17d18ac320f136b469acb34921d9cd289ba5eca315eda39ba167a0fffe +size 13719 diff --git a/Content/Widgets/MainMenu/BP_MainMenuWidget.uasset b/Content/Widgets/MainMenu/BP_MainMenuWidget.uasset index 2f5e38b..646deca 100644 --- a/Content/Widgets/MainMenu/BP_MainMenuWidget.uasset +++ b/Content/Widgets/MainMenu/BP_MainMenuWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03a4749681e73f1ad5955607c5642519c94eedbcbe1f333f26cfb144ea5d247c -size 34181 +oid sha256:e1f25ae329e9bde235d93f4f04e5b090208773c74f48a2a37f5a9457cf9ca5f9 +size 36167 diff --git a/Content/Widgets/MainMenu/BP_SelectWeaponWidget.uasset b/Content/Widgets/MainMenu/BP_SelectWeaponWidget.uasset index 6389df5..3a23009 100644 --- a/Content/Widgets/MainMenu/BP_SelectWeaponWidget.uasset +++ b/Content/Widgets/MainMenu/BP_SelectWeaponWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ec5786143e6e67bc90193fc0db42a1c9df540171914a0ad1a35e7264e7e3197 -size 37344 +oid sha256:f843ffe6516efb169974074fb18c4370390878199c103cd00153c2c575f0a5ba +size 38252 diff --git a/Content/Widgets/MainMenu/BP_StarterButtonWIdget.uasset b/Content/Widgets/MainMenu/BP_StarterButtonWIdget.uasset index 77214ab..f4ad67e 100644 --- a/Content/Widgets/MainMenu/BP_StarterButtonWIdget.uasset +++ b/Content/Widgets/MainMenu/BP_StarterButtonWIdget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f39a382b0e96995f040175ffc22c6c3217277d0f5af52487ebd7bfc59baf4e39 -size 34087 +oid sha256:31099c6b90b3524ae3b7612aadc5a1168ff51f089a82ad0bf47a5fc7e85d89e1 +size 35529 diff --git a/Source/vampires/Widgets/SelectWeaponWidget.cpp b/Source/vampires/Widgets/SelectWeaponWidget.cpp index d74aa44..c337992 100644 --- a/Source/vampires/Widgets/SelectWeaponWidget.cpp +++ b/Source/vampires/Widgets/SelectWeaponWidget.cpp @@ -17,6 +17,13 @@ void USelectWeaponWidget::NativeConstruct() if (BackButton) { BackButton->OnClicked.AddUniqueDynamic(this, &USelectWeaponWidget::BackButtonClicked); + BackButton->OnClicked.AddUniqueDynamic(this, &USelectWeaponWidget::PlayClickedSound); + + BackButton->OnHovered.AddUniqueDynamic(this, &USelectWeaponWidget::PlayHoveredSound); + BackButton->OnHovered.AddUniqueDynamic(this, &USelectWeaponWidget::BackButtonTextBlockHoveredDelegate); + + BackButton->OnUnhovered.AddUniqueDynamic(this, &USelectWeaponWidget::BackButtonTextBlockUnhoveredDelegate); + BackButton->OnUnhovered.AddUniqueDynamic(this, &USelectWeaponWidget::PlayUnhoveredSound); } if (UpgradesListView) diff --git a/Source/vampires/Widgets/SelectWeaponWidget.h b/Source/vampires/Widgets/SelectWeaponWidget.h index b274142..79b5e26 100644 --- a/Source/vampires/Widgets/SelectWeaponWidget.h +++ b/Source/vampires/Widgets/SelectWeaponWidget.h @@ -20,10 +20,13 @@ class VAMPIRES_API USelectWeaponWidget : public UVampireInteractiveWidget public: UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) - UButton* BackButton; + TObjectPtr BackButton; UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) - UListView* UpgradesListView; + TObjectPtr BackTextBlock; + + UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) + TObjectPtr UpgradesListView; UPROPERTY(EditDefaultsOnly) TArray> starterWeapons; @@ -38,4 +41,9 @@ private: UFUNCTION() void BackButtonClicked(); + UFUNCTION() + void BackButtonTextBlockHoveredDelegate() { SetTextBlockHovered(BackTextBlock); } + + UFUNCTION() + void BackButtonTextBlockUnhoveredDelegate() { SetTextBlockUnhovered(BackTextBlock); } }; diff --git a/Source/vampires/Widgets/StarterWeaponButtonWidget.cpp b/Source/vampires/Widgets/StarterWeaponButtonWidget.cpp index c00dab3..93bed99 100644 --- a/Source/vampires/Widgets/StarterWeaponButtonWidget.cpp +++ b/Source/vampires/Widgets/StarterWeaponButtonWidget.cpp @@ -31,6 +31,12 @@ void UStarterWeaponButtonWidget::NativeOnListItemObjectSet(UObject* ListItemObje if (Body) { Body->OnClicked.AddUniqueDynamic(this, &UStarterWeaponButtonWidget::OnClicked); + + Body->OnHovered.AddUniqueDynamic(this, &UStarterWeaponButtonWidget::PlayHoveredSound); + Body->OnHovered.AddUniqueDynamic(this, &UStarterWeaponButtonWidget::OnHoveredDelegate); + + Body->OnUnhovered.AddUniqueDynamic(this, &UStarterWeaponButtonWidget::OnUnhoveredDelegate); + Body->OnUnhovered.AddUniqueDynamic(this, &UStarterWeaponButtonWidget::PlayUnhoveredSound); } } } diff --git a/Source/vampires/Widgets/StarterWeaponButtonWidget.h b/Source/vampires/Widgets/StarterWeaponButtonWidget.h index b1c3adc..aa96212 100644 --- a/Source/vampires/Widgets/StarterWeaponButtonWidget.h +++ b/Source/vampires/Widgets/StarterWeaponButtonWidget.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "VampireInteractiveWidget.h" #include "Blueprint/IUserObjectListEntry.h" #include "Blueprint/UserWidget.h" #include "StarterWeaponButtonWidget.generated.h" @@ -15,7 +16,7 @@ class UButton; * */ UCLASS() -class VAMPIRES_API UStarterWeaponButtonWidget : public UUserWidget, public IUserObjectListEntry +class VAMPIRES_API UStarterWeaponButtonWidget : public UVampireInteractiveWidget, public IUserObjectListEntry { GENERATED_BODY() @@ -46,4 +47,11 @@ protected: private: UFUNCTION() virtual void OnClicked(); + + UFUNCTION() + void OnHoveredDelegate() { SetTextBlockHovered(WeaponNameTextBlock); SetTextBlockHovered(DescriptionTextBlock); } + + UFUNCTION() + void OnUnhoveredDelegate() { SetTextBlockUnhovered(WeaponNameTextBlock); SetTextBlockUnhovered(DescriptionTextBlock); } + }; diff --git a/Source/vampires/Widgets/UpgradeButtonWidget.cpp b/Source/vampires/Widgets/UpgradeButtonWidget.cpp index 638b532..052cfac 100644 --- a/Source/vampires/Widgets/UpgradeButtonWidget.cpp +++ b/Source/vampires/Widgets/UpgradeButtonWidget.cpp @@ -53,6 +53,12 @@ void UUpgradeButtonWidget::NativeOnListItemObjectSet(UObject* ListItemObject) if (Body) { Body->OnClicked.AddUniqueDynamic(this, &UUpgradeButtonWidget::OnClicked); + + Body->OnHovered.AddUniqueDynamic(this, &UUpgradeButtonWidget::PlayHoveredSound); + Body->OnHovered.AddUniqueDynamic(this, &UUpgradeButtonWidget::OnHoveredDelegate); + + Body->OnUnhovered.AddUniqueDynamic(this, &UUpgradeButtonWidget::OnUnhoveredDelegate); + Body->OnUnhovered.AddUniqueDynamic(this, &UUpgradeButtonWidget::PlayUnhoveredSound); } } diff --git a/Source/vampires/Widgets/UpgradeButtonWidget.h b/Source/vampires/Widgets/UpgradeButtonWidget.h index 3755ab0..95d81bd 100644 --- a/Source/vampires/Widgets/UpgradeButtonWidget.h +++ b/Source/vampires/Widgets/UpgradeButtonWidget.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "VampireInteractiveWidget.h" #include "Blueprint/IUserObjectListEntry.h" #include "Blueprint/UserWidget.h" #include "UpgradeButtonWidget.generated.h" @@ -26,7 +27,7 @@ class UButton; * */ UCLASS() -class VAMPIRES_API UUpgradeButtonWidget : public UUserWidget, public IUserObjectListEntry +class VAMPIRES_API UUpgradeButtonWidget : public UVampireInteractiveWidget, public IUserObjectListEntry { GENERATED_BODY() @@ -79,4 +80,11 @@ protected: private: UFUNCTION() virtual void OnClicked(); + + UFUNCTION() + void OnHoveredDelegate() { SetTextBlockHovered(WeaponNameTextBlock); SetTextBlockHovered(DescriptionTextBlock); } + + UFUNCTION() + void OnUnhoveredDelegate() { SetTextBlockUnhovered(WeaponNameTextBlock); SetTextBlockUnhovered(DescriptionTextBlock); } + };