SceneType.Net改回SceneType.NetInner

Config/Json/cs/StartConfig/Localhost/StartSceneConfig.txt

@@ -1,5 +1,5 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Net","Name":"Net","Port":30001}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"NetInner","Name":"NetInner","Port":30001}],
 [2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
 [3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
 [4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],

Config/Json/cs/StartConfig/Release/StartSceneConfig.txt

@@ -1,5 +1,5 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Net","Name":"Net","Port":30001}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"NetInner","Name":"NetInner","Port":30001}],
 [3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
 [4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
 [5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],

Config/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt

@@ -1,5 +1,5 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Net","Name":"Net","Port":30001}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"NetInner","Name":"NetInner","Port":30001}],
 [3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
 [4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
 [5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],

Config/Json/s/StartConfig/Localhost/StartSceneConfig.txt

@@ -1,5 +1,5 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Net","Name":"Net","Port":30001}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"NetInner","Name":"NetInner","Port":30001}],
 [2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
 [3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
 [4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],

Config/Json/s/StartConfig/Release/StartSceneConfig.txt

@@ -1,5 +1,5 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Net","Name":"Net","Port":30001}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"NetInner","Name":"NetInner","Port":30001}],
 [3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
 [4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
 [5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],

Config/Json/s/StartConfig/RouterTest/StartSceneConfig.txt

@@ -1,5 +1,5 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Net","Name":"Net","Port":30001}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"NetInner","Name":"NetInner","Port":30001}],
 [3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
 [4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
 [5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],

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

@@ -7,7 +7,7 @@ namespace ET
 	{
 		None = 0,
 		Main = 1, // 主纤程,一个进程一个, 初始化从这里开始
-		Net = 1 << 2, // 负责进程间消息通信
+		NetInner = 1 << 2, // 负责进程间消息通信
 		Realm = 1 << 3,
 		Gate = 1 << 4,
 		Http = 1 << 5,

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

@@ -2,17 +2,17 @@
 
 namespace ET.Server
 {
-    [ActorMessageHandler(SceneType.Net)]
-    public class A2Net_MessageHandler: ActorMessageHandler<Scene, A2Net_Message>
+    [ActorMessageHandler(SceneType.NetInner)]
+    public class A2Net_MessageHandler: ActorMessageHandler<Scene, A2NetInner_Message>
     {
-        protected override async ETTask Run(Scene root, A2Net_Message message)
+        protected override async ETTask Run(Scene root, A2NetInner_Message innerMessage)
         {
-            int process = message.ActorId.Process;
-            StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.Nets[process];
+            int process = innerMessage.ActorId.Process;
+            StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.NetInners[process];
             Session session = root.GetComponent<NetInnerComponent>().Get(startSceneConfig.Id);
-            ActorId actorId = message.ActorId;
-            actorId.Address = message.FromAddress;
-            session.Send(actorId, message.MessageObject);
+            ActorId actorId = innerMessage.ActorId;
+            actorId.Address = innerMessage.FromAddress;
+            session.Send(actorId, innerMessage.MessageObject);
             await ETTask.CompletedTask;
         }
     }

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

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

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

@@ -112,13 +112,13 @@ namespace ET
             }
 
 
-            A2Net_Message netMessage = A2Net_Message.Create();
-            netMessage.FromAddress = fiber.Address;
-            netMessage.ActorId = actorId;
-            netMessage.MessageObject = message;
+            A2NetInner_Message netInnerMessage = A2NetInner_Message.Create();
+            netInnerMessage.FromAddress = fiber.Address;
+            netInnerMessage.ActorId = actorId;
+            netInnerMessage.MessageObject = message;
             // 扔到Net纤程
-            StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.Nets[fiber.Process];
-            ActorMessageQueue.Instance.Send(startSceneConfig.ActorId, netMessage);
+            StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.NetInners[fiber.Process];
+            ActorMessageQueue.Instance.Send(startSceneConfig.ActorId, netInnerMessage);
         }
 
 

Unity/Assets/Scripts/Model/Generate/ClientServer/ConfigPartial/StartSceneConfig.cs

@@ -10,7 +10,7 @@ namespace ET
         
         public MultiMap<int, StartSceneConfig> ProcessScenes = new();
         
-        public Dictionary<int, StartSceneConfig> Nets = new();
+        public Dictionary<int, StartSceneConfig> NetInners = new();
         
         public Dictionary<long, Dictionary<string, StartSceneConfig>> ClientScenesByName = new();
 
@@ -50,8 +50,8 @@ namespace ET
                 
                 switch (startSceneConfig.Type)
                 {
-                    case SceneType.Net:
-                        this.Nets.Add(startSceneConfig.Process, startSceneConfig);
+                    case SceneType.NetInner:
+                        this.NetInners.Add(startSceneConfig.Process, startSceneConfig);
                         break;
                     case SceneType.Realm:
                         this.Realms.Add(startSceneConfig);

Unity/Assets/Scripts/Model/Generate/Server/ConfigPartial/StartSceneConfig.cs

@@ -10,7 +10,7 @@ namespace ET
         
         public MultiMap<int, StartSceneConfig> ProcessScenes = new();
         
-        public Dictionary<int, StartSceneConfig> Nets = new();
+        public Dictionary<int, StartSceneConfig> NetInners = new();
         
         public Dictionary<long, Dictionary<string, StartSceneConfig>> ClientScenesByName = new();
 
@@ -50,8 +50,8 @@ namespace ET
                 
                 switch (startSceneConfig.Type)
                 {
-                    case SceneType.Net:
-                        this.Nets.Add(startSceneConfig.Process, startSceneConfig);
+                    case SceneType.NetInner:
+                        this.NetInners.Add(startSceneConfig.Process, startSceneConfig);
                         break;
                     case SceneType.Realm:
                         this.Realms.Add(startSceneConfig);

Unity/Assets/Scripts/Model/Share/Module/Actor/ActorSenderComponent.cs

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