Dialogue window fix, time of day fix and some bazaar improvements

This commit is contained in:
2026-08-20 22:31:00 +02:00
parent 4f405923a7
commit af29e5f859
23 changed files with 44 additions and 57 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -97,6 +97,10 @@ void UDialogueComponent::TriggerDialogue(USpeechDataAsset* DialogueAssetPath, co
{ {
BindToControllerInput(); BindToControllerInput();
bDialogueSelectOpen = false; bDialogueSelectOpen = false;
}
if (!DialogueWidget)
{
DialogueWidget = Cast<UDialogueWidget>(EleriPlayerController->ToggleDialogueWindow(true)); DialogueWidget = Cast<UDialogueWidget>(EleriPlayerController->ToggleDialogueWindow(true));
DialogueWidget->AssignDialogueComponent(this); DialogueWidget->AssignDialogueComponent(this);
} }

View File

@@ -33,7 +33,6 @@ ATimeOfDayManager::ATimeOfDayManager()
currentMonth = 1; currentMonth = 1;
currentHours = 0; currentHours = 0;
currentYear = 100; currentYear = 100;
StartedTicking = false;
ShouldRain = false; ShouldRain = false;
RootComponent = CreateDefaultSubobject<USceneComponent>(TEXT("Root")); RootComponent = CreateDefaultSubobject<USceneComponent>(TEXT("Root"));
@@ -478,16 +477,6 @@ void ATimeOfDayManager::SetTimeOfDay(float Minutes)
OnTimePassed.Broadcast(GetTimeOfDay()); OnTimePassed.Broadcast(GetTimeOfDay());
} }
void ATimeOfDayManager::StartTimeOfDay()
{
StartedTicking = true;
}
void ATimeOfDayManager::StopTimeOfDay()
{
StartedTicking = false;
}
void ATimeOfDayManager::ToggleTimeActive(bool bNewActive) void ATimeOfDayManager::ToggleTimeActive(bool bNewActive)
{ {
TimeTicking = bNewActive; TimeTicking = bNewActive;

View File

@@ -299,12 +299,6 @@ public:
UFUNCTION(BlueprintCallable, Category = "Time of day") UFUNCTION(BlueprintCallable, Category = "Time of day")
void SetTimeOfDay(float Minutes); void SetTimeOfDay(float Minutes);
UFUNCTION(BlueprintCallable, Category = "Time of day")
void StartTimeOfDay();
UFUNCTION(BlueprintCallable, Category = "Time of day")
void StopTimeOfDay();
UFUNCTION(BlueprintCallable, Category = "Time of day") UFUNCTION(BlueprintCallable, Category = "Time of day")
void AddMinutes(float minutes); void AddMinutes(float minutes);
@@ -373,7 +367,7 @@ protected:
int32 GetWeatherDistributionMaxValue() const; int32 GetWeatherDistributionMaxValue() const;
UWeatherPresetDataAsset *GetWeatherDistributionValue() const; UWeatherPresetDataAsset *GetWeatherDistributionValue() const;
bool StartedTicking; UPROPERTY()
bool TimeTicking; bool TimeTicking;
//True intensity evaluated from curve //True intensity evaluated from curve