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

Updated Sisters Quest & Wrapped Text on Selections

Browse Source
This commit is contained in:
Philip W 2023-05-12 13:08:00 +01:00
parent 2c22311c43
commit 3aca076981
6 changed files with 12 additions and 13 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/Blueprints/Quests/Quest_SistersPendant.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dialogue/SM_Merchant_Blueprint.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dialogue/TextPrompt.uasset (Stored with Git LFS)
View File

Binary file not shown.

2
Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp
View File

@ -96,7 +96,7 @@ void UDialogueNPC::NextDialogue()
GetWorld()->GetTimerManager().PauseTimer(TextAnimationTimerHandle); GetWorld()->GetTimerManager().PauseTimer(TextAnimationTimerHandle);
DialogueText->SetText(FText::FromString("")); DialogueText->SetText(FText::FromString(""));
Choice1Button->SetVisibility(ESlateVisibility::Visible); Choice1Button->SetVisibility(ESlateVisibility::Visible);
Choice2Button->SetVisibility(ESlateVisibility::Visible); if (Choice2Text->GetText().ToString() != "") Choice2Button->SetVisibility(ESlateVisibility::Visible);
if (Choice3Text->GetText().ToString() != "") Choice3Button->SetVisibility(ESlateVisibility::Visible); if (Choice3Text->GetText().ToString() != "") Choice3Button->SetVisibility(ESlateVisibility::Visible);
NextArrow->SetVisibility(ESlateVisibility::Hidden); NextArrow->SetVisibility(ESlateVisibility::Hidden);
return; return;

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

@ -24,10 +24,6 @@ AInteraction::AInteraction()
void AInteraction::BeginPlay() void AInteraction::BeginPlay()
{ {
Super::BeginPlay(); Super::BeginPlay();
//Character & Camera refs
TempCharacterRef = Cast<ATempCharacter>(GetWorld()->GetFirstPlayerController()->GetCharacter());
MainCamera = Cast<UCameraComponent>(TempCharacterRef->FindComponentByClass<UCameraComponent>());
//Item refs //Item refs
TargetHealingLocation = HealingItem->GetActorLocation(); TargetHealingLocation = HealingItem->GetActorLocation();
@ -91,6 +87,9 @@ void AInteraction::OnInteract()
void AInteraction::RemoveWidget() void AInteraction::RemoveWidget()
{ {
//Character & Camera refs
TempCharacterRef = Cast<ATempCharacter>(GetWorld()->GetFirstPlayerController()->GetCharacter());
MainCamera = Cast<UCameraComponent>(TempCharacterRef->FindComponentByClass<UCameraComponent>());
bDisableShopDialMove = true; bDisableShopDialMove = true;
bisDisabled = true; bisDisabled = true;
//Setting ShopWidgetText back to hidden //Setting ShopWidgetText back to hidden