NetInner改成Net

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

@@ -6,8 +6,8 @@ namespace ET
 	public enum SceneType: long
 	{
 		None = 0,
-		Process = 1,
-		Manager = 1 << 2,
+		Main = 1, // 主纤程,一个进程一个, 初始化从这里开始
+		Net = 1 << 2, // 负责进程间消息通信
 		Realm = 1 << 3,
 		Gate = 1 << 4,
 		Http = 1 << 5,
@@ -23,9 +23,7 @@ namespace ET
 		Room = 1 << 15,
 		LockStepClient = 1 << 16,
 		LockStepServer = 1 << 17,
-		Main = 1 << 18, // 主纤程,一个进程一个, 初始化从这里开始
-		NetInner = 1 << 19,  // 负责进程间消息通信
-		RoomRoot = 1 << 20,
+		RoomRoot = 1 << 18,
 
 		// 客户端
 		Demo = 1 << 30,

Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorSenderComponent.cs

@@ -2,11 +2,11 @@
 
 namespace ET
 {
-    public class A2NetInner_Message: MessageObject, IActorMessage
+    public class A2Net_Message: MessageObject, IActorMessage
     {
-        public static A2NetInner_Message Create()
+        public static A2Net_Message Create()
         {
-            return ObjectPool.Instance.Fetch(typeof(A2NetInner_Message)) as A2NetInner_Message;
+            return ObjectPool.Instance.Fetch(typeof(A2Net_Message)) as A2Net_Message;
         }
 
         public override void Dispose()

Unity/Assets/Scripts/Hotfix/Server/Demo/EntryEvent2_InitServer.cs

@@ -15,7 +15,7 @@ namespace ET.Server
                 case AppType.Server:
                 {
                     // 创建进程通信纤程
-                    FiberManager.Instance.Create(SchedulerType.ThreadPool, ConstFiberId.NetInner, 0, SceneType.NetInner, SceneType.NetInner.ToString());
+                    FiberManager.Instance.Create(SchedulerType.ThreadPool, ConstFiberId.Net, 0, SceneType.Net, SceneType.Net.ToString());
 
                     // 根据配置创建纤程
                     var processScenes = StartSceneConfigCategory.Instance.GetByProcess(root.Fiber().Process);

Unity/Assets/Scripts/Hotfix/Server/Module/Message/A2NetInner_MessageHandler.cs → Unity/Assets/Scripts/Hotfix/Server/Module/Message/A2Net_MessageHandler.cs

@@ -1,9 +1,9 @@
 namespace ET.Server
 {
-    [ActorMessageHandler(SceneType.NetInner)]
-    public class A2NetInner_MessageHandler: ActorMessageHandler<Scene, A2NetInner_Message>
+    [ActorMessageHandler(SceneType.Net)]
+    public class A2Net_MessageHandler: ActorMessageHandler<Scene, A2Net_Message>
     {
-        protected override async ETTask Run(Scene root, A2NetInner_Message message)
+        protected override async ETTask Run(Scene root, A2Net_Message message)
         {
             int process = message.ActorId.Process;
             Session session = root.GetComponent<NetInnerComponent>().Get(process);

Unity/Assets/Scripts/Hotfix/Server/Module/Message/A2NetInner_MessageHandler.cs.meta → Unity/Assets/Scripts/Hotfix/Server/Module/Message/A2Net_MessageHandler.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4359315e8c3f08048a63d07d17a65fae
+guid: c88c8f9b180ab7f4b8c92e3cbdd3260f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Hotfix/Server/Module/NetInner/FiberInit_NetInner.cs → Unity/Assets/Scripts/Hotfix/Server/Module/NetInner/FiberInit_Net.cs

@@ -2,7 +2,7 @@
 
 namespace ET.Server
 {
-    [Invoke((long)SceneType.NetInner)]
+    [Invoke((long)SceneType.Net)]
     public class FiberInit_NetInner: AInvokeHandler<FiberInit>
     {
         public override void Handle(FiberInit fiberInit)

Unity/Assets/Scripts/Hotfix/Server/Module/NetInner/FiberInit_NetInner.cs.meta → Unity/Assets/Scripts/Hotfix/Server/Module/NetInner/FiberInit_Net.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a9fcced502e107648b31b80088f9d294
+guid: e9246ca7a67d1d74283089a148b9ab16
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Hotfix/Share/Module/Actor/ActorSenderComponentSystem.cs

@@ -116,12 +116,12 @@ namespace ET
             }
 
 
-            A2NetInner_Message netInnerMessage = A2NetInner_Message.Create();
-            netInnerMessage.FromAddress = fiber.Address;
-            netInnerMessage.ActorId = actorId;
-            netInnerMessage.MessageObject = message;
+            A2Net_Message netMessage = A2Net_Message.Create();
+            netMessage.FromAddress = fiber.Address;
+            netMessage.ActorId = actorId;
+            netMessage.MessageObject = message;
             // 扔到NetInner纤程
-            ActorMessageQueue.Instance.Send(new ActorId(actorId.Process, ConstFiberId.NetInner), netInnerMessage);
+            ActorMessageQueue.Instance.Send(new ActorId(actorId.Process, ConstFiberId.Net), netMessage);
         }
 
 

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

@@ -3,7 +3,7 @@
     public static class ConstFiberId
     {
         public const int Main = -1;
-        public const int NetInner = -2;
+        public const int Net = -2;
         public const int DB = -3;
     }
 }