Compare commits
80 Commits
dev_202509
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 3959389f3e | |||
| 45eec41cbf | |||
| 31311ad092 | |||
| 45f580cc70 | |||
| d4509f92e3 | |||
| f80c48465c | |||
| f9674f5445 | |||
| cb74c13494 | |||
| 253df874a3 | |||
| 0513ccc3d7 | |||
| 220ea3a481 | |||
| a07bf2a19c | |||
| c3e1ed0762 | |||
| f4fe5cc478 | |||
| 5df127f3ed | |||
| 99a6d3b35a | |||
| 7718b4b3c0 | |||
| a07705c683 | |||
| c07849c95b | |||
| 4821d206c0 | |||
| 0f942b0b77 | |||
| 111f68fa10 | |||
| 1ccc1d8796 | |||
| f07e298eb8 | |||
| 3c084a8795 | |||
| 8917abed28 | |||
| 10d2c7e354 | |||
| a8756f2e4c | |||
| 016199c0a5 | |||
| f2173d2ae1 | |||
| 34039547f9 | |||
| 284ace6683 | |||
| 3842f9b8f2 | |||
| cb029ce971 | |||
| a963437069 | |||
| 8106645812 | |||
| e3dd0f022f | |||
| f2b7dc65dd | |||
| 1d294c5ee6 | |||
| 427bede723 | |||
| 905e881cab | |||
| 86c87dbe64 | |||
| 7aac1a1544 | |||
| 08e4076f22 | |||
| 3a6b9042f1 | |||
| 2c6e4f2a89 | |||
| 4f33cfbd32 | |||
| c00a1064b1 | |||
| 680b6b3d87 | |||
| a8f426c2fc | |||
| df2e59ac80 | |||
| f270a852d3 | |||
| b45581bd90 | |||
| ce4efe2972 | |||
| c340c59eab | |||
| 4c07e0601d | |||
| 37dd8f735e | |||
| 3e0d32b97f | |||
| 9cf66d29ca | |||
| 1d06510bf7 | |||
| 6c1571fa4c | |||
| d902bb9255 | |||
| 2cd0504023 | |||
| 248bffdc34 | |||
| 0fb5705210 | |||
| f07f48e2ae | |||
| 224bde8e47 | |||
| e0b187cf7e | |||
| 2b29c2096a | |||
| a377b9e0fc | |||
| 76cb4541b8 | |||
| dac6c48d38 | |||
| dc714bfd03 | |||
| 17e1f726e2 | |||
| 828ced50ab | |||
| 4f3a60c2e6 | |||
| e995564111 | |||
| 6598a5f66d | |||
| 654a90892f | |||
| 6677b285b8 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -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
|
||||
|
||||
9
ProjectFish/.claude/settings.local.json
Normal file
9
ProjectFish/.claude/settings.local.json
Normal file
@ -0,0 +1,9 @@
|
||||
{
|
||||
"permissions": {
|
||||
"allow": [
|
||||
"Bash(dir:*)"
|
||||
],
|
||||
"deny": [],
|
||||
"ask": []
|
||||
}
|
||||
}
|
||||
@ -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",
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -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)
|
||||
|
||||
@ -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=()
|
||||
|
||||
|
||||
@ -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.
BIN
ProjectFish/Content/DataAssets/Dialogue/5.uasset
Normal file
BIN
ProjectFish/Content/DataAssets/Dialogue/5.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/DataAssets/Dialogue/Condition_False.uasset
Normal file
BIN
ProjectFish/Content/DataAssets/Dialogue/Condition_False.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/DataAssets/Dialogue/Condition_True.uasset
Normal file
BIN
ProjectFish/Content/DataAssets/Dialogue/Condition_True.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/DataAssets/Dialogue/DemoDialogue.uasset
Normal file
BIN
ProjectFish/Content/DataAssets/Dialogue/DemoDialogue.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/DataAssets/Fish/Fish_Boss.uasset
Normal file
BIN
ProjectFish/Content/DataAssets/Fish/Fish_Boss.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/DataAssets/Fish/Fish_DeepInfo.uasset
Normal file
BIN
ProjectFish/Content/DataAssets/Fish/Fish_DeepInfo.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/DataAssets/FishReward/Fish1Reward.uasset
Normal file
BIN
ProjectFish/Content/DataAssets/FishReward/Fish1Reward.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/DataAssets/FishReward/Fish1Reward2.uasset
Normal file
BIN
ProjectFish/Content/DataAssets/FishReward/Fish1Reward2.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
ProjectFish/Content/DataAssets/Market/Shape_Market_Asset.uasset
Normal file
BIN
ProjectFish/Content/DataAssets/Market/Shape_Market_Asset.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
ProjectFish/Content/DataAssets/Ship/ShipShapeAsset.uasset
Normal file
BIN
ProjectFish/Content/DataAssets/Ship/ShipShapeAsset.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/DataTable/DT_MarketQuestDialogue.uasset
Normal file
BIN
ProjectFish/Content/DataTable/DT_MarketQuestDialogue.uasset
Normal file
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.
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.
BIN
ProjectFish/Content/Gameplay/DeskMode/BP_DeskModeGameMode.uasset
Normal file
BIN
ProjectFish/Content/Gameplay/DeskMode/BP_DeskModeGameMode.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/Gameplay/DeskMode/M_ClickCube.uasset
Normal file
BIN
ProjectFish/Content/Gameplay/DeskMode/M_ClickCube.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/Gameplay/Fish/BP_EnemyFish.uasset
Normal file
BIN
ProjectFish/Content/Gameplay/Fish/BP_EnemyFish.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/Gameplay/Fish/Fish_Boss.uasset
Normal file
BIN
ProjectFish/Content/Gameplay/Fish/Fish_Boss.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/Gameplay/Home/BP_HomeGameMode.uasset
Normal file
BIN
ProjectFish/Content/Gameplay/Home/BP_HomeGameMode.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/Gameplay/Home/BP_HomePlayerController.uasset
Normal file
BIN
ProjectFish/Content/Gameplay/Home/BP_HomePlayerController.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
ProjectFish/Content/Maps/DeskModeTest.umap
Normal file
BIN
ProjectFish/Content/Maps/DeskModeTest.umap
Normal file
Binary file not shown.
BIN
ProjectFish/Content/Maps/Home.umap
Normal file
BIN
ProjectFish/Content/Maps/Home.umap
Normal file
Binary file not shown.
Binary file not shown.
BIN
ProjectFish/Content/Maps/TestDialogue.umap
Normal file
BIN
ProjectFish/Content/Maps/TestDialogue.umap
Normal file
Binary file not shown.
BIN
ProjectFish/Content/Maps/TestDrag.umap
Normal file
BIN
ProjectFish/Content/Maps/TestDrag.umap
Normal file
Binary file not shown.
BIN
ProjectFish/Content/Maps/TestUI.umap
Normal file
BIN
ProjectFish/Content/Maps/TestUI.umap
Normal file
Binary file not shown.
BIN
ProjectFish/Content/Materials/M_DeskModeMat.uasset
Normal file
BIN
ProjectFish/Content/Materials/M_DeskModeMat.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/Textures/FishingRewards/Reward1.uasset
Normal file
BIN
ProjectFish/Content/Textures/FishingRewards/Reward1.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/Textures/FishingRewards/Reward2.uasset
Normal file
BIN
ProjectFish/Content/Textures/FishingRewards/Reward2.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/Textures/Market/MarketNPC.uasset
Normal file
BIN
ProjectFish/Content/Textures/Market/MarketNPC.uasset
Normal file
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.
BIN
ProjectFish/Content/UI/Common/TestWindow.uasset
Normal file
BIN
ProjectFish/Content/UI/Common/TestWindow.uasset
Normal file
Binary file not shown.
BIN
ProjectFish/Content/UI/DeskMode/UMG_DeskMode.uasset
Normal file
BIN
ProjectFish/Content/UI/DeskMode/UMG_DeskMode.uasset
Normal file
Binary file not shown.
Binary file not shown.
BIN
ProjectFish/Content/UI/Fishing/Ready/UMG_FishingRodConfig.uasset
Normal file
BIN
ProjectFish/Content/UI/Fishing/Ready/UMG_FishingRodConfig.uasset
Normal file
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.
Binary file not shown.
Binary file not shown.
BIN
ProjectFish/Content/UI/Fishing/Windows/UMG_ReadyWIndow.uasset
Normal file
BIN
ProjectFish/Content/UI/Fishing/Windows/UMG_ReadyWIndow.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
ProjectFish/Content/UI/HomeUI/Windows/UMG_HomeWindow_Main.uasset
Normal file
BIN
ProjectFish/Content/UI/HomeUI/Windows/UMG_HomeWindow_Main.uasset
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
ProjectFish/Content/UI/Main/UMG_MainWindow.uasset
Normal file
BIN
ProjectFish/Content/UI/Main/UMG_MainWindow.uasset
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user