Attempted fix widget to merchant system
This commit is contained in:
parent
363623a315
commit
6f9f95ab9d
BIN
Content/Assets/Characters/Merchant/AMerchant.uasset
(Stored with Git LFS)
BIN
Content/Assets/Characters/Merchant/AMerchant.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Combat_UI/CombatCharacter.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Combat_UI/CombatCharacter.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Display_UI/BP_CrossHair.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Display_UI/BP_CrossHair.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Display_UI/BP_ImportantStats.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Display_UI/BP_ImportantStats.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Game_UI/WBP_Combos.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Game_UI/WBP_Combos.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Game_UI/WBP_Gear.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Game_UI/WBP_Gear.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Game_UI/WBP_Lore.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Game_UI/WBP_Lore.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Game_UI/WBP_MainWidg.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Game_UI/WBP_MainWidg.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Game_UI/WBP_Maps.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Game_UI/WBP_Maps.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Game_UI/WBP_Settings.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Game_UI/WBP_Settings.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Player/BP_MyTempCharacter.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Player/BP_MyTempCharacter.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/Build.umap
(Stored with Git LFS)
BIN
Content/Levels/Build.umap
(Stored with Git LFS)
Binary file not shown.
@ -40,8 +40,8 @@ void AInteraction::BeginPlay()
|
|||||||
|
|
||||||
//Item Selector refs
|
//Item Selector refs
|
||||||
ItemSelectorWidget = CreateWidget<UUserWidget>(GetWorld(), ItemSelector);
|
ItemSelectorWidget = CreateWidget<UUserWidget>(GetWorld(), ItemSelector);
|
||||||
|
ItemSelectorWidget->AddToViewport();
|
||||||
ItemSelectorWidget->SetVisibility(ESlateVisibility::Hidden);
|
ItemSelectorWidget->SetVisibility(ESlateVisibility::Hidden);
|
||||||
//ItemSelectorWidget->AddToViewport();
|
|
||||||
//We are getting the property of interaction since we need a reference for when we cast in BP and we need the reference to be self
|
//We are getting the property of interaction since we need a reference for when we cast in BP and we need the reference to be self
|
||||||
Property = ItemSelectorWidget->GetClass()->FindPropertyByName("publicActor");
|
Property = ItemSelectorWidget->GetClass()->FindPropertyByName("publicActor");
|
||||||
|
|
||||||
@ -102,7 +102,6 @@ void AInteraction::RemoveWidget()
|
|||||||
UE_LOG(LogTemp, Display, TEXT("You cant open this widget when this widget is open"));
|
UE_LOG(LogTemp, Display, TEXT("You cant open this widget when this widget is open"));
|
||||||
}
|
}
|
||||||
UE_LOG(LogTemp, Display, TEXT("setting isDisabled to true"));
|
UE_LOG(LogTemp, Display, TEXT("setting isDisabled to true"));
|
||||||
ExitScreen();
|
|
||||||
|
|
||||||
if (Property == nullptr)
|
if (Property == nullptr)
|
||||||
{
|
{
|
||||||
@ -121,6 +120,7 @@ void AInteraction::RemoveWidget()
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
ItemSelectorWidget->SetVisibility(ESlateVisibility::Visible);
|
ItemSelectorWidget->SetVisibility(ESlateVisibility::Visible);
|
||||||
|
ItemSelectorWidget->SetRenderOpacity(1);
|
||||||
bisDisabled = false;
|
bisDisabled = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -42,6 +42,19 @@ void ATempCharacter::BeginPlay()
|
|||||||
//UGameplayStatics::GetAllActorsWithTag(GetWorld(), Enemy, AIActors);
|
//UGameplayStatics::GetAllActorsWithTag(GetWorld(), Enemy, AIActors);
|
||||||
Ammo = TEXT("Ammo");
|
Ammo = TEXT("Ammo");
|
||||||
NoiseEmitter = Cast<UPawnNoiseEmitterComponent>(this->FindComponentByClass(UPawnNoiseEmitterComponent::StaticClass()));
|
NoiseEmitter = Cast<UPawnNoiseEmitterComponent>(this->FindComponentByClass(UPawnNoiseEmitterComponent::StaticClass()));
|
||||||
|
|
||||||
|
//Widget Refs
|
||||||
|
CrossHairWidget = CreateWidget<UUserWidget>(GetWorld(), CrossHairSub);
|
||||||
|
CrossHairWidget->SetVisibility(ESlateVisibility::Visible);
|
||||||
|
CrossHairWidget->AddToViewport();
|
||||||
|
|
||||||
|
ImportantStatsWidget = CreateWidget<UUserWidget>(GetWorld(), ImportantStatsSub);
|
||||||
|
ImportantStatsWidget->SetVisibility(ESlateVisibility::Visible);
|
||||||
|
ImportantStatsWidget->AddToViewport();
|
||||||
|
|
||||||
|
MainMenuWidget = CreateWidget<UUserWidget>(GetWorld(), MainMenuSub);
|
||||||
|
MainMenuWidget->SetVisibility(ESlateVisibility::Hidden);
|
||||||
|
MainMenuWidget->AddToViewport();
|
||||||
}
|
}
|
||||||
|
|
||||||
//Binds the input we made in the setup player component to the forward vector
|
//Binds the input we made in the setup player component to the forward vector
|
||||||
|
@ -37,8 +37,8 @@ public:
|
|||||||
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Inventory, meta = (AllowPrivateAccess = "true"))
|
UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Inventory, meta = (AllowPrivateAccess = "true"))
|
||||||
class UInventoryComponent* Inventory; //Using the InventoryComponent class
|
class UInventoryComponent* Inventory; //Using the InventoryComponent class
|
||||||
|
|
||||||
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
|
//UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
|
||||||
UUserWidget* ItemSelectorWidget;
|
//UUserWidget* ItemSelectorWidget;
|
||||||
|
|
||||||
// Called to bind functionality to input
|
// Called to bind functionality to input
|
||||||
virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override;
|
virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override;
|
||||||
@ -100,8 +100,26 @@ public:
|
|||||||
|
|
||||||
bool isInStealth = false;
|
bool isInStealth = false;
|
||||||
|
|
||||||
|
UPROPERTY()
|
||||||
|
UUserWidget* ImportantStatsWidget;
|
||||||
|
|
||||||
|
UPROPERTY()
|
||||||
|
UUserWidget* CrossHairWidget;
|
||||||
|
|
||||||
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
|
||||||
UUserWidget* ImportantStats;
|
UUserWidget* ImportantStats;
|
||||||
|
|
||||||
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
|
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Widgets")
|
||||||
UUserWidget* MainMenuWidget;
|
UUserWidget* MainMenuWidget;
|
||||||
|
|
||||||
|
UPROPERTY(EditAnywhere, Category= "Widgets")
|
||||||
|
TSubclassOf<UUserWidget> ImportantStatsSub;
|
||||||
|
|
||||||
|
UPROPERTY(EditAnywhere, Category= "Widgets")
|
||||||
|
TSubclassOf<UUserWidget> MainMenuSub;
|
||||||
|
|
||||||
|
UPROPERTY(EditAnywhere, Category= "Widgets")
|
||||||
|
TSubclassOf<UUserWidget> CrossHairSub;
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user