From 2159b415a8d445a6602ff708c110bcbb4944a25a Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 18 九月 2025 16:52:32 +0800
Subject: [PATCH] 0312 同步战力计算

---
 Main/System/Battle/Skill/SkillBase.cs |  716 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 695 insertions(+), 21 deletions(-)

diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index 6c8a691..09f6301 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -1,52 +1,726 @@
 using System.Collections.Generic;
 using UnityEngine;
+using System;
+using DG.Tweening;
+using Spine;
+using System.Linq;
 
 
 public class SkillBase
 {
+	const float moveTime = 0.5f;
+
+	protected SkillEffect skillEffect;
+
+	protected HB427_tagSCUseSkill tagUseSkillAttack;
+
 	protected SkillConfig skillConfig;
 
 	protected bool isFinished = false;
 
-	public SkillBase(SkillConfig _skillCfg)
+	protected BattleField battleField = null; // 鎴樺満
+
+	protected RectTransform targetNode = null; // 鐩爣鑺傜偣
+
+	protected BattleObject caster = null; // 鏂芥硶鑰�
+
+	protected bool startCounting = false;
+
+	protected bool pauseState = false;
+
+	protected int curFrame = 0;
+
+	protected List<GameNetPackBasic> packList;
+
+	protected SkillRecordAction otherSkillAction;
+
+	protected List<H0704_tagRolePackRefresh> dropPackList = new List<H0704_tagRolePackRefresh>();
+
+	protected List<HB405_tagMCAddExp> expPackList = new List<HB405_tagMCAddExp>();
+
+	protected bool moveFinished = false;
+
+	public SkillBase(BattleObject _caster, SkillConfig _skillCfg, HB427_tagSCUseSkill vNetData, List<GameNetPackBasic> _packList, BattleField _battleField = null)
 	{
+		caster = _caster;
 		skillConfig = _skillCfg;
+		tagUseSkillAttack = vNetData;
+		battleField = _battleField;
+		packList = _packList;
+
+		
+
 	}
 
 	public virtual void Run()
 	{
+		if (startCounting)
+		{
+			curFrame++;
+		}
+
+		if (null != skillEffect)
+		{
+			skillEffect.Run();
+		}
+
+		if (otherSkillAction != null)
+		{
+			if (otherSkillAction.IsFinished())
+			{
+				otherSkillAction = null;
+				OnSkillFinished();
+			}
+			else
+			{
+				otherSkillAction.Run();
+			}
+		}
+	}
+
+
+
+	public void Pause()
+	{
+		pauseState = startCounting;
+		startCounting = false;
+	}
+
+	public void Resume()
+	{
+		startCounting = pauseState;
+	}
+
+
+	// 0路绉诲姩鍒拌窛绂荤洰鏍噉鐮侊紝鐨勮窛绂婚噴鏀撅紙鍙厤缃紝9999鍗冲師鍦伴噴鏀撅紝璐熸暟鍒欐槸绉诲姩鍒颁汉鐗╄儗闈紝浜虹墿瑕佽浆韬級
+	// 1路绉诲姩鍒拌窛绂婚樀瀹逛綅缃畁鐮佺殑璺濈锛堝2鍙蜂綅锛�5鍙蜂綅锛夐噴鏀撅紙鍗虫垬鍦轰腑澶绫伙級
+	public virtual void Cast()
+	{
+		EventBroadcast.Instance.Broadcast<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, battleField.guid, skillConfig, caster.teamHero);
+
+		//	楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
+		HighLightAllTargets();
+
+		//	璺濈閰嶆垚璐熸暟瑕佽浆韬� TurnBack
+		switch (skillConfig.castMode)
+		{
+			case SkillCastMode.Self:
+				CastImpl(OnAttackFinish);
+				break;
+			case SkillCastMode.Enemy:
+				CastToEnemy();
+				break;
+			case SkillCastMode.Target:
+				CastToTarget();
+				break;
+			case SkillCastMode.Allies:
+				CastToAllies();
+				break;
+			case SkillCastMode.DashCast:
+				DashCast(OnAttackFinish);
+				break;
+			default:
+				Debug.LogError("寮哄埗缁撴潫鎶�鑳� 鏆傛椂涓嶆敮鎸佸叾浠栫殑鏂瑰紡閲婃斁 鏈夐渶姹傝鑱旂郴绛栧垝 鎶�鑳絠d:" + skillConfig.SkillID + " cast position " + skillConfig.CastPosition);
+				ForceFinished();
+				break;
+		}
+
+	}
+
+	//	鍐叉挒鏀诲嚮
+	protected void DashCast(Action _onComplete)
+	{
+		Debug.LogError("DashCast 杩樻病瀹炵幇");
+		ForceFinished();
+		//	YYL TODO
+
+		// var entry = caster.motionBase.PlayAnimation(skillConfig.GetMotionName(), false);
+		// float animationTime = entry.AnimationTime;
+
+		// int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(caster, tagUseSkillAttack.HurtList.ToList(), skillConfig);
+
+		// BattleCamp battleCamp = skillConfig.TagFriendly != 0 ? caster.Camp : caster.GetEnemyCamp();
+
+		// RectTransform targetTrans = battleField.GetTeamNode(battleCamp, mainTargetPosNum);
+
+		// var tweener = BattleUtility.MoveToTarget(caster.heroRectTrans, targetTrans, new Vector2(skillConfig.CastDistance, 0), animationTime * 0.9f, () =>
+		// {
+		// 	caster.motionBase.PlayAnimation(MotionName.idle, true);
+		// 	_onComplete?.Invoke();
+		// });
+		// battleField.battleTweenMgr.OnPlayTween(tweener);
+	}
+
+	protected void MoveToTarget(RectTransform target, Vector2 offset, Action _onComplete = null, float speed = 500f)
+	{
+		//	鍘熷湴閲婃斁
+		if (skillConfig.CastDistance >= 9999)
+		{
+			_onComplete?.Invoke();
+			return;
+		}
+
+		caster.motionBase.PlayAnimation(MotionName.run, true);
+		var tweener = BattleUtility.MoveToTarget(caster.heroRectTrans, target, offset, () =>
+		{
+			caster.motionBase.PlayAnimation(MotionName.idle, true);
+			_onComplete?.Invoke();
+		}, speed);
+		battleField.battleTweenMgr.OnPlayTween(tweener);
+	}
+
+	protected void TurnBack(Action _onComplete, float forward)
+	{
+		if (skillConfig.CastDistance < 0)
+		{
+			//	杞韩
+			Vector3 scale = caster.heroGo.transform.localScale;
+			scale.x = Mathf.Abs(scale.x) * forward;
+			caster.heroGo.transform.localScale = scale;
+		}
+		_onComplete?.Invoke();
+	}
+
+	protected void CastToEnemy()
+	{
+
+		RectTransform target = battleField.GetTeamNode(caster.GetEnemyCamp(), skillConfig);
+
+		MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), () =>
+		{
+			//	鍒颁綅缃浆韬�(涓嶄竴瀹氶潪瑕佽浆韬� 浣嗘槸娴佺▼瑕佸啓)
+			TurnBack(() =>
+			{
+				//	鍒拌揪鐩爣浣嶇疆
+				CastImpl(() =>
+				{
+					TurnBack(
+						() =>
+						{
+							//	鍥炲埌鍘熸潵鐨勪綅缃�
+							MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, 
+								OnAttackFinish, 750F);
+						}
+					, -1f);
+				});
+			}, -1f);
+		});
+	}
+
+
+
+	protected void CastToTarget()
+	{
+		// 鐩爣鏄晫鏂逛富鐩爣
+		if (tagUseSkillAttack.HurtCount <= 0)
+		{
+			Debug.LogError("鎶�鑳芥敾鍑诲寘娌℃湁鐩爣 HurtCount <= 0");
+			OnSkillFinished();
+			return;
+		}
+
+		int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(caster, tagUseSkillAttack.HurtList.ToList(), skillConfig);
+
+		BattleCamp battleCamp = skillConfig.TagFriendly != 0 ? caster.Camp : caster.GetEnemyCamp();
+
+		RectTransform targetTrans = battleField.GetTeamNode(battleCamp, mainTargetPosNum);
+
+		MoveToTarget(targetTrans, new Vector2(skillConfig.CastDistance, 0), () =>
+		{
+			//	鍒颁綅缃浆韬�(涓嶄竴瀹氶潪瑕佽浆韬� 浣嗘槸娴佺▼瑕佸啓)
+			TurnBack(() =>
+			{
+				//	鍒拌揪鐩爣浣嶇疆
+				CastImpl(() =>
+				{
+					TurnBack(
+						() =>
+						{
+							RectTransform rectTransform = battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum);
+							//	鍥炲埌鍘熸潵鐨勪綅缃�
+							MoveToTarget(rectTransform, Vector2.zero, OnAttackFinish, 750F);
+						}
+					, -1f);
+				});
+			}, -1f);
+		});
+	}
+
+	protected virtual void OnAllAttackMoveFinished()
+	{
+		moveFinished = true;
+	}
+
+	protected void CastToAllies()
+	{
+		RectTransform target = battleField.GetTeamNode(caster.Camp, skillConfig);
+
+		MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), () =>
+		{
+			//	鍒颁綅缃浆韬�(涓嶄竴瀹氶潪瑕佽浆韬� 浣嗘槸娴佺▼瑕佸啓)
+			TurnBack(() =>
+			{
+				//	鍒拌揪鐩爣浣嶇疆
+				CastImpl(() =>
+				{
+					TurnBack(
+						() =>
+						{
+							//	鍥炲埌鍘熸潵鐨勪綅缃�
+							MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum),
+								Vector2.zero, OnAttackFinish, 750F);
+						}
+					, -1f);
+				});
+			}, -1f);
+		});
+	}
+
+	protected void OnAttackFinish()
+	{
+		TurnBack(null, 1f);
+		OnAllAttackMoveFinished();
+		caster.motionBase.PlayAnimation(MotionName.idle, true);
+	}
+
+
+	//	鎵胯浇鎶�鑳藉ぇ閮ㄥ垎鐨勯�昏緫
+	protected TrackEntry CastImpl(Action onComplete = null)
+	{
+		// 鎾斁鏂芥硶鍔ㄤ綔
+		//	onComplete鏄寚鏂芥硶鍔ㄤ綔鎾斁瀹岀殑鍥炶皟 涓嶄唬琛ㄦ槸鎶�鑳界粨鏉�
+		//	鍏蜂綋鎶�鑳界粨鏉熺殑鏃堕棿搴旇鐪嬫妧鑳藉搴旂殑閫昏緫
+		//	杩欓噷鍙彁渚�6涓姩浣滅浉鍏崇殑鍑芥暟
+		// OnSkillStart 鍔ㄤ綔绗竴甯�
+		// OnStartSkillFrameEnd 鍓嶆憞缁撴潫
+		// OnMiddleFrameStart 涓憞寮�濮�
+		// OnMiddleFrameEnd 涓憞缁撴潫
+		// OnFinalFrameStart 鍚庢憞寮�濮�
+		// OnFinalFrameEnd 鍚庢憞缁撴潫
+		return caster.motionBase.PlaySkillAnimation(skillConfig, this, onComplete);
+	}
+
+	//	鎶�鑳藉紑濮�
+	public void OnSkillStart()
+	{
+		skillEffect = SkillEffectFactory.CreateSkillEffect(
+				caster,
+				skillConfig,
+				tagUseSkillAttack
+			);
+		// if (skillEffect != null)
+		{
+			skillEffect.Play(OnHitTargets);
+		}
+
+		
+
+	}
+
+	//	鎶�鑳藉墠鎽囧抚缁撴潫
+	public virtual void OnStartSkillFrameEnd()
+	{
+
+	}
+
+	/// <summary>
+	/// 涓憞寮�濮� times=绗嚑娆″惊鐜� 浠�0寮�濮�
+	/// </summary>
+	/// <param name="times"></param>
+	public virtual void OnMiddleFrameStart(int times)
+	{
+		// if (skillEffect != null)
+		{
+			skillEffect.OnMiddleFrameStart(times);
+		}
+	}
+
+	public virtual void OnMiddleFrameEnd(int times, int hitIndex)
+	{
+		// if (skillEffect != null)
+		{
+			skillEffect.OnMiddleFrameEnd(times, hitIndex);
+		}
+	}
+
+	/// <summary>
+	/// 鍚庢憞寮�濮�
+	/// </summary>
+	public virtual void OnFinalFrameStart()
+	{
+		// if (skillEffect != null)
+		{
+			skillEffect.OnFinalFrameStart();
+		}
+	}
+
+	/// <summary>
+	/// 鍚庢憞缁撴潫
+	/// </summary>
+	public virtual void OnFinalFrameEnd()
+	{
+		// if (skillEffect != null)
+		{
+			skillEffect.OnFinalFrameEnd();
+		}
+
+		HandleDead();
+	}
+
+
+
+
+	protected void HighLightAllTargets()
+	{
+		if (skillConfig.FuncType != 2)
+			return;
+
+		// 楂樹寒鎵�鏈夌洰鏍�
+		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
+		//	鎶婅繖浜汢O鍏ㄩ珮浜� 鎴栬�呰鎶婇櫎浜嗚繖浜涚殑閮芥斁鍦ㄩ伄缃╁悗闈�
+		//	YYL TODO
+	}
+
+	//	鍛戒腑鐩爣鍚庣殑鍥炶皟 姝ｅ父鏄互鍚勬妧鑳界殑鏂瑰紡鏉ュ鐞嗙殑
+	protected virtual void OnHitTargets(int _hitIndex, List<HB427_tagSCUseSkill.tagSCUseSkillHurt> hitList)
+	{
+		for (int i = 0; i < hitList.Count; i++)
+		{
+			HB427_tagSCUseSkill.tagSCUseSkillHurt hurt = hitList[i];
+
+			BattleObject target = caster.battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
+			if (target == null)
+			{
+				Debug.LogError("鐩爣涓虹┖ target == null ObjId : " + hurt.ObjID);
+				continue;
+			}
+
+			OnHitEachTarget(_hitIndex, target, hurt);
+		}
 		
 	}
 
-	public virtual void Cast(BattleObject _caster, BattleField battleField, List<Dictionary<int, List<int>>> damageList)
+
+	protected virtual void OnHitEachTarget(int _hitIndex, BattleObject target, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
 	{
-		Debug.LogError("SkillBase Cast should be overridden by derived class");
+		// 浼ゅ鍒嗗竷 (涓囧垎姣�)
+		// Debug.LogError("skillConfig.DamageDivide.Count " + skillConfig.DamageDivide.Length + " _hitIndex " + _hitIndex);
+		int[] damageDivide = skillConfig.DamageDivide[_hitIndex];
+
+		long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
+
+		// 淇濊瘉鎵�鏈夊垎閰嶉」鍔犺捣鏉ョ瓑浜巘otalDamage锛岄伩鍏嶅洜鏁撮櫎瀵艰嚧鐨勮宸�
+		List<long> damageList = BattleUtility.DivideDamageToList(damageDivide, totalDamage);
+		// public uint ObjID;
+		// public uint AttackTypes;        // 椋樿绫诲瀷姹囨�伙紝鏀寔澶氱绫诲瀷骞跺瓨锛屽鏃犺闃插尽涓旀毚鍑诲悓鏃惰鏍兼尅锛屼簩杩涘埗鎴栬繍绠楁渶缁堝�硷紱0-澶辫触锛�1-鏅�氾紱2-鍥炶锛�5-鏍兼尅锛�6-鏃犺闃插尽锛�7-鏆村嚮锛�9-闂伩
+		// public uint HurtHP;        // 椋樿鍊硷紝姹備綑浜块儴鍒�
+		// public uint HurtHPEx;        // 椋樿鍊硷紝鏁撮櫎浜块儴鍒�
+		// public uint CurHP;        // 鏇存柊鍓╀綑琛�閲忥紝姹備綑浜块儴鍒�
+		// public uint CurHPEx;        // 鏇存柊鍓╀綑琛�閲忥紝鏁撮櫎浜块儴鍒�
+		// public uint SuckHP;        // 鏈浼ゅ杞寲鐨勫惛琛�閲�
+		// public uint BounceHP;        // 鏈浼ゅ鍙嶅脊鐨勪激瀹抽噺
+
+
+		//	TODO YYL AttackTypes  瑕佽〃鐜版垚浠�涔堟牱鍛紵 鏀寔澶氱绫诲瀷骞跺瓨锛屽鏃犺闃插尽涓旀毚鍑诲悓鏃惰鏍兼尅锛屼簩杩涘埗鎴栬繍绠楁渶缁堝�硷紱0-澶辫触锛�1-鏅�氾紱2-鍥炶锛�5-鏍兼尅锛�6-鏃犺闃插尽锛�7-鏆村嚮锛�9-闂伩
+		target.Hurt(damageList, totalDamage, hurt, skillConfig);
+
+		//	TODO YYL 杩欓噷鏄鍋氱粺涓�璁＄畻鍚庡啀hurt璺焥uckhp杩樻槸鎬庢牱
+		caster.SuckHp(hurt.SuckHP, skillConfig);//	鍚歌
+		caster.HurtByReflect(hurt.BounceHP, skillConfig);// 鍙嶅脊浼ゅ
 	}
 
+
+	protected void HandleDead()
+	{
+		var deadPackList = BattleUtility.FindDeadPack(packList);
+		int deadCount = deadPackList.Count;
+
+		if (deadCount <= 0)
+		{
+			//	濡傛灉娌℃浜″氨涓嶇敤绠�
+			return;
+		}
+
+		CheckAfterDeadhPack();
+
+		// 澶勭悊鎺夎惤鍖� 鎻愬墠distribute涔嬪悗 PackManager鎵嶆湁鎺夎惤鐗� 鎵�浠ヤ笉璺焌ssignexp涓�鏍穌istribute
+		foreach (var _dropPack in dropPackList)
+		{
+			PackageRegedit.Distribute(_dropPack);
+			packList.Remove(_dropPack);
+		}
+
+		// 鑾峰彇鎺夎惤鐗╁搧
+		var dropPack = PackManager.Instance.GetSinglePack(PackType.DropItem);
+		var itemDict = dropPack.GetAllItems();
+		List<ItemModel> itemList = new List<ItemModel>(
+			from item in itemDict.Values
+			where item != null && item.isAuction
+			select item);
+
+
+
+		// 鍒嗛厤鎺夎惤鍜岀粡楠�
+		var dropAssign = AssignDrops(itemList, deadCount);
+		var expAssign = AssignExp(expPackList, deadCount);
+
+		// 鏋勯�� BattleDrops 骞跺垎閰�
+		for (int i = 0; i < deadCount; i++)
+		{
+			BattleObject deadTarget = battleField.battleObjMgr.GetBattleObject((int)deadPackList[i].ObjID);
+			List<ItemModel> itemModelDrops = dropAssign[i];
+			List<int> itemModelDropsIndexList = new List<int>(
+				from item in itemModelDrops select item.gridIndex);
+			BattleDrops battleDrops = new BattleDrops()
+			{
+				rectTransform = deadTarget.heroRectTrans,
+				dropItemPackIndex = itemModelDropsIndexList,
+				expDrops = expAssign[i]
+			};
+			deadTarget.PushDropItems(battleDrops);
+		}
+
+		// 鍒嗗彂姝讳骸鍖�
+
+		battleField.OnObjsDead(new List<HB422_tagMCTurnFightObjDead>(deadPackList));
+		foreach (var deadPack in deadPackList)
+		{
+			packList.Remove(deadPack);
+		}
+		deadPackList.Clear();
+	}
+
+
+
+	// 鍒嗛厤鎺夎惤
+	protected List<List<ItemModel>> AssignDrops(List<ItemModel> itemList, int deadCount)
+	{
+		var dropAssign = new List<List<ItemModel>>(deadCount);
+		for (int i = 0; i < deadCount; i++)
+			dropAssign.Add(new List<ItemModel>());
+		for (int i = 0; i < itemList.Count; i++)
+			dropAssign[i % deadCount].Add(itemList[i]);
+		return dropAssign;
+	}
+
+	// 鍒嗛厤缁忛獙锛氭瘡涓師濮嬪寘閮藉钩鍧囧垎閰嶅埌姣忎釜姝讳骸瀵硅薄
+	protected List<List<HB405_tagMCAddExp>> AssignExp(List<HB405_tagMCAddExp> expList, int deadCount)
+	{
+		var expAssign = new List<List<HB405_tagMCAddExp>>(deadCount);
+		for (int i = 0; i < deadCount; i++)
+			expAssign.Add(new List<HB405_tagMCAddExp>());
+
+		foreach (var expPack in expList)
+		{
+			long totalExp = GeneralDefine.GetFactValue(expPack.Exp, expPack.ExpPoint);
+			long avgExp = totalExp / deadCount;
+			long remain = totalExp % deadCount;
+
+			for (int i = 0; i < deadCount; i++)
+			{
+				long assignExp = avgExp + (i < remain ? 1 : 0);
+				long expPoint = assignExp / 100000000;
+				long exp = assignExp % 100000000;
+				var newPack = new HB405_tagMCAddExp
+				{
+					Exp = (uint)exp,
+					ExpPoint = (uint)expPoint,
+					Source = expPack.Source // 淇濇寔鍘熷寘鏉ユ簮
+				};
+				expAssign[i].Add(newPack);
+			}
+			packList.Remove(expPack);
+		}
+		return expAssign;
+	}
+
+
+
+	protected void CheckAfterDeadhPack()
+	{
+		List<int> removeIndexList = new List<int>();
+		for (int i = 0; i < packList.Count; i++)
+		{
+			var pack = packList[i];
+
+			// 	澶嶆椿鍩烘湰閮介潬鎶�鑳藉寘
+			if (pack is CustomHB426CombinePack)
+			{
+				var combinePack = pack as CustomHB426CombinePack;
+				if (combinePack.startTag.Tag.StartsWith("Skill_"))
+				{
+					break; // 鎵惧埌鎶�鑳藉寘灏变笉闇�瑕佸啀澶勭悊浜�
+				}
+			}
+			else if (pack is H0704_tagRolePackRefresh)
+			{
+				var h0704Pack = pack as H0704_tagRolePackRefresh;
+				if (h0704Pack.PackType == (byte)PackType.DropItem)
+				{
+					//	鎺夎惤鐨�
+					if (h0704Pack.IsBind == 1)
+					{
+						//	鎺夎惤鐨勭墿鍝�
+						dropPackList.Add(h0704Pack);
+						removeIndexList.Add(i);
+					}
+					else if (h0704Pack.IsBind == 0)
+					{
+						//	鏇挎崲鐨�
+					}
+				}
+			}
+			else if (pack is HB405_tagMCAddExp)
+			{
+				var h405Pack = pack as HB405_tagMCAddExp;
+
+				//B4 05 鑾峰緱缁忛獙 #tagMCAddExp 閫氱煡鑾峰緱鐨勭粡楠岋紝
+				//鍙敤浜庡仛缁忛獙鑾峰緱琛ㄧ幇 Source = 2 鏃朵负涓荤嚎鍑绘潃鎬墿鑾峰緱缁忛獙
+				if (h405Pack.Source == 2)
+				{
+					expPackList.Add(h405Pack);
+					removeIndexList.Add(i);
+				}
+			}
+
+		}
+
+		for (int i = removeIndexList.Count - 1; i >= 0; i--)
+		{
+			packList.RemoveAt(removeIndexList[i]);
+		}
+	}
 	public virtual bool IsFinished()
 	{
-		return isFinished;
+		if (skillEffect != null)
+		{
+			if (!skillEffect.IsFinished())
+			{
+				return false;
+			}
+			else
+			{
+				OnSkillFinished();
+				skillEffect = null;
+			}
+		}
+
+		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()
 	{
+		skillEffect?.ForceFinished();
+		isFinished = true;
+		moveFinished = true;
+
+		while (packList.Count > 0)
+		{
+			var pack = packList[0];
+			packList.RemoveAt(0);
+
+			if (pack is CustomHB426CombinePack)
+			{
+				var combinePack = pack as CustomHB426CombinePack;
+				if (combinePack.startTag.Tag.StartsWith("Skill_"))
+				{
+					BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
+					otherSkillAction = combinePack.CreateSkillAction();
+
+					//	寮哄埗缁撴潫鍏朵粬鎶�鑳�
+					otherSkillAction.ForceFinish();
+					return;
+				}
+			}
+			PackageRegedit.Distribute(pack);
+		}
+	}
+
+	public void OnSkillFinished()
+	{
+		if (skillEffect != null)
+		{
+			if (!skillEffect.IsFinished())
+			{
+				return;
+			}
+		}
+
+		while (packList.Count > 0)
+		{
+			var pack = packList[0];
+			packList.RemoveAt(0);
+
+			if (pack is CustomHB426CombinePack)
+			{
+				var combinePack = pack as CustomHB426CombinePack;
+				if (combinePack.startTag.Tag.StartsWith("Skill_"))
+				{
+					BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
+					otherSkillAction = combinePack.CreateSkillAction();
+					return;
+				}
+			}
+			PackageRegedit.Distribute(pack);
+		}
+
 		isFinished = true;
 	}
-
-#if UNITY_EDITOR
-	public virtual List<BattleObject> GetTargetList(BattleObject _caster, BattleField battleField)
-	{
-		SkillTargetType targetType = SkillTargetType.Enemy;
-		SkillTargetRangeType rangeType = SkillTargetRangeType.LowestHP;
-
-		List<BattleObject> affectList = battleField.battleObjMgr.GetTargetList(_caster, targetType, rangeType);
-		return affectList;
-	}
-	
-	public virtual List<Dictionary<int, List<int>>> GetDamageList(BattleObject _caster, BattleField battleField)
-	{
-		Debug.LogError("SkillBase GetDamageList should be overridden by derived class");
-		return null;
-	}
-#endif
 }
\ No newline at end of file

--
Gitblit v1.8.0