baz/vampires
baz/vampires
1
0
Fork 0
Code Issues 11 Projects 1 Activity

Compare commits

base: baz:49fab1bf38eda731f23a5683d03fce5b12dc0031
Branches Tags
baz:main
..
compare: baz:8ab53108a4a3d8a32d283c6efa3f260f75a209eb
Branches Tags
baz:main

No commits in common. "49fab1bf38eda731f23a5683d03fce5b12dc0031" and "8ab53108a4a3d8a32d283c6efa3f260f75a209eb" have entirely different histories.
49fab1bf38 ... 8ab53108a4

5 changed files with 10 additions and 27 deletions
Show Stats Expand all files Collapse all files

BIN
Content/Widgets/GameOver/BP_GameOverWidget.uasset (Stored with Git LFS)
View File

Binary file not shown.

7
Source/vampires/Widgets/GameOverWidget.cpp
View File

@ -16,13 +16,6 @@ void UGameOverWidget::NativeConstruct()
if (ReturnButton) if (ReturnButton)
{ {
ReturnButton->OnClicked.AddUniqueDynamic(this, &UGameOverWidget::ReturnButtonClicked); ReturnButton->OnClicked.AddUniqueDynamic(this, &UGameOverWidget::ReturnButtonClicked);
ReturnButton->OnClicked.AddUniqueDynamic(this, &UGameOverWidget::PlayClickedSound);
ReturnButton->OnHovered.AddUniqueDynamic(this, &UGameOverWidget::PlayHoveredSound);
ReturnButton->OnHovered.AddUniqueDynamic(this, &UGameOverWidget::ReturnTextBlockHoveredDelegate);
ReturnButton->OnUnhovered.AddUniqueDynamic(this, &UGameOverWidget::ReturnTextBlockUnhoveredDelegate);
ReturnButton->OnUnhovered.AddUniqueDynamic(this, &UGameOverWidget::PlayUnhoveredSound);
} }
} }

12
Source/vampires/Widgets/GameOverWidget.h
View File

@ -3,7 +3,6 @@
#pragma once #pragma once
#include "CoreMinimal.h" #include "CoreMinimal.h"
#include "VampireInteractiveWidget.h"
#include "Blueprint/UserWidget.h" #include "Blueprint/UserWidget.h"
#include "GameOverWidget.generated.h" #include "GameOverWidget.generated.h"
@ -13,7 +12,7 @@ class UButton;
* *
*/ */
UCLASS() UCLASS()
class VAMPIRES_API UGameOverWidget : public UVampireInteractiveWidget class VAMPIRES_API UGameOverWidget : public UUserWidget
{ {
GENERATED_BODY() GENERATED_BODY()
@ -21,9 +20,6 @@ protected:
UPROPERTY(BlueprintReadWrite, meta=(BindWidget)) UPROPERTY(BlueprintReadWrite, meta=(BindWidget))
TObjectPtr<UButton> ReturnButton; TObjectPtr<UButton> ReturnButton;
UPROPERTY(BlueprintReadWrite, meta = (BindWidget))
TObjectPtr <UTextBlock> ReturnBlock;
UPROPERTY(BlueprintReadWrite, meta = (BindWidget)) UPROPERTY(BlueprintReadWrite, meta = (BindWidget))
TObjectPtr <UTextBlock> LevelBlock; TObjectPtr <UTextBlock> LevelBlock;
@ -44,10 +40,4 @@ public:
private: private:
UFUNCTION() UFUNCTION()
void ReturnButtonClicked(); void ReturnButtonClicked();
UFUNCTION()
void ReturnTextBlockHoveredDelegate() { SetTextBlockHovered(ReturnBlock); }
UFUNCTION()
void ReturnTextBlockUnhoveredDelegate() { SetTextBlockUnhovered(ReturnBlock); }
}; };

4
Source/vampires/Widgets/MainMenuWidget.h
View File

@ -30,10 +30,10 @@ protected:
UPROPERTY(BlueprintReadWrite, meta = (BindWidget)) UPROPERTY(BlueprintReadWrite, meta = (BindWidget))
TObjectPtr<UTextBlock> QuitTextBlock; TObjectPtr<UTextBlock> QuitTextBlock;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Widget Settings | New Game") UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
TSubclassOf<class UUserWidget> NewGameMenuWidget; TSubclassOf<class UUserWidget> NewGameMenuWidget;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Widget Settings | New Game") UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
TSoftObjectPtr<UWorld> NewGameLevel; TSoftObjectPtr<UWorld> NewGameLevel;
private: private:

10
Source/vampires/Widgets/VampireInteractiveWidget.h
View File

@ -16,19 +16,19 @@ class VAMPIRES_API UVampireInteractiveWidget : public UUserWidget
GENERATED_BODY() GENERATED_BODY()
protected: protected:
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Widget Settings | Sound") UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
TObjectPtr<USoundBase> ButtonHoveredSound; TObjectPtr<USoundBase> ButtonHoveredSound;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Widget Settings | Color") UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
FLinearColor ButtonHoveredTextColor = {0, 1, 0, 1}; FLinearColor ButtonHoveredTextColor = {0, 1, 0, 1};
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Widget Settings | Color") UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
FLinearColor ButtonUnhoveredTextColor = {1, 1, 1, 1}; FLinearColor ButtonUnhoveredTextColor = {1, 1, 1, 1};
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Widget Settings | Sound") UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
TObjectPtr<USoundBase> ButtonUnhoveredSound; TObjectPtr<USoundBase> ButtonUnhoveredSound;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Widget Settings | Sound") UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
TObjectPtr<USoundBase> ButtonClickedSound; TObjectPtr<USoundBase> ButtonClickedSound;
protected: protected: