diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll index a19a622..ff06f8e 100644 Binary files a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll differ diff --git a/ProjectFish/Content/DataAssets/FishReward/Fish1Reward2.uasset b/ProjectFish/Content/DataAssets/FishReward/Fish1Reward2.uasset index bee7026..722b5a8 100644 Binary files a/ProjectFish/Content/DataAssets/FishReward/Fish1Reward2.uasset and b/ProjectFish/Content/DataAssets/FishReward/Fish1Reward2.uasset differ diff --git a/ProjectFish/Content/UI/Common/Container/UMGP_Container_Item_Info.uasset b/ProjectFish/Content/UI/Common/Container/UMGP_Container_Item_Info.uasset new file mode 100644 index 0000000..852f92f Binary files /dev/null and b/ProjectFish/Content/UI/Common/Container/UMGP_Container_Item_Info.uasset differ diff --git a/ProjectFish/Content/UI/Common/Container/UMG_Container_Item.uasset b/ProjectFish/Content/UI/Common/Container/UMG_Container_Item.uasset index 8190226..9446c85 100644 Binary files a/ProjectFish/Content/UI/Common/Container/UMG_Container_Item.uasset and b/ProjectFish/Content/UI/Common/Container/UMG_Container_Item.uasset differ diff --git a/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.h b/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.h index 3a20993..0116c4d 100644 --- a/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.h +++ b/ProjectFish/Source/ProjectFish/DataAsset/FishInfoConfigAsset.h @@ -14,7 +14,12 @@ UCLASS(BlueprintType) class PROJECTFISH_API UFishInfoConfigAsset : public UDataAsset { GENERATED_BODY() + + //virtual void PostDuplicate(bool bDuplicateForPIE) override; public: + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = fish, meta = (ToolTip = "鱼的ID")) + int32 FishID; + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = fish, meta = (ToolTip = "鱼的名称")) FText FishName; diff --git a/ProjectFish/Source/ProjectFish/DataAsset/FishingRewardDataAsset.h b/ProjectFish/Source/ProjectFish/DataAsset/FishingRewardDataAsset.h index 04f33a0..41fecaf 100644 --- a/ProjectFish/Source/ProjectFish/DataAsset/FishingRewardDataAsset.h +++ b/ProjectFish/Source/ProjectFish/DataAsset/FishingRewardDataAsset.h @@ -25,6 +25,9 @@ class PROJECTFISH_API UFishingRewardDataAsset : public UPrimaryDataAsset public: UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Fishing Reward Data" , meta = (ToolTip = "鱼获名称")) FText RewardName; + + UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Fishing Reward Data" , meta = (ToolTip = "鱼获描述")) + FText RewardDes; UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Fishing Reward Data" , meta = (ToolTip = "鱼获图片") ) UTexture2D* RewardTexture; @@ -40,4 +43,7 @@ public: UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Fishing Reward Data" , meta = (ToolTip = "鱼获对应的任务信息")) FQuestTargetInfo QuestTargetInfo; + + UPROPERTY(BlueprintReadWrite, EditAnywhere, Category = "Fishing Reward Data" , meta = (ToolTip = "价格")) + float RewardPrice; };