summaryrefslogtreecommitdiff
path: root/marching/Assets/Scripts/Common
diff options
context:
space:
mode:
Diffstat (limited to 'marching/Assets/Scripts/Common')
-rw-r--r--marching/Assets/Scripts/Common/Singleton.cs16
-rw-r--r--marching/Assets/Scripts/Common/Singleton.cs.meta11
-rw-r--r--marching/Assets/Scripts/Common/SingletonMB.cs58
-rw-r--r--marching/Assets/Scripts/Common/SingletonMB.cs.meta11
4 files changed, 0 insertions, 96 deletions
diff --git a/marching/Assets/Scripts/Common/Singleton.cs b/marching/Assets/Scripts/Common/Singleton.cs
deleted file mode 100644
index bb382e2..0000000
--- a/marching/Assets/Scripts/Common/Singleton.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-public class Singleton<T> where T : class, new()
-{
- private static T _instance;
-
- public static T Instance
- {
- get
- {
- if (_instance == null)
- _instance = Activator.CreateInstance<T>();
- return _instance;
- }
- }
-} \ No newline at end of file
diff --git a/marching/Assets/Scripts/Common/Singleton.cs.meta b/marching/Assets/Scripts/Common/Singleton.cs.meta
deleted file mode 100644
index 9a9cdf7..0000000
--- a/marching/Assets/Scripts/Common/Singleton.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 02534dc90b1e47743969d14d9386660d
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/marching/Assets/Scripts/Common/SingletonMB.cs b/marching/Assets/Scripts/Common/SingletonMB.cs
deleted file mode 100644
index 5debe57..0000000
--- a/marching/Assets/Scripts/Common/SingletonMB.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using Newtonsoft.Json.Utilities;
-using UnityEngine;
-
-public abstract class SingletonMB<T> : MonoBehaviour where T : class
-{
- protected static T m_Instance;
-
- public static T Instance
- {
- get { return m_Instance; }
- set
- {
- if (m_Instance != null)
- {
- throw new System.ApplicationException("An instance was created duplicate!");
- }
-
- m_Instance = value;
- }
- }
-
- protected virtual void Awake()
- {
- //if (null != m_Instance)
- //{
- // LogHelper.LogError(StringUtil.Concat("Exception: Duplicated Instance!! type is ", typeof(T).ToString(), ", plz send this error msg to hanjun!"));
- //}
-
- m_Instance = gameObject.GetComponent<T>();
- }
-
- /// <summary>
- /// CN: 加这个函数是为了同一个GameObject挂了多个Manager类,再OnDestroy里设置自己的单例为null
- /// </summary>
- protected virtual void OnDestroy()
- {
- //m_Instance = null;
- DoWhenOnDestroy();
- }
-
- protected virtual void DoWhenOnDestroy()
- {
-
- }
-
- public void ReleaseInstance()
- {
- if (m_Instance != null)
- {
- UnityEngine.Object.Destroy(this.gameObject);
- //m_Instance = null;
- }
- else
- {
- Debug.LogError("m_Instance is already null!! type is " + typeof(T).ToString());
- }
- }
-} \ No newline at end of file
diff --git a/marching/Assets/Scripts/Common/SingletonMB.cs.meta b/marching/Assets/Scripts/Common/SingletonMB.cs.meta
deleted file mode 100644
index 2305ad2..0000000
--- a/marching/Assets/Scripts/Common/SingletonMB.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4f80ac80ccf55c443ae18ec55cc8f37e
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant: