From f6ae1fc5eb8b3ac6458ed473edf597072a2683d7 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期日, 14 九月 2025 22:42:33 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/Battle/Skill/SkillBase.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index f51ffe4..2ce14ec 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -151,12 +151,12 @@
// battleField.battleTweenMgr.OnPlayTween(tweener);
}
- protected void MoveToTarget(RectTransform target, Vector2 offset, Action onComplete = null)
+ protected void MoveToTarget(RectTransform target, Vector2 offset, Action _onComplete = null)
{
// 鍘熷湴閲婃斁
if (skillConfig.CastDistance >= 9999)
{
- onComplete?.Invoke();
+ _onComplete?.Invoke();
return;
}
@@ -164,7 +164,7 @@
var tweener = BattleUtility.MoveToTarget(caster.heroRectTrans, target, offset, () =>
{
caster.motionBase.PlayAnimation(MotionName.idle, true);
- onComplete?.Invoke();
+ _onComplete?.Invoke();
});
battleField.battleTweenMgr.OnPlayTween(tweener);
}
@@ -236,9 +236,9 @@
TurnBack(
() =>
{
+ RectTransform rectTransform = battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum);
// 鍥炲埌鍘熸潵鐨勪綅缃�
- MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero,
- OnAttackFinish);
+ MoveToTarget(rectTransform, Vector2.zero, OnAttackFinish);
}
, -1f);
});
@@ -376,7 +376,7 @@
HashSet<BattleObject> highlightList = new HashSet<BattleObject>(battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack));
highlightList.Add(caster);
-
+ // caster.battleField.skillMask
// 鎶婅繖浜汢O鍏ㄩ珮浜� 鎴栬�呰鎶婇櫎浜嗚繖浜涚殑閮芥斁鍦ㄩ伄缃╁悗闈�
// YYL TODO
}
@@ -404,6 +404,7 @@
protected virtual void OnHitEachTarget(int _hitIndex, BattleObject target, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
{
// 浼ゅ鍒嗗竷 (涓囧垎姣�)
+ // Debug.LogError("skillConfig.DamageDivide.Count " + skillConfig.DamageDivide.Length + " _hitIndex " + _hitIndex);
int[] damageDivide = skillConfig.DamageDivide[_hitIndex];
long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
--
Gitblit v1.8.0