tanghai 7 лет назад
Родитель
Сommit
d904f249c4

+ 1 - 1
Server/Hotfix/Module/Actor/ActorComponentSystem.cs

@@ -41,7 +41,7 @@ namespace ETHotfix
 	}
 
 	[ObjectSystem]
-	public class ActorComponentDesdroySystem : DestroySystem<ActorComponent>
+	public class ActorComponentDestroySystem : DestroySystem<ActorComponent>
 	{
 		public override void Destroy(ActorComponent self)
 		{

+ 2 - 2
Unity/Assets/Scripts/Base/Object/Component.cs

@@ -79,8 +79,8 @@ namespace ETModel
 				Game.ObjectPool.Recycle(this);
 			}
 
-			// 触发Desdroy事件
-			Game.EventSystem.Desdroy(this);
+			// 触发Destroy事件
+			Game.EventSystem.Destroy(this);
 		}
 	}
 }

+ 4 - 4
Unity/Assets/Scripts/Base/Object/EventSystem.cs

@@ -24,7 +24,7 @@ namespace ETModel
 
 		private readonly UnOrderMultiMap<Type, IStartSystem> startEvents = new UnOrderMultiMap<Type, IStartSystem>();
 
-		private readonly UnOrderMultiMap<Type, IDestroySystem> desdroyEvents = new UnOrderMultiMap<Type, IDestroySystem>();
+		private readonly UnOrderMultiMap<Type, IDestroySystem> destroyEvents = new UnOrderMultiMap<Type, IDestroySystem>();
 
 		private readonly UnOrderMultiMap<Type, ILoadSystem> loadEvents = new UnOrderMultiMap<Type, ILoadSystem>();
 
@@ -92,7 +92,7 @@ namespace ETModel
 				IDestroySystem destroySystem = obj as IDestroySystem;
 				if (destroySystem != null)
 				{
-					this.desdroyEvents.Add(destroySystem.Type(), destroySystem);
+					this.destroyEvents.Add(destroySystem.Type(), destroySystem);
 				}
 
 				ILoadSystem loadSystem = obj as ILoadSystem;
@@ -379,9 +379,9 @@ namespace ETModel
 			}
 		}
 
-		public void Desdroy(Component component)
+		public void Destroy(Component component)
 		{
-			List<IDestroySystem> iDestroySystems = this.desdroyEvents[component.GetType()];
+			List<IDestroySystem> iDestroySystems = this.destroyEvents[component.GetType()];
 			if (iDestroySystems == null)
 			{
 				return;

+ 1 - 1
Unity/Assets/Scripts/Module/AssetsBundle/ResourcesComponent.cs

@@ -48,7 +48,7 @@ namespace ETModel
 
 			base.Dispose();
 
-			//Log.Debug($"desdroy assetbundle: {this.Name}");
+			//Log.Debug($"destroy assetbundle: {this.Name}");
 
 			this.AssetBundle?.Unload(true);
 		}

+ 2 - 2
Unity/Hotfix/Base/Object/Component.cs

@@ -79,8 +79,8 @@ namespace ETHotfix
 				Game.ObjectPool.Recycle(this);
 			}
 
-			// 触发Desdroy事件
-			Game.EventSystem.Desdroy(this);
+			// 触发Destroy事件
+			Game.EventSystem.Destroy(this);
 		}
 	}
 }

+ 4 - 4
Unity/Hotfix/Base/Object/EventSystem.cs

@@ -14,7 +14,7 @@ namespace ETHotfix
 
 		private readonly UnOrderMultiMap<Type, IStartSystem> startEvents = new UnOrderMultiMap<Type, IStartSystem>();
 
-		private readonly UnOrderMultiMap<Type, IDestroySystem> desdroyEvents = new UnOrderMultiMap<Type, IDestroySystem>();
+		private readonly UnOrderMultiMap<Type, IDestroySystem> destroyEvents = new UnOrderMultiMap<Type, IDestroySystem>();
 
 		private readonly UnOrderMultiMap<Type, ILoadSystem> loadEvents = new UnOrderMultiMap<Type, ILoadSystem>();
 
@@ -74,7 +74,7 @@ namespace ETHotfix
 				IDestroySystem destroySystem = obj as IDestroySystem;
 				if (destroySystem != null)
 				{
-					this.desdroyEvents.Add(destroySystem.Type(), destroySystem);
+					this.destroyEvents.Add(destroySystem.Type(), destroySystem);
 				}
 
 				ILoadSystem loadSystem = obj as ILoadSystem;
@@ -367,9 +367,9 @@ namespace ETHotfix
 			}
 		}
 
-		public void Desdroy(Component component)
+		public void Destroy(Component component)
 		{
-			List<IDestroySystem> iDestroySystems = this.desdroyEvents[component.GetType()];
+			List<IDestroySystem> iDestroySystems = this.destroyEvents[component.GetType()];
 			if (iDestroySystems == null)
 			{
 				return;