diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.pdb b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.pdb new file mode 100644 index 0000000..841a893 Binary files /dev/null and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.pdb differ diff --git a/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0001.pdb b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0001.pdb new file mode 100644 index 0000000..bd9d0a2 Binary files /dev/null and b/ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor-0001.pdb 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/BagConfig/PlayerBagConfig.uasset b/ProjectFish/Content/Gameplay/BagSystem/BagConfig/PlayerBagConfig.uasset index 57ae518..d7fcb82 100644 Binary files a/ProjectFish/Content/Gameplay/BagSystem/BagConfig/PlayerBagConfig.uasset and b/ProjectFish/Content/Gameplay/BagSystem/BagConfig/PlayerBagConfig.uasset differ diff --git a/ProjectFish/Content/Gameplay/BagSystem/SkillAsset/Charge.uasset b/ProjectFish/Content/Gameplay/BagSystem/SkillAsset/Charge.uasset index 46abd76..9d16a1f 100644 Binary files a/ProjectFish/Content/Gameplay/BagSystem/SkillAsset/Charge.uasset and b/ProjectFish/Content/Gameplay/BagSystem/SkillAsset/Charge.uasset differ diff --git a/ProjectFish/Source/ProjectFish/Skill/SkillManager.cpp b/ProjectFish/Source/ProjectFish/Skill/SkillManager.cpp index 435b684..d59ba70 100644 --- a/ProjectFish/Source/ProjectFish/Skill/SkillManager.cpp +++ b/ProjectFish/Source/ProjectFish/Skill/SkillManager.cpp @@ -4,6 +4,7 @@ #include "SkillManager.h" #include "Skill.h" #include "ProjectFish/DataAsset/BagConfigAsset.h" +#include "ProjectFish/DataAsset/BagShapeAsset.h" void USkillManager::Tick(float DeltaTime) { @@ -42,6 +43,7 @@ void USkillManager::AddBagWithSkills(UBagConfigAsset* Bag, APawnWithSkill* Pawn, TArray& BagPositions) { FIntPoint BagSize = *PawnInfo.Find(Pawn); + TMap* states = PawnBagState.Find(Pawn); for (auto PlacedSkill: Bag->PlacedSkills) { USkill* skill = NewObject(this); @@ -49,6 +51,14 @@ void USkillManager::AddBagWithSkills(UBagConfigAsset* Bag, APawnWithSkill* Pawn, SkillObjects.Add(skill); BagPositions.Add(FIntPoint(PlacedSkill.PositionX, PlacedSkill.PositionY)); Skills.Add(skill); + //设置占用状态 + for (int x = 0; x < Bag->BagShapeAsset->BagWidth; x++) + { + for (int y = 0; y < Bag->BagShapeAsset->BagHeight; y++) + { + states->Add(FIntPoint(x, y) + FIntPoint(x, y), GetSkillIndex(skill)); + } + } } @@ -167,3 +177,5 @@ TArray USkillManager::GetSkillsByType(ESkillType SkillType) const } return Result; } + + diff --git a/ProjectFish/Source/ProjectFish/Skill/SkillManager.h b/ProjectFish/Source/ProjectFish/Skill/SkillManager.h index 73d3ccf..77f9a28 100644 --- a/ProjectFish/Source/ProjectFish/Skill/SkillManager.h +++ b/ProjectFish/Source/ProjectFish/Skill/SkillManager.h @@ -62,6 +62,7 @@ public: UFUNCTION(BlueprintPure) TArray GetSkillsByType(ESkillType SkillType) const; + protected: UPROPERTY(BlueprintReadWrite) TArray Skills;