命名空间全部改成ET，不再区分ETModel跟ETHotfix

Proto/InnerMessage.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package ETModel;
+package ET;
 
 /// <summary>
 /// 传送unit

Proto/OuterMessage.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package ETModel;
+package ET;
 
 message C2M_TestRequest // IActorLocationRequest
 {

Server/App/Program.cs

@@ -5,7 +5,7 @@ using System.Threading;
 using CommandLine;
 using NLog;
 
-namespace ETModel
+namespace ET
 {
 	internal static class Program
 	{

Server/Hotfix/Demo/Actor_TransferHandler.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Net;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ActorMessageHandler]
 	public class Actor_TransferHandler : AMActorRpcHandler<Unit, Actor_TransferRequest, Actor_TransferResponse>

Server/Hotfix/Demo/C2G_EnterMapHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[MessageHandler]
 	public class C2G_EnterMapHandler : AMRpcHandler<C2G_EnterMap, G2C_EnterMap>

Server/Hotfix/Demo/C2G_LoginGateHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[MessageHandler]
 	public class C2G_LoginGateHandler : AMRpcHandler<C2G_LoginGate, G2C_LoginGate>

Server/Hotfix/Demo/C2M_TestActorRequestHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ActorMessageHandler]
 	public class C2M_TestActorRequestHandler : AMActorLocationRpcHandler<Unit, C2M_TestActorRequest, M2C_TestActorResponse>

Server/Hotfix/Demo/C2R_LoginHandler.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Net;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[MessageHandler]
 	public class C2R_LoginHandler : AMRpcHandler<C2R_Login, R2C_Login>

Server/Hotfix/Demo/Frame_ClickMapHandler.cs

@@ -1,8 +1,8 @@
-using ETModel;
+
 using PF;
 using UnityEngine;
 
-namespace ETHotfix
+namespace ET
 {
 	[ActorMessageHandler]
 	public class Frame_ClickMapHandler : AMActorLocationHandler<Unit, Frame_ClickMap>

Server/Hotfix/Demo/G2M_CreateUnitHandler.cs

@@ -1,9 +1,9 @@
 using System;
-using ETModel;
+
 using PF;
 using UnityEngine;
 
-namespace ETHotfix
+namespace ET
 {
 	[ActorMessageHandler]
 	public class G2M_CreateUnitHandler : AMActorRpcHandler<Scene, G2M_CreateUnit, M2G_CreateUnit>

Server/Hotfix/Demo/G2M_SessionDisconnectHandler.cs

@@ -1,6 +1,6 @@
-using ETModel;
+
 
-namespace ETHotfix
+namespace ET
 {
 	[ActorMessageHandler]
 	public class G2M_SessionDisconnectHandler : AMActorLocationHandler<Unit, G2M_SessionDisconnect>

Server/Hotfix/Demo/M2M_TrasferUnitRequestHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ActorMessageHandler]
 	public class M2M_TrasferUnitRequestHandler : AMActorRpcHandler<Scene, M2M_TrasferUnitRequest, M2M_TrasferUnitResponse>

Server/Hotfix/Demo/MessageHelper.cs

@@ -1,6 +1,6 @@
-using ETModel;
+
 
-namespace ETHotfix
+namespace ET
 {
     public static class MessageHelper
     {

Server/Hotfix/Demo/R2G_GetLoginKeyHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ActorMessageHandler]
 	public class R2G_GetLoginKeyHandler : AMActorRpcHandler<Scene, R2G_GetLoginKey, G2R_GetLoginKey>

Server/Hotfix/Demo/RealmGateAddressHelper.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	public static class RealmGateAddressHelper
 	{

Server/Hotfix/Demo/SessionPlayerComponentSystem.cs

@@ -1,6 +1,6 @@
-using ETModel;
+
 
-namespace ETHotfix
+namespace ET
 {
 	[ObjectSystem]
 	public class SessionPlayerComponentDestroySystem : DestroySystem<SessionPlayerComponent>

Server/Hotfix/Demo/UnitPathComponentSystem.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Threading;
-using ETModel;
+
 using PF;
 using UnityEngine;
 
-namespace ETHotfix
+namespace ET
 {
     public static class UnitPathComponentHelper
     {

Server/Hotfix/Handler/C2G_PlayerInfoHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	// 用来测试消息包含复杂类型，是否产生gc
 	[MessageHandler]

Server/Hotfix/Handler/C2M_ReloadHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[MessageHandler]
 	public class C2M_ReloadHandler: AMRpcHandler<C2M_Reload, M2C_Reload>

Server/Hotfix/Handler/C2R_PingHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[MessageHandler]
 	public class C2R_PingHandler : AMRpcHandler<C2R_Ping, R2C_Ping>

Server/Hotfix/Handler/G2C_TestHandler.cs

@@ -1,6 +1,6 @@
-using ETModel;
+
 
-namespace ETHotfix
+namespace ET
 {
     [MessageHandler]
     public class G2C_TestHandler: AMHandler<G2C_Test>

Server/Hotfix/Handler/M2A_ReloadHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[MessageHandler]
 	public class M2A_ReloadHandler : AMRpcHandler<M2A_Reload, A2M_Reload>

Server/Hotfix/Helper/HotfixHelper.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Reflection;
 
-namespace ETHotfix
+namespace ET
 {
 	public static class HotfixHelper
 	{

Server/Hotfix/Module/Actor/ActorMessageDispatcherComponentSystem.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ObjectSystem]
 	public class ActorMessageDispatcherComponentAwakeSystem: AwakeSystem<ActorMessageDispatcherComponent>

Server/Hotfix/Module/Actor/ActorMessageSenderComponentSystem.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
     [ObjectSystem]
     public class ActorMessageSenderComponentAwakeSystem : AwakeSystem<ActorMessageSenderComponent>

Server/Hotfix/Module/Actor/MailBoxComponentSystem.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ObjectSystem]
 	public class MailBoxComponentAwakeSystem : AwakeSystem<MailBoxComponent>

Server/Hotfix/Module/ActorLocation/ActorLocationSenderComponentSystem.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
     [ObjectSystem]
     public class ActorLocationSenderComponentAwakeSystem : AwakeSystem<ActorLocationSenderComponent>

Server/Hotfix/Module/ActorLocation/ActorLocationSenderSystem.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
     [ObjectSystem]
     public class ActorLocationSenderAwakeSystem: AwakeSystem<ActorLocationSender>

Server/Hotfix/Module/ActorLocation/LocationProxyComponentSystem.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ObjectSystem]
 	public class LocationProxyComponentSystem : AwakeSystem<LocationProxyComponent>

Server/Hotfix/Module/ActorLocation/ObjectAddRequestHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ActorMessageHandler]
 	public class ObjectAddRequestHandler : AMActorRpcHandler<Scene, ObjectAddRequest, ObjectAddResponse>

Server/Hotfix/Module/ActorLocation/ObjectGetRequestHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ActorMessageHandler]
 	public class ObjectGetRequestHandler : AMActorRpcHandler<Scene, ObjectGetRequest, ObjectGetResponse>

Server/Hotfix/Module/ActorLocation/ObjectLockRequestHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ActorMessageHandler]
 	public class ObjectLockRequestHandler : AMActorRpcHandler<Scene, ObjectLockRequest, ObjectLockResponse>

Server/Hotfix/Module/ActorLocation/ObjectRemoveRequestHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ActorMessageHandler]
 	public class ObjectRemoveRequestHandler : AMActorRpcHandler<Scene, ObjectRemoveRequest, ObjectRemoveResponse>

Server/Hotfix/Module/ActorLocation/ObjectUnLockRequestHandler.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ActorMessageHandler]
 	public class ObjectUnLockRequestHandler : AMActorRpcHandler<Scene, ObjectUnLockRequest, ObjectUnLockResponse>

Server/Hotfix/Module/Benchmark/BenchmarkComponentSystem.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Net;
 using System.Threading.Tasks;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ObjectSystem]
 	public class BenchmarkComponentSystem : AwakeSystem<BenchmarkComponent, string>

Server/Hotfix/Module/Benchmark/WebSocketBenchmarkComponentSystem.cs

@@ -1,7 +1,7 @@
 using System;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ObjectSystem]
 	public class WebSocketBenchmarkComponentSystem : AwakeSystem<WebSocketBenchmarkComponent, string>

Server/Hotfix/Module/Config/ConfigComponentSystem.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
     [ObjectSystem]
     public class ConfigAwakeSystem : AwakeSystem<ConfigComponent>

Server/Hotfix/Module/DB/DBComponentSystem.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq.Expressions;
 using MongoDB.Driver;
 
-namespace ETModel
+namespace ET
 {
 	[ObjectSystem]
 	public class DBComponentAwakeSystem : AwakeSystem<DBComponent, string, string>

Server/Hotfix/Module/Message/InnerMessageDispatcher.cs

@@ -1,6 +1,6 @@
-using ETModel;
+
 
-namespace ETHotfix
+namespace ET
 {
     public class InnerMessageDispatcher: IMessageDispatcher
     {

Server/Hotfix/Module/Message/InnerMessageDispatcherHelper.cs

@@ -1,6 +1,6 @@
-using ETModel;
+
 
- namespace ETHotfix
+ namespace ET
 {
     public static class InnerMessageDispatcherHelper
     {

Server/Hotfix/Module/Message/MessageDispatherComponentSystem.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
 	[ObjectSystem]
 	public class MessageDispatcherComponentAwakeSystem : AwakeSystem<MessageDispatcherComponent>

Server/Hotfix/Module/Message/NetInnerComponentSystem.cs

@@ -1,6 +1,6 @@
-using ETModel;
+
 
-namespace ETHotfix
+namespace ET
 {
 	[ObjectSystem]
 	public class NetInnerComponentAwakeSystem : AwakeSystem<NetInnerComponent>

Server/Hotfix/Module/Message/OuterMessageDispatcher.cs

@@ -1,6 +1,6 @@
-using ETModel;
+
 
-namespace ETHotfix
+namespace ET
 {
 	public class OuterMessageDispatcher: IMessageDispatcher
 	{

Server/Hotfix/Module/Scene/AfterScenesAdd_CreateScene.cs

@@ -1,6 +1,6 @@
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
     [Event(EventIdType.AfterScenesAdd)]
     public class AfterScenesAdd_CreateScene: AEvent

Server/Hotfix/Module/Scene/SceneFactory.cs

@@ -1,6 +1,6 @@
-using ETModel;
 
-namespace ETHotfix
+
+namespace ET
 {
     public static class SceneFactory
     {

Server/Hotfix/Server.Hotfix.csproj

@@ -21,6 +21,12 @@
     <Compile Include="..\..\Unity\Assets\Hotfix\Module\Message\NetOuterComponentSystem.cs">
       <Link>Module\Message\NetOuterComponentSystem.cs</Link>
     </Compile>
+    <Compile Include="..\..\Unity\Assets\Hotfix\Module\Numeric\NumericChangeEvent_NotifyWatcher.cs">
+      <Link>Module\Numeric\NumericChangeEvent_NotifyWatcher.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Unity\Assets\Hotfix\Module\Numeric\NumericWatcher_Hp_ShowUI.cs">
+      <Link>Module\Numeric\NumericWatcher_Hp_ShowUI.cs</Link>
+    </Compile>
     <EmbeddedResource Remove="Other\**" />
     <None Remove="Other\**" />
   </ItemGroup>

Server/Model/Base/Event/EventIdType.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	public static class EventIdType
 	{

Server/Model/Base/Helper/DllHelper.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using System.Reflection;
 
-namespace ETModel
+namespace ET
 {
 	public static class DllHelper
 	{

Server/Model/Base/Helper/JsonHelper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ETModel
+namespace ET
 {
 	public static class JsonHelper
 	{

Server/Model/Base/Log.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ETModel
+namespace ET
 {
 	public static class Log
 	{

Server/Model/Base/LogType.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	public enum LogType
 	{

Server/Model/Base/Logger/ILog.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	public interface ILog
 	{

Server/Model/Base/Logger/NLogAdapter.cs

@@ -1,6 +1,6 @@
 using NLog;
 
-namespace ETModel
+namespace ET
 {
 	public class NLogAdapter: ILog
 	{

Server/Model/Base/Object/IDBCollection.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
     public interface IDBCollection
     {

Server/Model/Component/KVComponent.cs

@@ -1,43 +0,0 @@
-using System.Collections.Generic;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace ETModel
-{
-	/// <summary>
-	/// Key Value组件用于保存一些数据
-	/// </summary>
-	public class KVComponent: Entity
-	{
-		[BsonElement]
-		private readonly Dictionary<string, object> kv = new Dictionary<string, object>();
-
-		public void Add(string key, object value)
-		{
-			this.kv.Add(key, value);
-		}
-
-		public void Remove(string key)
-		{
-			this.kv.Remove(key);
-		}
-
-		public T Get<T>(string key)
-		{
-			if (!this.kv.TryGetValue(key, out object k))
-			{
-				return default(T);
-			}
-			return (T) k;
-		}
-
-		public override void Dispose()
-		{
-			if (this.IsDisposed)
-			{
-				return;
-			}
-
-			base.Dispose();
-		}
-	}
-}

Server/Model/Component/OptionComponent.cs

@@ -1,26 +0,0 @@
-using System;
-using CommandLine;
-
-namespace ETModel
-{
-	[ObjectSystem]
-	public class OptionComponentSystem : AwakeSystem<OptionComponent, string[]>
-	{
-		public override void Awake(OptionComponent self, string[] a)
-		{
-			self.Awake(a);
-		}
-	}
-	
-	public class OptionComponent : Entity
-	{
-		public Options Options { get; set; }
-
-		public void Awake(string[] args)
-		{
-			Parser.Default.ParseArguments<Options>(args)
-				.WithNotParsed(error => throw new Exception($"命令行格式错误!"))
-				.WithParsed(options => { Options = options; });
-		}
-	}
-}

Server/Model/Component/RobotComponent.cs

@@ -1,15 +0,0 @@
-namespace ETModel
-{
-	public class RobotComponent: Entity
-	{
-		public override void Dispose()
-		{
-			if (this.IsDisposed)
-			{
-				return;
-			}
-
-			base.Dispose();
-		}
-	}
-}

Server/Model/Demo/Config/StartProcessConfig.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	[Config]
 	public partial class StartProcessConfigCategory : ACategory<StartProcessConfig>

Server/Model/Demo/Config/StartSceneConfig.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	[Config]
 	public partial class StartSceneConfigCategory : ACategory<StartSceneConfig>

Server/Model/Demo/Config/StartZoneConfig.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	[Config]
 	public partial class StartZoneConfigCategory : ACategory<StartZoneConfig>

Server/Model/Demo/Config/UnitConfig.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	[Config]
 	public partial class UnitConfigCategory : ACategory<UnitConfig>

Server/Model/Demo/ConfigPartial/StartProcessConfig.cs

@@ -1,14 +1,11 @@
 using System.ComponentModel;
 
-namespace ETModel
+namespace ET
 {
-	public partial class StartProcessConfigCategory : ISupportInitialize
+	public partial class StartProcessConfigCategory
 	{
-		
-		
-		public void EndInit()
+		public override void EndInit()
 		{
-			
 		}
 	}
 	

Server/Model/Demo/ConfigPartial/StartSceneConfig.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 
-namespace ETModel
+namespace ET
 {
-    public partial class StartSceneConfigCategory: ISupportInitialize
+    public partial class StartSceneConfigCategory
     {
         public MultiMap<int, StartSceneConfig> Gates = new MultiMap<int, StartSceneConfig>();
         
@@ -23,7 +23,7 @@ namespace ETModel
             return this.ZoneScenesByName[zone][name];
         }
         
-        public void EndInit()
+        public override void EndInit()
         {
             foreach (StartSceneConfig startSceneConfig in this.GetAll().Values)
             {

Server/Model/Demo/GateSessionKeyComponent.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace ETModel
+namespace ET
 {
 	public class GateSessionKeyComponent : Entity
 	{

Server/Model/Demo/MoveComponent.cs

@@ -2,7 +2,7 @@ using System;
 using System.Threading;
 using UnityEngine;
 
-namespace ETModel
+namespace ET
 {
     public class MoveComponent: Entity
     {

Server/Model/Demo/Player.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	[ObjectSystem]
 	public class PlayerSystem : AwakeSystem<Player, string>

Server/Model/Demo/PlayerComponent.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace ETModel
+namespace ET
 {
 	[ObjectSystem]
 	public class PlayerComponentSystem : AwakeSystem<PlayerComponent>

Server/Model/Demo/SessionInfoComponent.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	public class SessionInfoComponent : Entity
 	{

Server/Model/Demo/SessionPlayerComponent.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	public class SessionPlayerComponent : Entity
 	{

Server/Model/Demo/Unit.cs

@@ -1,7 +1,7 @@
 using PF;
 using UnityEngine;
 
-namespace ETModel
+namespace ET
 {
 	public enum UnitType
 	{

Server/Model/Demo/UnitComponent.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using MongoDB.Bson.Serialization.Attributes;
 using MongoDB.Bson.Serialization.Options;
 
-namespace ETModel
+namespace ET
 {
 	public class UnitComponent: Entity
 	{

Server/Model/Demo/UnitGateComponent.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	[ObjectSystem]
 	public class UnitGateComponentAwakeSystem : AwakeSystem<UnitGateComponent, long>

Server/Model/Demo/UnitPathComponent.cs

@@ -3,7 +3,7 @@ using System.Threading;
 using PF;
 using UnityEngine;
 
-namespace ETModel
+namespace ET
 {
     public class UnitPathComponent: Entity
     {

Server/Model/Module/Actor/AMActorHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ETModel
+namespace ET
 {
 	public abstract class AMActorHandler<E, Message>: IMActorHandler where E: Entity where Message : class, IActorMessage
 	{

Server/Model/Module/Actor/AMActorRpcHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ETModel
+namespace ET
 {
 	public abstract class AMActorRpcHandler<E, Request, Response>: IMActorHandler where E: Entity where Request: class, IActorRequest where Response : class, IActorResponse
 	{

Server/Model/Module/Actor/ActorMessageAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ETModel
+namespace ET
 {
 	public class ActorMessageAttribute : Attribute
 	{

Server/Model/Module/Actor/ActorMessageDispatcherComponent.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ETModel
+namespace ET
 {
 	/// <summary>
 	/// Actor消息分发组件

Server/Model/Module/Actor/ActorMessageHandlerAttribute.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	public class ActorMessageHandlerAttribute : BaseAttribute
 	{

Server/Model/Module/Actor/ActorMessageSender.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ETModel
+namespace ET
 {
 	// 知道对方的instanceId，使用这个类发actor消息
 	public struct ActorMessageSender

Server/Model/Module/Actor/ActorMessageSenderComponent.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace ETModel
+namespace ET
 {
 	public class ActorMessageSenderComponent: Entity
 	{

Server/Model/Module/Actor/ActorResponse.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	/// <summary>
 	/// actor RPC消息响应

Server/Model/Module/Actor/ActorTask.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	public struct ActorTask
 	{

Server/Model/Module/Actor/IMActorHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ETModel
+namespace ET
 {
 	public interface IMActorHandler
 	{

Server/Model/Module/Actor/MailBoxComponent.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	/// <summary>
 	/// 挂上这个组件表示该Entity是一个Actor,接收的消息将会队列处理

Server/Model/Module/Actor/MailboxType.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	public enum MailboxType
 	{

Server/Model/Module/ActorLocation/AMActorLocationHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ETModel
+namespace ET
 {
 	public abstract class AMActorLocationHandler<E, Message>: IMActorHandler where E: Entity where Message : class, IActorLocationMessage
 	{

Server/Model/Module/ActorLocation/AMActorLocationRpcHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ETModel
+namespace ET
 {
 	public abstract class AMActorLocationRpcHandler<E, Request, Response>: IMActorHandler where E: Entity where Request: class, IActorLocationRequest where Response : class, IActorLocationResponse
 	{

Server/Model/Module/ActorLocation/ActorLocationSender.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
     // 知道对方的Id，使用这个类发actor消息
     public class ActorLocationSender : Entity

Server/Model/Module/ActorLocation/ActorLocationSenderComponent.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ETModel
+namespace ET
 {
     public class ActorLocationSenderComponent: Entity
     {

Server/Model/Module/ActorLocation/LocationComponent.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ETModel
+namespace ET
 {
 	[ObjectSystem]
 	public class LockInfoAwakeSystem : AwakeSystem<LockInfo, long, CoroutineLock>

Server/Model/Module/ActorLocation/LocationProxyComponent.cs

@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace ETModel
+namespace ET
 {
 	public class LocationProxyComponent : Entity
 	{

Server/Model/Module/Benchmark/BenchmarkComponent.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	public class BenchmarkComponent: Entity
 	{

Server/Model/Module/Benchmark/WebSocketBenchmarkComponent.cs

@@ -1,4 +1,4 @@
-namespace ETModel
+namespace ET
 {
 	public class WebSocketBenchmarkComponent: Entity
 	{

Server/Model/Module/Config/ConfigComponent.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ETModel
+namespace ET
 {
 	/// <summary>
 	/// Config组件会扫描所有的有ConfigAttribute标签的配置,加载进来

Server/Model/Module/Config/ConfigHelper.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace ETModel
+namespace ET
 {
 	public static class ConfigHelper
 	{

Server/Model/Component/ConsoleComponent.cs → Server/Model/Module/Console/ConsoleComponent.cs

@@ -2,7 +2,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ETModel
+namespace ET
 {
     [ObjectSystem]
     public class ConsoleComponentAwakeSystem : StartSystem<ConsoleComponent>

Server/Model/Component/ReplComponent.cs → Server/Model/Module/Console/ReplComponent.cs

@@ -3,7 +3,7 @@ using System.Threading;
 using Microsoft.CodeAnalysis.CSharp.Scripting;
 using Microsoft.CodeAnalysis.Scripting;
 
-namespace ETModel
+namespace ET
 {
     [ObjectSystem]
     public class ReplComponentAwakeSystem : AwakeSystem<ReplComponent>

Server/Model/Module/DB/DBComponent.cs

@@ -2,7 +2,7 @@
 using System.Text;
 using MongoDB.Driver;
 
-namespace ETModel
+namespace ET
 {
 	/// <summary>
 	/// 用来缓存数据

Server/Model/Module/Message/AMRpcHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ETModel
+namespace ET
 {
 	public abstract class AMRpcHandler<Request, Response>: IMHandler where Request : class, IRequest where Response : class, IResponse 
 	{

Server/Model/Module/Message/InnerMessage.cs

@@ -1,6 +1,6 @@
-using ETModel;
+
 using System.Collections.Generic;
-namespace ETModel
+namespace ET
 {
 /// <summary>
 /// 传送unit