整理代码,对象事件代码更合理了

Server/App/Program.cs

@@ -12,8 +12,8 @@ namespace App
 		{
 			try
 			{
-				DisposerManager.Instance.Register("Model", typeof(Game).Assembly);
-				DisposerManager.Instance.Register("Controller", DllHelper.GetController());
+				Game.DisposerEventManager.Register("Model", typeof(Game).Assembly);
+				Game.DisposerEventManager.Register("Controller", DllHelper.GetController());
 
 				StartConfig startConfig = Game.Scene.AddComponent<StartConfigComponent, string[]>(args).MyConfig;
 
@@ -70,7 +70,7 @@ namespace App
 
 				while (true)
 				{
-					DisposerManager.Instance.Update();
+					Game.Update();
 				}
 			}
 			catch (Exception e)

Server/Controller/Message/M2A_ReloadHandler.cs

@@ -12,7 +12,7 @@ namespace Controller
 			A2M_Reload a2MReload = new A2M_Reload();
 			try
 			{
-				DisposerManager.Instance.Register("Controller", DllHelper.GetController());
+				Game.DisposerEventManager.Register("Controller", DllHelper.GetController());
 			}
 			catch (Exception e)
 			{

Server/Model/Server.Model.csproj

@@ -173,8 +173,8 @@
     <Compile Include="..\..\Unity\Assets\Scripts\Object\DisposerEventAttribute.cs">
       <Link>Object\DisposerEventAttribute.cs</Link>
     </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Object\DisposerManager.cs">
-      <Link>Object\DisposerManager.cs</Link>
+    <Compile Include="..\..\Unity\Assets\Scripts\Object\DisposerEventManager.cs">
+      <Link>Object\DisposerEventManager.cs</Link>
     </Compile>
     <Compile Include="..\..\Unity\Assets\Scripts\Object\Entity.cs">
       <Link>Object\Entity.cs</Link>

Unity/Assets/Editor/EditorInit.cs

@@ -2,7 +2,6 @@
 using Base;
 using UnityEditor;
 using UnityEngine;
-using Model;
 
 namespace MyEditor
 {
@@ -11,7 +10,7 @@ namespace MyEditor
 	{
 		static EditorInit()
 		{
-			DisposerManager.Instance.Register("Editor", typeof(EditorInit).Assembly);
+			Game.DisposerEventManager.Register("Editor", typeof(EditorInit).Assembly);
 			EditorApplication.update += Update;
 		}
 
@@ -24,11 +23,10 @@ namespace MyEditor
 
 			try
 			{
-				DisposerManager.Instance.Update();
+				Game.Update();
 			}
 			catch (Exception e)
 			{
-				DisposerManager.Reset();
 				Log.Error(e.ToString());
 			}
 		}

Unity/Assets/Editor/ObjectManagerToolsEditor/ObjectManagerToolsWindow.cs

@@ -7,13 +7,13 @@ public class ObjectManagerToolsWindow : EditorWindow
 	[MenuItem("Tools/ObjectManagerTools/显示未Dispose的对象")]
 	private static void ShowUnDisposeObjects()
 	{
-		Log.Info(DisposerManager.Instance.ToString());
+		Log.Info(Game.DisposerInfo());
 	}
 	
 
 	[MenuItem("Tools/ObjectManagerTools/清除所有对象")]
 	private static void ClearAllObjects()
 	{
-		DisposerManager.Reset();
+		Game.ClearDisposers();
 	}
 }

Unity/Assets/Scripts/Component/ConfigComponent.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using Base;
 
 namespace Model
 {
@@ -10,7 +11,7 @@ namespace Model
 
 		public void Load()
 		{
-			Assembly assembly = DisposerManager.Instance.GetAssembly("Base");
+			Assembly assembly = Game.DisposerEventManager.GetAssembly("Base");
 
 			this.allConfig = new Dictionary<Type, ICategory>();
 			Type[] types = assembly.GetTypes();

Unity/Assets/Scripts/Component/EventComponent.cs

@@ -29,7 +29,7 @@ namespace Model
 		public void Load()
 		{
 			this.allEvents = new Dictionary<EventIdType, List<object>>();
-			Assembly[] assemblies = DisposerManager.Instance.GetAssemblies();
+			Assembly[] assemblies = Game.DisposerEventManager.GetAssemblies();
 			foreach (Assembly assembly in assemblies)
 			{
 				Type[] types = assembly.GetTypes();

Unity/Assets/Scripts/Component/MessageDispatherComponent.cs

@@ -40,7 +40,7 @@ namespace Model
 			this.handlers = new Dictionary<ushort, List<IMHandler>>();
 			this.messageOpcode = new Dictionary<Type, MessageAttribute>();
 
-			Assembly[] assemblies = DisposerManager.Instance.GetAssemblies();
+			Assembly[] assemblies = Game.DisposerEventManager.GetAssemblies();
 
 			foreach (Assembly assembly in assemblies)
 			{

Unity/Assets/Scripts/Component/UIComponent.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Base;
 using UnityEngine;
 
 namespace Model
@@ -63,7 +64,7 @@ namespace Model
 		{
 			this.UiTypes = new Dictionary<UIType, IUIFactory>();
 
-			Assembly[] assemblies = DisposerManager.Instance.GetAssemblies();
+			Assembly[] assemblies = Game.DisposerEventManager.GetAssemblies();
 			foreach (Assembly assembly in assemblies)
 			{
 				Type[] types = assembly.GetTypes();

Unity/Assets/Scripts/Entity/Game.cs

@@ -1,9 +1,16 @@
-using Model;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Model;
 
 namespace Base
 {
 	public static class Game
 	{
+		private static readonly HashSet<Disposer> disposers = new HashSet<Disposer>();
+
+		private static DisposerEventManager disposerEventManager;
+
 		private static Scene scene;
 
 		public static Scene Scene
@@ -14,11 +21,69 @@ namespace Base
 			}
 		}
 
-		public static void Close()
+		public static void CloseScene()
 		{
-			Scene s = scene;
+			scene.Dispose();
 			scene = null;
-			s.Dispose();
+		}
+
+		public static void ClearDisposers()
+		{
+			foreach (Disposer disposer in disposers)
+			{
+				disposer.Dispose();
+			}
+			disposers.Clear();
+		}
+
+		public static DisposerEventManager DisposerEventManager
+		{
+			get
+			{
+				return disposerEventManager ?? (disposerEventManager = new DisposerEventManager());
+			}
+		}
+
+		public static void Add(Disposer disposer)
+		{
+			disposers.Add(disposer);
+			disposerEventManager.Add(disposer);
+		}
+
+		public static void Remove(Disposer disposer)
+		{
+			disposers.Remove(disposer);
+			disposerEventManager.Remove(disposer);
+		}
+
+		public static void Update()
+		{
+			disposerEventManager.Update();
+		}
+
+		public static string DisposerInfo()
+		{
+			var info = new Dictionary<string, int>();
+			foreach (Disposer disposer in disposers)
+			{
+				if (info.ContainsKey(disposer.GetType().Name))
+				{
+					info[disposer.GetType().Name] += 1;
+				}
+				else
+				{
+					info[disposer.GetType().Name] = 1;
+				}
+			}
+			info = info.OrderByDescending(s => s.Value).ToDictionary(p => p.Key, p => p.Value);
+			StringBuilder sb = new StringBuilder();
+			sb.Append("\r\n");
+			foreach (string key in info.Keys)
+			{
+				sb.Append($"{info[key],10} {key}\r\n");
+			}
+			
+			return sb.ToString();
 		}
 	}
 }

Unity/Assets/Scripts/Init.cs

@@ -8,8 +8,8 @@ namespace Model
 	{
 		private void Start()
 		{
-			DisposerManager.Instance.Register("Model", typeof(Game).Assembly);
-			DisposerManager.Instance.Register("Controller", DllHelper.GetController());
+			Game.DisposerEventManager.Register("Model", typeof(Game).Assembly);
+			Game.DisposerEventManager.Register("Controller", DllHelper.GetController());
 
 			Game.Scene.AddComponent<EventComponent>().Run(EventIdType.InitSceneStart);
 		}
@@ -18,7 +18,7 @@ namespace Model
 		{
 			try
 			{
-				DisposerManager.Instance.Update();
+				Game.Update();
 			}
 			catch (Exception e)
 			{
@@ -28,7 +28,7 @@ namespace Model
 
 		private void OnApplicationQuit()
 		{
-			Game.Close();
+			Game.CloseScene();
 		}
 	}
 }

Unity/Assets/Scripts/Object/Disposer.cs

@@ -7,18 +7,27 @@ namespace Model
 	{
 		protected Disposer(): base(IdGenerater.GenerateId())
 		{
-			DisposerManager.Instance.Add(this);
+			Game.Add(this);
 		}
 
 		protected Disposer(long id): base(id)
 		{
-			DisposerManager.Instance.Add(this);
+			Game.Add(this);
 		}
 
 		public virtual void Dispose()
 		{
-			DisposerManager.Instance.Remove(this);
+			Game.Remove(this);
 			this.Id = 0;
 		}
+
+		public override void BeginInit()
+		{
+		}
+
+		public override void EndInit()
+		{
+			Game.Add(this);
+		}
 	}
 }

Unity/Assets/Scripts/Object/DisposerManager.cs → Unity/Assets/Scripts/Object/DisposerEventManager.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using Base;
 
 namespace Model
@@ -33,44 +32,15 @@ namespace Model
 		}
 	}
 
-	public sealed class DisposerManager : IDisposable
+	public sealed class DisposerEventManager
 	{
 		private readonly Dictionary<string, Assembly> assemblies = new Dictionary<string, Assembly>();
 
 		private Dictionary<Type, IDisposerEvent> disposerEvents;
 
-		private readonly HashSet<Disposer> disposers = new HashSet<Disposer>();
 		private readonly HashSet<Disposer> updates = new HashSet<Disposer>();
 		private readonly HashSet<Disposer> loaders = new HashSet<Disposer>();
 
-		private static DisposerManager instance = new DisposerManager();
-
-		public static DisposerManager Instance
-		{
-			get
-			{
-				return instance;
-			}
-		}
-
-		private DisposerManager()
-		{
-		}
-
-		public static void Reset()
-		{
-			instance.Dispose();
-			instance = new DisposerManager();
-		}
-
-		public void Dispose()
-		{
-			foreach (Disposer o in this.disposers.ToArray())
-			{
-				o.Dispose();
-			}
-		}
-
 		public void Register(string name, Assembly assembly)
 		{
 			this.assemblies[name] = assembly;
@@ -136,8 +106,7 @@ namespace Model
 			{
 				return;
 			}
-
-			this.disposers.Add(disposer);
+			
 			IDisposerEvent disposerEvent;
 			if (!this.disposerEvents.TryGetValue(disposer.GetType(), out disposerEvent))
 			{
@@ -159,15 +128,13 @@ namespace Model
 
 		public void Remove(Disposer disposer)
 		{
-			this.disposers.Remove(disposer);
-
 			IDisposerEvent disposerEvent;
 			if (!this.disposerEvents.TryGetValue(disposer.GetType(), out disposerEvent))
 			{
 				return;
 			}
 
-			IUpdate iUpdate = disposerEvent as IUpdate;
+			IUpdate iUpdate = disposerEvent as IUpdate; 
 			if (iUpdate != null)
 			{
 				this.updates.Remove(disposer);
@@ -269,31 +236,5 @@ namespace Model
 				}
 			}
 		}
-
-		public override string ToString()
-		{
-			var info = new Dictionary<string, int>();
-			foreach (Disposer obj in this.disposers)
-			{
-				if (info.ContainsKey(obj.GetType().Name))
-				{
-					info[obj.GetType().Name] += 1;
-				}
-				else
-				{
-					info[obj.GetType().Name] = 1;
-				}
-			}
-			info = info.OrderByDescending(s => s.Value).ToDictionary(p => p.Key, p => p.Value);
-			StringBuilder sb = new StringBuilder();
-			sb.Append("\r\n");
-			foreach (string key in info.Keys)
-			{
-				sb.Append($"{info[key],10} {key}\r\n");
-			}
-
-			sb.Append($"\r\n update: {this.updates.Count} total: {this.disposers.Count}");
-			return sb.ToString();
-		}
 	}
 }

Unity/Assets/Scripts/Object/Entity.cs

@@ -66,7 +66,7 @@ namespace Model
 
 			this.components.Add(component);
 			this.componentDict.Add(component.GetType(), component);
-			DisposerManager.Instance.Awake(component);
+			Game.DisposerEventManager.Awake(component);
 			return component;
 		}
 
@@ -87,7 +87,7 @@ namespace Model
 
 			this.components.Add(component);
 			this.componentDict.Add(component.GetType(), component);
-			DisposerManager.Instance.Awake(component, p1);
+			Game.DisposerEventManager.Awake(component, p1);
 			return component;
 		}
 
@@ -108,7 +108,7 @@ namespace Model
 
 			this.components.Add(component);
 			this.componentDict.Add(component.GetType(), component);
-			DisposerManager.Instance.Awake(component, p1, p2);
+			Game.DisposerEventManager.Awake(component, p1, p2);
 			return component;
 		}
 
@@ -130,7 +130,7 @@ namespace Model
 
 			this.components.Add(component);
 			this.componentDict.Add(component.GetType(), component);
-			DisposerManager.Instance.Awake(component, p1, p2, p3);
+			Game.DisposerEventManager.Awake(component, p1, p2, p3);
 			return component;
 		}
 
@@ -147,7 +147,7 @@ namespace Model
 			}
 			this.components.Add(component);
 			this.componentDict.Add(component.GetType(), component);
-			DisposerManager.Instance.Awake(component);
+			Game.DisposerEventManager.Awake(component);
 		}
 
 		public void RemoveComponent<K>() where K : Component

Unity/Unity.csproj

@@ -13,13 +13,11 @@
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
-    <CompilerResponseFile>
-    </CompilerResponseFile>
+    <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
     <UnityVersion>5.4.1f1</UnityVersion>
-    <RootNamespace>
-    </RootNamespace>
+    <RootNamespace></RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -108,12 +106,12 @@
     <Compile Include="Assets\Scripts\Entity\Config\BuffConfig.cs" />
     <Compile Include="Assets\Scripts\Entity\Config\StartConfig.cs" />
     <Compile Include="Assets\Scripts\Entity\Game.cs" />
-    <Compile Include="Assets\Scripts\Entity\Message\OuterMessage.cs" />
     <Compile Include="Assets\Scripts\Entity\Message\InnerMessage.cs" />
+    <Compile Include="Assets\Scripts\Entity\Message\OuterMessage.cs" />
     <Compile Include="Assets\Scripts\Entity\Scene.cs" />
     <Compile Include="Assets\Scripts\Entity\Session.cs" />
-    <Compile Include="Assets\Scripts\Entity\Unit.cs" />
     <Compile Include="Assets\Scripts\Entity\UI.cs" />
+    <Compile Include="Assets\Scripts\Entity\Unit.cs" />
     <Compile Include="Assets\Scripts\Event\AEventAttribute.cs" />
     <Compile Include="Assets\Scripts\Event\Env.cs" />
     <Compile Include="Assets\Scripts\Event\EnvKey.cs" />
@@ -134,15 +132,15 @@
     <Compile Include="Assets\Scripts\Message\OpcodeHelper.cs" />
     <Compile Include="Assets\Scripts\Message\RpcException.cs" />
     <Compile Include="Assets\Scripts\Object\Component.cs" />
+    <Compile Include="Assets\Scripts\Object\Disposer.cs" />
+    <Compile Include="Assets\Scripts\Object\DisposerEventAttribute.cs" />
+    <Compile Include="Assets\Scripts\Object\DisposerEventManager.cs" />
     <Compile Include="Assets\Scripts\Object\Entity.cs" />
     <Compile Include="Assets\Scripts\Object\EntityType.cs" />
     <Compile Include="Assets\Scripts\Object\IAwake.cs" />
     <Compile Include="Assets\Scripts\Object\ILoader.cs" />
     <Compile Include="Assets\Scripts\Object\IUpdate.cs" />
-    <Compile Include="Assets\Scripts\Object\Disposer.cs" />
     <Compile Include="Assets\Scripts\Object\Object.cs" />
-    <Compile Include="Assets\Scripts\Object\DisposerEventAttribute.cs" />
-    <Compile Include="Assets\Scripts\Object\DisposerManager.cs" />
     <Compile Include="Assets\Scripts\Other\Define.cs" />
     <Compile Include="Assets\Scripts\Other\GameException.cs" />
     <Compile Include="Assets\Scripts\Other\IUIFactory.cs" />