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/BattleObject/BattleObject.cs | 752 ++++++++++++++++-----------------------------------------
1 files changed, 219 insertions(+), 533 deletions(-)
diff --git a/Main/System/Battle/BattleObject/BattleObject.cs b/Main/System/Battle/BattleObject/BattleObject.cs
index cba9472..12f5dd3 100644
--- a/Main/System/Battle/BattleObject/BattleObject.cs
+++ b/Main/System/Battle/BattleObject/BattleObject.cs
@@ -26,11 +26,9 @@
Burned = 1 << 5
}
-public class BattleObject
+public abstract class BattleObject
{
public BattleField battleField;
-
- public BattleObjectBuffMgr buffMgr;
public BattleObjectLayerMgr layerMgr;
@@ -38,240 +36,234 @@
public BattleCamp Camp { get; protected set; }
- public TeamHero teamHero { get; protected set; }
-
- public MotionBase motionBase;
-
- public GameObject heroGo
- {
- get;
- private set;
- }
-
- protected BattleDrops m_battleDrops;
-
- private RectTransform m_heroRectTrans;
-
-
- public RectTransform heroRectTrans
- {
- get
- {
- if (m_heroRectTrans == null)
- {
- m_heroRectTrans = heroGo.GetComponent<RectTransform>();
- }
- return m_heroRectTrans;
- }
- }
-
- protected Action onDeathAnimationComplete;
-
- protected Renderer[] renderers;
-
- private List<HB405_tagMCAddExp> hB405_tagMCAddExps = new List<HB405_tagMCAddExp>();
- public BattleHeroInfoBar heroInfoBar;
-
- public bool isReborning = false;
-
public BattleObject(BattleField _battleField)
{
battleField = _battleField;
}
- public virtual void Init(GameObject _heroGo, TeamHero _teamHero, BattleCamp _camp)
+ // SkillBase.MoveToTarget 鍙戣捣鐨勫墠鍐� / 鍥炰綅 tween 鍙ユ焺锛堢敱 SkillBase 缁存姢锛夈��
+ // CanCastSkillAnimation 鍙垽鏂繖涓�涓彞鏌勶紝閬垮厤璇激 caster 韬笂鍏跺畠涓氬姟 tween銆�
+ public Tween activeMoveTween;
+
+ // ============ 鎶借薄璁块棶鏂规硶锛堝瓙绫昏繑鍥炲悇鑷殑Team绫诲瀷淇℃伅锛� ============
+
+ public abstract int GetPositionNum();
+ public abstract float GetModelScale();
+ public abstract string GetName();
+
+ // Buff 绠＄悊鍣ㄨ闂柟娉曪紙Hero 鏈� buff锛孧ingge 杩斿洖 null锛�
+ public abstract BattleObjectBuffMgr GetBuffMgr();
+
+ // 鐘舵�佹煡璇㈡娊璞℃柟娉�
+ protected abstract bool GetIsStunned();
+ protected abstract bool GetIsFrozen();
+ protected abstract bool GetIsStoned();
+ protected abstract bool GetIsSlient();
+ protected abstract bool GetIsDisarmed();
+ protected abstract bool GetIsInvincible();
+ protected abstract bool GetIsDead();
+ public abstract int GetRage();
+
+ // 琛�閲忕浉鍏虫娊璞℃柟娉曪紙Hero 鐗规湁锛孧ingge 杩斿洖榛樿鍊硷級
+ public abstract long GetCurHp();
+ public abstract long GetMaxHp();
+ public abstract void SetCurHp(long value);
+ public abstract void SetIsDead(bool value);
+
+ // 鍏朵粬灞炴�ц闂柟娉�
+ public abstract int GetNPCID();
+ public abstract long GetFightPower();
+
+ public abstract void Run();
+
+ public abstract void Pause();
+
+ public abstract void Resume();
+
+ public abstract void Destroy();
+
+ // ============ 鍔ㄧ敾鐩稿叧鎶借薄鏂规硶锛堟浛浠� motionBase 鐩存帴璋冪敤锛� ============
+
+ /// <summary>
+ /// 鎾斁鍔ㄧ敾
+ /// </summary>
+ public abstract void PlayAnimation(MotionName motionName, bool loop);
+
+ /// <summary>
+ /// 鏄剧ず骞诲奖娈嬪奖
+ /// </summary>
+ public abstract void ShowIllusionShadow(bool show, Color? color = null);
+
+ /// <summary>
+ /// 鎾斁鎶�鑳藉姩鐢�
+ /// </summary>
+ public abstract Spine.TrackEntry PlaySkillAnimation(SkillConfig skillConfig, SkillSkinConfig skillSkinConfig, SkillBase skillBase, bool isCounter, Action onComplete);
+
+ /// <summary>
+ /// 妫�鏌ユ槸鍚﹀彲浠ュ紑濮嬫浜�
+ /// </summary>
+ public abstract bool CanStartDeath();
+
+ /// <summary>
+ /// 妫�鏌ユ槸鍚﹀彲浠ラ噴鏀炬妧鑳�
+ /// </summary>
+ public abstract bool CanCastSkillAnimation(SkillSkinConfig skillSkinConfig);
+
+ /// <summary>
+ /// 鑾峰彇楠ㄩ鍔ㄧ敾缁勪欢锛堢敤浜庣壒鏁堟寕杞界瓑锛�
+ /// </summary>
+ public abstract SkeletonAnimation GetSkeletonAnimation();
+
+ /// <summary>
+ /// 璁剧疆楠ㄩ鍔ㄧ敾閫忔槑搴�
+ /// </summary>
+ public abstract void SetSkeletonAlpha(float alpha);
+
+ /// <summary>
+ /// 鑾峰彇 RectTransform锛堢敤浜庣Щ鍔ㄧ瓑鎿嶄綔锛�
+ /// </summary>
+ public virtual RectTransform GetRectTransform() => null;
+
+ /// <summary>
+ /// 鑾峰彇 GameObject
+ /// </summary>
+ public virtual GameObject GetGameObject() => null;
+
+ /// <summary>
+ /// 鑾峰彇 Transform锛堢敤浜庣壒鏁堟寕杞界瓑锛�
+ /// </summary>
+ public virtual Transform GetTransform() => null;
+
+ /// <summary>
+ /// 鑾峰彇涓栫晫鍧愭爣浣嶇疆
+ /// </summary>
+ public virtual Vector3 GetPosition() => Vector3.zero;
+
+ /// <summary>
+ /// 鑾峰彇琛�鏉′俊鎭爮
+ /// </summary>
+ public virtual BattleHeroInfoBar GetHeroInfoBar() => null;
+
+ /// <summary>
+ /// 鍒锋柊Buff鏄剧ず
+ /// </summary>
+ public virtual void RefreshBuff(List<HB428_tagSCBuffRefresh> buffList) { }
+
+ /// <summary>
+ /// 鏇存柊琛�閲忔樉绀�
+ /// </summary>
+ public virtual void UpdateHP(float percentage) { }
+
+ /// <summary>
+ /// 鏄惁姝ｅ湪澶嶆椿涓�
+ /// </summary>
+ public virtual bool IsReborning() => false;
+
+ /// <summary>
+ /// 璁剧疆澶嶆椿鐘舵��
+ /// </summary>
+ public virtual void SetReborning(bool value) { }
+
+ /// <summary>
+ /// 璁剧疆 GameObject 婵�娲荤姸鎬�
+ /// </summary>
+ public virtual void SetActive(bool active) { }
+
+ /// <summary>
+ /// 閲嶇疆浣嶇疆鍒板師鐐�
+ /// </summary>
+ public virtual void ResetPosition() { }
+
+ /// <summary>
+ /// 璁剧疆鏈濆悜锛堥�氳繃缂╂斁锛�
+ /// </summary>
+ public virtual void SetFacing(float direction) { }
+
+ /// <summary>
+ /// 閲嶇疆鏈濆悜锛堟湞鍚戝彸杈癸級
+ /// </summary>
+ public virtual void ResetFacing() { }
+
+ /// <summary>
+ /// 鍋滄鎵�鏈夌Щ鍔ㄥ姩鐢�
+ /// </summary>
+ public virtual void StopMoveAnimation() { }
+
+ /// <summary>
+ /// 鏄剧ず鎻愮ず淇℃伅锛堢畝鍗曠増鏈級
+ /// </summary>
+ public virtual void ShowTips(string message, bool useArtText = false, bool followCharacter = true, float scaleRatio = 1f) { }
+
+ /// <summary>
+ /// 鏄剧ず鎻愮ず淇℃伅锛堝畬鏁寸増鏈級
+ /// </summary>
+ public virtual void ShowTips(BattleHeroInfoBar.TipsInfo tipsInfo) { }
+
+ /// <summary>
+ /// 璁剧疆姝讳骸鐘舵�侊紙Hero 鐗瑰畾锛�
+ /// </summary>
+ public virtual void SetDeath() { }
+
+ /// <summary>
+ /// 澶嶆椿鍚庡鐞嗭紙Hero 鐗瑰畾锛�
+ /// </summary>
+ public virtual void AfterReborn() { }
+
+ /// <summary>
+ /// 澶嶆椿鍓嶅噯澶囷紙Hero 鐗瑰畾锛�
+ /// </summary>
+ public virtual void PreReborn(bool reviveSelf = false) { }
+
+ /// <summary>
+ /// 澶嶆椿鍔ㄤ綔锛圚ero 鐗瑰畾锛�
+ /// </summary>
+ public virtual void OnReborn(HB427_tagSCUseSkill.tagSCUseSkillHurt vNetData, bool reviveSelf = false, RecordAction parentAction = null) { }
+
+ public virtual void OnObjInfoRefresh(H0418_tagObjInfoRefresh _refreshInfo)
{
- heroGo = _heroGo;
- teamHero = _teamHero;
- Camp = _camp;
- motionBase = new MotionBase();
- motionBase.Init(heroGo.GetComponentInChildren<SkeletonAnimation>(true));
- buffMgr = new BattleObjectBuffMgr();
- buffMgr.Init(this);
-
- buffMgr.onIsControlChanged += OnControledChange;
-
- layerMgr = new BattleObjectLayerMgr();
- layerMgr.Init(this);
-
- renderers = heroGo.GetComponentsInChildren<Renderer>(true);
-
- heroInfoBar = heroGo.GetComponentInChildren<BattleHeroInfoBar>(true);
- heroInfoBar.SetBattleObject(this);
-
- // 鏍规嵁闃佃惀缈昏浆琛�鏉�
- var heroInfoBarScale = heroInfoBar.transform.localScale;
- heroInfoBarScale.x *= Camp == BattleCamp.Red ? 1 : -1;
- heroInfoBar.transform.localScale = heroInfoBarScale;
- if (battleField is StoryBattleField && (battleField as StoryBattleField).battleState == StoryBattleState.Break)
- {
- //涓荤嚎鍏冲崱浼戞伅涓殑涓嶆樉绀鸿鏉�
- heroInfoBar.SetActive(false);
- }
- else
- {
- heroInfoBar.SetActive(true);
- }
- SetFront();
+ // 瀛愮被瀹炵幇
}
-
-
- public virtual void Run()
- {
- motionBase.Run();
- heroInfoBar.Run();
- buffMgr.Run();
- }
-
- public virtual void Pause()
- {
- motionBase.Pause();
- }
-
- public virtual void Resume()
- {
- motionBase.Resume();
- }
-
- public virtual void Destroy()
- {
-
- motionBase.Release();
- motionBase = null;
- buffMgr.onIsControlChanged -= OnControledChange;
- buffMgr.Release();
- buffMgr = null;
- teamHero = null;
- ObjID = 0;
-
- if (heroGo != null)
- {
- GameObject.DestroyImmediate(heroGo);
- heroGo = null;
- }
- }
-
- // 鏈夊彉鍖栦簡鎵嶄細璋冪敤杩欎釜鍑芥暟
- private void OnControledChange(int groupType, bool value)
- {
- // 杩欓噷鏄彈鍒扮‖鎺ф椂鍊� 闇�瑕佽〃鐜扮殑鍔ㄧ敾
- if (groupType == BattleConst.HardControlGroup)
- {
- // 浠庢病琚‖鎺у埌琚‖鎺�
- if (value)
- {
- motionBase.SetControledAnimation();
- }
- else
- {
- motionBase.CancelControledAnimation();
- }
- }
- }
-
- public void OnObjInfoRefresh(H0418_tagObjInfoRefresh _refreshInfo)
- {
- // 澶╁瓙鐨勬寫鎴樻嫤鎴鏉�,涓嶆嫤鎴�掓皵
- BattleObject boss = battleField.FindBoss();
- if (boss != null && battleField.MapID == 30020 && boss.ObjID == _refreshInfo.ObjID && _refreshInfo.RefreshType != (ushort)PlayerDataType.XP)
- return;
- switch ((PlayerDataType)_refreshInfo.RefreshType)
- {
- case PlayerDataType.HP:
- long toHp = GeneralDefine.GetFactValue(_refreshInfo.Value, _refreshInfo.ValueEx);
- if (!IsTianziBoss())
- {
- heroInfoBar.UpdateHP(teamHero.curHp, toHp, teamHero.maxHp, false);
- }
- teamHero.curHp = GeneralDefine.GetFactValue(_refreshInfo.Value, _refreshInfo.ValueEx);
- // Debug.LogError("OnObjInfoRefresh " + teamHero.curHp);
- break;
- case PlayerDataType.MaxHP:
- teamHero.maxHp = GeneralDefine.GetFactValue(_refreshInfo.Value, _refreshInfo.ValueEx);
- if (!IsTianziBoss())
- {
- heroInfoBar.UpdateHP(teamHero.curHp, teamHero.curHp, teamHero.maxHp, false);
- }
- break;
- case PlayerDataType.XP:
- long toXp = GeneralDefine.GetFactValue(_refreshInfo.Value, _refreshInfo.ValueEx);
- heroInfoBar.UpdateXP(teamHero.rage, toXp, 100);
- teamHero.rage = (int)GeneralDefine.GetFactValue(_refreshInfo.Value, _refreshInfo.ValueEx);
- break;
- default:
- Debug.LogError("BattleObject.ObjInfoRefresh 鍑虹幇鎰忓绫诲瀷 " + _refreshInfo.RefreshType.ToString());
- break;
- }
- }
-
- // public void ObjPropertyRefreshView(HB418_tagSCObjPropertyRefreshView vNetData)
- // {
- // // 澶╁瓙鐨勬寫鎴樻嫤鎴鏉�,涓嶆嫤鎴�掓皵
- // BattleObject boss = battleField.FindBoss();
- // if (boss != null && battleField.MapID == 30020 && boss.ObjID == vNetData.ObjID && vNetData.RefreshType != (ushort)PlayerDataType.XP)
- // return;
- // switch ((PlayerDataType)vNetData.RefreshType)
- // {
- // case PlayerDataType.HP:
- // long toHp = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
- // heroInfoBar.UpdateHP(teamHero.curHp, toHp, teamHero.maxHp, false);
- // teamHero.curHp = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
- // break;
- // case PlayerDataType.MaxHP:
- // teamHero.maxHp = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
- // heroInfoBar.UpdateHP(teamHero.curHp, teamHero.curHp, teamHero.maxHp, false);
- // break;
- // case PlayerDataType.XP:
- // long toXp = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
- // heroInfoBar.UpdateXP(teamHero.rage, toXp, 100);
- // teamHero.rage = (int)GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
- // break;
- // default:
- // Debug.LogError("BattleObject.ObjPropertyRefreshView 鍑虹幇鎰忓绫诲瀷 " + vNetData.RefreshType.ToString());
- // break;
- // }
- // }
// 鐪╂檿
public bool IsStunned()
{
- return teamHero.isStunned;
+ return GetIsStunned();
}
// 鍐板喕
public bool IsFrozen()
{
- return teamHero.isFrozen;
+ return GetIsFrozen();
}
// 鐭冲寲
public bool IsStoned()
{
- return teamHero.isStoned;
+ return GetIsStoned();
}
// 琚矇榛�
public bool IsSlient()
{
- return teamHero.isSlient;
+ return GetIsSlient();
}
// 琚即姊�
public bool IsDisarmed()
{
- return teamHero.isDisarmed;
+ return GetIsDisarmed();
}
// 鏄惁鏃犳晫
public bool IsInvincable()
{
- return teamHero.isInvinceble;
+ return GetIsInvincible();
}
// 鏄惁姝讳骸
public bool IsDead()
{
- return teamHero.isDead;
+ return GetIsDead();
}
// 鏄惁琚帶浣忎簡
@@ -295,7 +287,7 @@
}
// 鐪嬬湅鎬掓皵鏄惁杈惧埌閲婃斁瑕佹眰
- return teamHero.rage >= 100;
+ return GetRage() >= 100;
}
public virtual bool IsCanNormalAttack()
@@ -315,252 +307,17 @@
return true;
}
- public virtual void Hurt(BattleHurtParam battleHurtParam, RecordAction causingRecordAction = null)
- {
- bool isLastHit = battleHurtParam.hitIndex >= battleHurtParam.skillConfig.DamageDivide.Length - 1;
- bool firstHit = battleHurtParam.hitIndex == 0;
-
- // 娣诲姞璋冭瘯鏃ュ織
- bool isHealing = BattleUtility.IsHealing(battleHurtParam.hurt);
-
- BattleDmgInfo dmgInfo = PopDamage(battleHurtParam);
+ public abstract DeathRecordAction Hurt(BattleHurtParam battleHurtParam, SkillRecordAction _parentSkillAction = null);
+ public abstract void OnDodgeBegin(DamageType damageType);
- // ============ 搴旂敤鐩爣鐨勮閲忓拰鎶ょ浘鍙樺寲 ============
- ApplyHurtToTarget(battleHurtParam, isLastHit);
+ public abstract void OnDodgeEnd(Action _complete = null);
- // 杩欓噷
- if (dmgInfo.IsType(DamageType.Dodge) /*&& !buffMgr.isControled[BattleConst.HardControlGroup]*/)//濡傛灉琚帶鍒朵簡杩橀棯閬夸簡 瑕佺湅鐪嬫湇鍔″櫒鎬庝箞澶勭悊浜�
- {
- if (isLastHit)
- {
- DodgeFinishAction dodgeFinish = new DodgeFinishAction(battleField, this);
- battleField.recordPlayer.InsertRecord(dodgeFinish);
- }
+ public abstract void OnDeath(Action _onDeathAnimationComplete, bool withoutAnime = false);
- if (firstHit)
- {
- OnDodgeBegin();
- }
- }
+ protected abstract BattleDmgInfo PopDamage(BattleHurtParam battleHurtParam);
- bool isFatalAttack = (null != battleHurtParam.deadPack) && isLastHit;
-
- if (isFatalAttack)
- {
- if (null != battleHurtParam.battleDrops)
- {
- PushDropItems(battleHurtParam.battleDrops);
- }
- battleField.OnObjsDead(new List<BattleDeadPack>() { battleHurtParam.deadPack }, causingRecordAction);
-
- }
- else
- {
- if (dmgInfo.IsType(DamageType.Block))
- {
- battleField.battleEffectMgr.PlayEffect(this, BattleConst.BlockEffectID, heroRectTrans, Camp, teamHero.modelScale);
- }
- // else
- // {
- if ((dmgInfo.IsType(DamageType.Damage) || dmgInfo.IsRealdamage()))
- {
- if (!buffMgr.isControled[BattleConst.HardControlGroup])
- {
- battleField.soundManager.PlayEffectSound(teamHero.heroConfig.HitSFX, false);
- motionBase.PlayAnimation(MotionName.hit, false);
- }
- }
- // }
-
- }
- }
-
- /// <summary>
- /// 搴旂敤鐩爣鐨勮閲忓拰鎶ょ浘鍙樺寲
- /// </summary>
- private void ApplyHurtToTarget(BattleHurtParam battleHurtParam, bool isLastHit)
- {
- BattleHurtObj hurter = battleHurtParam.hurter;
-
- // 搴旂敤琛�閲忓彉鍖�
- teamHero.curHp = hurter.toHp;
-
- // foreach (var obj in battleField.battleObjMgr.allBattleObjDict.Values)
- // {
- // Debug.LogError($"[ApplyHurtToTarget] ObjID: {obj.ObjID}, Name: {obj.teamHero.heroConfig.Name}, CurHp: {obj.teamHero.curHp}, MaxHp: {obj.teamHero.maxHp} Skill {battleHurtParam.hB427_TagSCUseSkill.packUID} ");
- // }
-
-
-#if UNITY_EDITOR
- // 鏈�鍚庝竴鍑绘椂楠岃瘉琛�閲忔槸鍚︿笌鏈嶅姟鍣ㄤ竴鑷�
- if (isLastHit)
- {
- BattleUtility.ValidateHpConsistency(battleHurtParam, "鐩爣鍙椾激");
- }
-#endif
- }
-
- const float pingpongTime = 0.4f;
- // 闂伩寮�濮�
- public virtual void OnDodgeBegin()
- {
- RectTransform rectTrans = heroRectTrans;
- var tween = rectTrans.DOAnchorPos(new Vector3(-30, 0, 0), pingpongTime)
- .SetEase(Ease.OutCubic);
-
- motionBase.ShowIllusionShadow(true);
-
- DamageNumConfig damageNumConfig = DamageNumConfig.Get((int)DamageType.Dodge);
-
- string dodgeStr = ((char)damageNumConfig.prefix).ToString();
-
- heroInfoBar.ShowTips(dodgeStr, true, false);
-
- tween.onComplete += () =>
- {
- motionBase.ShowIllusionShadow(false);
- };
-
-
- battleField.soundManager.PlayEffectSound(BattleConst.DodgeSoundID);
-
- battleField.battleTweenMgr.OnPlayTween(tween);
- }
-
- // 闂伩缁撴潫
- public virtual void OnDodgeEnd(Action _complete = null)
- {
- RectTransform rectTrans = heroRectTrans;
-
- var tween = rectTrans.DOAnchorPos(Vector3.zero, pingpongTime)
- .SetEase(Ease.OutCubic);
-
- tween.onComplete += () =>
- {
- _complete?.Invoke();
- };
-
- battleField.battleTweenMgr.OnPlayTween(tween);
- }
-
- public virtual void OnDeath(Action _onDeathAnimationComplete, bool withoutAnime = false)
- {
- buffMgr.RemoveAllBuff();
- battleField.soundManager.PlayEffectSound(teamHero.heroConfig.DeathSFX, false);
- if (withoutAnime)
- {
- SetDeath();
- _onDeathAnimationComplete?.Invoke();
- }
- else
- {
- motionBase.PlayDeadAnimation(() =>
- {
- SetDeath();
- _onDeathAnimationComplete?.Invoke();
- });
- }
- }
-
- public void SetDeath()
- {
- teamHero.isDead = true;
- OnDeadAnimationComplete();
- }
-
- protected virtual void OnDeadAnimationComplete()
- {
- // 鎴栬鐪嬬湅婧惰В鐗规晥锛� YYL TODO
- heroGo.SetActive(false);
-
- // 闃叉缁欐浜″璞″張涓奲uff
- buffMgr.RemoveAllBuff();
- }
-
- // 閲婃斁鑰呭氨鏄娲昏�呮椂璋冪敤
- public void PreReborn(bool reviveSelf = false)
- {
- heroGo.SetActive(true);
- motionBase.skeletonAnim.skeleton.A = 0f;
- motionBase.skeletonAnim.LateUpdate();
- heroRectTrans.anchoredPosition = Vector2.zero;
- motionBase.ResetForReborn(reviveSelf);
- }
-
- // 澶嶆椿action
- public void OnReborn(HB427_tagSCUseSkill.tagSCUseSkillHurt vNetData, bool reviveSelf = false)
- {
- isReborning = true;
- heroGo.SetActive(true);
- motionBase.ResetForReborn(reviveSelf);
- heroRectTrans.anchoredPosition = Vector2.zero;
- motionBase.skeletonAnim.skeleton.A = 0f;
- motionBase.skeletonAnim.LateUpdate();
- RebornRecordAction recordAction = new RebornRecordAction(battleField, this, () =>
- {
- battleField.OnObjReborn((uint)ObjID);
- teamHero.curHp = GeneralDefine.GetFactValue(vNetData.CurHP, vNetData.CurHPEx);
-
- // Debug.LogError("OnReborn " + teamHero.curHp);
- teamHero.isDead = false;
-
- });
- battleField.recordPlayer.InsertRecord(recordAction);
- }
-
- public void AfterReborn()
- {
- // 娓呯┖鎵�鏈�
- motionBase.ResetForReborn(false);
- isReborning = false;
- }
-
-
- // 浼ゅ杩樿鐪� 鏄惁闂伩 鏆村嚮 and so on 闇�瑕佹湁涓�涓狣amageType 鏈嶅姟鍣ㄥ簲璇ヤ細缁�
- protected virtual BattleDmgInfo PopDamage(BattleHurtParam battleHurtParam)
- {
- BattleDmgInfo battleDmgInfo = new BattleDmgInfo(battleField.guid, battleHurtParam);
- // 澶╁瓙鐨勬寫鎴樻嫤鎴鏉￠�昏緫
- BattleObject boss = battleField.FindBoss();
- // 淇锛歜attleHurtParam.hurtObj.ObjID -> battleHurtParam.hurter.hurtObj.ObjID
- if (boss != null && battleField.MapID == 30020 && boss.ObjID == battleHurtParam.hurter.hurtObj.ObjID)
- {
- EventBroadcast.Instance.Broadcast(EventName.BATTLE_DAMAGE_TAKEN, battleDmgInfo);
- return battleDmgInfo;
- }
- else
- {
- heroInfoBar.UpdateDamage(battleDmgInfo);
-
- // YYL TODO 鏄惁闇�瑕佹寕鍦ㄥ湪鑷韩鐨刦ollow鐐逛笂
- EventBroadcast.Instance.Broadcast(EventName.BATTLE_DAMAGE_TAKEN, battleDmgInfo);
- return battleDmgInfo;
- }
-
- }
-
- /// <summary>
- /// 涓烘柦娉曡�呭垱寤轰激瀹充俊鎭紙鍚歌/鍙嶄激锛�
- /// </summary>
- protected virtual BattleDmgInfo PopDamageForCaster(BattleHurtParam battleHurtParam)
- {
- // 浼犲叆 isCasterView=true 琛ㄧず杩欐槸鏂芥硶鑰呰瑙�
- BattleDmgInfo battleDmgInfo = new BattleDmgInfo(battleField.guid, battleHurtParam, _isCasterView: true);
-
- BattleObject boss = battleField.FindBoss();
- if (boss != null && battleField.MapID == 30020 && boss.ObjID == this.ObjID)
- {
- EventBroadcast.Instance.Broadcast(EventName.BATTLE_DAMAGE_TAKEN, battleDmgInfo);
- return battleDmgInfo;
- }
- else
- {
- heroInfoBar.UpdateDamage(battleDmgInfo);
- EventBroadcast.Instance.Broadcast(EventName.BATTLE_DAMAGE_TAKEN, battleDmgInfo);
- return battleDmgInfo;
- }
- }
+ protected abstract BattleDmgInfo PopDamageForCaster(BattleHurtParam battleHurtParam);
public RectTransform GetAliasTeamNode()
{
@@ -577,26 +334,16 @@
return Camp == BattleCamp.Red ? BattleCamp.Blue : BattleCamp.Red;
}
- public void HaveRest()
- {
- // YYL TODO
- // 浼戞伅鐘舵��
- // 澶氫竴涓獄zz鐨勪竴涓壒鏁�
- heroGo.SetActive(true);
- motionBase.HaveRest();
- heroRectTrans.anchoredPosition = Vector2.zero;
- isReborning = false;
+ public abstract void HaveRest();
- heroInfoBar.SetActive(false);
- SetFront();
- }
+ protected BattleDrops m_battleDrops;
- public void PushDropItems(BattleDrops _battleDrops)
+ public virtual void PushDropItems(BattleDrops _battleDrops)
{
m_battleDrops = _battleDrops;
}
- public void PerformDrop()
+ public virtual void PerformDrop()
{
if (null == m_battleDrops)
return;
@@ -605,7 +352,7 @@
EventName.BATTLE_DROP_ITEMS, battleField.guid, m_battleDrops, OnPerformDropFinish);
}
- protected void OnPerformDropFinish()
+ protected virtual void OnPerformDropFinish()
{
m_battleDrops = null;
}
@@ -620,85 +367,13 @@
layerMgr.SetFront();
}
- public void SetSpeedRatio(float ratio)
- {
- motionBase.SetSpeedRatio(ratio);
- heroInfoBar.SetSpeedRatio(ratio);
- }
+ public abstract void SetSpeedRatio(float ratio);
- public void OnObjPropertyRefreshView(HB418_tagSCObjPropertyRefreshView vNetData)
- {
- // 澶╁瓙鐨勬寫鎴樻嫤鎴鏉�,涓嶆嫤鎴�掓皵
- BattleObject boss = battleField.FindBoss();
- if (boss != null && battleField.MapID == 30020 && boss.ObjID == vNetData.ObjID && vNetData.RefreshType != (ushort)PlayerDataType.XP)
- return;
-
- // public uint ObjID;
- // public ushort RefreshType; // 鍚�0418鍒锋柊绫诲瀷锛屽琛�閲忋�佹�掓皵
- // public uint AttackTypes; // 椋樺瓧绫诲瀷姹囨�伙紝鏀寔澶氱绫诲瀷骞跺瓨锛屽鏃犺闃插尽涓旀毚鍑诲悓鏃惰鏍兼尅锛屼簩杩涘埗鎴栬繍绠楁渶缁堝�硷紱0-澶辫触锛�1-鏅�氾紱2-鍥炶锛�5-鏍兼尅锛�6-鏃犺闃插尽锛�7-鏆村嚮锛�9-闂伩
- // public uint Value; // 鏇存柊鍊�
- // public uint ValueEx; // 鏇存柊鍊硷紝濡傛灉鏄ぇ鏁板�肩殑姝ゅ�间负鏁撮櫎浜块儴鍒�
- // public byte DiffType; // 鍙樺寲绫诲瀷锛�0-鍑忓皯锛�1-澧炲姞
- // public uint DiffValue; // 鍙樺寲鍊�
- // public uint DiffValueEx; // 鍙樺寲鍊硷紝濡傛灉鏄ぇ鏁板�肩殑姝ゅ�间负鏁撮櫎浜块儴鍒�
- // public uint SkillID; // 浣跨敤鐨勬妧鑳借〃ID
- // public uint RelatedSkillID; // 鍏宠仈鐨勬妧鑳絀D锛屼竴鑸槸涓绘妧鑳絀D锛岄潪涓绘妧鑳介澶栬Е鍙戠殑涓�0
-
- long diffValue = GeneralDefine.GetFactValue(vNetData.DiffValue, vNetData.DiffValueEx);
- diffValue *= vNetData.DiffType == 0 ? -1 : 1;
-
- long newValue = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
-
-
- switch ((PlayerDataType)vNetData.RefreshType)
- {
- case PlayerDataType.HP:
- long toHp = GeneralDefine.GetFactValue(vNetData.Value, vNetData.ValueEx);
- bool isMinus = teamHero.curHp > toHp;
- if (!IsTianziBoss())
- {
- heroInfoBar.UpdateHP(teamHero.curHp, toHp, teamHero.maxHp, false);
- }
- teamHero.curHp = newValue;
- // Debug.LogError("OnObjPropertyRefreshView " + teamHero.curHp);
- break;
- case PlayerDataType.MaxHP:
- teamHero.maxHp = newValue;
- if (!IsTianziBoss())
- {
- heroInfoBar.UpdateHP(teamHero.curHp, teamHero.curHp, teamHero.maxHp, false);
- }
- break;
- case PlayerDataType.XP:
- long toXp = newValue;
- heroInfoBar.UpdateXP(teamHero.rage, toXp, 100);
- teamHero.rage = (int)newValue;
-
- DamageNumConfig damageNumConfig = DamageNumConfig.Get((int)DamageType.RageUp);
- string message = BattleUtility.ConvertToArtFont(damageNumConfig, diffValue);
- heroInfoBar.ShowTips(new BattleHeroInfoBar.TipsInfo()
- {
- message = message,
- useArtText = true,
- followCharacter = true,
- scaleRatio = 1f,
- isRage = true
- });
- break;
- default:
- Debug.LogError("BattleObject.ObjPropertyRefreshView 鍑虹幇鎰忓绫诲瀷 " + vNetData.RefreshType.ToString());
- break;
- }
- }
+ public abstract void OnObjPropertyRefreshView(HB418_tagSCObjPropertyRefreshView vNetData);
#if UNITY_EDITOR_STOP_USING
- public void EditorRevive()
- {
- teamHero.curHp = 100;
- heroGo.SetActive(true);
- motionBase.PlayAnimation(MotionName.idle, true);
- }
+ public abstract void EditorRevive();
public List<int> TryAttack(BattleObject obj, SkillConfig skillConfig)
{
@@ -734,7 +409,7 @@
}
// ============ 搴旂敤鏂芥硶鑰呯殑琛�閲忓拰鎶ょ浘鍙樺寲 ============
- bool isLastHit = battleHurtParam.hitIndex >= battleHurtParam.skillConfig.DamageDivide.Length - 1;
+ bool isLastHit = battleHurtParam.hitIndex >= battleHurtParam.skillSkinConfig.DamageDivide.Length - 1;
ApplyHurtToCaster(battleHurtParam, isLastHit);
// 鍜孒urt涓�鏍凤紝璋冪敤PopDamage澶勭悊鍚歌/鍙嶄激鐨勬樉绀�
@@ -744,9 +419,10 @@
if (hasReflectHp && casterDmgInfo.casterDamageList != null && casterDmgInfo.casterDamageList.Count > 0)
{
long totalReflect = casterDmgInfo.casterDamageList.Sum(d => d.damage);
- if (totalReflect > 0 && !buffMgr.isControled[BattleConst.HardControlGroup])
+ var buffMgr = GetBuffMgr();
+ if (totalReflect > 0 && buffMgr != null && !buffMgr.isControled[BattleConst.HardControlGroup])
{
- motionBase.PlayAnimation(MotionName.hit, false);
+ OnPlayHitAnimation();
}
}
}
@@ -758,8 +434,8 @@
{
BattleCastObj caster = battleHurtParam.caster;
- // 搴旂敤琛�閲忓彉鍖�
- teamHero.curHp = caster.toHp;
+ // 搴旂敤琛�閲忓彉鍖栵紙鐢卞瓙绫诲疄鐜帮級
+ ApplyCasterHpChange(caster.toHp);
// 鎵撳嵃鎵�鏈夎鑹茬殑鍚嶅瓧鍜屽綋鍓嶈閲忚窡鎬昏閲�
// foreach (var obj in battleField.battleObjMgr.allBattleObjDict.Values)
@@ -782,4 +458,14 @@
{
return battleField.MapID == 30020 && battleField.FindBoss() == this;
}
+
+ /// <summary>
+ /// 鎾斁鍙楀嚮鍔ㄧ敾锛堝彧鏈� Hero 鏈夊疄鐜帮紝Mingge 鐣欑┖锛�
+ /// </summary>
+ protected abstract void OnPlayHitAnimation();
+
+ /// <summary>
+ /// 搴旂敤鏂芥硶鑰呰閲忓彉鍖栵紙鍚歌/鍙嶄激锛�
+ /// </summary>
+ protected abstract void ApplyCasterHpChange(long newHp);
}
\ No newline at end of file
--
Gitblit v1.8.0