From 9fb3c8e114a67c0cdf353b32b1b50e90414fd597 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 25 二月 2026 16:34:07 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Battle/BattleEffectMgr.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Main/System/Battle/BattleEffectMgr.cs b/Main/System/Battle/BattleEffectMgr.cs
index 6e28f34..eb29191 100644
--- a/Main/System/Battle/BattleEffectMgr.cs
+++ b/Main/System/Battle/BattleEffectMgr.cs
@@ -132,7 +132,15 @@
if (effectDict.TryGetValue(effectId, out effectPlayers))
{
effectPlayers.Remove(effectPlayer);
- GameObject.DestroyImmediate(effectPlayer.gameObject);
+ if (null == effectPlayer)
+ {
+ BattleDebug.LogError("effect player is null, effectid : " + effectId);
+ return;
+ }
+ if (null != effectPlayer.gameObject)
+ {
+ GameObject.DestroyImmediate(effectPlayer.gameObject);
+ }
effectPlayer = null;
}
else
--
Gitblit v1.8.0