diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll
index 2f4f033..71f0d59 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.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll
index c6086f1..2284b9f 100644
Binary files a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.dll differ
diff --git a/ProjectFish/Content/ART/Map/fishing.umap b/ProjectFish/Content/ART/Map/fishing.umap
index b151e28..2c95678 100644
Binary files a/ProjectFish/Content/ART/Map/fishing.umap and b/ProjectFish/Content/ART/Map/fishing.umap differ
diff --git a/ProjectFish/Content/DataTable/FishRods.uasset b/ProjectFish/Content/DataTable/FishRods.uasset
index ea42596..e74bd27 100644
Binary files a/ProjectFish/Content/DataTable/FishRods.uasset and b/ProjectFish/Content/DataTable/FishRods.uasset differ
diff --git a/ProjectFish/Content/Deep_Hunter/Character/SKM_Deep_hunter1.uasset b/ProjectFish/Content/Deep_Hunter/Character/SKM_Deep_hunter1.uasset
new file mode 100644
index 0000000..3f4f1aa
Binary files /dev/null and b/ProjectFish/Content/Deep_Hunter/Character/SKM_Deep_hunter1.uasset differ
diff --git a/ProjectFish/Content/Entity/BP_FishingPoint.uasset b/ProjectFish/Content/Entity/BP_FishingPoint.uasset
index fc59dda..1cdec4e 100644
Binary files a/ProjectFish/Content/Entity/BP_FishingPoint.uasset and b/ProjectFish/Content/Entity/BP_FishingPoint.uasset differ
diff --git a/ProjectFish/Content/Gameplay/BP_Dabaza_GameMode.uasset b/ProjectFish/Content/Gameplay/BP_Dabaza_GameMode.uasset
index adeb7a4..de6fa52 100644
Binary files a/ProjectFish/Content/Gameplay/BP_Dabaza_GameMode.uasset and b/ProjectFish/Content/Gameplay/BP_Dabaza_GameMode.uasset differ
diff --git a/ProjectFish/Content/Gameplay/BP_TopCameraPawn.uasset b/ProjectFish/Content/Gameplay/BP_TopCameraPawn.uasset
index 24ab2bf..4ad284d 100644
Binary files a/ProjectFish/Content/Gameplay/BP_TopCameraPawn.uasset and b/ProjectFish/Content/Gameplay/BP_TopCameraPawn.uasset differ
diff --git a/ProjectFish/Content/Gameplay/BagSystem/BagConfig/FishBoss_BagConfig.uasset b/ProjectFish/Content/Gameplay/BagSystem/BagConfig/FishBoss_BagConfig.uasset
new file mode 100644
index 0000000..a024701
Binary files /dev/null and b/ProjectFish/Content/Gameplay/BagSystem/BagConfig/FishBoss_BagConfig.uasset differ
diff --git a/ProjectFish/Content/Gameplay/BagSystem/BagConfig/FishBagConfig.uasset b/ProjectFish/Content/Gameplay/BagSystem/BagConfig/FishDeep_BagConfig.uasset
similarity index 78%
rename from ProjectFish/Content/Gameplay/BagSystem/BagConfig/FishBagConfig.uasset
rename to ProjectFish/Content/Gameplay/BagSystem/BagConfig/FishDeep_BagConfig.uasset
index cfd532a..5d47c6c 100644
Binary files a/ProjectFish/Content/Gameplay/BagSystem/BagConfig/FishBagConfig.uasset and b/ProjectFish/Content/Gameplay/BagSystem/BagConfig/FishDeep_BagConfig.uasset differ
diff --git a/ProjectFish/Content/Gameplay/Characters/BP_DeepFish.uasset b/ProjectFish/Content/Gameplay/Characters/BP_DeepFish.uasset
deleted file mode 100644
index eacf6a9..0000000
Binary files a/ProjectFish/Content/Gameplay/Characters/BP_DeepFish.uasset and /dev/null differ
diff --git a/ProjectFish/Content/Gameplay/Characters/BP_PawnEntity.uasset b/ProjectFish/Content/Gameplay/Characters/BP_PawnEntity.uasset
index 0528b72..b7ea0c6 100644
Binary files a/ProjectFish/Content/Gameplay/Characters/BP_PawnEntity.uasset and b/ProjectFish/Content/Gameplay/Characters/BP_PawnEntity.uasset differ
diff --git a/ProjectFish/Content/Gameplay/Fish/BP_EnemyFish.uasset b/ProjectFish/Content/Gameplay/Fish/BP_EnemyFish.uasset
new file mode 100644
index 0000000..c1151b9
Binary files /dev/null and b/ProjectFish/Content/Gameplay/Fish/BP_EnemyFish.uasset differ
diff --git a/ProjectFish/Content/Gameplay/Fish/Fish_Boss.uasset b/ProjectFish/Content/Gameplay/Fish/Fish_Boss.uasset
new file mode 100644
index 0000000..9528a65
Binary files /dev/null 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
new file mode 100644
index 0000000..085dc25
Binary files /dev/null and b/ProjectFish/Content/Gameplay/Fish/Fish_DeepInfo.uasset differ
diff --git a/ProjectFish/Content/Gameplay/MapSystem/MapConfig.uasset b/ProjectFish/Content/Gameplay/MapSystem/MapConfig.uasset
index 6c79f25..33917d1 100644
Binary files a/ProjectFish/Content/Gameplay/MapSystem/MapConfig.uasset and b/ProjectFish/Content/Gameplay/MapSystem/MapConfig.uasset differ
diff --git a/ProjectFish/Content/Gameplay/Ship/BP_Ship.uasset b/ProjectFish/Content/Gameplay/Ship/BP_Ship.uasset
index 2cd3acc..551520c 100644
Binary files a/ProjectFish/Content/Gameplay/Ship/BP_Ship.uasset and b/ProjectFish/Content/Gameplay/Ship/BP_Ship.uasset differ
diff --git a/ProjectFish/Content/Maps/ChildLevel_Ship.umap b/ProjectFish/Content/Maps/ChildLevel_Ship.umap
index 8c6d70d..8c6ed8d 100644
Binary files a/ProjectFish/Content/Maps/ChildLevel_Ship.umap and b/ProjectFish/Content/Maps/ChildLevel_Ship.umap differ
diff --git a/ProjectFish/Content/Maps/MaySystem.umap b/ProjectFish/Content/Maps/MaySystem.umap
deleted file mode 100644
index 444fc5f..0000000
Binary files a/ProjectFish/Content/Maps/MaySystem.umap and /dev/null differ
diff --git a/ProjectFish/Content/__ExternalActors__/Maps/Dabaza/9/GX/KCVNFI6L6PBCQ844W3A926.uasset b/ProjectFish/Content/__ExternalActors__/Maps/Dabaza/9/GX/KCVNFI6L6PBCQ844W3A926.uasset
index e6d1e4d..4a6de1a 100644
Binary files a/ProjectFish/Content/__ExternalActors__/Maps/Dabaza/9/GX/KCVNFI6L6PBCQ844W3A926.uasset and b/ProjectFish/Content/__ExternalActors__/Maps/Dabaza/9/GX/KCVNFI6L6PBCQ844W3A926.uasset differ
diff --git a/ProjectFish/Content/__ExternalActors__/TopDown/Maps/TopDownMap/9/AQ/5WMQIL1ED2FF1GZMSJI2EG.uasset b/ProjectFish/Content/__ExternalActors__/TopDown/Maps/TopDownMap/9/AQ/5WMQIL1ED2FF1GZMSJI2EG.uasset
index b500806..9a44422 100644
Binary files a/ProjectFish/Content/__ExternalActors__/TopDown/Maps/TopDownMap/9/AQ/5WMQIL1ED2FF1GZMSJI2EG.uasset and b/ProjectFish/Content/__ExternalActors__/TopDown/Maps/TopDownMap/9/AQ/5WMQIL1ED2FF1GZMSJI2EG.uasset differ
diff --git a/ProjectFish/ProjectFish.sln.DotSettings.user b/ProjectFish/ProjectFish.sln.DotSettings.user
index e8e7bb7..a5e292d 100644
--- a/ProjectFish/ProjectFish.sln.DotSettings.user
+++ b/ProjectFish/ProjectFish.sln.DotSettings.user
@@ -16,10 +16,12 @@
ForceIncluded
ForceIncluded
ForceIncluded
+ ForceIncluded
ForceIncluded
ForceIncluded
ForceIncluded
ForceIncluded
+ ForceIncluded
ForceIncluded
ForceIncluded
ForceIncluded
diff --git a/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.cpp b/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.cpp
new file mode 100644
index 0000000..6abe5de
--- /dev/null
+++ b/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.cpp
@@ -0,0 +1,4 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+
+#include "FishInfoConfigAsset.h"
diff --git a/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.h b/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.h
new file mode 100644
index 0000000..b78306f
--- /dev/null
+++ b/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.h
@@ -0,0 +1,34 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Engine/DataAsset.h"
+#include "FishInfoConfigAsset.generated.h"
+
+/**
+ *
+ */
+UCLASS(BlueprintType)
+class PROJECTFISH_API UFishInfoConfigAsset : public UDataAsset
+{
+ GENERATED_BODY()
+public:
+ UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = fish, meta = (ToolTip = "鱼的名称"))
+ FText FishName;
+
+ UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = fish, meta = (ToolTip = "鱼的模型"))
+ class USkeletalMesh* FishMesh;
+
+ UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = fish, meta = (ToolTip = "鱼的技能背包"))
+ class UBagConfigAsset* BagConfigAsset;
+
+ UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = fish, meta = (ToolTip = "鱼的最大生命值"))
+ int32 MaxEndurance;
+
+ UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = fish, meta = (ToolTip = "鱼的最大韧性"))
+ int32 MaxTenacity;
+
+ UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = fish, meta = (ToolTip = "韧性归零时的眩晕时长"))
+ int32 StunTime;
+};
diff --git a/ProjectFish/Source/ProjectFish/DataAsset/MapConfigAsset.h b/ProjectFish/Source/ProjectFish/DataAsset/MapConfigAsset.h
index 62b0677..0c25c09 100644
--- a/ProjectFish/Source/ProjectFish/DataAsset/MapConfigAsset.h
+++ b/ProjectFish/Source/ProjectFish/DataAsset/MapConfigAsset.h
@@ -36,6 +36,10 @@ public:
TArray RandomSkills;
// UPROPERTY(EditAnywhere, BlueprintReadWrite, Category= MapConfig, meta = (AllowedClasses = "SkillAsset", ToolTip = "道具节点提供的技能"))
// TArray RandomSkills;
-
+ UPROPERTY(EditAnywhere, BlueprintReadWrite, Category= MapConfig, meta = (ToolTip = "Boss的配置信息", AllowedClasses = "FishInfoConfigAsset "))
+ FSoftObjectPath BossConfigAsset;
+
+ UPROPERTY(EditAnywhere, BlueprintReadWrite, Category= MapConfig, meta = (ToolTip = "普通怪物节点的配置信息", AllowedClasses = "FishInfoConfigAsset "))
+ TArray FishConfigAssets;
};
diff --git a/ProjectFish/Source/ProjectFish/Entity/FishingPoint.h b/ProjectFish/Source/ProjectFish/Entity/FishingPoint.h
index 40d2d9a..878e0c3 100644
--- a/ProjectFish/Source/ProjectFish/Entity/FishingPoint.h
+++ b/ProjectFish/Source/ProjectFish/Entity/FishingPoint.h
@@ -22,4 +22,7 @@ protected:
protected:
UPROPERTY(EditAnywhere,BlueprintReadWrite)
class UBoxComponent* BoxComponent;
+
+ UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowedClasses = FishInfoConfigAsset))
+ FSoftObjectPath FishInfo;
};
diff --git a/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/FishingMapSubSystem.cpp b/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/FishingMapSubSystem.cpp
index 3316fcf..8abd880 100644
--- a/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/FishingMapSubSystem.cpp
+++ b/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/FishingMapSubSystem.cpp
@@ -102,11 +102,18 @@ void UFishingMapSubSystem::MoveToNode(FGuid NodeID)
switch (node->NodeType)
{
case EMapNodeType::Battle:
- UGameplayStatics::OpenLevel(this, MapConfig->BattleMapName);
- break;
+ {
+ FString enemyConfigPath = MapConfig->FishConfigAssets[FMath::RandRange(0, MapConfig->FishConfigAssets.Num() - 1)].GetAssetPathString();
+ UGameplayStatics::OpenLevel(this, MapConfig->BattleMapName, true, "enemyConfig=" + enemyConfigPath);
+ break;
+ }
case EMapNodeType::Boss:
- UGameplayStatics::OpenLevel(this, MapConfig->BattleMapName);
- break;
+ {
+ FString bossConfigPath = MapConfig->BossConfigAsset.GetAssetPathString();
+ UGameplayStatics::OpenLevel(this, MapConfig->BattleMapName, true, "enemyConfig=" + bossConfigPath);
+ break;
+ }
+
case EMapNodeType::Skill:
//添加技能到背包系统中
if (UGameInstance* GameInstance = GetGameInstance())