From 6a10188f3eddc740b9b8b1e7eefb0e2fdb3850e3 Mon Sep 17 00:00:00 2001 From: yyl <yyl> Date: 星期一, 15 九月 2025 19:41:19 +0800 Subject: [PATCH] 125 【战斗】战斗系统 角色层级&战斗速度调整 --- Main/System/Battle/Skill/SkillBase.cs | 41 ++++++++++++++++++++++++++++++++--------- 1 files changed, 32 insertions(+), 9 deletions(-) diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs index 7e83c22..049ac80 100644 --- a/Main/System/Battle/Skill/SkillBase.cs +++ b/Main/System/Battle/Skill/SkillBase.cs @@ -151,7 +151,7 @@ // battleField.battleTweenMgr.OnPlayTween(tweener); } - protected void MoveToTarget(RectTransform target, Vector2 offset, Action _onComplete = null) + protected void MoveToTarget(RectTransform target, Vector2 offset, Action _onComplete = null, float speed = 500f) { // 鍘熷湴閲婃斁 if (skillConfig.CastDistance >= 9999) @@ -165,7 +165,7 @@ { caster.motionBase.PlayAnimation(MotionName.idle, true); _onComplete?.Invoke(); - }); + }, speed); battleField.battleTweenMgr.OnPlayTween(tweener); } @@ -199,7 +199,7 @@ { // 鍥炲埌鍘熸潵鐨勪綅缃� MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, - OnAttackFinish); + OnAttackFinish, 750F); } , -1f); }); @@ -238,7 +238,7 @@ { RectTransform rectTransform = battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum); // 鍥炲埌鍘熸潵鐨勪綅缃� - MoveToTarget(rectTransform, Vector2.zero, OnAttackFinish); + MoveToTarget(rectTransform, Vector2.zero, OnAttackFinish, 750F); } , -1f); }); @@ -268,7 +268,7 @@ { // 鍥炲埌鍘熸潵鐨勪綅缃� MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), - Vector2.zero, OnAttackFinish); + Vector2.zero, OnAttackFinish, 750F); } , -1f); }); @@ -372,6 +372,9 @@ protected void HighLightAllTargets() { + if (skillConfig.FuncType != 2) + return; + // 楂樹寒鎵�鏈夌洰鏍� List<BattleObject> highlightList = battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack); highlightList.Add(caster); @@ -383,15 +386,17 @@ BattleObject bo = allList[i]; if (highlightList.Contains(bo)) { - bo.SetToFront(); + bo.layerMgr.SetFront(); + bo.heroRectTrans.SetParent(battleField.battleRootNode.skillFrontNode, true); } else { - bo.SetToBack(); + bo.layerMgr.SetBack(); + bo.heroRectTrans.SetParent(battleField.battleRootNode.skillBackNode, true); } } - // battleField.skillMask.SetActive(true); + battleField.battleRootNode.skillMaskNode.SetActive(true); // caster.battleField.skillMask // 鎶婅繖浜汢O鍏ㄩ珮浜� 鎴栬�呰鎶婇櫎浜嗚繖浜涚殑閮芥斁鍦ㄩ伄缃╁悗闈� @@ -622,7 +627,25 @@ } } - return isFinished && moveFinished; + if (isFinished && moveFinished) + { + List<BattleObject> allList = battleField.battleObjMgr.allBattleObjDict.Values.ToList<BattleObject>(); + for (int i = 0; i < allList.Count; i++) + { + BattleObject bo = allList[i]; + bo.layerMgr.SetFront(); + bo.heroRectTrans.SetParent(battleField.GetTeamNode(bo.Camp, bo.teamHero.positionNum), true); + } + battleField.battleRootNode.skillMaskNode.SetActive(false); + + + + return true; + } + else + { + return false; + } } public virtual void ForceFinished() -- Gitblit v1.8.0