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/NormalSkillEffect.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Main/System/Battle/SkillEffect/NormalSkillEffect.cs b/Main/System/Battle/SkillEffect/NormalSkillEffect.cs
index ae1fa16..1a2f1e3 100644
--- a/Main/System/Battle/SkillEffect/NormalSkillEffect.cs
+++ b/Main/System/Battle/SkillEffect/NormalSkillEffect.cs
@@ -11,8 +11,8 @@
// protected BattleObject caster;
// protected List<BattleObject> targets; // 鐩爣鍒楄〃
- public NormalSkillEffect(SkillBase _skillBase, SkillConfig _skillConfig, BattleObject _caster, HB427_tagSCUseSkill _tagUseSkillAttack)
- : base(_skillBase, _skillConfig, _caster, _tagUseSkillAttack)
+ public NormalSkillEffect(SkillBase _skillBase, SkillConfig _skillConfig, SkillSkinConfig _skillSkinConfig, BattleObject _caster, HB427_tagSCUseSkill _tagUseSkillAttack)
+ : base(_skillBase, _skillConfig, _skillSkinConfig, _caster, _tagUseSkillAttack)
{
}
@@ -21,20 +21,20 @@
public override void OnMiddleFrameEnd(int times, int hitIndex)
{
- int mainTargetIndex = BattleUtility.GetMainTargetPositionNum(skillBase, caster, tagUseSkillAttack.HurtList.ToList(), skillConfig);
+ int mainTargetIndex = BattleUtility.GetMainTargetPositionNum(skillBase, caster, tagUseSkillAttack.HurtList, skillConfig);
BattleCamp battleCamp = skillConfig.TagFriendly == 1 ? caster.Camp : caster.GetEnemyCamp();
RectTransform targetTransform = caster.battleField.GetTeamNode(battleCamp, mainTargetIndex);
- if (skillConfig.ExplosionEffectId > 0)
+ if (skillSkinConfig.ExplosionEffectId > 0)
{
- caster.battleField.battleEffectMgr.PlayEffect(caster, skillConfig.ExplosionEffectId, targetTransform, caster.Camp);
+ caster.battleField.battleEffectMgr.PlayEffect(caster, skillSkinConfig.ExplosionEffectId, targetTransform, caster.Camp, 1f);
}
- if (skillConfig.ExplosionEffect2 > 0)
+ if (skillSkinConfig.ExplosionEffect2 > 0)
{
- caster.battleField.battleEffectMgr.PlayEffect(caster, skillConfig.ExplosionEffect2, targetTransform, caster.Camp);
+ caster.battleField.battleEffectMgr.PlayEffect(caster, skillSkinConfig.ExplosionEffect2, targetTransform, caster.Camp, 1f);
}
for (int i = 0; i < tagUseSkillAttack.HurtList.Length; i++)
@@ -47,17 +47,17 @@
continue;
}
- if (skillConfig.ExplosionEffect3 > 0)
+ if (skillSkinConfig.ExplosionEffect3 > 0)
{
- caster.battleField.battleEffectMgr.PlayEffect(target, skillConfig.ExplosionEffect3, target.heroGo.transform, caster.Camp);
+ caster.battleField.battleEffectMgr.PlayEffect(target, skillSkinConfig.ExplosionEffect3, target.GetTransform(), caster.Camp, target.GetModelScale());
}
- if (skillConfig.ExplosionEffect4 > 0)
+ if (skillSkinConfig.ExplosionEffect4 > 0)
{
- caster.battleField.battleEffectMgr.PlayEffect(target, skillConfig.ExplosionEffect4, target.heroGo.transform, caster.Camp);
+ caster.battleField.battleEffectMgr.PlayEffect(target, skillSkinConfig.ExplosionEffect4, target.GetTransform(), caster.Camp, target.GetModelScale());
}
}
- onHit?.Invoke(hitIndex, tagUseSkillAttack.HurtList.ToList());
+ onHit?.Invoke(hitIndex, HurtListAsList);
}
/// <summary>
--
Gitblit v1.8.0