From 45d3d873a7740886fa09f35c9fea2830f4563072 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 11:04:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/Battle/SkillEffect/SkillEffectFactory.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Main/System/Battle/SkillEffect/SkillEffectFactory.cs b/Main/System/Battle/SkillEffect/SkillEffectFactory.cs
index 7175020..c25adb1 100644
--- a/Main/System/Battle/SkillEffect/SkillEffectFactory.cs
+++ b/Main/System/Battle/SkillEffect/SkillEffectFactory.cs
@@ -4,27 +4,29 @@
public static class SkillEffectFactory
{
- public static SkillEffect CreateSkillEffect(SkillBase skillBase, BattleObject caster, SkillConfig skillConfig, HB427_tagSCUseSkill tagUseSkillAttack)
+ public static SkillEffect CreateSkillEffect(SkillBase skillBase, BattleObject caster, SkillConfig skillConfig, SkillSkinConfig skillSkinConfig, HB427_tagSCUseSkill tagUseSkillAttack)
{
- switch (skillConfig.effectType)
+ switch (skillSkinConfig.effectType)
{
case SkillEffectType.Bullet:
- return new BulletSkillEffect(skillBase,skillConfig, caster, tagUseSkillAttack);
+ return new BulletSkillEffect(skillBase,skillConfig, skillSkinConfig, caster, tagUseSkillAttack);
case SkillEffectType.Direct:
- return new NormalSkillEffect(skillBase, skillConfig, caster, tagUseSkillAttack);
+ return new NormalSkillEffect(skillBase, skillConfig, skillSkinConfig, caster, tagUseSkillAttack);
// case SkillEffectType.BuffEffect:
// return new BuffSkillEffect(skillConfig, caster, targets);
// case SkillEffectType.StageEffect:
// return new StageSkillEffect(skillConfig, caster, targets);
case SkillEffectType.DOTEffect:
- return new DotSkillEffect(skillBase,skillConfig, caster, tagUseSkillAttack);
+ return new DotSkillEffect(skillBase,skillConfig, skillSkinConfig, caster, tagUseSkillAttack);
case SkillEffectType.NoEffect:
case SkillEffectType.None:
- return new NoEffect(skillBase, skillConfig, caster, tagUseSkillAttack);
+ return new NoEffect(skillBase, skillConfig, skillSkinConfig, caster, tagUseSkillAttack);
default:
- UnityEngine.Debug.LogError("Unknown Skill Effect Type " + skillConfig.effectType + " skill id is " + skillConfig.SkillID);
- return new NoEffect(skillBase, skillConfig, caster, tagUseSkillAttack);
+ UnityEngine.Debug.LogError("Unknown Skill Effect Type " + skillSkinConfig.effectType + " skill id is " + skillConfig.SkillID);
+ return new NoEffect(skillBase, skillConfig, skillSkinConfig, caster, tagUseSkillAttack);
+ break;
}
+ return null;
}
}
\ No newline at end of file
--
Gitblit v1.8.0