去掉SingletonLoad跟ConfigSingleton，只需要Singleton就够了

Share/Tool/Template.txt

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class (ConfigName)Category : ConfigSingleton<(ConfigName)Category>, IMerge
+    public partial class (ConfigName)Category : Singleton<(ConfigName)Category>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, (ConfigName)> dict = new Dictionary<int, (ConfigName)>();
+        private Dictionary<int, (ConfigName)> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Core/Entity/EntitySystemSingleton.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace ET
 {
-    public class EntitySystemSingleton: SingletonReload<EntitySystemSingleton>, ISingletonAwake
+    public class EntitySystemSingleton: Singleton<EntitySystemSingleton>, ISingletonAwake, ISingletonLoad
     {
         public TypeSystems TypeSystems { get; private set; }
         
@@ -28,7 +28,7 @@ namespace ET
             }
         }
         
-        public override void Load()
+        public void Load()
         {
             World.Instance.AddSingleton<EntitySystemSingleton>(true);
         }

Unity/Assets/Scripts/Core/World/Module/Actor/ActorMessageDispatcherComponent.cs

@@ -19,7 +19,7 @@ namespace ET
     /// <summary>
     /// Actor消息分发组件
     /// </summary>
-    public class ActorMessageDispatcherComponent: SingletonReload<ActorMessageDispatcherComponent>, ISingletonAwake
+    public class ActorMessageDispatcherComponent: Singleton<ActorMessageDispatcherComponent>, ISingletonAwake, ISingletonLoad
     {
         private readonly Dictionary<Type, List<ActorMessageDispatcherInfo>> ActorMessageHandlers = new();
 
@@ -40,7 +40,7 @@ namespace ET
             }
         }
         
-        public override void Load()
+        public void Load()
         {
             World.Instance.AddSingleton<ActorMessageDispatcherComponent>(true);
         }

Unity/Assets/Scripts/Core/World/Module/Config/ConfigSingleton.cs

@@ -1,62 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace ET
-{
-    public abstract class ConfigSingleton<T>: ISingleton, ISupportInitialize where T: ConfigSingleton<T>, new()
-    {
-        private bool isDisposed;
-        
-        [StaticField]
-        private static T instance;
-        
-        public static T Instance
-        {
-            get
-            {
-                return instance;
-            }
-            private set
-            {
-                instance = value;
-            }
-        }
-
-        public virtual void Register()
-        {
-            Instance = (T)this;
-        }
-
-        public bool IsDisposed()
-        {
-            return this.isDisposed;
-        }
-
-        protected virtual void Destroy()
-        {
-            
-        }
-
-        void IDisposable.Dispose()
-        {
-            if (this.isDisposed)
-            {
-                return;
-            }
-            
-            this.isDisposed = true;
-
-            Instance = null;
-            
-            this.Destroy();
-        }
-
-        public virtual void BeginInit()
-        {
-        }
-
-        public virtual void EndInit()
-        {
-        }
-    }
-}

Unity/Assets/Scripts/Core/World/Module/Config/ConfigSingleton.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e3f57aff7b8dfc3489d97b45c8423bc8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Core/World/Singleton.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Threading;
+using System.ComponentModel;
 
 namespace ET
 {
@@ -9,9 +9,9 @@ namespace ET
         
     }
     
-    public abstract class Singleton<T>: ISingleton where T: Singleton<T>, new()
+    public abstract class Singleton<T>: ISingleton, ISupportInitialize where T: Singleton<T>, new()
     {
-        protected bool isDisposed;
+        private bool isDisposed;
         
         [StaticField]
         private static T instance;
@@ -54,56 +54,13 @@ namespace ET
             
             this.Destroy();
         }
-    }
-    
-    public abstract class SingletonReload<T>: ISingleton, ISingletonLoad where T: SingletonReload<T>, new()
-    {
-        private bool isDisposed;
-        
-        [StaticField]
-        private static T instance;
-        
-        public static T Instance
-        {
-            get
-            {
-                return instance;
-            }
-            private set
-            {
-                instance = value;
-            }
-        }
 
-        public virtual void Register()
+        public virtual void BeginInit()
         {
-            Instance = (T)this;
         }
 
-        public bool IsDisposed()
+        public virtual void EndInit()
         {
-            return this.isDisposed;
         }
-
-        protected virtual void Destroy()
-        {
-            
-        }
-
-        void IDisposable.Dispose()
-        {
-            if (this.isDisposed)
-            {
-                return;
-            }
-            
-            this.isDisposed = true;
-
-            Instance = null;
-            
-            this.Destroy();
-        }
-
-        public abstract void Load();
     }
 }

Unity/Assets/Scripts/Editor/BuildEditor/BuildEditor.cs

@@ -132,14 +132,7 @@ namespace ET
 			
 			if (GUILayout.Button("ExcelExporter"))
 			{
-				//Directory.Delete("Assets/Bundles/Config", true);
 				ToolsEditor.ExcelExporter();
-				
-				// 设置ab包
-				AssetImporter assetImporter = AssetImporter.GetAtPath($"Assets/Bundles/Config");
-				assetImporter.assetBundleName = "Config.unity3d";
-				AssetDatabase.SaveAssets();
-				AssetDatabase.Refresh();
 			}
 			
 			if (GUILayout.Button("Proto2CS"))

Unity/Assets/Scripts/Model/Generate/Client/Config/AIConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class AIConfigCategory : ConfigSingleton<AIConfigCategory>, IMerge
+    public partial class AIConfigCategory : Singleton<AIConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, AIConfig> dict = new Dictionary<int, AIConfig>();
+        private Dictionary<int, AIConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/Client/Config/UnitConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class UnitConfigCategory : ConfigSingleton<UnitConfigCategory>, IMerge
+    public partial class UnitConfigCategory : Singleton<UnitConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, UnitConfig> dict = new Dictionary<int, UnitConfig>();
+        private Dictionary<int, UnitConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/ClientServer/Config/AIConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class AIConfigCategory : ConfigSingleton<AIConfigCategory>, IMerge
+    public partial class AIConfigCategory : Singleton<AIConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, AIConfig> dict = new Dictionary<int, AIConfig>();
+        private Dictionary<int, AIConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/ClientServer/Config/StartMachineConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class StartMachineConfigCategory : ConfigSingleton<StartMachineConfigCategory>, IMerge
+    public partial class StartMachineConfigCategory : Singleton<StartMachineConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartMachineConfig> dict = new Dictionary<int, StartMachineConfig>();
+        private Dictionary<int, StartMachineConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/ClientServer/Config/StartProcessConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class StartProcessConfigCategory : ConfigSingleton<StartProcessConfigCategory>, IMerge
+    public partial class StartProcessConfigCategory : Singleton<StartProcessConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartProcessConfig> dict = new Dictionary<int, StartProcessConfig>();
+        private Dictionary<int, StartProcessConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/ClientServer/Config/StartSceneConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class StartSceneConfigCategory : ConfigSingleton<StartSceneConfigCategory>, IMerge
+    public partial class StartSceneConfigCategory : Singleton<StartSceneConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartSceneConfig> dict = new Dictionary<int, StartSceneConfig>();
+        private Dictionary<int, StartSceneConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/ClientServer/Config/StartZoneConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class StartZoneConfigCategory : ConfigSingleton<StartZoneConfigCategory>, IMerge
+    public partial class StartZoneConfigCategory : Singleton<StartZoneConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartZoneConfig> dict = new Dictionary<int, StartZoneConfig>();
+        private Dictionary<int, StartZoneConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/ClientServer/Config/UnitConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class UnitConfigCategory : ConfigSingleton<UnitConfigCategory>, IMerge
+    public partial class UnitConfigCategory : Singleton<UnitConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, UnitConfig> dict = new Dictionary<int, UnitConfig>();
+        private Dictionary<int, UnitConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/ClientServer/ConfigPartial/StartSceneConfig.cs

@@ -37,7 +37,7 @@ namespace ET
         {
             return this.ClientScenesByName[zone][name];
         }
-        
+
         public override void EndInit()
         {
             foreach (StartSceneConfig startSceneConfig in this.GetAll().Values)
@@ -84,7 +84,7 @@ namespace ET
         }
     }
     
-    public partial class StartSceneConfig: ISupportInitialize
+    public partial class StartSceneConfig
     {
         public ActorId ActorId;
         

Unity/Assets/Scripts/Model/Generate/Server/Config/AIConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class AIConfigCategory : ConfigSingleton<AIConfigCategory>, IMerge
+    public partial class AIConfigCategory : Singleton<AIConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, AIConfig> dict = new Dictionary<int, AIConfig>();
+        private Dictionary<int, AIConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/Server/Config/StartMachineConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class StartMachineConfigCategory : ConfigSingleton<StartMachineConfigCategory>, IMerge
+    public partial class StartMachineConfigCategory : Singleton<StartMachineConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartMachineConfig> dict = new Dictionary<int, StartMachineConfig>();
+        private Dictionary<int, StartMachineConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/Server/Config/StartProcessConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class StartProcessConfigCategory : ConfigSingleton<StartProcessConfigCategory>, IMerge
+    public partial class StartProcessConfigCategory : Singleton<StartProcessConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartProcessConfig> dict = new Dictionary<int, StartProcessConfig>();
+        private Dictionary<int, StartProcessConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/Server/Config/StartSceneConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class StartSceneConfigCategory : ConfigSingleton<StartSceneConfigCategory>, IMerge
+    public partial class StartSceneConfigCategory : Singleton<StartSceneConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartSceneConfig> dict = new Dictionary<int, StartSceneConfig>();
+        private Dictionary<int, StartSceneConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/Server/Config/StartZoneConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class StartZoneConfigCategory : ConfigSingleton<StartZoneConfigCategory>, IMerge
+    public partial class StartZoneConfigCategory : Singleton<StartZoneConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, StartZoneConfig> dict = new Dictionary<int, StartZoneConfig>();
+        private Dictionary<int, StartZoneConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/Server/Config/UnitConfig.cs

@@ -2,15 +2,16 @@ using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
+using System.ComponentModel;
 
 namespace ET
 {
     [Config]
-    public partial class UnitConfigCategory : ConfigSingleton<UnitConfigCategory>, IMerge
+    public partial class UnitConfigCategory : Singleton<UnitConfigCategory>, IMerge
     {
         [BsonElement]
         [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
-        private Dictionary<int, UnitConfig> dict = new Dictionary<int, UnitConfig>();
+        private Dictionary<int, UnitConfig> dict = new();
 		
         public void Merge(object o)
         {

Unity/Assets/Scripts/Model/Generate/Server/ConfigPartial/StartSceneConfig.cs

@@ -37,7 +37,7 @@ namespace ET
         {
             return this.ClientScenesByName[zone][name];
         }
-        
+
         public override void EndInit()
         {
             foreach (StartSceneConfig startSceneConfig in this.GetAll().Values)

Unity/Assets/Scripts/Model/Server/Module/Http/HttpDispatcher.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 
 namespace ET.Server
 {
-    public class HttpDispatcher: SingletonReload<HttpDispatcher>, ISingletonAwake
+    public class HttpDispatcher: Singleton<HttpDispatcher>, ISingletonAwake, ISingletonLoad
     {
         private readonly Dictionary<string, Dictionary<int, IHttpHandler>> dispatcher = new();
         
-        public override void Load()
+        public void Load()
         {
             World.Instance.AddSingleton<HttpDispatcher>(true);
         }

Unity/Assets/Scripts/Model/Share/LockStep/LSEntitySystemSingleton.cs

@@ -11,7 +11,7 @@ namespace ET
         public const int Max = 1;
     }
     
-    public class LSEntitySystemSingleton: SingletonReload<LSEntitySystemSingleton>, ISingletonAwake
+    public class LSEntitySystemSingleton: Singleton<LSEntitySystemSingleton>, ISingletonAwake, ISingletonLoad
     {
         public TypeSystems TypeSystems { get; private set; }
         
@@ -37,7 +37,7 @@ namespace ET
             }
         }
         
-        public override void Load()
+        public void Load()
         {
             World.Instance.AddSingleton<LSEntitySystemSingleton>(true);
         }

Unity/Assets/Scripts/Model/Share/Module/AI/AIDispatcherComponent.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace ET
 {
-    public class AIDispatcherComponent: SingletonReload<AIDispatcherComponent>, ISingletonAwake
+    public class AIDispatcherComponent: Singleton<AIDispatcherComponent>, ISingletonAwake, ISingletonLoad
     {
         private readonly Dictionary<string, AAIHandler> aiHandlers = new();
         
@@ -28,7 +28,7 @@ namespace ET
             return aaiHandler;
         }
 
-        public override void Load()
+        public void Load()
         {
             World.Instance.AddSingleton<AIDispatcherComponent>(true);
         }

Unity/Assets/Scripts/Model/Share/Module/Console/ConsoleDispatcher.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 
 namespace ET
 {
-    public class ConsoleDispatcher: SingletonReload<ConsoleDispatcher>, ISingletonAwake
+    public class ConsoleDispatcher: Singleton<ConsoleDispatcher>, ISingletonAwake, ISingletonLoad
     {
         private readonly Dictionary<string, IConsoleHandler> handlers = new();
         
-        public override void Load()
+        public void Load()
         {
             World.Instance.AddSingleton<ConsoleDispatcher>(true);
         }

Unity/Assets/Scripts/Model/Share/Module/Message/MessageDispatcherComponent.cs

@@ -15,7 +15,7 @@ namespace ET
         }
     }
     
-    public class MessageDispatcherComponent: SingletonReload<MessageDispatcherComponent>, ISingletonAwake
+    public class MessageDispatcherComponent: Singleton<MessageDispatcherComponent>, ISingletonAwake, ISingletonLoad
     {
         private readonly Dictionary<ushort, List<MessageDispatcherInfo>> handlers = new();
         
@@ -53,7 +53,7 @@ namespace ET
             }
         }
         
-        public override void Load()
+        public void Load()
         {
             World.Instance.AddSingleton<MessageDispatcherComponent>(true);
         }

Unity/Assets/Scripts/Model/Share/Module/Numeric/NumericWatcherComponent.cs

@@ -18,7 +18,7 @@ namespace ET
     /// <summary>
     /// 监视数值变化组件,分发监听
     /// </summary>
-    public class NumericWatcherComponent : SingletonReload<NumericWatcherComponent>, ISingletonAwake
+    public class NumericWatcherComponent : Singleton<NumericWatcherComponent>, ISingletonAwake, ISingletonLoad
     {
         private readonly Dictionary<int, List<NumericWatcherInfo>> allWatchers = new();
         
@@ -43,7 +43,7 @@ namespace ET
             }
         }
         
-        public override void Load()
+        public void Load()
         {
             World.Instance.AddSingleton<NumericWatcherComponent>(true);
         }

Unity/Assets/Scripts/ModelView/Client/Module/UI/UIEventComponent.cs

@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
-using UnityEngine;
 
 namespace ET.Client
 {
 	/// <summary>
 	/// 管理所有UI GameObject
 	/// </summary>
-	public class UIEventComponent: SingletonReload<UIEventComponent>, ISingletonAwake
+	public class UIEventComponent: Singleton<UIEventComponent>, ISingletonLoad, ISingletonAwake
 	{
 		public Dictionary<string, AUIEvent> UIEvents { get; } = new();
 		
@@ -28,7 +27,7 @@ namespace ET.Client
             }
         }
         
-        public override void Load()
+        public void Load()
         {
 	        World.Instance.AddSingleton<UIEventComponent>(true);
         }