admin/Project02
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin:4821d206c0a5540b037b8afb6f3c10f5bec30789
Branches Tags
admin:main
admin:dev
admin:Dev
admin:dev_20250908
admin:BagSystem
admin:V1.1
admin:master
...
compare: admin:7718b4b3c0cba3f4334b13401790fc69854c3698
Branches Tags
admin:main
admin:dev
admin:Dev
admin:dev_20250908
admin:BagSystem
admin:V1.1
admin:master

3 Commits
4821d206c0 ... 7718b4b3c0

Author SHA1 Message Date
997146918
7718b4b3c0 添加鱼市任务显示UI 2025-10-30 18:51:03 +08:00
997146918
a07705c683 调整任务UI 2025-10-28 20:03:02 +08:00
997146918
c07849c95b 添加新游戏功能 2025-10-28 19:58:18 +08:00
18 changed files with 32 additions and 1 deletions
Show Stats Expand all files Collapse all files

BIN
ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll
View File

Binary file not shown.

BIN
ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll
View File

Binary file not shown.

BIN
ProjectFish/Content/DataTable/DT_MarketQuestDialogue.uasset Normal file
View File

Binary file not shown.

BIN
ProjectFish/Content/Maps/Home.umap
View File

Binary file not shown.

BIN
ProjectFish/Content/UI/Fishing/Widgets/FollowQuest/UMG_Following_Quest_ObjectInfo.uasset
View File

Binary file not shown.

BIN
ProjectFish/Content/UI/HomeUI/Widgets/HomeFuncList/UMG_Home_FuncList.uasset
View File

Binary file not shown.

BIN
ProjectFish/Content/UI/HomeUI/Windows/UMG_HomeWindow_Main.uasset
View File

Binary file not shown.

BIN
ProjectFish/Content/UI/HomeUI/Windows/UMG_HomeWindow_Market.uasset
View File

Binary file not shown.

BIN
ProjectFish/Content/UI/Main/UMG_MainWindow.uasset Normal file
View File

Binary file not shown.

BIN
ProjectFish/Content/UI/HomeUI/Widgets/Market/UMG_Market_ContainerSwitcher.uasset → ProjectFish/Content/UI/Market/Widgets/UMG_Market_ContainerSwitcher.uasset
View File

Binary file not shown.

BIN
ProjectFish/Content/UI/Market/Widgets/UMG_Market_Dialogue_Btn.uasset Normal file
View File

Binary file not shown.

BIN
ProjectFish/Content/UI/Market/Window/UMG_Market_Dialogue.uasset Normal file
View File

Binary file not shown.

BIN
ProjectFish/Content/UI/Market/Window/UMG_Market_Main.uasset Normal file
View File

Binary file not shown.

BIN
ProjectFish/Content/UI/Quest/Widget/UMG_QuestInfo_Widget.uasset
View File

Binary file not shown.

10
ProjectFish/ProjectFish.sln.DotSettings.user
View File

@ -40,6 +40,7 @@
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ACoreUObject_002Fd_003APublic_002Fd_003AUObject_002Ff_003AUnrealType_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ACoreUObject_002Fd_003APublic_002Fd_003AUObject_002Ff_003AUObjectArray_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ACoreUObject_002Fd_003APublic_002Fd_003AUObject_002Ff_003AUObjectBase_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ACore_002Fd_003APublic_002Fd_003ATemplates_002Ff_003ASharedPointerInternals_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ACore_002Fd_003APublic_002Fd_003ATemplates_002Ff_003ASharedPointer_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ACore_002Fd_003APublic_002Fd_003ATemplates_002Ff_003ATuple_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AEngine_002Fd_003AClasses_002Fd_003AEngine_002Ff_003AEngine_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
@ -48,5 +49,12 @@
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AEngine_002Fd_003APrivate_002Ff_003AGameplayStatics_002Ecpp/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AEngine_002Fd_003APrivate_002Ff_003AUnrealEngine_002Ecpp/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ASlate_002Fd_003APrivate_002Fd_003AFramework_002Fd_003AApplication_002Ff_003ASlateApplication_002Ecpp/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ASlate_002Fd_003APrivate_002Fd_003AWidgets_002Fd_003ALayout_002Ff_003ASDPIScaler_002Ecpp/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ASlate_002Fd_003APublic_002Fd_003AFramework_002Fd_003AApplication_002Ff_003ASlateApplication_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ASlate_002Fd_003APublic_002Fd_003AWidgets_002Fd_003ALayout_002Ff_003ASBorder_002Eh/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ASlate_002Fd_003APublic_002Fd_003AWidgets_002Fd_003ALayout_002Ff_003ASBorder_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ASlate_002Fd_003APublic_002Fd_003AWidgets_002Fd_003ALayout_002Ff_003ASDPIScaler_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ASlateCore_002Fd_003APrivate_002Fd_003ALayout_002Ff_003AVisibility_002Ecpp/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003ASlateCore_002Fd_003APublic_002Fd_003ALayout_002Ff_003AVisibility_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AUMG_002Fd_003APrivate_002Fd_003ASlate_002Ff_003AUMGDragDropOp_002Ecpp/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AUMG_002Fd_003APrivate_002Ff_003ADragDropOperation_002Ecpp/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=72263A5F_002DD5F9_002D3915_002D8DA0_002DCD45C38A70E5_002Fdl_003ASource_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_002Fd_003ARuntime_002Fd_003AUMG_002Fd_003APublic_002Fd_003ASlate_002Ff_003AUMGDragDropOp_002Eh/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>

15
ProjectFish/Source/ProjectFish/Definations.h
View File

@ -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;
};

5
ProjectFish/Source/ProjectFish/Gameplay/Subsystem/GameInfoManager.cpp
View File

@ -17,6 +17,11 @@ void UGameInfoManager::Initialize(FSubsystemCollectionBase& Collection)
}
}
void UGameInfoManager::NewSaveGame()
{
UGameplayStatics::DeleteGameInSlot(SaveGameSlotName, 0);
}
void UGameInfoManager::SaveGameInfo()
{
if (!IsValid(PlayerInfo.Get()))

3
ProjectFish/Source/ProjectFish/Gameplay/Subsystem/GameInfoManager.h
View File

@ -18,6 +18,8 @@ public:
virtual void Initialize(FSubsystemCollectionBase& Collection) override;
public:
UFUNCTION(BlueprintCallable)
void NewSaveGame();
UFUNCTION(BlueprintCallable)
void SaveGameInfo();
UFUNCTION(BlueprintCallable)
@ -30,5 +32,6 @@ public:
protected:
UPROPERTY(BlueprintReadOnly)
TObjectPtr<class UPlayerInfoSaveGame> PlayerInfo;
static FString SaveGameSlotName;
};