admin/Project02
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改主动技能bug

Browse Source
This commit is contained in:
997146918 2025-09-04 14:57:34 +08:00
parent a98cdd7458
commit 129ed02380
6 changed files with 3 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish-0001.exp
View File

Binary file not shown.

BIN
ProjectFish/Binaries/Win64/UnrealEditor-ProjectFish.pdb
View File

Binary file not shown.

BIN
ProjectFish/Binaries/Win64/UnrealEditor-ProjectFishEditor.pdb
View File

Binary file not shown.

1
ProjectFish/ProjectFish.sln.DotSettings.user
View File

@ -4,6 +4,7 @@
<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_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_003ADelegates_002Ff_003ADelegateSignatureImpl_002Einl/@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_003ADelegate_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_003AMath_002Ff_003AUnrealMathUtility_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_003AMisc_002Ff_003AGuid_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_003AMisc_002Ff_003AMTAccessDetector_002Eh/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>

7
ProjectFish/Source/ProjectFish/DataAsset/SkillAsset.h
View File

@ -51,17 +51,12 @@ public:
int32 Endurance;
//主动技能属性
UPROPERTY( BlueprintReadWrite, meta = (ToolTip = "技能CD", EditConditionHides, EditCondition = "triggerType == ESkillTriggerType::ActiveSkill"))
UPROPERTY( EditAnywhere, BlueprintReadWrite, meta = (ToolTip = "技能CD", EditConditionHides, EditCondition = "triggerType == ESkillTriggerType::ActiveSkill"))
float CD;
UPROPERTY( BlueprintReadWrite, meta = (ToolTip = "技能CD速度", EditConditionHides, EditCondition = "triggerType == ESkillTriggerType::ActiveSkill"))
float Speed = 1.0f;
// //被动技能属性
// UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ToolTip = "被动技能触发器，没有配置的话为光环类技能默认进行触发", AllowedClasses = "SkillTrigger",
// EditConditionHides, EditCondition = "triggerType != ESkillTriggerType::ActiveSkill"))
// TSubclassOf<class USkillTrigger> SkillTrigger;
UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ToolTip = "被动技能触发条件配置",
EditConditionHides, EditCondition = "triggerType == ESkillTriggerType::PassiveSkill"))

51
ProjectFish/Source/ProjectFish/Skill/SkillManager.cpp
View File

@ -38,56 +38,6 @@ void USkillManager::AddPawn(class APawnWithSkill* Pawn, FIntPoint BagSize)
PawnBagState.Add(Pawn, states);
}
// void USkillManager::InitPawns(TArray<APawnWithSkill*> Pawns)
// {
// this->SkillPawns = Pawns;
// }
// USkill* USkillManager::AddSkill(FSkillData data, APawnWithSkill* Pawn, FIntPoint& BagPos)
// {
// TMap<FIntPoint, int32>* states = PawnBagState.Find(Pawn);
// FIntPoint BagSize = *PawnInfo.Find(Pawn);
// bool bAddAble = true;
// for (int y = 0; y < BagSize.Y; y++)
// {
// for (int x = 0; x < BagSize.X; x++)
// {
// bAddAble = true;
// for (int skillX = 0; skillX < data.SkillWeight.X; skillX++)
// {
// for (int skillY = 0; skillY < data.SkillWeight.Y; skillY++)
// {
// if (states->Find(FIntPoint(x, y) + FIntPoint(skillX, skillY)) == nullptr
// || *states->Find(FIntPoint(x, y) + FIntPoint(skillX, skillY)) != -1)
// {
// bAddAble = false;
// }
// }
// }
// //满足条件
// if (bAddAble)
// {
// BagPos = FIntPoint(x, y);
// USkill* skill = NewObject<USkill>(this);
// skill->InitSkill(Pawn, this, data, BagPos);
// Skills.Add(skill);
// //设置占用状态
// for (int xTemp = 0; xTemp < data.SkillWeight.X; xTemp++)
// {
// for (int yTemp = 0; yTemp < data.SkillWeight.Y; yTemp++)
// {
// states->Add(FIntPoint(xTemp, yTemp) + FIntPoint(x, y), GetSkillIndex(skill));
// }
// }
//
// return skill;
// }
// }
// }
//
// return nullptr;
// }
void USkillManager::AddBagWithSkills(UBagConfigAsset* Bag, APawnWithSkill* Pawn, TArray<USkill*>& SkillObjects,
TArray<FIntPoint>& BagPositions)
{
@ -98,6 +48,7 @@ void USkillManager::AddBagWithSkills(UBagConfigAsset* Bag, APawnWithSkill* Pawn,
skill->InitSkill(Pawn, this, PlacedSkill);
SkillObjects.Add(skill);
BagPositions.Add(FIntPoint(PlacedSkill.PositionX, PlacedSkill.PositionY));
Skills.Add(skill);
}