diff --git a/ProjectFish/Source/ProjectFish/Definations.h b/ProjectFish/Source/ProjectFish/Definations.h index 86309a2..600e2ab 100644 --- a/ProjectFish/Source/ProjectFish/Definations.h +++ b/ProjectFish/Source/ProjectFish/Definations.h @@ -150,7 +150,8 @@ struct FAuraTriggerConfig UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ToolTip = "触发条件类型")) EAuraTriggerCondition Condition = EAuraTriggerCondition::None; - UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ToolTip = "触发目标")) + UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ToolTip = "触发目标", EditConditionHides, + EditCondition = "Condition != EAuraTriggerCondition::None")) EAuraTriggerTarget Target = EAuraTriggerTarget::Self; UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ToolTip = "百分比值 (0-1)", EditConditionHides, diff --git a/ProjectFish/Source/ProjectFish/Skill/Skill.cpp b/ProjectFish/Source/ProjectFish/Skill/Skill.cpp index ae4263e..de843b8 100644 --- a/ProjectFish/Source/ProjectFish/Skill/Skill.cpp +++ b/ProjectFish/Source/ProjectFish/Skill/Skill.cpp @@ -84,7 +84,6 @@ void USkill::InitSkillTrigger() } case ESkillTriggerType::AuraSkill: - if (SkillData->AuraTriggerConfig.Condition != EAuraTriggerCondition::None) { USkillTrigger* SkillTrigger = NewObject(this); FSkillContext context; @@ -92,11 +91,20 @@ void USkill::InitSkillTrigger() context.SkillManager = SkillManager; SkillTrigger->Init(context, SkillData->PassiveTriggerConfig, SkillData->AuraTriggerConfig); } - else - { - //UE_LOG(LogTemp, Warning, TEXT("没有Trigger的被动技能,直接触发")); - ExecuteSkill(); - } + + // if (SkillData->AuraTriggerConfig.Condition != EAuraTriggerCondition::None) + // { + // USkillTrigger* SkillTrigger = NewObject(this); + // FSkillContext context; + // context.OwnerSkill = this; + // context.SkillManager = SkillManager; + // SkillTrigger->Init(context, SkillData->PassiveTriggerConfig, SkillData->AuraTriggerConfig); + // } + // else + // { + // //UE_LOG(LogTemp, Warning, TEXT("没有Trigger的被动技能,直接触发")); + // ExecuteSkill(); + // } break; }