diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll index 3416d8f..51a92f5 100644 Binary files a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll index be13fa2..aab4c08 100644 Binary files a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll differ diff --git a/ProjectFish/Content/DataAssets/Dialogue/Dialogue_ReadyMarket.uasset b/ProjectFish/Content/DataAssets/Dialogue/Dialogue_ReadyMarket.uasset new file mode 100644 index 0000000..6fa319a Binary files /dev/null and b/ProjectFish/Content/DataAssets/Dialogue/Dialogue_ReadyMarket.uasset differ diff --git a/ProjectFish/Content/DataTable/DT_TutorialSteps.uasset b/ProjectFish/Content/DataTable/DT_TutorialSteps.uasset index 746f6f5..9db6a23 100644 Binary files a/ProjectFish/Content/DataTable/DT_TutorialSteps.uasset and b/ProjectFish/Content/DataTable/DT_TutorialSteps.uasset differ diff --git a/ProjectFish/Content/UI/Fishing/Windows/UMG_ManagerFishingREward_Window.uasset b/ProjectFish/Content/UI/Fishing/Windows/UMG_ManagerFishingREward_Window.uasset index 6519f4a..067e326 100644 Binary files a/ProjectFish/Content/UI/Fishing/Windows/UMG_ManagerFishingREward_Window.uasset and b/ProjectFish/Content/UI/Fishing/Windows/UMG_ManagerFishingREward_Window.uasset differ diff --git a/ProjectFish/Content/UI/Fishing/Windows/UMG_ReadyWIndow.uasset b/ProjectFish/Content/UI/Fishing/Windows/UMG_ReadyWIndow.uasset index f36fd5d..0c4a19f 100644 Binary files a/ProjectFish/Content/UI/Fishing/Windows/UMG_ReadyWIndow.uasset and b/ProjectFish/Content/UI/Fishing/Windows/UMG_ReadyWIndow.uasset differ diff --git a/ProjectFish/Content/UI/HomeUI/Widgets/HomeFuncList/UMG_Home_FuncList.uasset b/ProjectFish/Content/UI/HomeUI/Widgets/HomeFuncList/UMG_Home_FuncList.uasset index 41907b1..3ecb9a7 100644 Binary files a/ProjectFish/Content/UI/HomeUI/Widgets/HomeFuncList/UMG_Home_FuncList.uasset and b/ProjectFish/Content/UI/HomeUI/Widgets/HomeFuncList/UMG_Home_FuncList.uasset differ diff --git a/ProjectFish/Content/UI/HomeUI/Windows/UMG_HomeWindow_Main.uasset b/ProjectFish/Content/UI/HomeUI/Windows/UMG_HomeWindow_Main.uasset index c54d5a2..58e8583 100644 Binary files a/ProjectFish/Content/UI/HomeUI/Windows/UMG_HomeWindow_Main.uasset and b/ProjectFish/Content/UI/HomeUI/Windows/UMG_HomeWindow_Main.uasset differ diff --git a/ProjectFish/Content/UI/Market/Widgets/UMG_Market_ContainerSwitcher.uasset b/ProjectFish/Content/UI/Market/Widgets/UMG_Market_ContainerSwitcher.uasset index 4ce6471..a81d397 100644 Binary files a/ProjectFish/Content/UI/Market/Widgets/UMG_Market_ContainerSwitcher.uasset and b/ProjectFish/Content/UI/Market/Widgets/UMG_Market_ContainerSwitcher.uasset differ diff --git a/ProjectFish/Source/ProjectFish/Definations.h b/ProjectFish/Source/ProjectFish/Definations.h index ea304fe..0fa4215 100644 --- a/ProjectFish/Source/ProjectFish/Definations.h +++ b/ProjectFish/Source/ProjectFish/Definations.h @@ -487,6 +487,8 @@ public: TSubclassOf TutorialControlUIClass; UPROPERTY(EditAnywhere, BlueprintReadOnly) TArray HiddenUINames; + // UPROPERTY(EditAnywhere, BlueprintReadOnly) + // TArray ShowUINames; }; USTRUCT(BlueprintType) diff --git a/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/TutorialManagerSubsystem.cpp b/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/TutorialManagerSubsystem.cpp index 3affcdb..6e747ad 100644 --- a/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/TutorialManagerSubsystem.cpp +++ b/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/TutorialManagerSubsystem.cpp @@ -152,7 +152,8 @@ void UTutorialManagerSubsystem::ControlUI() UWidgetBlueprintLibrary::GetAllWidgetsOfClass(this, FoundWidgets, ControlParam.TutorialControlUIClass, false); for (auto Widget: FoundWidgets) { - Cast(Widget)->TutorialHidenUI(ControlParam.HiddenUINames); + Cast(Widget)->TutorialHideUI(ControlParam.HiddenUINames); + //Cast(Widget)->TutorialShowUI(ControlParam.ShowUINames); } } diff --git a/ProjectFish/Source/ProjectFish/Gameplay/TutorialSystem/TutorialTask_CheckShipContainer.cpp b/ProjectFish/Source/ProjectFish/Gameplay/TutorialSystem/TutorialTask_CheckShipContainer.cpp new file mode 100644 index 0000000..943f1b3 --- /dev/null +++ b/ProjectFish/Source/ProjectFish/Gameplay/TutorialSystem/TutorialTask_CheckShipContainer.cpp @@ -0,0 +1,15 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "TutorialTask_CheckShipContainer.h" + +void UTutorialTask_CheckShipContainer::Execute_Implementation(class AGameModeBase* GameMode) +{ + Super::Execute_Implementation(GameMode); + +} + +void UTutorialTask_CheckShipContainer::BeforTutorialComplete_Implementation() +{ + Super::BeforTutorialComplete_Implementation(); +} diff --git a/ProjectFish/Source/ProjectFish/Gameplay/TutorialSystem/TutorialTask_CheckShipContainer.h b/ProjectFish/Source/ProjectFish/Gameplay/TutorialSystem/TutorialTask_CheckShipContainer.h new file mode 100644 index 0000000..af6d271 --- /dev/null +++ b/ProjectFish/Source/ProjectFish/Gameplay/TutorialSystem/TutorialTask_CheckShipContainer.h @@ -0,0 +1,19 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "TutorialTask_Base.h" +#include "TutorialTask_CheckShipContainer.generated.h" + +/** + * + */ +UCLASS() +class PROJECTFISH_API UTutorialTask_CheckShipContainer : public UTutorialTask_Base +{ + GENERATED_BODY() + virtual void Execute_Implementation(class AGameModeBase* GameMode) override; + + virtual void BeforTutorialComplete_Implementation() override; +}; diff --git a/ProjectFish/Source/ProjectFish/Widget/TutorialControlWidget_Base.h b/ProjectFish/Source/ProjectFish/Widget/TutorialControlWidget_Base.h index 4dd1f2c..49a2d3c 100644 --- a/ProjectFish/Source/ProjectFish/Widget/TutorialControlWidget_Base.h +++ b/ProjectFish/Source/ProjectFish/Widget/TutorialControlWidget_Base.h @@ -16,5 +16,7 @@ class PROJECTFISH_API UTutorialControlWidget_Base : public UUserWidget public: UFUNCTION(BlueprintImplementableEvent) - void TutorialHidenUI(const TArray& HiddenNames); + void TutorialHideUI(const TArray& UINames); + // UFUNCTION(BlueprintImplementableEvent) + // void TutorialShowUI(const TArray& UINames); };