Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Removed Merchant Soft Lock for Build

Browse Source 
Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED
This commit is contained in:
Philip W 2023-03-14 03:26:14 +00:00
parent ca87feaf2a
commit c5409fcaa7
7 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Assets/Characters/Merchant/AMerchant.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/BlueprintAI/AI/AIControllerBruh.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Display_UI/BP_ImportantStats.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Levels/Build.umap (Stored with Git LFS)
View File

Binary file not shown.

3
Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp
View File

@ -41,7 +41,7 @@ void AInteraction::BeginPlay()
//Item Selector refs //Item Selector refs
ItemSelectorWidget = CreateWidget<UUserWidget>(GetWorld(), ItemSelector); ItemSelectorWidget = CreateWidget<UUserWidget>(GetWorld(), ItemSelector);
ItemSelectorWidget->SetVisibility(ESlateVisibility::Hidden); ItemSelectorWidget->SetVisibility(ESlateVisibility::Hidden);
ItemSelectorWidget->AddToViewport(); //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,6 +102,7 @@ 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)
{ {

2
Source/the_twilight_abyss/Quest/QuestSystem.cpp
View File

@ -11,7 +11,7 @@ UQuestSystem::UQuestSystem()
// off to improve performance if you don't need them. // off to improve performance if you don't need them.
PrimaryComponentTick.bCanEverTick = true; PrimaryComponentTick.bCanEverTick = true;
static ConstructorHelpers::FClassFinder<UUserWidget> QuestWidgetClass(TEXT("/Game/Quest_UI/Quest_UI")); static ConstructorHelpers::FClassFinder<UUserWidget> QuestWidgetClass(TEXT("/Game/Blueprints/Quest_UI/Quest_UI"));
QuestWidget = QuestWidgetClass.Class; QuestWidget = QuestWidgetClass.Class;
} }