diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll index dc09ac8..cde94ea 100644 Binary files a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll differ diff --git a/ProjectFish/Content/DataAssets/Dialogue/Dialogue_Battle.uasset b/ProjectFish/Content/DataAssets/Dialogue/Dialogue_Battle.uasset index 3a384d3..e46de95 100644 Binary files a/ProjectFish/Content/DataAssets/Dialogue/Dialogue_Battle.uasset and b/ProjectFish/Content/DataAssets/Dialogue/Dialogue_Battle.uasset differ diff --git a/ProjectFish/Content/DataAssets/Dialogue/Dialogue_FirstQuest.uasset b/ProjectFish/Content/DataAssets/Dialogue/Dialogue_FirstQuest.uasset index a1bbb2a..f578c7c 100644 Binary files a/ProjectFish/Content/DataAssets/Dialogue/Dialogue_FirstQuest.uasset and b/ProjectFish/Content/DataAssets/Dialogue/Dialogue_FirstQuest.uasset differ diff --git a/ProjectFish/Content/UI/Dialogue/UMG_DialogueWindow.uasset b/ProjectFish/Content/UI/Dialogue/UMG_DialogueWindow.uasset index 8afc438..d7a0379 100644 Binary files a/ProjectFish/Content/UI/Dialogue/UMG_DialogueWindow.uasset and b/ProjectFish/Content/UI/Dialogue/UMG_DialogueWindow.uasset differ diff --git a/ProjectFish/Content/UI/Dialogue/UMG_DialogueWindow_AutoPlay.uasset b/ProjectFish/Content/UI/Dialogue/UMG_DialogueWindow_AutoPlay.uasset new file mode 100644 index 0000000..e7e874d Binary files /dev/null and b/ProjectFish/Content/UI/Dialogue/UMG_DialogueWindow_AutoPlay.uasset differ diff --git a/ProjectFish/Plugins/Dialogue/Binaries/Win64/UnrealEditor-Dialogue.dll b/ProjectFish/Plugins/Dialogue/Binaries/Win64/UnrealEditor-Dialogue.dll index 43be0e6..1e702f8 100644 Binary files a/ProjectFish/Plugins/Dialogue/Binaries/Win64/UnrealEditor-Dialogue.dll and b/ProjectFish/Plugins/Dialogue/Binaries/Win64/UnrealEditor-Dialogue.dll differ diff --git a/ProjectFish/Plugins/Dialogue/Binaries/Win64/UnrealEditor-DialogueEditor.dll b/ProjectFish/Plugins/Dialogue/Binaries/Win64/UnrealEditor-DialogueEditor.dll index cb2bb19..b883628 100644 Binary files a/ProjectFish/Plugins/Dialogue/Binaries/Win64/UnrealEditor-DialogueEditor.dll and b/ProjectFish/Plugins/Dialogue/Binaries/Win64/UnrealEditor-DialogueEditor.dll differ diff --git a/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/TutorialManagerSubsystem.cpp b/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/TutorialManagerSubsystem.cpp index 65e8691..7ae972a 100644 --- a/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/TutorialManagerSubsystem.cpp +++ b/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/TutorialManagerSubsystem.cpp @@ -20,7 +20,7 @@ void UTutorialManagerSubsystem::Initialize(FSubsystemCollectionBase& Collection) Super::Initialize(Collection); Collection.InitializeDependency(); - DialogueUIPath = (TEXT("/Game/UI/Dialogue/UMG_DialogueWindow.UMG_DialogueWindow_C")); + //DialogueUIPath = (TEXT("/Game/UI/Dialogue/UMG_DialogueWindow.UMG_DialogueWindow_C")); } void UTutorialManagerSubsystem::InitSteps(TArray Steps) @@ -116,8 +116,18 @@ void UTutorialManagerSubsystem::OnDialogueCompleted() void UTutorialManagerSubsystem::ShowDialogue() { + FTimerHandle TimerHandle; + GetWorld()->GetTimerManager().SetTimer( + TimerHandle, + this, + &UTutorialManagerSubsystem::OnDialogueCompleted, + 1.0f, // 间隔时间 + true, // 是否循环 + -1.0f, // 首次延迟(-1表示使用间隔时间) + false // bUseGameTime = false,使用真实时间 + ); FTutorialStep CurrentStep = TutorialSteps[CurrentTutorialStep]; - UClass* WidgetClass = LoadClass(this, *DialogueUIPath); + UClass* WidgetClass = CurrentStep.Dialogue->DialogueWidget.Get(); if (WidgetClass) { DialogueWidget = CreateWidget(GetWorld(), WidgetClass); diff --git a/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/TutorialManagerSubsystem.h b/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/TutorialManagerSubsystem.h index fd164e7..04be882 100644 --- a/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/TutorialManagerSubsystem.h +++ b/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/TutorialManagerSubsystem.h @@ -57,7 +57,7 @@ protected: TArray TutorialSteps; int32 CurrentTutorialStep = 0; - FString DialogueUIPath; + //FString DialogueUIPath; UPROPERTY() class UDialogueWidget_Base* DialogueWidget;