Component的Owner改成Entity，GetOwner改成GetEntity，与GetComponent命名一致

Server/Model/Component/ActorComponent.cs

@@ -55,8 +55,8 @@ namespace Model
 		
 		public async void Start()
 		{
-			this.actorId = this.Owner.Id;
-			Game.Scene.GetComponent<ActorManagerComponent>().Add(this.Owner);
+			this.actorId = this.Entity.Id;
+			Game.Scene.GetComponent<ActorManagerComponent>().Add(this.Entity);
 			await Game.Scene.GetComponent<LocationProxyComponent>().Add(this.actorId);
 			this.HandleAsync();
 		}
@@ -93,7 +93,7 @@ namespace Model
 				try
 				{
 					ActorMessageInfo info = await this.GetAsync();
-					await this.entityActorHandler.Handle(info.Session, this.Owner, info.Message);
+					await this.entityActorHandler.Handle(info.Session, this.Entity, info.Message);
 				}
 				catch (Exception e)
 				{

Server/Model/Component/LocationComponent.cs

@@ -215,7 +215,7 @@ namespace Model
 				tasks = new Queue<LocationTask>();
 				this.taskQueues[key] = tasks;
 			}
-			task.Scene = this.GetOwner<Scene>();
+			task.Scene = this.GetEntity<Scene>();
 			tasks.Enqueue(task);
 		}
 

Server/Model/Component/Unit/LockComponent.cs

@@ -82,7 +82,7 @@ namespace Model
 			{
 				Session session = Game.Scene.GetComponent<NetInnerComponent>().Get(this.address);
 				string serverAddress = Game.Scene.GetComponent<StartConfigComponent>().StartConfig.ServerIP;
-				G2G_LockRequest request = new G2G_LockRequest { Id = this.Owner.Id, Address = serverAddress };
+				G2G_LockRequest request = new G2G_LockRequest { Id = this.Entity.Id, Address = serverAddress };
 				await session.Call<G2G_LockResponse>(request);
 
 				this.status = LockStatus.Locked;
@@ -95,7 +95,7 @@ namespace Model
 			}
 			catch (Exception e)
 			{
-				Log.Error($"获取锁失败: {this.address} {this.Owner.Id} {e}");
+				Log.Error($"获取锁失败: {this.address} {this.Entity.Id} {e}");
 			}
 		}
 

Unity/Assets/Scripts/Base/Object/Component.cs

@@ -6,11 +6,11 @@ namespace Model
 	public abstract class Component: Disposer
 	{
 		[BsonIgnore]
-		public Entity Owner { get; set; }
+		public Entity Entity { get; set; }
 
-		public T GetOwner<T>() where T : Entity
+		public T GetEntity<T>() where T : Entity
 		{
-			return this.Owner as T;
+			return this.Entity as T;
 		}
 
 		protected Component()
@@ -23,7 +23,7 @@ namespace Model
 
 		public T GetComponent<T>() where T : Component
 		{
-			return this.Owner.GetComponent<T>();
+			return this.Entity.GetComponent<T>();
 		}
 
 		public override void Dispose()
@@ -35,7 +35,7 @@ namespace Model
 
 			base.Dispose();
 
-			this.Owner?.RemoveComponent(this.GetType());
+			this.Entity?.RemoveComponent(this.GetType());
 		}
 	}
 }

Unity/Assets/Scripts/Base/Object/ComponentFactory.cs

@@ -7,7 +7,7 @@ namespace Model
 		public static T Create<T>(Entity entity) where T : Component
 		{
 			T disposer = (T)Activator.CreateInstance(typeof(T));
-			disposer.Owner = entity;
+			disposer.Entity = entity;
 			ObjectEvents.Instance.Awake(disposer);
 			return disposer;
 		}
@@ -15,7 +15,7 @@ namespace Model
 		public static T Create<T, A>(Entity entity, A a) where T : Component
 		{
 			T disposer = (T)Activator.CreateInstance(typeof(T));
-			disposer.Owner = entity;
+			disposer.Entity = entity;
 			ObjectEvents.Instance.Awake(disposer, a);
 			return disposer;
 		}
@@ -23,7 +23,7 @@ namespace Model
 		public static T Create<T, A, B>(Entity entity, A a, B b) where T : Component
 		{
 			T disposer = (T)Activator.CreateInstance(typeof(T));
-			disposer.Owner = entity;
+			disposer.Entity = entity;
 			ObjectEvents.Instance.Awake(disposer, a, b);
 			return disposer;
 		}
@@ -31,7 +31,7 @@ namespace Model
 		public static T Create<T, A, B, C>(Entity entity, A a, B b, C c) where T : Component
 		{
 			T disposer = (T)Activator.CreateInstance(typeof(T));
-			disposer.Owner = entity;
+			disposer.Entity = entity;
 			ObjectEvents.Instance.Awake(disposer, a, b, c);
 			return disposer;
 		}

Unity/Assets/Scripts/Base/Object/Entity.cs

@@ -207,7 +207,7 @@ namespace Model
 			{
 				foreach (Component component in this.components)
 				{
-					component.Owner = this;
+					component.Entity = this;
 					this.componentDict.Add(component.GetType(), component);
 				}
 			}

Unity/Assets/Scripts/Component/BehaviorTreeComponent.cs

@@ -103,7 +103,7 @@ namespace Model
 		private Node CreateTreeNode(NodeProto proto)
 		{
 			Node node = this.CreateOneNode(proto);
-			node.EndInit(this.GetOwner<Scene>());
+			node.EndInit(this.GetEntity<Scene>());
 
 			if (proto.Children == null)
 			{

Unity/Assets/Scripts/Entity/Session.cs

@@ -99,7 +99,7 @@ namespace Model
 
 		private void RunDecompressedBytes(ushort opcode, byte[] messageBytes, int offset)
 		{
-			Type messageType = this.network.Owner.GetComponent<OpcodeTypeComponent>().GetType(opcode);
+			Type messageType = this.network.Entity.GetComponent<OpcodeTypeComponent>().GetType(opcode);
 			object message = this.network.MessagePacker.DeserializeFrom(messageType, messageBytes, offset, messageBytes.Length - offset);
 
 			//Log.Debug($"recv: {JsonHelper.ToJson(message)}");
@@ -209,7 +209,7 @@ namespace Model
 		private void SendMessage(object message)
 		{
 			//Log.Debug($"send: {message.ToJson()}");
-			ushort opcode = this.network.Owner.GetComponent<OpcodeTypeComponent>().GetOpcode(message.GetType());
+			ushort opcode = this.network.Entity.GetComponent<OpcodeTypeComponent>().GetOpcode(message.GetType());
 			opcode = NetworkHelper.HostToNetworkOrder(opcode);
 			byte[] opcodeBytes = BitConverter.GetBytes(opcode);