Dialogue window fix, time of day fix and some bazaar improvements
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -97,6 +97,10 @@ void UDialogueComponent::TriggerDialogue(USpeechDataAsset* DialogueAssetPath, co
|
||||
{
|
||||
BindToControllerInput();
|
||||
bDialogueSelectOpen = false;
|
||||
}
|
||||
|
||||
if (!DialogueWidget)
|
||||
{
|
||||
DialogueWidget = Cast<UDialogueWidget>(EleriPlayerController->ToggleDialogueWindow(true));
|
||||
DialogueWidget->AssignDialogueComponent(this);
|
||||
}
|
||||
|
||||
@@ -33,7 +33,6 @@ ATimeOfDayManager::ATimeOfDayManager()
|
||||
currentMonth = 1;
|
||||
currentHours = 0;
|
||||
currentYear = 100;
|
||||
StartedTicking = false;
|
||||
ShouldRain = false;
|
||||
|
||||
RootComponent = CreateDefaultSubobject<USceneComponent>(TEXT("Root"));
|
||||
@@ -478,16 +477,6 @@ void ATimeOfDayManager::SetTimeOfDay(float Minutes)
|
||||
OnTimePassed.Broadcast(GetTimeOfDay());
|
||||
}
|
||||
|
||||
void ATimeOfDayManager::StartTimeOfDay()
|
||||
{
|
||||
StartedTicking = true;
|
||||
}
|
||||
|
||||
void ATimeOfDayManager::StopTimeOfDay()
|
||||
{
|
||||
StartedTicking = false;
|
||||
}
|
||||
|
||||
void ATimeOfDayManager::ToggleTimeActive(bool bNewActive)
|
||||
{
|
||||
TimeTicking = bNewActive;
|
||||
|
||||
@@ -299,12 +299,6 @@ public:
|
||||
UFUNCTION(BlueprintCallable, Category = "Time of day")
|
||||
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")
|
||||
void AddMinutes(float minutes);
|
||||
|
||||
@@ -373,7 +367,7 @@ protected:
|
||||
int32 GetWeatherDistributionMaxValue() const;
|
||||
UWeatherPresetDataAsset *GetWeatherDistributionValue() const;
|
||||
|
||||
bool StartedTicking;
|
||||
UPROPERTY()
|
||||
bool TimeTicking;
|
||||
|
||||
//True intensity evaluated from curve
|
||||
|
||||
Reference in New Issue
Block a user