diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.dll deleted file mode 100644 index ac55444..0000000 Binary files a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.dll and /dev/null differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll index 9cc4474..4f6bc22 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-0001.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0001.dll deleted file mode 100644 index 7c163af..0000000 Binary files a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0001.dll and /dev/null differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll index 74517cf..1978833 100644 Binary files a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor.modules b/ProjectFish/Binaries/Win64/UnrealEditor.modules index fe900f8..22c08e6 100644 --- a/ProjectFish/Binaries/Win64/UnrealEditor.modules +++ b/ProjectFish/Binaries/Win64/UnrealEditor.modules @@ -2,7 +2,7 @@ "BuildId": "37670630", "Modules": { - "ProjectFish": "UnrealEditor-ProjectFish-0001.dll", - "ProjectFishEditor": "UnrealEditor-ProjectFishEditor-0001.dll" + "ProjectFish": "UnrealEditor-ProjectFish.dll", + "ProjectFishEditor": "UnrealEditor-ProjectFishEditor.dll" } } \ No newline at end of file diff --git a/ProjectFish/Content/DataTable/DT_MarketQuestDialogue.uasset b/ProjectFish/Content/DataTable/DT_MarketQuestDialogue.uasset new file mode 100644 index 0000000..650a14f Binary files /dev/null and b/ProjectFish/Content/DataTable/DT_MarketQuestDialogue.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 afd4deb..41907b1 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_Market.uasset b/ProjectFish/Content/UI/HomeUI/Windows/UMG_HomeWindow_Market.uasset deleted file mode 100644 index 18136d9..0000000 Binary files a/ProjectFish/Content/UI/HomeUI/Windows/UMG_HomeWindow_Market.uasset and /dev/null differ diff --git a/ProjectFish/Content/UI/HomeUI/Widgets/Market/UMG_Market_ContainerSwitcher.uasset b/ProjectFish/Content/UI/Market/Widgets/UMG_Market_ContainerSwitcher.uasset similarity index 55% rename from ProjectFish/Content/UI/HomeUI/Widgets/Market/UMG_Market_ContainerSwitcher.uasset rename to ProjectFish/Content/UI/Market/Widgets/UMG_Market_ContainerSwitcher.uasset index a1e7c18..4ce6471 100644 Binary files a/ProjectFish/Content/UI/HomeUI/Widgets/Market/UMG_Market_ContainerSwitcher.uasset and b/ProjectFish/Content/UI/Market/Widgets/UMG_Market_ContainerSwitcher.uasset differ diff --git a/ProjectFish/Content/UI/Market/Widgets/UMG_Market_Dialogue_Btn.uasset b/ProjectFish/Content/UI/Market/Widgets/UMG_Market_Dialogue_Btn.uasset new file mode 100644 index 0000000..1d259b9 Binary files /dev/null and b/ProjectFish/Content/UI/Market/Widgets/UMG_Market_Dialogue_Btn.uasset differ diff --git a/ProjectFish/Content/UI/Market/Window/UMG_Market_Dialogue.uasset b/ProjectFish/Content/UI/Market/Window/UMG_Market_Dialogue.uasset new file mode 100644 index 0000000..b9d6c9b Binary files /dev/null and b/ProjectFish/Content/UI/Market/Window/UMG_Market_Dialogue.uasset differ diff --git a/ProjectFish/Content/UI/Market/Window/UMG_Market_Main.uasset b/ProjectFish/Content/UI/Market/Window/UMG_Market_Main.uasset new file mode 100644 index 0000000..9ef86e1 Binary files /dev/null and b/ProjectFish/Content/UI/Market/Window/UMG_Market_Main.uasset differ diff --git a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode-0001.dll b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode-0001.dll deleted file mode 100644 index cfb38bc..0000000 Binary files a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode-0001.dll and /dev/null differ diff --git a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules index b19fd1c..437a3ab 100644 --- a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules +++ b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules @@ -2,6 +2,6 @@ "BuildId": "37670630", "Modules": { - "DeskMode": "UnrealEditor-DeskMode-0001.dll" + "DeskMode": "UnrealEditor-DeskMode.dll" } } \ No newline at end of file diff --git a/ProjectFish/ProjectFish.sln.DotSettings.user b/ProjectFish/ProjectFish.sln.DotSettings.user index b661920..c180708 100644 --- a/ProjectFish/ProjectFish.sln.DotSettings.user +++ b/ProjectFish/ProjectFish.sln.DotSettings.user @@ -40,6 +40,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded @@ -48,5 +49,12 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded - ForceIncluded \ No newline at end of file + ForceIncluded + ForceIncluded + ForceIncluded + ForceIncluded + ForceIncluded + ForceIncluded + ForceIncluded \ No newline at end of file diff --git a/ProjectFish/Source/ProjectFish/Definations.h b/ProjectFish/Source/ProjectFish/Definations.h index 2b9d3a7..34dbc27 100644 --- a/ProjectFish/Source/ProjectFish/Definations.h +++ b/ProjectFish/Source/ProjectFish/Definations.h @@ -6,6 +6,7 @@ #include "GameplayTagContainer.h" #include "PawnWithSkill.h" #include "DataAsset/ShapeAsset.h" +#include "Quest/QuestTypes.h" #include "UObject/Object.h" #include "Definations.generated.h" @@ -462,6 +463,20 @@ struct FSimpleConnection } }; +USTRUCT(BlueprintType) +struct FMarketQuestDialogue: public FTableRowBase +{ + GENERATED_BODY() +public: + UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ToolTip = "任务对话")) + FText QuestTitle; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ToolTip = "任务对话")) + FText QuestDialogue; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ToolTip = "任务ID")) + int32 QuestID; +};