From b3b82915705dfee86db127d45eea6dd2442d6d92 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 21 十一月 2025 17:25:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Battle/SkillEffect/SkillEffect.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Main/System/Battle/SkillEffect/SkillEffect.cs b/Main/System/Battle/SkillEffect/SkillEffect.cs
index 5acf824..f588b5b 100644
--- a/Main/System/Battle/SkillEffect/SkillEffect.cs
+++ b/Main/System/Battle/SkillEffect/SkillEffect.cs
@@ -4,16 +4,20 @@
public class SkillEffect
{
+ protected SkillBase skillBase;
protected SkillConfig skillConfig;
protected BattleObject caster;
protected HB427_tagSCUseSkill tagUseSkillAttack;// 鐩爣鍒楄〃
protected bool isFinish = false;
+ protected bool isFinishFrameEnd = false;
+
protected Action<int, List<HB427_tagSCUseSkill.tagSCUseSkillHurt>> onHit;
- public SkillEffect(SkillConfig _skillConfig, BattleObject _caster, HB427_tagSCUseSkill _tagUseSkillAttack)
+ public SkillEffect(SkillBase _skillBase, SkillConfig _skillConfig, BattleObject _caster, HB427_tagSCUseSkill _tagUseSkillAttack)
{
+ skillBase = _skillBase;
skillConfig = _skillConfig;
caster = _caster;
tagUseSkillAttack = _tagUseSkillAttack;
@@ -25,11 +29,11 @@
onHit = _onHit;
if (skillConfig.EffectId > 0)
{
- caster.battleField.battleEffectMgr.PlayEffect(caster.ObjID, skillConfig.EffectId, caster.heroRectTrans, caster.Camp);
+ caster.battleField.battleEffectMgr.PlayEffect(caster, skillConfig.EffectId, caster.heroRectTrans, caster.Camp);
}
if (skillConfig.EffectId2 > 0)
{
- caster.battleField.battleEffectMgr.PlayEffect(caster.ObjID, skillConfig.EffectId2, caster.heroRectTrans, caster.Camp);
+ caster.battleField.battleEffectMgr.PlayEffect(caster, skillConfig.EffectId2, caster.heroRectTrans, caster.Camp);
}
}
@@ -48,7 +52,7 @@
if (skillConfig.MStartEffectId <= 0)
return;
// 涓憞鍥哄畾鐗规晥
- caster.battleField.battleEffectMgr.PlayEffect(caster.ObjID, skillConfig.MStartEffectId, caster.heroGo.transform, caster.Camp);
+ caster.battleField.battleEffectMgr.PlayEffect(caster, skillConfig.MStartEffectId, caster.heroGo.transform, caster.Camp);
}
/// <summary>
@@ -64,16 +68,17 @@
/// </summary>
public virtual void OnFinalFrameEnd()
{
-
+ isFinishFrameEnd = true;
}
public virtual bool IsFinished()
{
- return isFinish;
+ return isFinish && isFinishFrameEnd;
}
public virtual void ForceFinished()
{
isFinish = true;
+ isFinishFrameEnd = true;
}
}
\ No newline at end of file
--
Gitblit v1.8.0