From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Battle/SkillEffect/SkillEffectFactory.cs | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Main/System/Battle/SkillEffect/SkillEffectFactory.cs b/Main/System/Battle/SkillEffect/SkillEffectFactory.cs
index 1a79c8c..84b6db6 100644
--- a/Main/System/Battle/SkillEffect/SkillEffectFactory.cs
+++ b/Main/System/Battle/SkillEffect/SkillEffectFactory.cs
@@ -4,28 +4,27 @@
public static class SkillEffectFactory
{
- public static SkillEffect CreateSkillEffect(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(skillConfig, caster, tagUseSkillAttack);
+ return new BulletSkillEffect(skillBase,skillConfig, skillSkinConfig, caster, tagUseSkillAttack);
case SkillEffectType.Direct:
- return new NormalSkillEffect(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(skillConfig, caster, tagUseSkillAttack);
+ return new DotSkillEffect(skillBase,skillConfig, skillSkinConfig, caster, tagUseSkillAttack);
case SkillEffectType.NoEffect:
- return new NoEffect(skillConfig, caster, tagUseSkillAttack);
+ case SkillEffectType.None:
+ 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(skillConfig, caster, tagUseSkillAttack);
- break;
+ UnityEngine.Debug.LogError("Unknown Skill Effect Type " + skillSkinConfig.effectType + " skill id is " + skillConfig.SkillID);
+ return new NoEffect(skillBase, skillConfig, skillSkinConfig, caster, tagUseSkillAttack);
}
- return null;
}
}
\ No newline at end of file
--
Gitblit v1.8.0