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/SkillEffect.cs | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/Main/System/Battle/SkillEffect/SkillEffect.cs b/Main/System/Battle/SkillEffect/SkillEffect.cs
index 538dc6b..5231a17 100644
--- a/Main/System/Battle/SkillEffect/SkillEffect.cs
+++ b/Main/System/Battle/SkillEffect/SkillEffect.cs
@@ -6,6 +6,7 @@
{
protected SkillBase skillBase;
protected SkillConfig skillConfig;
+ protected SkillSkinConfig skillSkinConfig;
protected BattleObject caster;
protected HB427_tagSCUseSkill tagUseSkillAttack;// 鐩爣鍒楄〃
@@ -15,10 +16,23 @@
protected Action<int, List<HB427_tagSCUseSkill.tagSCUseSkillHurt>> onHit;
- public SkillEffect(SkillBase _skillBase, SkillConfig _skillConfig, BattleObject _caster, HB427_tagSCUseSkill _tagUseSkillAttack)
+ // 缂撳瓨HurtList鐨凩ist鍓湰锛岄伩鍏嶆瘡娆nHit鍥炶皟鏃堕噸澶峊oList鍒嗛厤
+ private List<HB427_tagSCUseSkill.tagSCUseSkillHurt> _hurtListCache;
+ protected List<HB427_tagSCUseSkill.tagSCUseSkillHurt> HurtListAsList
+ {
+ get
+ {
+ if (_hurtListCache == null)
+ _hurtListCache = new List<HB427_tagSCUseSkill.tagSCUseSkillHurt>(tagUseSkillAttack.HurtList);
+ return _hurtListCache;
+ }
+ }
+
+ public SkillEffect(SkillBase _skillBase, SkillConfig _skillConfig, SkillSkinConfig _skillSkinConfig, BattleObject _caster, HB427_tagSCUseSkill _tagUseSkillAttack)
{
skillBase = _skillBase;
skillConfig = _skillConfig;
+ skillSkinConfig = _skillSkinConfig;
caster = _caster;
tagUseSkillAttack = _tagUseSkillAttack;
}
@@ -27,13 +41,13 @@
public virtual void Play(Action<int, List<HB427_tagSCUseSkill.tagSCUseSkillHurt>> _onHit)
{
onHit = _onHit;
- if (skillConfig.EffectId > 0)
+ if (skillSkinConfig.EffectId > 0)
{
- caster.battleField.battleEffectMgr.PlayEffect(caster, skillConfig.EffectId, caster.GetRectTransform(), caster.Camp, caster.GetModelScale());
+ caster.battleField.battleEffectMgr.PlayEffect(caster, skillSkinConfig.EffectId, caster.GetRectTransform(), caster.Camp, caster.GetModelScale());
}
- if (skillConfig.EffectId2 > 0)
+ if (skillSkinConfig.EffectId2 > 0)
{
- caster.battleField.battleEffectMgr.PlayEffect(caster, skillConfig.EffectId2, caster.GetRectTransform(), caster.Camp, caster.GetModelScale());
+ caster.battleField.battleEffectMgr.PlayEffect(caster, skillSkinConfig.EffectId2, caster.GetRectTransform(), caster.Camp, caster.GetModelScale());
}
}
@@ -49,10 +63,10 @@
public virtual void OnMiddleFrameStart(int times)
{
- if (skillConfig.MStartEffectId <= 0)
+ if (skillSkinConfig.MStartEffectId <= 0)
return;
// 涓憞鍥哄畾鐗规晥
- caster.battleField.battleEffectMgr.PlayEffect(caster, skillConfig.MStartEffectId, caster.GetTransform(), caster.Camp, caster.GetModelScale());
+ caster.battleField.battleEffectMgr.PlayEffect(caster, skillSkinConfig.MStartEffectId, caster.GetTransform(), caster.Camp, caster.GetModelScale());
}
/// <summary>
@@ -76,6 +90,14 @@
return isFinish && isFinishFrameEnd;
}
+#if UNITY_EDITOR
+ /// <summary>鍗℃璇婃柇鐢細鎵撳嵃 SkillEffect 鍐呴儴 isFinish / isFinishFrameEnd 绛夋爣蹇椾綅銆�</summary>
+ public virtual string DumpState()
+ {
+ return $"{GetType().Name} isFinish={isFinish} isFinishFrameEnd={isFinishFrameEnd}";
+ }
+#endif
+
public virtual void ForceFinished()
{
isFinish = true;
--
Gitblit v1.8.0