Ver Fonte

1.修改默认配置的端口,避免使用100003端口
2.NetService去掉对KService的依赖,NetService应该只依赖AService

tanghai há 3 anos atrás
pai
commit
f422408d87
25 ficheiros alterados com 126 adições e 106 exclusões
  1. 3 3
      Config/Excel/cs/StartConfig/Benchmark/StartSceneConfigCategory.bytes
  2. 8 8
      Config/Excel/cs/StartConfig/Localhost/StartSceneConfigCategory.bytes
  3. 3 3
      Config/Excel/cs/StartConfig/Release/StartSceneConfigCategory.bytes
  4. 8 8
      Config/Excel/cs/StartConfig/RouterTest/StartSceneConfigCategory.bytes
  5. 3 3
      Config/Excel/s/StartConfig/Benchmark/StartSceneConfigCategory.bytes
  6. 8 8
      Config/Excel/s/StartConfig/Localhost/StartSceneConfigCategory.bytes
  7. 3 3
      Config/Excel/s/StartConfig/Release/StartSceneConfigCategory.bytes
  8. 8 8
      Config/Excel/s/StartConfig/RouterTest/StartSceneConfigCategory.bytes
  9. 3 3
      Config/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt
  10. 8 8
      Config/Json/cs/StartConfig/Localhost/StartSceneConfig.txt
  11. 3 3
      Config/Json/cs/StartConfig/Release/StartSceneConfig.txt
  12. 8 8
      Config/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt
  13. 3 3
      Config/Json/s/StartConfig/Benchmark/StartSceneConfig.txt
  14. 8 8
      Config/Json/s/StartConfig/Localhost/StartSceneConfig.txt
  15. 3 3
      Config/Json/s/StartConfig/Release/StartSceneConfig.txt
  16. 8 8
      Config/Json/s/StartConfig/RouterTest/StartSceneConfig.txt
  17. BIN
      Unity/Assets/Config/Excel/StartConfig/Benchmark/StartSceneConfig@s.xlsx
  18. BIN
      Unity/Assets/Config/Excel/StartConfig/Localhost/StartSceneConfig@s.xlsx
  19. BIN
      Unity/Assets/Config/Excel/StartConfig/Release/StartSceneConfig@s.xlsx
  20. BIN
      Unity/Assets/Config/Excel/StartConfig/RouterTest/StartSceneConfig@s.xlsx
  21. 1 1
      Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Router/RouterCheckComponentSystem.cs
  22. 1 1
      Unity/Assets/Scripts/Codes/Hotfix/Share/ConstValue.cs
  23. 9 0
      Unity/Assets/Scripts/Core/Module/Network/AService.cs
  24. 20 0
      Unity/Assets/Scripts/Core/Module/Network/KService.cs
  25. 7 16
      Unity/Assets/Scripts/Core/Module/Network/NetServices.cs

+ 3 - 3
Config/Excel/cs/StartConfig/Benchmark/StartSceneConfigCategory.bytes

@@ -1,4 +1,4 @@
 
-+"BenchmarkServer*BenchmarkServer0’N
-,"BenchmarkClient*BenchmarkClient10“N
-,"BenchmarkClient*BenchmarkClient20”N
+,"BenchmarkServer*BenchmarkServer0±ê
+-"BenchmarkClient*BenchmarkClient10²ê
+-"BenchmarkClient*BenchmarkClient20³ê

+ 8 - 8
Config/Excel/cs/StartConfig/Localhost/StartSceneConfigCategory.bytes

@@ -1,13 +1,13 @@
 
-"Realm*Realm0’N
-"Gate*Gate10“N
-"Gate*Gate20”N
+"Realm*Realm0²ê
+"Gate*Gate10³ê
+"Gate*Gate20´ê
 "Location*Location
 "Map*Map1
 "Map*Map2
 È"Robot*Robot01
-(¬"
RouterManager*
RouterManager0¼P
-­"Router*Router010½P
-®"Router*Router020¾P
-¯"Router*Router030¿P
-°"Router*Router040ÀP
+)¬"
RouterManager*
RouterManager0Üì
+­"Router*Router010Ýì
+®"Router*Router020Þì
+¯"Router*Router030ßì
+°"Router*Router040àì

+ 3 - 3
Config/Excel/cs/StartConfig/Release/StartSceneConfigCategory.bytes

@@ -1,7 +1,7 @@
 
-"Realm*Realm0’N
-"Gate*Gate10“N
-"Gate*Gate20”N
+"Realm*Realm0±ê
+"Gate*Gate10²ê
+"Gate*Gate20³ê
 "Location*Location
 "Map*Map1
 "Map*Map2

+ 8 - 8
Config/Excel/cs/StartConfig/RouterTest/StartSceneConfigCategory.bytes

@@ -1,13 +1,13 @@
 
-"Realm*Realm0’N
-"Gate*Gate10“N
-"Gate*Gate20”N
+"Realm*Realm0±ê
+"Gate*Gate10²ê
+"Gate*Gate20³ê
 "Location*Location
 "Map*Map1
 "Map*Map2
 È"Robot*Robot01
-(�"
RouterManager*
RouterManager0¼P
-‘"Router*Router010½P
-’"Router*Router020¾P
-“"Router*Router030¿P
-”"Router*Router040ÀP
+)�"
RouterManager*
RouterManager0Üì
+‘"Router*Router010Ýì
+’"Router*Router020Þì
+“"Router*Router030ßì
+”"Router*Router040àì

+ 3 - 3
Config/Excel/s/StartConfig/Benchmark/StartSceneConfigCategory.bytes

@@ -1,4 +1,4 @@
 
-+"BenchmarkServer*BenchmarkServer0’N
-,"BenchmarkClient*BenchmarkClient10“N
-,"BenchmarkClient*BenchmarkClient20”N
+,"BenchmarkServer*BenchmarkServer0±ê
+-"BenchmarkClient*BenchmarkClient10²ê
+-"BenchmarkClient*BenchmarkClient20³ê

+ 8 - 8
Config/Excel/s/StartConfig/Localhost/StartSceneConfigCategory.bytes

@@ -1,13 +1,13 @@
 
-"Realm*Realm0’N
-"Gate*Gate10“N
-"Gate*Gate20”N
+"Realm*Realm0²ê
+"Gate*Gate10³ê
+"Gate*Gate20´ê
 "Location*Location
 "Map*Map1
 "Map*Map2
 È"Robot*Robot01
-(¬"
RouterManager*
RouterManager0¼P
-­"Router*Router010½P
-®"Router*Router020¾P
-¯"Router*Router030¿P
-°"Router*Router040ÀP
+)¬"
RouterManager*
RouterManager0Üì
+­"Router*Router010Ýì
+®"Router*Router020Þì
+¯"Router*Router030ßì
+°"Router*Router040àì

+ 3 - 3
Config/Excel/s/StartConfig/Release/StartSceneConfigCategory.bytes

@@ -1,7 +1,7 @@
 
-"Realm*Realm0’N
-"Gate*Gate10“N
-"Gate*Gate20”N
+"Realm*Realm0±ê
+"Gate*Gate10²ê
+"Gate*Gate20³ê
 "Location*Location
 "Map*Map1
 "Map*Map2

+ 8 - 8
Config/Excel/s/StartConfig/RouterTest/StartSceneConfigCategory.bytes

@@ -1,13 +1,13 @@
 
-"Realm*Realm0’N
-"Gate*Gate10“N
-"Gate*Gate20”N
+"Realm*Realm0±ê
+"Gate*Gate10²ê
+"Gate*Gate20³ê
 "Location*Location
 "Map*Map1
 "Map*Map2
 È"Robot*Robot01
-(�"
RouterManager*
RouterManager0¼P
-‘"Router*Router010½P
-’"Router*Router020¾P
-“"Router*Router030¿P
-”"Router*Router040ÀP
+)�"
RouterManager*
RouterManager0Üì
+‘"Router*Router010Ýì
+’"Router*Router020Þì
+“"Router*Router030ßì
+”"Router*Router040àì

+ 3 - 3
Config/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt

@@ -1,5 +1,5 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"BenchmarkServer","Name":"BenchmarkServer","OuterPort":10002},
-{"_t":"StartSceneConfig","_id":2,"Process":2,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient1","OuterPort":10003},
-{"_t":"StartSceneConfig","_id":3,"Process":3,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient2","OuterPort":10004},
+{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"BenchmarkServer","Name":"BenchmarkServer","OuterPort":30001},
+{"_t":"StartSceneConfig","_id":2,"Process":2,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient1","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":3,"Process":3,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient2","OuterPort":30003},
 ]}

+ 8 - 8
Config/Json/cs/StartConfig/Localhost/StartSceneConfig.txt

@@ -1,14 +1,14 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":10002},
-{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":10003},
-{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":10004},
+{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30003},
+{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30004},
 {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0},
 {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0},
 {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0},
 {"_t":"StartSceneConfig","_id":200,"Process":1,"Zone":2,"SceneType":"Robot","Name":"Robot01","OuterPort":0},
-{"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":10300},
-{"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":10301},
-{"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":10302},
-{"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":10303},
-{"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":10304},
+{"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300},
+{"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301},
+{"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":30302},
+{"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":30303},
+{"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":30304},
 ]}

+ 3 - 3
Config/Json/cs/StartConfig/Release/StartSceneConfig.txt

@@ -1,7 +1,7 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":10002},
-{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":10003},
-{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":10004},
+{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30001},
+{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30003},
 {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0},
 {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0},
 {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0},

+ 8 - 8
Config/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt

@@ -1,14 +1,14 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":10002},
-{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":10003},
-{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":10004},
+{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30001},
+{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30003},
 {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0},
 {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0},
 {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0},
 {"_t":"StartSceneConfig","_id":200,"Process":2,"Zone":2,"SceneType":"Robot","Name":"Robot01","OuterPort":0},
-{"_t":"StartSceneConfig","_id":400,"Process":3,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":10300},
-{"_t":"StartSceneConfig","_id":401,"Process":4,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":10301},
-{"_t":"StartSceneConfig","_id":402,"Process":5,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":10302},
-{"_t":"StartSceneConfig","_id":403,"Process":6,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":10303},
-{"_t":"StartSceneConfig","_id":404,"Process":7,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":10304},
+{"_t":"StartSceneConfig","_id":400,"Process":3,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300},
+{"_t":"StartSceneConfig","_id":401,"Process":4,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301},
+{"_t":"StartSceneConfig","_id":402,"Process":5,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":30302},
+{"_t":"StartSceneConfig","_id":403,"Process":6,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":30303},
+{"_t":"StartSceneConfig","_id":404,"Process":7,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":30304},
 ]}

+ 3 - 3
Config/Json/s/StartConfig/Benchmark/StartSceneConfig.txt

@@ -1,5 +1,5 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"BenchmarkServer","Name":"BenchmarkServer","OuterPort":10002},
-{"_t":"StartSceneConfig","_id":2,"Process":2,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient1","OuterPort":10003},
-{"_t":"StartSceneConfig","_id":3,"Process":3,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient2","OuterPort":10004},
+{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"BenchmarkServer","Name":"BenchmarkServer","OuterPort":30001},
+{"_t":"StartSceneConfig","_id":2,"Process":2,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient1","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":3,"Process":3,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient2","OuterPort":30003},
 ]}

+ 8 - 8
Config/Json/s/StartConfig/Localhost/StartSceneConfig.txt

@@ -1,14 +1,14 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":10002},
-{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":10003},
-{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":10004},
+{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30003},
+{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30004},
 {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0},
 {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0},
 {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0},
 {"_t":"StartSceneConfig","_id":200,"Process":1,"Zone":2,"SceneType":"Robot","Name":"Robot01","OuterPort":0},
-{"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":10300},
-{"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":10301},
-{"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":10302},
-{"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":10303},
-{"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":10304},
+{"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300},
+{"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301},
+{"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":30302},
+{"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":30303},
+{"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":30304},
 ]}

+ 3 - 3
Config/Json/s/StartConfig/Release/StartSceneConfig.txt

@@ -1,7 +1,7 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":10002},
-{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":10003},
-{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":10004},
+{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30001},
+{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30003},
 {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0},
 {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0},
 {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0},

+ 8 - 8
Config/Json/s/StartConfig/RouterTest/StartSceneConfig.txt

@@ -1,14 +1,14 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":10002},
-{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":10003},
-{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":10004},
+{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30001},
+{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30003},
 {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0},
 {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0},
 {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0},
 {"_t":"StartSceneConfig","_id":200,"Process":2,"Zone":2,"SceneType":"Robot","Name":"Robot01","OuterPort":0},
-{"_t":"StartSceneConfig","_id":400,"Process":3,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":10300},
-{"_t":"StartSceneConfig","_id":401,"Process":4,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":10301},
-{"_t":"StartSceneConfig","_id":402,"Process":5,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":10302},
-{"_t":"StartSceneConfig","_id":403,"Process":6,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":10303},
-{"_t":"StartSceneConfig","_id":404,"Process":7,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":10304},
+{"_t":"StartSceneConfig","_id":400,"Process":3,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300},
+{"_t":"StartSceneConfig","_id":401,"Process":4,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301},
+{"_t":"StartSceneConfig","_id":402,"Process":5,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":30302},
+{"_t":"StartSceneConfig","_id":403,"Process":6,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":30303},
+{"_t":"StartSceneConfig","_id":404,"Process":7,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":30304},
 ]}

BIN
Unity/Assets/Config/Excel/StartConfig/Benchmark/StartSceneConfig@s.xlsx


BIN
Unity/Assets/Config/Excel/StartConfig/Localhost/StartSceneConfig@s.xlsx


BIN
Unity/Assets/Config/Excel/StartConfig/Release/StartSceneConfig@s.xlsx


BIN
Unity/Assets/Config/Excel/StartConfig/RouterTest/StartSceneConfig@s.xlsx


+ 1 - 1
Unity/Assets/Scripts/Codes/Hotfix/Client/Demo/Router/RouterCheckComponentSystem.cs

@@ -41,7 +41,7 @@ namespace ET.Client
                 {
                     long sessionId = session.Id;
 
-                    (uint localConn, uint remoteConn) = await NetServices.Instance.GetKChannelConn(session.ServiceId, sessionId);
+                    (uint localConn, uint remoteConn) = await NetServices.Instance.GetChannelConn(session.ServiceId, sessionId);
                     
                     IPEndPoint realAddress = self.GetParent<Session>().RemoteAddress;
                     Log.Info($"get recvLocalConn start: {self.ClientScene().Id} {realAddress} {localConn} {remoteConn}");

+ 1 - 1
Unity/Assets/Scripts/Codes/Hotfix/Share/ConstValue.cs

@@ -3,7 +3,7 @@ namespace ET
     public static class ConstValue
     {
         public const string RouterHttpHost = "127.0.0.1";
-        public const int RouterHttpPort = 10300;
+        public const int RouterHttpPort = 30300;
         public const int SessionTimeoutTime = 30 * 1000;
     }
 }

+ 9 - 0
Unity/Assets/Scripts/Core/Module/Network/AService.cs

@@ -40,5 +40,14 @@ namespace ET
         public abstract void Create(long id, IPEndPoint address);
 
         public abstract void Send(long channelId, long actorId, object message);
+
+        public virtual (uint, uint) GetChannelConn(long channelId)
+        {
+            throw new Exception($"default conn throw Exception! {channelId}");
+        }
+        
+        public virtual void ChangeAddress(long channelId, IPEndPoint ipEndPoint)
+        {
+        }
     }
 }

+ 20 - 0
Unity/Assets/Scripts/Core/Module/Network/KService.cs

@@ -184,7 +184,27 @@ namespace ET
             this.socket.Close();
             this.socket = null;
         }
+
+        public override (uint, uint) GetChannelConn(long channelId)
+        {
+            KChannel kChannel = this.Get(channelId);
+            if (kChannel == null)
+            {
+                throw new Exception($"GetChannelConn conn not found KChannel! {channelId}");
+            }
+            return (kChannel.LocalConn, kChannel.RemoteConn);
+        }
         
+        public override void ChangeAddress(long channelId, IPEndPoint newIPEndPoint)
+        {
+            KChannel kChannel = this.Get(channelId);
+            if (kChannel == null)
+            {
+                return;
+            }
+            kChannel.RemoteAddress = newIPEndPoint;
+        }
+
         private IPEndPoint CloneAddress()
         {
             IPEndPoint ip = (IPEndPoint) this.ipEndPoint;

+ 7 - 16
Unity/Assets/Scripts/Core/Module/Network/NetServices.cs

@@ -24,7 +24,7 @@ namespace ET
         CreateChannel = 6,
         RemoveChannel = 7,
         SendMessage = 9,
-        GetKChannelConn = 10,
+        GetChannelConn = 10,
         ChangeAddress = 11,
     }
     
@@ -90,10 +90,10 @@ namespace ET
         
         private int serviceIdGenerator;
 
-        public async Task<(uint, uint)> GetKChannelConn(int serviceId, long channelId)
+        public async Task<(uint, uint)> GetChannelConn(int serviceId, long channelId)
         {
             TaskCompletionSource<(uint, uint)> tcs = new TaskCompletionSource<(uint, uint)>();
-            NetOperator netOperator = new NetOperator() { Op = NetOp.GetKChannelConn, ServiceId = serviceId, ChannelId = channelId, Object = tcs};
+            NetOperator netOperator = new NetOperator() { Op = NetOp.GetChannelConn, ServiceId = serviceId, ChannelId = channelId, Object = tcs};
             this.netThreadOperators.Enqueue(netOperator);
             return await tcs.Task;
         }
@@ -281,7 +281,7 @@ namespace ET
                             }
                             break;
                         }
-                        case NetOp.GetKChannelConn:
+                        case NetOp.GetChannelConn:
                         {
                             var tcs = op.Object as TaskCompletionSource<ValueTuple<uint, uint>>;
                             try
@@ -291,12 +291,8 @@ namespace ET
                                 {
                                     break;
                                 }
-                                KChannel kChannel = (service as KService).Get(op.ChannelId);
-                                if (kChannel == null)
-                                {
-                                    break;
-                                }
-                                tcs.SetResult((kChannel.LocalConn, kChannel.RemoteConn));
+
+                                tcs.SetResult(service.GetChannelConn(op.ChannelId));
                             }
                             catch (Exception e)
                             {
@@ -311,12 +307,7 @@ namespace ET
                             {
                                 break;
                             }
-                            KChannel kChannel = (service as KService).Get(op.ChannelId);
-                            if (kChannel == null)
-                            {
-                                break;
-                            }
-                            kChannel.RemoteAddress = op.Object as IPEndPoint;
+                            service.ChangeAddress(op.ChannelId, op.Object as IPEndPoint);
                             break;
                         }
                         default: