diff --git a/Source/the_twilight_abyss/Quest/QuestSystem.h b/Source/the_twilight_abyss/Quest/QuestSystem.h index 4c776ed..8d553df 100644 --- a/Source/the_twilight_abyss/Quest/QuestSystem.h +++ b/Source/the_twilight_abyss/Quest/QuestSystem.h @@ -32,6 +32,9 @@ public: UPROPERTY(VisibleAnywhere, BlueprintReadOnly) bool bHasSubQuest = false; + UPROPERTY() + UUserWidget* QuestWidgetInstance; + protected: // Called when the game starts virtual void BeginPlay() override; @@ -39,8 +42,6 @@ protected: UPROPERTY() TSubclassOf QuestWidget; UPROPERTY() - UUserWidget* QuestWidgetInstance; - UPROPERTY() TSubclassOf QuestCompletionWidget; UPROPERTY() UUserWidget* QuestCompletionWidgetInstance; diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 56d3a5b..c2f00a4 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -13,6 +13,7 @@ #include "Kismet/KismetMathLibrary.h" #include "Misc/OutputDeviceNull.h" #include "the_twilight_abyss/PlayerTemp/TempCharacter.h" +#include "the_twilight_abyss/Quest/QuestSystem.h" // Sets default values ATurnBaseCombatV2::ATurnBaseCombatV2() @@ -46,7 +47,8 @@ void ATurnBaseCombatV2::StartCombat(AActor* Enemy, bool bWasShot) EscapePercentageTextBlock->SetText(FText::Join(FText::FromString(""), FText::FromString(FString::FromInt(EscapePercentage * 100)), FText::FromString("%"))); bIsInCombat = true; UBlackboardComponent* EnemyBlackboard = Cast(Enemy->GetInstigatorController())->GetBlackboardComponent(); - + Cast(PlayerActor->GetComponentByClass(UQuestSystem::StaticClass()))->QuestWidgetInstance->SetVisibility(ESlateVisibility::Hidden); + //Disable Character Movement APlayerController* PlayerController = GetWorld()->GetFirstPlayerController(); PlayerController->SetIgnoreMoveInput(true); @@ -126,6 +128,7 @@ void ATurnBaseCombatV2::EndCombat() BookHUD->SetVisibility(ESlateVisibility::Hidden); HUD->RemoveFromParent(); BookStaticMeshComponent->SetVisibility(false); + Cast(PlayerActor->GetComponentByClass(UQuestSystem::StaticClass()))->QuestWidgetInstance->SetVisibility(ESlateVisibility::HitTestInvisible); Cast(PlayerActor)->ResetWidgetPointer(); TurnIndicatorTextBlock->SetText(FText::FromString("")); bEnemyHasExtraTurn = false;