Project_SG_scripts.git

			@@ -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, float speed = 500f)
			{
			// 原地释放
			if (skillConfig.CastDistance >= 9999)
			{
			onComplete?.Invoke();
			_onComplete?.Invoke();
			return;
			}

			@@ -164,8 +164,8 @@
			var tweener = BattleUtility.MoveToTarget(caster.heroRectTrans, target, offset, () =>
			{
			caster.motionBase.PlayAnimation(MotionName.idle, true);
			onComplete?.Invoke();
			});
			_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);
			});
			@@ -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, 750F);
			}
			, -1f);
			});
			@@ -268,7 +268,7 @@
			{
			// 回到原来的位置
			MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum),
			Vector2.zero, OnAttackFinish);
			Vector2.zero, OnAttackFinish, 750F);
			}
			, -1f);
			});
			@@ -372,11 +372,48 @@

			protected void HighLightAllTargets()
			{
			if (skillConfig.FuncType != 2)
			return;

			// 高亮所有目标
			HashSet<BattleObject> highlightList = new HashSet<BattleObject>(battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack));
			List<BattleObject> targetList = battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack);
			List<BattleObject> highlightList = new List<BattleObject>(targetList);
			highlightList.Add(caster);

			List<BattleObject> allList = battleField.battleObjMgr.allBattleObjDict.Values.ToList<BattleObject>();

			caster.heroInfoBar.SetActive(false);

			for (int i = 0; i < allList.Count; i++)
			{
			BattleObject bo = allList[i];
			if (highlightList.Contains(bo))
			{
			bo.layerMgr.SetFront();
			bo.heroInfoBar.SetActive(true);
			bo.heroRectTrans.SetParent(battleField.battleRootNode.skillFrontNode, true);
			}
			else
			{
			bo.layerMgr.SetBack();
			bo.heroRectTrans.SetParent(battleField.battleRootNode.skillBackNode, true);
			}

			if (targetList.Contains(bo))
			{
			bo.heroInfoBar.SetActive(true);
			}
			else
			{
			bo.heroInfoBar.SetActive(false);
			}
			}

			caster.layerMgr.SetSortingOrder(BattleConst.ActiveHeroActionSortingOrder);

			battleField.battleRootNode.skillMaskNode.SetActive(true);

			// caster.battleField.skillMask
			// 把这些BO全高亮或者说把除了这些的都放在遮罩后面
			// YYL TODO
			}
			@@ -404,6 +441,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);
			@@ -604,7 +642,27 @@
			}
			}

			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);
			bo.heroInfoBar.SetActive(true);
			}
			battleField.battleRootNode.skillMaskNode.SetActive(false);




			return true;
			}
			else
			{
			return false;
			}
			}

			public virtual void ForceFinished()