izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Tutorial alert now dismisses again when tutorial is taken

Browse Source 
Undo issue caused by bad merge

#codereview James.Golding

[CL 2303871 by Thomas Sarkanen in Main branch]
This commit is contained in:
Thomas Sarkanen
2014-09-19 07:03:06 -04:00
committed by UnrealBot
parent 8d923f7226
commit 696af0bf93
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Engine/Source/Editor/IntroTutorials/Private/STutorialButton.cpp
View File

@@ -132,34 +132,34 @@ int32 STutorialButton::OnPaint(const FPaintArgs& Args, const FGeometry& Allotted
FReply STutorialButton::HandleButtonClicked()
{
UEditorTutorial* AttractTutorial = nullptr;
UEditorTutorial* LaunchTutorial = nullptr;
FString BrowserFilter;
GetDefault<UEditorTutorialSettings>()->FindTutorialInfoForContext(Context, AttractTutorial, LaunchTutorial, BrowserFilter);
RefreshStatus();
bTutorialAvailable = (LaunchTutorial != nullptr);
bTutorialCompleted = (LaunchTutorial != nullptr) && GetDefault<UTutorialStateSettings>()->HaveCompletedTutorial(LaunchTutorial);
bTutorialDismissed = (AttractTutorial != nullptr) && GetDefault<UTutorialStateSettings>()->IsTutorialDismissed(AttractTutorial);
if (FEngineAnalytics::IsAvailable())
if( FEngineAnalytics::IsAvailable() )
{
TArray<FAnalyticsEventAttribute> EventAttributes;
EventAttributes.Add(FAnalyticsEventAttribute(TEXT("Context"), Context.ToString()));
EventAttributes.Add(FAnalyticsEventAttribute(TEXT("TimeSinceAlertStarted"), (AlertStartTime != 0.0f && ShouldShowAlert()) ? (FPlatformTime::Seconds() - AlertStartTime) : -1.0f));
EventAttributes.Add(FAnalyticsEventAttribute(TEXT("LaunchedBrowser"), ShouldLaunchBrowser()));
FEngineAnalytics::GetProvider().RecordEvent(TEXT("Rocket.Tutorials.ClickedContextButton"), EventAttributes);
FEngineAnalytics::GetProvider().RecordEvent( TEXT("Rocket.Tutorials.ClickedContextButton"), EventAttributes );
}
FIntroTutorials& IntroTutorials = FModuleManager::GetModuleChecked<FIntroTutorials>(TEXT("IntroTutorials"));
if (ShouldLaunchBrowser())
if(ShouldLaunchBrowser())
{
IntroTutorials.SummonTutorialBrowser(ContextWindow, BrowserFilter);
IntroTutorials.SummonTutorialBrowser(ContextWindow.Pin().ToSharedRef(), CachedBrowserFilter);
}
else if (LaunchTutorial != nullptr)
else if (CachedLaunchTutorial != nullptr)
{
auto Delegate = FSimpleDelegate::CreateSP(this, &STutorialButton::HandleTutorialExited);
const bool bRestart = true;
IntroTutorials.LaunchTutorial(LaunchTutorial, bRestart, ContextWindow);
IntroTutorials.LaunchTutorial(CachedLaunchTutorial, bRestart, ContextWindow, Delegate, Delegate);
const bool bDismissAcrossSessions = true;
GetMutableDefault<UTutorialStateSettings>()->DismissTutorial(CachedLaunchTutorial, bDismissAcrossSessions);
GetMutableDefault<UTutorialStateSettings>()->SaveProgress();
bTutorialDismissed = true;
}
return FReply::Handled();
@@ -209,16 +209,16 @@ void STutorialButton::DismissAlert()
{
RefreshStatus();
if( FEngineAnalytics::IsAvailable() )
{
TArray<FAnalyticsEventAttribute> EventAttributes;
EventAttributes.Add(FAnalyticsEventAttribute(TEXT("Context"), Context.ToString()));
EventAttributes.Add(FAnalyticsEventAttribute(TEXT("TimeSinceAlertStarted"), (AlertStartTime != 0.0f && ShouldShowAlert()) ? (FPlatformTime::Seconds() - AlertStartTime) : -1.0f));
if( FEngineAnalytics::IsAvailable() )
{
TArray<FAnalyticsEventAttribute> EventAttributes;
EventAttributes.Add(FAnalyticsEventAttribute(TEXT("Context"), Context.ToString()));
EventAttributes.Add(FAnalyticsEventAttribute(TEXT("TimeSinceAlertStarted"), (AlertStartTime != 0.0f && ShouldShowAlert()) ? (FPlatformTime::Seconds() - AlertStartTime) : -1.0f));
FEngineAnalytics::GetProvider().RecordEvent( TEXT("Rocket.Tutorials.DismissedTutorialAlert"), EventAttributes );
}
FEngineAnalytics::GetProvider().RecordEvent( TEXT("Rocket.Tutorials.DismissedTutorialAlert"), EventAttributes );
}
const bool bDismissAcrossSessions = true;
const bool bDismissAcrossSessions = true;
if (CachedAttractTutorial != nullptr)
{
GetMutableDefault<UTutorialStateSettings>()->DismissTutorial(CachedAttractTutorial, bDismissAcrossSessions);
@@ -227,12 +227,12 @@ void STutorialButton::DismissAlert()
{
GetMutableDefault<UTutorialStateSettings>()->DismissTutorial(CachedLaunchTutorial, bDismissAcrossSessions);
}
GetMutableDefault<UTutorialStateSettings>()->SaveProgress();
bTutorialDismissed = true;
GetMutableDefault<UTutorialStateSettings>()->SaveProgress();
bTutorialDismissed = true;
FIntroTutorials& IntroTutorials = FModuleManager::GetModuleChecked<FIntroTutorials>(TEXT("IntroTutorials"));
IntroTutorials.CloseAllTutorialContent();
}
FIntroTutorials& IntroTutorials = FModuleManager::GetModuleChecked<FIntroTutorials>(TEXT("IntroTutorials"));
IntroTutorials.CloseAllTutorialContent();
}
void STutorialButton::LaunchTutorial()
{