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 | 60 +++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/Main/System/Battle/SkillEffect/NormalSkillEffect.cs b/Main/System/Battle/SkillEffect/NormalSkillEffect.cs
index 369704d..1a2f1e3 100644
--- a/Main/System/Battle/SkillEffect/NormalSkillEffect.cs
+++ b/Main/System/Battle/SkillEffect/NormalSkillEffect.cs
@@ -11,32 +11,32 @@
// protected BattleObject caster;
// protected List<BattleObject> targets; // 鐩爣鍒楄〃
- public NormalSkillEffect(SkillConfig _skillConfig, BattleObject _caster, HB427_tagSCUseSkill _tagUseSkillAttack)
- : base(_skillConfig, _caster, _tagUseSkillAttack)
+ public NormalSkillEffect(SkillBase _skillBase, SkillConfig _skillConfig, SkillSkinConfig _skillSkinConfig, BattleObject _caster, HB427_tagSCUseSkill _tagUseSkillAttack)
+ : base(_skillBase, _skillConfig, _skillSkinConfig, _caster, _tagUseSkillAttack)
{
}
- // 鎶�鑳藉姩浣滅涓�甯�
- // 涓嶇敤鐞嗕細鍥炶皟
- public override void Play(Action<int, List<HB427_tagSCUseSkill.tagSCUseSkillHurt>> _onHit)
- {
- // 鎾斁鎶�鑳界壒鏁�
- BattleEffectPlayer battleEffectPlayer = caster.battleField.battleEffectMgr.PlayEffect(
- caster.ObjID,
- skillConfig.EffectId,
- caster.heroGo.transform
- );
- }
-
-
- public override void Run()
- {
- base.Run();
- }
public override void OnMiddleFrameEnd(int times, int hitIndex)
{
+
+ 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 (skillSkinConfig.ExplosionEffectId > 0)
+ {
+ caster.battleField.battleEffectMgr.PlayEffect(caster, skillSkinConfig.ExplosionEffectId, targetTransform, caster.Camp, 1f);
+ }
+
+ if (skillSkinConfig.ExplosionEffect2 > 0)
+ {
+ caster.battleField.battleEffectMgr.PlayEffect(caster, skillSkinConfig.ExplosionEffect2, targetTransform, caster.Camp, 1f);
+ }
+
for (int i = 0; i < tagUseSkillAttack.HurtList.Length; i++)
{
var hurt = tagUseSkillAttack.HurtList[i];
@@ -47,15 +47,25 @@
continue;
}
- caster.battleField.battleEffectMgr.PlayEffect(target.ObjID, skillConfig.ExplosionEffectId, target.heroGo.transform);
- caster.battleField.battleEffectMgr.PlayEffect(target.ObjID, skillConfig.ExplosionEffect2, target.heroGo.transform);
+ if (skillSkinConfig.ExplosionEffect3 > 0)
+ {
+ caster.battleField.battleEffectMgr.PlayEffect(target, skillSkinConfig.ExplosionEffect3, target.GetTransform(), caster.Camp, target.GetModelScale());
+ }
+ if (skillSkinConfig.ExplosionEffect4 > 0)
+ {
+ caster.battleField.battleEffectMgr.PlayEffect(target, skillSkinConfig.ExplosionEffect4, target.GetTransform(), caster.Camp, target.GetModelScale());
+ }
}
-
- onHit?.Invoke(hitIndex, tagUseSkillAttack.HurtList.ToList());
+
+ onHit?.Invoke(hitIndex, HurtListAsList);
}
- public override void OnMiddleFrameStart(int times)
+ /// <summary>
+ /// 鍚庢憞缁撴潫
+ /// </summary>
+ public override void OnFinalFrameEnd()
{
-
+ base.OnFinalFrameEnd();
+ isFinish = true;
}
}
\ No newline at end of file
--
Gitblit v1.8.0