更新鱼的相关信息配置功能

ProjectFish/ProjectFish.sln.DotSettings.user

@@ -16,10 +16,12 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUObjectArray_002Eh_002Fl_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_003FRuntime_003FCoreUObject_003FPublic_003FUObject_003FUObjectArray_002Eh/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUObjectBase_002Eh_002Fl_003AF_0021_003FEpic_003FUE_005F5_002E5_003FEngine_003FSource_003FRuntime_003FCoreUObject_003FPublic_003FUObject_003FUObjectBase_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_003AEditor_002Fd_003ABlueprintGraph_002Fd_003APrivate_002Ff_003AK2Node_005FCallFunction_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_003AEditor_002Fd_003AUnrealEd_002Fd_003APrivate_002Fd_003AKismet2_002Ff_003ABlueprintEditorUtils_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_003AEditor_002Fd_003AUnrealEd_002Fd_003APrivate_002Fd_003AKismet2_002Ff_003AKismetDebugUtilities_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_003ACoreUObject_002Fd_003APublic_002Fd_003AAssetRegistry_002Ff_003AAssetData_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_003AEditor_002Fd_003APropertyEditor_002Fd_003APublic_002Ff_003APropertyCustomizationHelpers_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_003AUObjectBaseUtility_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_003AUObjectGlobals_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_003APrivate_002Fd_003AMisc_002Ff_003AGuid_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_003ACore_002Fd_003APublic_002Fd_003AContainers_002Ff_003AArray_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_003ADelegates_002Ff_003ADelegateSignatureImpl_002Einl/@EntryIndexedValue">ForceIncluded</s:String>

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"

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

ProjectFish/Source/ProjectFish/DataAsset/MapConfigAsset.h

@@ -36,6 +36,10 @@ public:
 	TArray<class USkillAsset*> RandomSkills;
 	// UPROPERTY(EditAnywhere, BlueprintReadWrite,  Category= MapConfig, meta = (AllowedClasses = "SkillAsset", ToolTip = "道具节点提供的技能"))
 	// TArray<FSoftObjectPath> RandomSkills;
-	
 
+	UPROPERTY(EditAnywhere, BlueprintReadWrite,  Category= MapConfig, meta = (ToolTip = "Boss的配置信息", AllowedClasses = "FishInfoConfigAsset "))
+	FSoftObjectPath BossConfigAsset;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite,  Category= MapConfig, meta = (ToolTip = "普通怪物节点的配置信息", AllowedClasses = "FishInfoConfigAsset "))
+	TArray<FSoftObjectPath> FishConfigAssets;
 };

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

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())