diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.dll deleted file mode 100644 index 0b87085..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 c34682d..134044c 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 80d6755..0000000 Binary files a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0001.dll and /dev/null 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/Config/DefaultGame.ini b/ProjectFish/Config/DefaultGame.ini index acf0bda..7d28fff 100644 --- a/ProjectFish/Config/DefaultGame.ini +++ b/ProjectFish/Config/DefaultGame.ini @@ -5,3 +5,17 @@ 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)) +bOnlyCookProductionAssets=False +bShouldManagerDetermineTypeAndName=False +bShouldGuessTypeAndNameInEditor=True +bShouldAcquireMissingChunksOnLoad=False +bShouldWarnAboutInvalidAssets=True +MetaDataTagsForAssetRegistry=() + diff --git a/ProjectFish/Content/DataAssets/Fish/Fish_Boss.uasset b/ProjectFish/Content/DataAssets/Fish/Fish_Boss.uasset new file mode 100644 index 0000000..700a2fa Binary files /dev/null and b/ProjectFish/Content/DataAssets/Fish/Fish_Boss.uasset differ diff --git a/ProjectFish/Content/DataAssets/Fish/Fish_DeepInfo.uasset b/ProjectFish/Content/DataAssets/Fish/Fish_DeepInfo.uasset new file mode 100644 index 0000000..cf2afba Binary files /dev/null and b/ProjectFish/Content/DataAssets/Fish/Fish_DeepInfo.uasset differ diff --git a/ProjectFish/Content/DataAssets/FishReward/Fish1Reward.uasset b/ProjectFish/Content/DataAssets/FishReward/Fish1Reward.uasset new file mode 100644 index 0000000..03bbdc0 Binary files /dev/null and b/ProjectFish/Content/DataAssets/FishReward/Fish1Reward.uasset differ diff --git a/ProjectFish/Content/Gameplay/Fish/Fish_Boss.uasset b/ProjectFish/Content/Gameplay/Fish/Fish_Boss.uasset index 9528a65..984547d 100644 Binary files a/ProjectFish/Content/Gameplay/Fish/Fish_Boss.uasset and b/ProjectFish/Content/Gameplay/Fish/Fish_Boss.uasset differ diff --git a/ProjectFish/Content/Gameplay/Fish/Fish_DeepInfo.uasset b/ProjectFish/Content/Gameplay/Fish/Fish_DeepInfo.uasset deleted file mode 100644 index 085dc25..0000000 Binary files a/ProjectFish/Content/Gameplay/Fish/Fish_DeepInfo.uasset and /dev/null differ diff --git a/ProjectFish/Content/Gameplay/MapSystem/MapConfig.uasset b/ProjectFish/Content/Gameplay/MapSystem/MapConfig.uasset index 33917d1..8241812 100644 Binary files a/ProjectFish/Content/Gameplay/MapSystem/MapConfig.uasset and b/ProjectFish/Content/Gameplay/MapSystem/MapConfig.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 ec1427d..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-DeskMode.dll b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.dll index bc3f98b..0ba22d7 100644 Binary files a/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.dll and b/ProjectFish/Plugins/DeskMode/Binaries/Win64/UnrealEditor-DeskMode.dll 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/Source/ProjectFish/DataAsset/FishInfoConfigAsset.h b/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.h index b78306f..fd5663e 100644 --- a/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.h +++ b/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.h @@ -3,6 +3,7 @@ #pragma once #include "CoreMinimal.h" +#include "FishingRewardDataAsset.h" #include "Engine/DataAsset.h" #include "FishInfoConfigAsset.generated.h" @@ -31,4 +32,7 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = fish, meta = (ToolTip = "韧性归零时的眩晕时长")) int32 StunTime; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = fish, meta = (ToolTip = "击败后的鱼获配置", AllowedClasses = "FishingRewardDataAsset")) + TArray Rewards; };