diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.dll new file mode 100644 index 0000000..e5ef3ae Binary files /dev/null and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.dll differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.dll index b5ad910..103165d 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 new file mode 100644 index 0000000..f66bff3 Binary files /dev/null and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0001.dll differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor.modules b/ProjectFish/Binaries/Win64/UnrealEditor.modules index 22c08e6..fe900f8 100644 --- a/ProjectFish/Binaries/Win64/UnrealEditor.modules +++ b/ProjectFish/Binaries/Win64/UnrealEditor.modules @@ -2,7 +2,7 @@ "BuildId": "37670630", "Modules": { - "ProjectFish": "UnrealEditor-ProjectFish.dll", - "ProjectFishEditor": "UnrealEditor-ProjectFishEditor.dll" + "ProjectFish": "UnrealEditor-ProjectFish-0001.dll", + "ProjectFishEditor": "UnrealEditor-ProjectFishEditor-0001.dll" } } \ No newline at end of file diff --git a/ProjectFish/Content/Gameplay/BagSystem/BP_BagConfigComponent.uasset b/ProjectFish/Content/Gameplay/BagSystem/BP_BagConfigComponent.uasset new file mode 100644 index 0000000..045375f Binary files /dev/null and b/ProjectFish/Content/Gameplay/BagSystem/BP_BagConfigComponent.uasset differ diff --git a/ProjectFish/Content/Gameplay/Ship/BP_Ship.uasset b/ProjectFish/Content/Gameplay/Ship/BP_Ship.uasset index 5dbc632..b841982 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/Gameplay/Ship/BP_ShipGameMode.uasset b/ProjectFish/Content/Gameplay/Ship/BP_ShipGameMode.uasset index abca30a..aa8bf5b 100644 Binary files a/ProjectFish/Content/Gameplay/Ship/BP_ShipGameMode.uasset and b/ProjectFish/Content/Gameplay/Ship/BP_ShipGameMode.uasset differ diff --git a/ProjectFish/Content/UI/Ready/UMG_FishingRodConfig.uasset b/ProjectFish/Content/UI/Ready/UMG_FishingRodConfig.uasset index d135247..6cff888 100644 Binary files a/ProjectFish/Content/UI/Ready/UMG_FishingRodConfig.uasset and b/ProjectFish/Content/UI/Ready/UMG_FishingRodConfig.uasset differ diff --git a/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/FishingRodConfigSubsystem.cpp b/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/FishingRodConfigSubsystem.cpp index 91a0795..8effb3e 100644 --- a/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/FishingRodConfigSubsystem.cpp +++ b/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/FishingRodConfigSubsystem.cpp @@ -5,13 +5,22 @@ #include "ProjectFish/DataAsset/BagConfigAsset.h" -void UFishingRodConfigSubsystem::CreatePlayerInventory(class UBagShapeAsset* bagShape) +void UFishingRodConfigSubsystem::CreateFishingRodInventory(class UBagShapeAsset* FishingRodShape, class UBagShapeAsset* PlayerBagShape) { - inventoryConfig = NewObject(this); - inventoryConfig->BagShapeAsset = bagShape; + //鱼竿的技能配置资源 + fishingRodInventoryConfig = NewObject(this); + fishingRodInventoryConfig->BagShapeAsset = FishingRodShape; + //玩家背包的技能配置资源 + playerInventoryConfig = NewObject(this); + playerInventoryConfig->BagShapeAsset = PlayerBagShape; } UBagConfigAsset* UFishingRodConfigSubsystem::GetFishingRodInventory() { - return this->inventoryConfig; + return this->fishingRodInventoryConfig; +} + +UBagConfigAsset* UFishingRodConfigSubsystem::GetPlayerInventory() +{ + return playerInventoryConfig; } diff --git a/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/FishingRodConfigSubsystem.h b/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/FishingRodConfigSubsystem.h index b3fa70a..e116910 100644 --- a/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/FishingRodConfigSubsystem.h +++ b/ProjectFish/Source/ProjectFish/Gameplay/Subsystem/FishingRodConfigSubsystem.h @@ -16,11 +16,15 @@ class PROJECTFISH_API UFishingRodConfigSubsystem : public UGameInstanceSubsystem public: UFUNCTION(BlueprintCallable, Category = "PlayerInventorySubsystem") - void CreatePlayerInventory(class UBagShapeAsset* bagShape); + void CreateFishingRodInventory(class UBagShapeAsset* FishingRodShape, class UBagShapeAsset* PlayerBagShape); UFUNCTION(BlueprintPure, Category = "PlayerInventorySubsystem") UBagConfigAsset* GetFishingRodInventory(); + UFUNCTION(BlueprintPure, Category = "PlayerInventorySubsystem") + UBagConfigAsset* GetPlayerInventory(); private: UPROPERTY() - class UBagConfigAsset* inventoryConfig = nullptr; + class UBagConfigAsset* fishingRodInventoryConfig = nullptr; + UPROPERTY() + class UBagConfigAsset* playerInventoryConfig = nullptr; };