单例对象销毁时的检查，修正由此错误的销毁单例对象的bug

Kojima648 · Jul 9, 2024 · e53ceb0 · e53ceb0
1 parent 9afda78
commit e53ceb0
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameBase/SingletonBehaviour.cs b/UnityProject/Assets/GameScripts/HotFix/GameBase/SingletonBehaviour.cs
@@ -36,7 +36,10 @@ protected virtual void OnLoad()
 
         protected virtual void OnDestroy()
         {
-            Release();
+            if (this == _instance)
+            {
+                Release();
+            }
         }
 
         /// <summary>
@@ -60,7 +63,7 @@ public static void Release()
             if (_instance != null)
             {
                 SingletonSystem.Release(_instance.gameObject);
-                _instance = null;   
+                _instance = null;
             }
         }
 
@@ -96,7 +99,7 @@ public static T Instance
                         }
                     }
 
-                    if(_instance == null)
+                    if (_instance == null)
                     {
                         Log.Error($"Can't create SingletonBehaviour<{typeof(T)}>");
                     }