Compare commits

..

80 Commits

Author SHA1 Message Date
3959389f3e 更新对话编辑器 2025-11-18 15:37:21 +08:00
45eec41cbf 添加对话系统插件 2025-11-17 15:11:34 +08:00
31311ad092 修复鱼获 ui点击bug 2025-11-03 16:04:43 +08:00
45f580cc70 修复item拖拽bug 2025-11-03 15:57:30 +08:00
d4509f92e3 修改鱼市任务UI 拖拽bug 2025-11-03 13:35:35 +08:00
f80c48465c 添加容器原本位置存在item 替换拖拽 2025-11-02 19:26:19 +08:00
f9674f5445 修复拖拽后原物品不会删除的bug 2025-11-02 18:19:05 +08:00
cb74c13494 更新 ui拖拽时 可以进行旋转 2025-11-02 18:11:38 +08:00
253df874a3 添加可拖拽UI 2025-11-02 14:29:35 +08:00
0513ccc3d7 添加发现新的鱼 ui信息 2025-11-01 19:02:26 +08:00
220ea3a481 完善鱼信息配置类 2025-10-31 18:56:27 +08:00
a07bf2a19c 鱼的配置信息中添加id 2025-10-31 18:49:46 +08:00
c3e1ed0762 添加预试种物品 信息显示 2025-10-31 17:38:46 +08:00
f4fe5cc478 更新鱼市的任务系统 2025-10-31 11:52:15 +08:00
5df127f3ed 更新鱼市UI 2025-10-31 11:32:13 +08:00
99a6d3b35a 完善鱼市任务提交界面 2025-10-31 11:18:51 +08:00
7718b4b3c0 添加鱼市任务显示UI 2025-10-30 18:51:03 +08:00
a07705c683 调整任务UI 2025-10-28 20:03:02 +08:00
c07849c95b 添加新游戏功能 2025-10-28 19:58:18 +08:00
4821d206c0 修改任务资源复制时 id自动增加 2025-10-28 19:50:58 +08:00
0f942b0b77 更新获得鱼获后 完成任务 2025-10-28 18:33:39 +08:00
111f68fa10 完善追踪任务UI 2025-10-28 17:43:28 +08:00
1ccc1d8796 更新任务的存档功能 2025-10-28 15:29:36 +08:00
f07e298eb8 添加任务追踪功能 2025-10-28 15:15:27 +08:00
3c084a8795 更新任务列表UI 2025-10-27 20:05:54 +08:00
8917abed28 添加任务系统UI 2025-10-27 18:46:54 +08:00
10d2c7e354 完善任务存档数据的加载读取 2025-10-27 15:54:43 +08:00
a8756f2e4c 添加任务系统 2025-10-27 14:34:45 +08:00
016199c0a5 修复拖拽位置bug 2025-10-24 15:12:19 +08:00
f2173d2ae1 修复物品拖拽bug 2025-10-24 15:05:20 +08:00
34039547f9 修改物品摆放bug 2025-10-23 19:35:35 +08:00
284ace6683 修改背包物品摆放位置逻辑bug 2025-10-23 18:54:09 +08:00
3842f9b8f2 修改鱼获摆放位置bug 2025-10-23 09:59:26 +08:00
cb029ce971 修改鱼获获取界面 ui显示bug 2025-10-23 08:37:57 +08:00
a963437069 修复显示bug 2025-10-22 19:38:46 +08:00
8106645812 调整舱位容器结构 2025-10-22 19:31:01 +08:00
e3dd0f022f 更新仓库UI 2025-10-22 17:50:03 +08:00
f2b7dc65dd 添加鱼市UI 2025-10-22 10:03:28 +08:00
1d294c5ee6 添加鱼市UI window 2025-10-21 19:36:45 +08:00
427bede723 添加仓库UI 2025-10-21 19:33:48 +08:00
905e881cab 添加鱼获ui背景颜色 2025-10-21 17:17:43 +08:00
86c87dbe64 Merge branch 'dev' 2025-10-21 10:04:25 +08:00
7aac1a1544 修复存档保存bug 2025-10-21 10:01:04 +08:00
08e4076f22 修改鱼获显示bug 2025-10-21 09:50:35 +08:00
3a6b9042f1 更新船舱的保存功能 2025-10-21 09:17:17 +08:00
2c6e4f2a89 修改船舱的存档功能 2025-10-20 20:37:52 +08:00
4f33cfbd32 修复船舱添加bug 2025-10-20 20:16:33 +08:00
c00a1064b1 修改容器添加逻辑判断bug 2025-10-20 19:59:38 +08:00
680b6b3d87 修复船舱添加物品bug 2025-10-20 19:49:47 +08:00
a8f426c2fc 添加船舱UI 2025-10-20 19:44:19 +08:00
df2e59ac80 设置鱼获鼠标右键旋转 2025-10-20 18:10:28 +08:00
f270a852d3 添加可移动鱼获 2025-10-18 19:18:58 +08:00
b45581bd90 更新鱼获数据的存储读取 2025-10-18 10:41:43 +08:00
ce4efe2972 更新容器添加可旋转的shape物品 2025-10-17 18:59:12 +08:00
c340c59eab 添加属性存档 2025-10-16 19:24:59 +08:00
4c07e0601d 调整资源类型 2025-10-15 18:25:31 +08:00
37dd8f735e 修改鱼获的UI显示 2025-10-14 19:48:48 +08:00
3e0d32b97f 调整鱼获的ui显示 2025-10-14 19:44:34 +08:00
9cf66d29ca 添加击败敌人后的鱼获UI 2025-10-14 19:06:06 +08:00
1d06510bf7 删除exe文件 ignore 2025-10-14 15:54:45 +08:00
6c1571fa4c 添加鱼获配置 2025-10-14 15:54:07 +08:00
d902bb9255 更新ignore文件 2025-10-14 15:41:17 +08:00
2cd0504023 Merge branch 'main' of http://www.ntopia-tech.com:30000/admin/Project02
# Conflicts:
#	ProjectFish/Release/Windows/Manifest_NonUFSFiles_Win64.txt
#	ProjectFish/Release/Windows/Manifest_UFSFiles_Win64.txt
#	ProjectFish/Release/Windows/ProjectFish/Content/Paks/ProjectFish-Windows.pak
#	ProjectFish/Release/Windows/ProjectFish/Content/Paks/ProjectFish-Windows.ucas
#	ProjectFish/Release/Windows/ProjectFish/Content/Paks/ProjectFish-Windows.utoc
2025-10-14 11:56:52 +08:00
248bffdc34 添加打包后的文件 2025-10-14 11:54:23 +08:00
0fb5705210 鱼类资源中配置鱼获资源 2025-10-13 20:18:00 +08:00
f07f48e2ae 添加鱼获资源 2025-10-13 19:38:10 +08:00
224bde8e47 添加家园UI 出行UI 2025-10-13 17:39:17 +08:00
e0b187cf7e 添加打包后的文件 2025-10-10 17:24:06 +08:00
2b29c2096a 解决打包错误 2025-10-10 15:04:08 +08:00
a377b9e0fc 更新材质切换 2025-10-10 10:24:43 +08:00
76cb4541b8 添加模式切换模式UI 2025-10-09 11:35:42 +08:00
dac6c48d38 添加基础的桌面透明功能 2025-10-02 19:28:58 +08:00
dc714bfd03 接触背包鱼鱼竿间的技能拖拽限制 2025-09-28 18:31:47 +08:00
17e1f726e2 更新添加对战结束后,返回对战前的场景 2025-09-28 18:29:15 +08:00
828ced50ab 修改无限耐久度 在ui上不显示 2025-09-28 17:50:07 +08:00
4f3a60c2e6 更新鱼的相关信息配置功能 2025-09-28 15:38:29 +08:00
e995564111 调整船只的最大可移动角度 2025-09-26 13:42:53 +08:00
6598a5f66d 修改鱼竿的拖拽复制bug 2025-09-25 16:42:26 +08:00
654a90892f 修改船只的默认属性配置 2025-09-25 16:37:54 +08:00
6677b285b8 更新玩家背包默认使用的配置资源 2025-09-25 16:22:16 +08:00
299 changed files with 8635 additions and 424 deletions

2
.gitignore vendored
View File

@ -27,7 +27,6 @@
*.lib
# Executables
*.exe
*.out
*.app
*.ipa
@ -113,3 +112,4 @@ DerivedDataCache/*
/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.pdb
/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.pdb
/ProjectFish/Binaries/Win64/*.exp
/ProjectFish/Plugins/DeskMode/Intermediate

View File

@ -0,0 +1,9 @@
{
"permissions": {
"allow": [
"Bash(dir:*)"
],
"deny": [],
"ask": []
}
}

View File

@ -8028,6 +8028,38 @@
{
"Path": "$(ProjectDir)/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(ProjectDir)/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(ProjectDir)/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(ProjectDir)/Plugins/DeskMode/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
},
{
"Path": "$(ProjectDir)/Plugins/Dialogue/Binaries/Win64/UnrealEditor-Dialogue.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(ProjectDir)/Plugins/Dialogue/Binaries/Win64/UnrealEditor-Dialogue.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(ProjectDir)/Plugins/Dialogue/Binaries/Win64/UnrealEditor-DialogueEditor.dll",
"Type": "DynamicLibrary"
},
{
"Path": "$(ProjectDir)/Plugins/Dialogue/Binaries/Win64/UnrealEditor-DialogueEditor.pdb",
"Type": "SymbolFile"
},
{
"Path": "$(ProjectDir)/Plugins/Dialogue/Binaries/Win64/UnrealEditor.modules",
"Type": "RequiredResource"
}
],
"RuntimeDependencies": [
@ -33759,6 +33791,14 @@
"Path": "$(EngineDir)/Plugins/XGEController/XGEController.uplugin",
"Type": "UFS"
},
{
"Path": "$(ProjectDir)/Plugins/DeskMode/DeskMode.uplugin",
"Type": "UFS"
},
{
"Path": "$(ProjectDir)/Plugins/Dialogue/Dialogue.uplugin",
"Type": "UFS"
},
{
"Path": "$(ProjectDir)/ProjectFish.uproject",
"Type": "UFS"
@ -33827,6 +33867,8 @@
"Dataflow",
"DatasmithContent",
"DeformerGraph",
"DeskMode",
"Dialogue",
"DumpGPUServices",
"EOSShared",
"EditorDataStorage",

View File

@ -29,10 +29,12 @@ r.Lumen.TraceMeshSDFs=0
r.Lumen.Reflections.HardwareRayTracing.Translucent.Refraction.EnableForProject=True
r.Lumen.TranslucencyReflections.FrontLayer.EnableForProject=False
r.Shadow.TranslucentPerObject.ProjectEnabled=False
r.PostProcessing.PropagateAlpha=True
r.D3D11.UseAllowTearing=0
[/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
DefaultGraphicsRHI=DefaultGraphicsRHI_DX11
DefaultGraphicsRHI=DefaultGraphicsRHI_DX11
-D3D12TargetedShaderFormats=PCD3D_SM5
+D3D12TargetedShaderFormats=PCD3D_SM6
-D3D11TargetedShaderFormats=PCD3D_SM5
@ -98,6 +100,9 @@ ManualIPAddress=
+ClassRedirects=(OldName="/Script/ProjectFish.PlayerInventorySubsystem",NewName="/Script/ProjectFish.FishingRodConfigSubsystem")
+ClassRedirects=(OldName="/Script/ProjectFish.SimpleMapSystem",NewName="/Script/ProjectFish.FishingMapSubSystem")
+ClassRedirects=(OldName="/Script/ProjectFish.FishingMapSystem",NewName="/Script/ProjectFish.FishingMapSubSystem")
+ClassRedirects=(OldName="/Script/ProjectFish.BagShapeAsset",NewName="/Script/ProjectFish.ShapeAsset")
+ClassRedirects=(OldName="/Script/ProjectFishEditor.BagShapeFactory",NewName="/Script/ProjectFishEditor.ShapeFactory")
+ClassRedirects=(OldName="/Script/ProjectFishEditor.BagShapeAssetThumbnailRenderer",NewName="/Script/ProjectFishEditor.ShapeAssetThumbnailRenderer")
[/Script/Engine.CollisionProfile]
-Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision",bCanModify=False)

View File

@ -5,3 +5,19 @@ ProjectName=Top Down Game Template
[/Script/ProjectFish.ProjectFishCharacter]
FixedCameraPitch=-45.0
FixedCameraDistance=1500.0
[/Script/Engine.AssetManagerSettings]
-PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass=/Script/Engine.World,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
-PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass=/Script/Engine.PrimaryAssetLabel,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
+PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass="/Script/Engine.World",bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
+PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass="/Script/Engine.PrimaryAssetLabel",bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
+PrimaryAssetTypesToScan=(PrimaryAssetType="FishingRewardDataAsset",AssetBaseClass="/Script/ProjectFish.FishingRewardDataAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/DataAssets/FishReward")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=AlwaysCook))
+PrimaryAssetTypesToScan=(PrimaryAssetType="ShapeAsset",AssetBaseClass="/Script/ProjectFish.ShapeAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/DataAssets")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=AlwaysCook))
+PrimaryAssetTypesToScan=(PrimaryAssetType="QuestAsset",AssetBaseClass="/Script/ProjectFish.QuestAsset",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/DataAssets/Quest")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=AlwaysCook))
bOnlyCookProductionAssets=False
bShouldManagerDetermineTypeAndName=False
bShouldGuessTypeAndNameInEditor=True
bShouldAcquireMissingChunksOnLoad=False
bShouldWarnAboutInvalidAssets=True
MetaDataTagsForAssetRegistry=()

View File

@ -10,5 +10,8 @@ InvalidTagCharacters="\"\',"
+GameplayTagRedirects=(OldTagName="Skill.PoserPull",NewTagName="Skill.PowerPull")
NumBitsForContainerSize=6
NetIndexFirstBitSegment=16
+GameplayTagList=(Tag="FishReward",DevComment="鱼获")
+GameplayTagList=(Tag="FishReward.Fish1",DevComment="")
+GameplayTagList=(Tag="FishReward.Fish2",DevComment="")
+GameplayTagList=(Tag="Skill.PowerPull",DevComment="")

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More