把EventSystem跟Type相关的抽出来放到CodeTypes里面

DotNet/Loader/CodeLoader.cs

@@ -6,7 +6,6 @@ using System.Runtime.Loader;
 
 namespace ET
 {
-   
     public class CodeLoader: Singleton<CodeLoader>, ISingletonAwake
     {
         private AssemblyLoadContext assemblyLoadContext;
@@ -16,18 +15,17 @@ namespace ET
         public void Awake()
         {
             Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
-            foreach (Assembly assembly in assemblies)
+            foreach (Assembly ass in assemblies)
             {
-                if (assembly.GetName().Name == "Model")
+                if (ass.GetName().Name == "Model")
                 {
-                    this.assembly = assembly;
+                    this.assembly = ass;
                     break;
                 }
             }
             Assembly hotfixAssembly = this.LoadHotfix();
-            
-            Dictionary<string, Type> types = AssemblyHelper.GetAssemblyTypes(typeof (World).Assembly, typeof(Init).Assembly, this.assembly, hotfixAssembly);
-            World.Instance.AddSingleton<EventSystem, Dictionary<string, Type>>(types);
+
+            World.Instance.AddSingleton<CodeTypes, Assembly[]>(new[] { typeof (World).Assembly, typeof(Init).Assembly, this.assembly, hotfixAssembly });
             
             IStaticMethod start = new StaticMethod(this.assembly, "ET.Entry", "Start");
             start.Run();
@@ -48,8 +46,7 @@ namespace ET
         {
             Assembly hotfixAssembly = this.LoadHotfix();
 			
-            Dictionary<string, Type> types = AssemblyHelper.GetAssemblyTypes(typeof (World).Assembly, typeof(Init).Assembly, this.assembly, hotfixAssembly);
-            World.Instance.AddSingleton<EventSystem, Dictionary<string, Type>>(types, true);
+            World.Instance.AddSingleton<CodeTypes, Assembly[]>(new[] { typeof (World).Assembly, typeof(Init).Assembly, this.assembly, hotfixAssembly }, true);
 			
             World.Instance.Load();
 			

DotNet/Loader/ConfigLoader.cs

@@ -17,7 +17,7 @@ namespace ET
                 "StartSceneConfigCategory", 
                 "StartZoneConfigCategory",
             };
-            HashSet<Type> configTypes = EventSystem.Instance.GetTypes(typeof (ConfigAttribute));
+            HashSet<Type> configTypes = CodeTypes.Instance.GetTypes(typeof (ConfigAttribute));
             foreach (Type configType in configTypes)
             {
                 string configFilePath;

Share/Tool/Init.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Threading;
 using CommandLine;
 
@@ -30,8 +31,8 @@ namespace ET.Server
                 //process.AddSingleton<IdGenerater>();
                 
                 
-                Dictionary<string, Type> types = AssemblyHelper.GetAssemblyTypes(typeof (Init).Assembly);
-                World.Instance.AddSingleton<EventSystem, Dictionary<string, Type>>(types);
+                World.Instance.AddSingleton<CodeTypes, Assembly[]>(new[] { typeof (Init).Assembly });
+                World.Instance.AddSingleton<EventSystem>();
                 
                 MongoHelper.Register();
                 

Unity/Assets/Resources/GlobalConfig.asset

@@ -12,6 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 36527db572638af47b03c805671cba75, type: 3}
   m_Name: GlobalConfig
   m_EditorClassIdentifier: 
-  CodeMode: 3
+  CodeMode: 1
   BuildType: 1
   AppType: 7

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

@@ -11,7 +11,7 @@ namespace ET
         {
             this.TypeSystems = new TypeSystems(InstanceQueueIndex.Max);
 
-            foreach (Type type in EventSystem.Instance.GetTypes(typeof (EntitySystemAttribute)))
+            foreach (Type type in CodeTypes.Instance.GetTypes(typeof (EntitySystemAttribute)))
             {
                 object obj = Activator.CreateInstance(type);
 

Unity/Assets/Scripts/Core/Network/OpcodeType.cs

@@ -12,7 +12,7 @@ namespace ET
         
         public void Awake()
         {
-            HashSet<Type> types = EventSystem.Instance.GetTypes(typeof (MessageAttribute));
+            HashSet<Type> types = CodeTypes.Instance.GetTypes(typeof (MessageAttribute));
             foreach (Type type in types)
             {
                 object[] att = type.GetCustomAttributes(typeof (MessageAttribute), false);
@@ -50,7 +50,7 @@ namespace ET
                     }
 
                     ResponseTypeAttribute responseTypeAttribute = attrs[0] as ResponseTypeAttribute;
-                    this.requestResponse.Add(type, EventSystem.Instance.GetType($"ET.{responseTypeAttribute.Type}"));
+                    this.requestResponse.Add(type, CodeTypes.Instance.GetType($"ET.{responseTypeAttribute.Type}"));
                 }
             }
         }

Unity/Assets/Scripts/Core/Serialize/MongoHelper.cs

@@ -100,7 +100,7 @@ namespace ET
             RegisterStruct<TSVector4>();
             RegisterStruct<TSQuaternion>();
 
-            Dictionary<string, Type> types = EventSystem.Instance.GetTypes();
+            Dictionary<string, Type> types = CodeTypes.Instance.GetTypes();
             foreach (Type type in types.Values)
             {
                 if (!type.IsSubclassOf(typeof (Object)))

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

@@ -25,14 +25,14 @@ namespace ET
 
         public void Awake()
         {
-            HashSet<Type> types = EventSystem.Instance.GetTypes(typeof (ActorMessageHandlerAttribute));
+            HashSet<Type> types = CodeTypes.Instance.GetTypes(typeof (ActorMessageHandlerAttribute));
             
             foreach (Type type in types)
             {
                 this.Register(type);
             }
             
-            HashSet<Type> types2 = EventSystem.Instance.GetTypes(typeof (ActorMessageLocationHandlerAttribute));
+            HashSet<Type> types2 = CodeTypes.Instance.GetTypes(typeof (ActorMessageLocationHandlerAttribute));
             
             foreach (Type type in types2)
             {

Unity/Assets/Scripts/Core/World/Module/Code.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c5e58c2ab3d7603459db136e7b34468f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Core/World/Module/Code/CodeTypes.cs

@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using System.Reflection;
+using System;
+
+namespace ET
+{
+    public class CodeTypes: Singleton<CodeTypes>, ISingletonAwake<Assembly[]>
+    {
+        private readonly Dictionary<string, Type> allTypes = new();
+        private readonly UnOrderMultiMapSet<Type, Type> types = new();
+        
+        public void Awake(Assembly[] assemblies)
+        {
+            Dictionary<string, Type> addTypes = AssemblyHelper.GetAssemblyTypes(assemblies);
+            foreach ((string fullName, Type type) in addTypes)
+            {
+                this.allTypes[fullName] = type;
+                
+                if (type.IsAbstract)
+                {
+                    continue;
+                }
+                
+                // 记录所有的有BaseAttribute标记的的类型
+                object[] objects = type.GetCustomAttributes(typeof(BaseAttribute), true);
+
+                foreach (object o in objects)
+                {
+                    this.types.Add(o.GetType(), type);
+                }
+            }
+        }
+
+        public HashSet<Type> GetTypes(Type systemAttributeType)
+        {
+            if (!this.types.ContainsKey(systemAttributeType))
+            {
+                return new HashSet<Type>();
+            }
+
+            return this.types[systemAttributeType];
+        }
+
+        public Dictionary<string, Type> GetTypes()
+        {
+            return allTypes;
+        }
+
+        public Type GetType(string typeName)
+        {
+            return this.allTypes[typeName];
+        }
+    }
+}

Unity/Assets/Scripts/Core/World/Module/Config/ConfigComponent.cs.meta → Unity/Assets/Scripts/Core/World/Module/Code/CodeTypes.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f3220f986cb182d4da3952ba65888ae4
+guid: d7ad14f4a26068a4986898db72c0fbf0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

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

Unity/Assets/Scripts/Core/World/Module/EventSystem/EventSystem.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace ET
 {
-    public class EventSystem: Singleton<EventSystem>, ISingletonAwake<Dictionary<string, Type>>
+    public class EventSystem: Singleton<EventSystem>, ISingletonAwake, ISingletonLoad
     {
         private class EventInfo
         {
@@ -18,39 +18,14 @@ namespace ET
             }
         }
         
-        private readonly Dictionary<string, Type> allTypes = new();
-
-        private readonly UnOrderMultiMapSet<Type, Type> types = new();
-
         private readonly Dictionary<Type, List<EventInfo>> allEvents = new();
         
         private Dictionary<Type, Dictionary<long, object>> allInvokes = new(); 
         
-        public void Awake(Dictionary<string, Type> addTypes)
+        public void Awake()
         {
-            this.allTypes.Clear();
-            this.types.Clear();
-            
-            foreach ((string fullName, Type type) in addTypes)
-            {
-                this.allTypes[fullName] = type;
-                
-                if (type.IsAbstract)
-                {
-                    continue;
-                }
-                
-                // 记录所有的有BaseAttribute标记的的类型
-                object[] objects = type.GetCustomAttributes(typeof(BaseAttribute), true);
-
-                foreach (object o in objects)
-                {
-                    this.types.Add(o.GetType(), type);
-                }
-            }
-
-            this.allEvents.Clear();
-            foreach (Type type in types[typeof (EventAttribute)])
+            CodeTypes codeTypes = CodeTypes.Instance;
+            foreach (Type type in codeTypes.GetTypes(typeof (EventAttribute)))
             {
                 IEvent obj = Activator.CreateInstance(type) as IEvent;
                 if (obj == null)
@@ -75,8 +50,7 @@ namespace ET
                 }
             }
 
-            this.allInvokes = new Dictionary<Type, Dictionary<long, object>>();
-            foreach (Type type in types[typeof (InvokeAttribute)])
+            foreach (Type type in codeTypes.GetTypes(typeof (InvokeAttribute)))
             {
                 object obj = Activator.CreateInstance(type);
                 IInvoke iInvoke = obj as IInvoke;
@@ -107,25 +81,10 @@ namespace ET
                 }
             }
         }
-
-        public HashSet<Type> GetTypes(Type systemAttributeType)
-        {
-            if (!this.types.ContainsKey(systemAttributeType))
-            {
-                return new HashSet<Type>();
-            }
-
-            return this.types[systemAttributeType];
-        }
-
-        public Dictionary<string, Type> GetTypes()
-        {
-            return allTypes;
-        }
-
-        public Type GetType(string typeName)
+        
+        public void Load()
         {
-            return this.allTypes[typeName];
+            World.Instance.AddSingleton<EventSystem>(true);
         }
 
         public async ETTask PublishAsync<S, T>(S scene, T a) where S: class, IScene where T : struct

Unity/Assets/Scripts/Hotfix/Share/Module/Console/ReloadConfigConsoleHandler.cs

@@ -17,7 +17,7 @@ namespace ET
                     string[] ss = content.Split(" ");
                     string configName = ss[1];
                     string category = $"{configName}Category";
-                    Type type = EventSystem.Instance.GetType($"ET.{category}");
+                    Type type = CodeTypes.Instance.GetType($"ET.{category}");
                     if (type == null)
                     {
                         Log.Console($"reload config but not find {category}");

Unity/Assets/Scripts/Loader/CodeLoader.cs

@@ -26,8 +26,9 @@ namespace ET
 				}
 				
 				Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
-				Dictionary<string, Type> types = AssemblyHelper.GetAssemblyTypes(assemblies);
-				World.Instance.AddSingleton<EventSystem, Dictionary<string, Type>>(types);
+				
+				World.Instance.AddSingleton<CodeTypes, Assembly[]>(assemblies);
+				
 				foreach (Assembly ass in assemblies)
 				{
 					string name = ass.GetName().Name;
@@ -68,9 +69,7 @@ namespace ET
 			{
 				Assembly hotfixAssembly = this.LoadHotfix();
 
-				Dictionary<string, Type> types =
-						AssemblyHelper.GetAssemblyTypes(typeof (World).Assembly, typeof (Init).Assembly, this.assembly, hotfixAssembly);
-				World.Instance.AddSingleton<EventSystem, Dictionary<string, Type>>(types);
+				World.Instance.AddSingleton<CodeTypes, Assembly[]>(new []{typeof (World).Assembly, typeof(Init).Assembly, this.assembly, hotfixAssembly});
 
 				IStaticMethod start = new StaticMethod(this.assembly, "ET.Entry", "Start");
 				start.Run();
@@ -105,9 +104,8 @@ namespace ET
 		public void Reload()
 		{
 			Assembly hotfixAssembly = this.LoadHotfix();
-			
-			Dictionary<string, Type> types = AssemblyHelper.GetAssemblyTypes(typeof (World).Assembly, typeof(Init).Assembly, this.assembly, hotfixAssembly);
-			World.Instance.AddSingleton<EventSystem, Dictionary<string, Type>>(types, true);
+
+			World.Instance.AddSingleton<CodeTypes, Assembly[]>(new []{typeof (World).Assembly, typeof(Init).Assembly, this.assembly, hotfixAssembly}, true);
 			
 			World.Instance.Load();
 			

Unity/Assets/Scripts/Loader/ConfigLoader.cs

@@ -11,7 +11,7 @@ namespace ET
         public override Dictionary<Type, byte[]> Handle(ConfigLoader.GetAllConfigBytes args)
         {
             Dictionary<Type, byte[]> output = new Dictionary<Type, byte[]>();
-            HashSet<Type> configTypes = EventSystem.Instance.GetTypes(typeof (ConfigAttribute));
+            HashSet<Type> configTypes = CodeTypes.Instance.GetTypes(typeof (ConfigAttribute));
             
             if (Define.IsEditor)
             {

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

@@ -14,7 +14,7 @@ namespace ET.Server
 
         public void Awake()
         {
-            HashSet<Type> types = EventSystem.Instance.GetTypes(typeof (HttpHandlerAttribute));
+            HashSet<Type> types = CodeTypes.Instance.GetTypes(typeof (HttpHandlerAttribute));
 
             foreach (Type type in types)
             {

Unity/Assets/Scripts/Model/Share/Entry.cs

@@ -36,7 +36,8 @@ namespace ET
             
             MongoHelper.RegisterStruct<LSInput>();
             MongoHelper.Register();
-            
+
+            World.Instance.AddSingleton<EventSystem>();
             World.Instance.AddSingleton<OpcodeType>();
             World.Instance.AddSingleton<IdValueGenerater>();
             World.Instance.AddSingleton<ObjectPool>();

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

@@ -18,7 +18,7 @@ namespace ET
         public void Awake()
         {
             this.TypeSystems = new(LSQueneUpdateIndex.Max);
-            foreach (Type type in EventSystem.Instance.GetTypes(typeof (LSEntitySystemAttribute)))
+            foreach (Type type in CodeTypes.Instance.GetTypes(typeof (LSEntitySystemAttribute)))
             {
                 object obj = Activator.CreateInstance(type);
 

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

@@ -9,7 +9,7 @@ namespace ET
         
         public void Awake()
         {
-            var types = EventSystem.Instance.GetTypes(typeof (AIHandlerAttribute));
+            var types = CodeTypes.Instance.GetTypes(typeof (AIHandlerAttribute));
             foreach (Type type in types)
             {
                 AAIHandler aaiHandler = Activator.CreateInstance(type) as AAIHandler;

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

@@ -14,7 +14,7 @@ namespace ET
 
         public void Awake()
         {
-            HashSet<Type> types = EventSystem.Instance.GetTypes(typeof (ConsoleHandlerAttribute));
+            HashSet<Type> types = CodeTypes.Instance.GetTypes(typeof (ConsoleHandlerAttribute));
 
             foreach (Type type in types)
             {

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

@@ -21,7 +21,7 @@ namespace ET
         
         public void Awake()
         {
-            HashSet<Type> types = EventSystem.Instance.GetTypes(typeof (MessageHandlerAttribute));
+            HashSet<Type> types = CodeTypes.Instance.GetTypes(typeof (MessageHandlerAttribute));
 
             foreach (Type type in types)
             {

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

@@ -24,7 +24,7 @@ namespace ET
         
         public void Awake()
         {
-            HashSet<Type> types = EventSystem.Instance.GetTypes(typeof(NumericWatcherAttribute));
+            HashSet<Type> types = CodeTypes.Instance.GetTypes(typeof(NumericWatcherAttribute));
             foreach (Type type in types)
             {
                 object[] attrs = type.GetCustomAttributes(typeof(NumericWatcherAttribute), false);

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

@@ -12,7 +12,7 @@ namespace ET.Client
 		
         public void Awake()
         {
-            var uiEvents = EventSystem.Instance.GetTypes(typeof (UIEventAttribute));
+            var uiEvents = CodeTypes.Instance.GetTypes(typeof (UIEventAttribute));
             foreach (Type type in uiEvents)
             {
                 object[] attrs = type.GetCustomAttributes(typeof (UIEventAttribute), false);