被动技能添加触发条件

ProjectFish/Source/ProjectFish/DataAsset/SkillAsset.h

@@ -60,7 +60,7 @@ public:
 
 	//被动技能属性
 	UPROPERTY(EditAnywhere, BlueprintReadWrite,  meta = (ToolTip = "被动技能触发器，没有配置的话为光环类技能默认进行触发", AllowedClasses = "SkillTrigger",
-		EditConditionHides, EditCondition = "triggerType == ESkillTriggerType::PassiveSkill"))
+		EditConditionHides, EditCondition = "triggerType != ESkillTriggerType::ActiveSkill"))
 	TSubclassOf<class USkillTrigger> SkillTrigger;
 	
 

ProjectFish/Source/ProjectFish/Skill/Skill.cpp

@@ -136,11 +136,22 @@ void USkill::InitSkillTrigger()
 		}
 		break;
 	case ESkillTriggerType::AuraSkill:
+		if (SkillData->SkillTrigger)
+		{
+			USkillTrigger* SkillTrigger = NewObject<USkillTrigger>(this, SkillData->SkillTrigger);
+			FSkillContext context;
+			context.OwnerSkill = this;
+			context.SkillManager = SkillManager;
+			SkillTrigger->Init(context);
+		}
+		else
+		{
 			//UE_LOG(LogTemp, Warning, TEXT("没有Trigger的被动技能，直接触发"));
 			ExecuteSkill();
-		break;
 		}
 			
+		break;
+	}
 }