From cf263769139c3c41b9f309290fa3785ce2c473e7 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 02 二月 2026 14:38:54 +0800
Subject: [PATCH] 125 战斗 修复get max hp报错 跟refreshBlueMinggeBuff报错问题
---
Main/System/Battle/BaseBattleWin.cs | 10 ++++++----
Main/System/Battle/BattleObject/HeroBattleObject.cs | 13 +++++++------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/Main/System/Battle/BaseBattleWin.cs b/Main/System/Battle/BaseBattleWin.cs
index a706410..2caf743 100644
--- a/Main/System/Battle/BaseBattleWin.cs
+++ b/Main/System/Battle/BaseBattleWin.cs
@@ -88,9 +88,10 @@
if (battleField == null)
return;
MinggeBattleObject redMingge = battleField.battleObjMgr.redMingge;
- if (null != redMingge)
+ BattleObjectBuffMgr redMinggeBuffMgr = redMingge?.GetBuffMgr();
+ if (null != redMinggeBuffMgr)
{
- RefreshMinggeBuff(redMinggeBuffCells, redMingge.GetBuffMgr().GetBuffIconList());
+ RefreshMinggeBuff(redMinggeBuffCells, redMinggeBuffMgr.GetBuffIconList());
}
else
{
@@ -103,9 +104,10 @@
if (battleField == null)
return;
MinggeBattleObject blueMingge = battleField.battleObjMgr.blueMingge;
- if (null != blueMingge)
+ BattleObjectBuffMgr blueBuffMgr = blueMingge?.GetBuffMgr();
+ if (null != blueBuffMgr)
{
- RefreshMinggeBuff(blueMinggeBuffCells, blueMingge.GetBuffMgr().GetBuffIconList());
+ RefreshMinggeBuff(blueMinggeBuffCells, blueBuffMgr.GetBuffIconList());
}
else
{
diff --git a/Main/System/Battle/BattleObject/HeroBattleObject.cs b/Main/System/Battle/BattleObject/HeroBattleObject.cs
index c54460a..d26e314 100644
--- a/Main/System/Battle/BattleObject/HeroBattleObject.cs
+++ b/Main/System/Battle/BattleObject/HeroBattleObject.cs
@@ -546,16 +546,17 @@
protected override void ApplyCasterHpChange(long newHp)
{
+ if (teamHero == null) return;
teamHero.curHp = newHp;
}
- public override long GetCurHp() => teamHero.curHp;
- public override long GetMaxHp() => teamHero.maxHp;
- public override void SetCurHp(long value) { teamHero.curHp = value; }
- public override void SetIsDead(bool value) { teamHero.isDead = value; }
+ public override long GetCurHp() => teamHero == null ? 0 : teamHero.curHp;
+ public override long GetMaxHp() => teamHero == null ? 0 : teamHero.maxHp;
+ public override void SetCurHp(long value) { if (teamHero == null) return; teamHero.curHp = value; }
+ public override void SetIsDead(bool value) { if (teamHero == null) return; teamHero.isDead = value; }
- public override int GetNPCID() => teamHero.NPCID;
- public override long GetFightPower() => teamHero.fightPower;
+ public override int GetNPCID() => teamHero == null ? 0 : teamHero.NPCID;
+ public override long GetFightPower() => teamHero == null ? 0 : teamHero.fightPower;
// 浼ゅ杩樿鐪� 鏄惁闂伩 鏆村嚮 and so on 闇�瑕佹湁涓�涓狣amageType 鏈嶅姟鍣ㄥ簲璇ヤ細缁�
protected override BattleDmgInfo PopDamage(BattleHurtParam battleHurtParam)
--
Gitblit v1.8.0