浏览代码

Net纤程改成配置到StartSceneConfig中,每个进程必须配置一个Net纤程

tanghai 2 年之前
父节点
当前提交
cb7daea437
共有 57 个文件被更改,包括 150 次插入176 次删除
  1. 二进制
      Config/Excel/cs/StartConfig/Benchmark/StartProcessConfigCategory.bytes
  2. 二进制
      Config/Excel/cs/StartConfig/Benchmark/StartSceneConfigCategory.bytes
  3. 二进制
      Config/Excel/cs/StartConfig/Localhost/StartProcessConfigCategory.bytes
  4. 二进制
      Config/Excel/cs/StartConfig/Localhost/StartSceneConfigCategory.bytes
  5. 二进制
      Config/Excel/cs/StartConfig/Release/StartProcessConfigCategory.bytes
  6. 二进制
      Config/Excel/cs/StartConfig/Release/StartSceneConfigCategory.bytes
  7. 二进制
      Config/Excel/cs/StartConfig/RouterTest/StartProcessConfigCategory.bytes
  8. 二进制
      Config/Excel/cs/StartConfig/RouterTest/StartSceneConfigCategory.bytes
  9. 二进制
      Config/Excel/s/StartConfig/Benchmark/StartProcessConfigCategory.bytes
  10. 二进制
      Config/Excel/s/StartConfig/Benchmark/StartSceneConfigCategory.bytes
  11. 二进制
      Config/Excel/s/StartConfig/Localhost/StartProcessConfigCategory.bytes
  12. 二进制
      Config/Excel/s/StartConfig/Localhost/StartSceneConfigCategory.bytes
  13. 二进制
      Config/Excel/s/StartConfig/Release/StartProcessConfigCategory.bytes
  14. 二进制
      Config/Excel/s/StartConfig/Release/StartSceneConfigCategory.bytes
  15. 二进制
      Config/Excel/s/StartConfig/RouterTest/StartProcessConfigCategory.bytes
  16. 二进制
      Config/Excel/s/StartConfig/RouterTest/StartSceneConfigCategory.bytes
  17. 3 3
      Config/Json/cs/StartConfig/Benchmark/StartProcessConfig.txt
  18. 3 3
      Config/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt
  19. 1 1
      Config/Json/cs/StartConfig/Localhost/StartProcessConfig.txt
  20. 13 12
      Config/Json/cs/StartConfig/Localhost/StartSceneConfig.txt
  21. 2 2
      Config/Json/cs/StartConfig/Release/StartProcessConfig.txt
  22. 8 7
      Config/Json/cs/StartConfig/Release/StartSceneConfig.txt
  23. 7 7
      Config/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt
  24. 13 12
      Config/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt
  25. 3 3
      Config/Json/s/StartConfig/Benchmark/StartProcessConfig.txt
  26. 3 3
      Config/Json/s/StartConfig/Benchmark/StartSceneConfig.txt
  27. 1 1
      Config/Json/s/StartConfig/Localhost/StartProcessConfig.txt
  28. 13 12
      Config/Json/s/StartConfig/Localhost/StartSceneConfig.txt
  29. 2 2
      Config/Json/s/StartConfig/Release/StartProcessConfig.txt
  30. 8 7
      Config/Json/s/StartConfig/Release/StartSceneConfig.txt
  31. 7 7
      Config/Json/s/StartConfig/RouterTest/StartProcessConfig.txt
  32. 13 12
      Config/Json/s/StartConfig/RouterTest/StartSceneConfig.txt
  33. 二进制
      Unity/Assets/Config/Excel/StartConfig/Benchmark/StartProcessConfig@s.xlsx
  34. 二进制
      Unity/Assets/Config/Excel/StartConfig/Benchmark/StartSceneConfig@s.xlsx
  35. 二进制
      Unity/Assets/Config/Excel/StartConfig/Localhost/StartProcessConfig@s.xlsx
  36. 二进制
      Unity/Assets/Config/Excel/StartConfig/Localhost/StartSceneConfig@s.xlsx
  37. 二进制
      Unity/Assets/Config/Excel/StartConfig/Release/StartProcessConfig@s.xlsx
  38. 二进制
      Unity/Assets/Config/Excel/StartConfig/Release/StartSceneConfig@s.xlsx
  39. 二进制
      Unity/Assets/Config/Excel/StartConfig/RouterTest/StartProcessConfig@s.xlsx
  40. 二进制
      Unity/Assets/Config/Excel/StartConfig/RouterTest/StartSceneConfig@s.xlsx
  41. 0 3
      Unity/Assets/Scripts/Hotfix/Server/Demo/EntryEvent2_InitServer.cs
  42. 1 1
      Unity/Assets/Scripts/Hotfix/Server/Demo/Gate/FiberInit_Gate.cs
  43. 1 1
      Unity/Assets/Scripts/Hotfix/Server/Demo/Realm/C2R_LoginHandler.cs
  44. 1 1
      Unity/Assets/Scripts/Hotfix/Server/Demo/Realm/FiberInit_Realm.cs
  45. 2 2
      Unity/Assets/Scripts/Hotfix/Server/Demo/Router/HttpGetRouterHandler.cs
  46. 5 2
      Unity/Assets/Scripts/Hotfix/Server/Module/Message/A2Net_MessageHandler.cs
  47. 1 1
      Unity/Assets/Scripts/Hotfix/Server/Module/Message/NetInnerComponentSystem.cs
  48. 1 1
      Unity/Assets/Scripts/Hotfix/Server/Module/Router/FiberInit_RouterManager.cs
  49. 4 2
      Unity/Assets/Scripts/Hotfix/Share/Module/Actor/ActorSenderComponentSystem.cs
  50. 0 2
      Unity/Assets/Scripts/Model/Generate/ClientServer/Config/StartProcessConfig.cs
  51. 1 1
      Unity/Assets/Scripts/Model/Generate/ClientServer/Config/StartSceneConfig.cs
  52. 0 15
      Unity/Assets/Scripts/Model/Generate/ClientServer/ConfigPartial/StartProcessConfig.cs
  53. 20 20
      Unity/Assets/Scripts/Model/Generate/ClientServer/ConfigPartial/StartSceneConfig.cs
  54. 0 2
      Unity/Assets/Scripts/Model/Generate/Server/Config/StartProcessConfig.cs
  55. 1 1
      Unity/Assets/Scripts/Model/Generate/Server/Config/StartSceneConfig.cs
  56. 1 16
      Unity/Assets/Scripts/Model/Generate/Server/ConfigPartial/StartProcessConfig.cs
  57. 11 11
      Unity/Assets/Scripts/Model/Generate/Server/ConfigPartial/StartSceneConfig.cs

二进制
Config/Excel/cs/StartConfig/Benchmark/StartProcessConfigCategory.bytes


二进制
Config/Excel/cs/StartConfig/Benchmark/StartSceneConfigCategory.bytes


二进制
Config/Excel/cs/StartConfig/Localhost/StartProcessConfigCategory.bytes


二进制
Config/Excel/cs/StartConfig/Localhost/StartSceneConfigCategory.bytes


二进制
Config/Excel/cs/StartConfig/Release/StartProcessConfigCategory.bytes


二进制
Config/Excel/cs/StartConfig/Release/StartSceneConfigCategory.bytes


二进制
Config/Excel/cs/StartConfig/RouterTest/StartProcessConfigCategory.bytes


二进制
Config/Excel/cs/StartConfig/RouterTest/StartSceneConfigCategory.bytes


二进制
Config/Excel/s/StartConfig/Benchmark/StartProcessConfigCategory.bytes


二进制
Config/Excel/s/StartConfig/Benchmark/StartSceneConfigCategory.bytes


二进制
Config/Excel/s/StartConfig/Localhost/StartProcessConfigCategory.bytes


二进制
Config/Excel/s/StartConfig/Localhost/StartSceneConfigCategory.bytes


二进制
Config/Excel/s/StartConfig/Release/StartProcessConfigCategory.bytes


二进制
Config/Excel/s/StartConfig/Release/StartSceneConfigCategory.bytes


二进制
Config/Excel/s/StartConfig/RouterTest/StartProcessConfigCategory.bytes


二进制
Config/Excel/s/StartConfig/RouterTest/StartSceneConfigCategory.bytes


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

@@ -1,5 +1,5 @@
 {"dict": [
-[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101}],
-[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102}],
-[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1}],
+[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1}],
+[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1}],
 ]}

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

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

+ 1 - 1
Config/Json/cs/StartConfig/Localhost/StartProcessConfig.txt

@@ -1,3 +1,3 @@
 {"dict": [
-[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1}],
 ]}

+ 13 - 12
Config/Json/cs/StartConfig/Localhost/StartSceneConfig.txt

@@ -1,14 +1,15 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002}],
-[2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30003}],
-[3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30004}],
-[4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0}],
-[5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Match","Name":"Match","OuterPort":0}],
-[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0}],
-[7, {"_t":"StartSceneConfig","_id":7,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0}],
-[300, {"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300}],
-[301, {"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301}],
-[302, {"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":30302}],
-[303, {"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":30303}],
-[304, {"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":30304}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Net","Name":"Net","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}],
+[5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
+[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Match","Name":"Match","Port":0}],
+[7, {"_t":"StartSceneConfig","_id":7,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
+[8, {"_t":"StartSceneConfig","_id":8,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","Port":0}],
+[300, {"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":30300}],
+[301, {"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","Port":30301}],
+[302, {"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","Port":30302}],
+[303, {"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","Port":30303}],
+[304, {"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","Port":30304}],
 ]}

+ 2 - 2
Config/Json/cs/StartConfig/Release/StartProcessConfig.txt

@@ -1,4 +1,4 @@
 {"dict": [
-[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20001}],
-[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20002}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1}],
+[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1}],
 ]}

+ 8 - 7
Config/Json/cs/StartConfig/Release/StartSceneConfig.txt

@@ -1,9 +1,10 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30001}],
-[2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30002}],
-[3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30003}],
-[4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0}],
-[5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0}],
-[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0}],
-[200, {"_t":"StartSceneConfig","_id":200,"Process":1,"Zone":2,"SceneType":"Robot","Name":"Robot01","OuterPort":0}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Net","Name":"Net","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}],
+[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
+[7, {"_t":"StartSceneConfig","_id":7,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
+[8, {"_t":"StartSceneConfig","_id":8,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","Port":0}],
+[200, {"_t":"StartSceneConfig","_id":200,"Process":1,"Zone":2,"SceneType":"Robot","Name":"Robot01","Port":0}],
 ]}

+ 7 - 7
Config/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt

@@ -1,9 +1,9 @@
 {"dict": [
-[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101}],
-[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102}],
-[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103}],
-[4, {"_t":"StartProcessConfig","_id":4,"MachineId":1,"InnerPort":20104}],
-[5, {"_t":"StartProcessConfig","_id":5,"MachineId":1,"InnerPort":20105}],
-[6, {"_t":"StartProcessConfig","_id":6,"MachineId":1,"InnerPort":20106}],
-[7, {"_t":"StartProcessConfig","_id":7,"MachineId":1,"InnerPort":20107}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1}],
+[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1}],
+[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1}],
+[4, {"_t":"StartProcessConfig","_id":4,"MachineId":1}],
+[5, {"_t":"StartProcessConfig","_id":5,"MachineId":1}],
+[6, {"_t":"StartProcessConfig","_id":6,"MachineId":1}],
+[7, {"_t":"StartProcessConfig","_id":7,"MachineId":1}],
 ]}

+ 13 - 12
Config/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt

@@ -1,14 +1,15 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30001}],
-[2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30002}],
-[3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30003}],
-[4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0}],
-[5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0}],
-[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0}],
-[200, {"_t":"StartSceneConfig","_id":200,"Process":2,"Zone":2,"SceneType":"Robot","Name":"Robot01","OuterPort":0}],
-[400, {"_t":"StartSceneConfig","_id":400,"Process":3,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300}],
-[401, {"_t":"StartSceneConfig","_id":401,"Process":4,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301}],
-[402, {"_t":"StartSceneConfig","_id":402,"Process":5,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":30302}],
-[403, {"_t":"StartSceneConfig","_id":403,"Process":6,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":30303}],
-[404, {"_t":"StartSceneConfig","_id":404,"Process":7,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":30304}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Net","Name":"Net","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}],
+[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
+[7, {"_t":"StartSceneConfig","_id":7,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
+[8, {"_t":"StartSceneConfig","_id":8,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","Port":0}],
+[200, {"_t":"StartSceneConfig","_id":200,"Process":2,"Zone":2,"SceneType":"Robot","Name":"Robot01","Port":0}],
+[400, {"_t":"StartSceneConfig","_id":400,"Process":3,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":30300}],
+[401, {"_t":"StartSceneConfig","_id":401,"Process":4,"Zone":3,"SceneType":"Router","Name":"Router01","Port":30301}],
+[402, {"_t":"StartSceneConfig","_id":402,"Process":5,"Zone":3,"SceneType":"Router","Name":"Router02","Port":30302}],
+[403, {"_t":"StartSceneConfig","_id":403,"Process":6,"Zone":3,"SceneType":"Router","Name":"Router03","Port":30303}],
+[404, {"_t":"StartSceneConfig","_id":404,"Process":7,"Zone":3,"SceneType":"Router","Name":"Router04","Port":30304}],
 ]}

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

@@ -1,5 +1,5 @@
 {"dict": [
-[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101}],
-[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102}],
-[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1}],
+[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1}],
+[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1}],
 ]}

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

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

+ 1 - 1
Config/Json/s/StartConfig/Localhost/StartProcessConfig.txt

@@ -1,3 +1,3 @@
 {"dict": [
-[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1}],
 ]}

+ 13 - 12
Config/Json/s/StartConfig/Localhost/StartSceneConfig.txt

@@ -1,14 +1,15 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002}],
-[2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30003}],
-[3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30004}],
-[4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0}],
-[5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Match","Name":"Match","OuterPort":0}],
-[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0}],
-[7, {"_t":"StartSceneConfig","_id":7,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0}],
-[300, {"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300}],
-[301, {"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301}],
-[302, {"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":30302}],
-[303, {"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":30303}],
-[304, {"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":30304}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Net","Name":"Net","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}],
+[5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
+[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Match","Name":"Match","Port":0}],
+[7, {"_t":"StartSceneConfig","_id":7,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
+[8, {"_t":"StartSceneConfig","_id":8,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","Port":0}],
+[300, {"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":30300}],
+[301, {"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","Port":30301}],
+[302, {"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","Port":30302}],
+[303, {"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","Port":30303}],
+[304, {"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","Port":30304}],
 ]}

+ 2 - 2
Config/Json/s/StartConfig/Release/StartProcessConfig.txt

@@ -1,4 +1,4 @@
 {"dict": [
-[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20001}],
-[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20002}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1}],
+[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1}],
 ]}

+ 8 - 7
Config/Json/s/StartConfig/Release/StartSceneConfig.txt

@@ -1,9 +1,10 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30001}],
-[2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30002}],
-[3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30003}],
-[4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0}],
-[5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0}],
-[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0}],
-[200, {"_t":"StartSceneConfig","_id":200,"Process":1,"Zone":2,"SceneType":"Robot","Name":"Robot01","OuterPort":0}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Net","Name":"Net","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}],
+[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
+[7, {"_t":"StartSceneConfig","_id":7,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
+[8, {"_t":"StartSceneConfig","_id":8,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","Port":0}],
+[200, {"_t":"StartSceneConfig","_id":200,"Process":1,"Zone":2,"SceneType":"Robot","Name":"Robot01","Port":0}],
 ]}

+ 7 - 7
Config/Json/s/StartConfig/RouterTest/StartProcessConfig.txt

@@ -1,9 +1,9 @@
 {"dict": [
-[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101}],
-[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102}],
-[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103}],
-[4, {"_t":"StartProcessConfig","_id":4,"MachineId":1,"InnerPort":20104}],
-[5, {"_t":"StartProcessConfig","_id":5,"MachineId":1,"InnerPort":20105}],
-[6, {"_t":"StartProcessConfig","_id":6,"MachineId":1,"InnerPort":20106}],
-[7, {"_t":"StartProcessConfig","_id":7,"MachineId":1,"InnerPort":20107}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1}],
+[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1}],
+[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1}],
+[4, {"_t":"StartProcessConfig","_id":4,"MachineId":1}],
+[5, {"_t":"StartProcessConfig","_id":5,"MachineId":1}],
+[6, {"_t":"StartProcessConfig","_id":6,"MachineId":1}],
+[7, {"_t":"StartProcessConfig","_id":7,"MachineId":1}],
 ]}

+ 13 - 12
Config/Json/s/StartConfig/RouterTest/StartSceneConfig.txt

@@ -1,14 +1,15 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30001}],
-[2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":30002}],
-[3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":30003}],
-[4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","OuterPort":0}],
-[5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","OuterPort":0}],
-[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","OuterPort":0}],
-[200, {"_t":"StartSceneConfig","_id":200,"Process":2,"Zone":2,"SceneType":"Robot","Name":"Robot01","OuterPort":0}],
-[400, {"_t":"StartSceneConfig","_id":400,"Process":3,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300}],
-[401, {"_t":"StartSceneConfig","_id":401,"Process":4,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301}],
-[402, {"_t":"StartSceneConfig","_id":402,"Process":5,"Zone":3,"SceneType":"Router","Name":"Router02","OuterPort":30302}],
-[403, {"_t":"StartSceneConfig","_id":403,"Process":6,"Zone":3,"SceneType":"Router","Name":"Router03","OuterPort":30303}],
-[404, {"_t":"StartSceneConfig","_id":404,"Process":7,"Zone":3,"SceneType":"Router","Name":"Router04","OuterPort":30304}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Net","Name":"Net","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}],
+[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
+[7, {"_t":"StartSceneConfig","_id":7,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
+[8, {"_t":"StartSceneConfig","_id":8,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map2","Port":0}],
+[200, {"_t":"StartSceneConfig","_id":200,"Process":2,"Zone":2,"SceneType":"Robot","Name":"Robot01","Port":0}],
+[400, {"_t":"StartSceneConfig","_id":400,"Process":3,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":30300}],
+[401, {"_t":"StartSceneConfig","_id":401,"Process":4,"Zone":3,"SceneType":"Router","Name":"Router01","Port":30301}],
+[402, {"_t":"StartSceneConfig","_id":402,"Process":5,"Zone":3,"SceneType":"Router","Name":"Router02","Port":30302}],
+[403, {"_t":"StartSceneConfig","_id":403,"Process":6,"Zone":3,"SceneType":"Router","Name":"Router03","Port":30303}],
+[404, {"_t":"StartSceneConfig","_id":404,"Process":7,"Zone":3,"SceneType":"Router","Name":"Router04","Port":30304}],
 ]}

二进制
Unity/Assets/Config/Excel/StartConfig/Benchmark/StartProcessConfig@s.xlsx


二进制
Unity/Assets/Config/Excel/StartConfig/Benchmark/StartSceneConfig@s.xlsx


二进制
Unity/Assets/Config/Excel/StartConfig/Localhost/StartProcessConfig@s.xlsx


二进制
Unity/Assets/Config/Excel/StartConfig/Localhost/StartSceneConfig@s.xlsx


二进制
Unity/Assets/Config/Excel/StartConfig/Release/StartProcessConfig@s.xlsx


二进制
Unity/Assets/Config/Excel/StartConfig/Release/StartSceneConfig@s.xlsx


二进制
Unity/Assets/Config/Excel/StartConfig/RouterTest/StartProcessConfig@s.xlsx


二进制
Unity/Assets/Config/Excel/StartConfig/RouterTest/StartSceneConfig@s.xlsx


+ 0 - 3
Unity/Assets/Scripts/Hotfix/Server/Demo/EntryEvent2_InitServer.cs

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

+ 1 - 1
Unity/Assets/Scripts/Hotfix/Server/Demo/Gate/FiberInit_Gate.cs

@@ -15,7 +15,7 @@ namespace ET.Server
             root.AddComponent<ActorLocationSenderComponent>();
 
             StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.Get((int)root.Id);
-            root.AddComponent<NetServerComponent, IPEndPoint>(startSceneConfig.InnerIPOutPort);
+            root.AddComponent<NetServerComponent, IPEndPoint>(startSceneConfig.InnerIPPort);
         }
     }
 }

+ 1 - 1
Unity/Assets/Scripts/Hotfix/Server/Demo/Realm/C2R_LoginHandler.cs

@@ -17,7 +17,7 @@ namespace ET.Server
 			G2R_GetLoginKey g2RGetLoginKey = (G2R_GetLoginKey) await session.Fiber().Root.GetComponent<ActorSenderComponent>().Call(
 				config.ActorId, new R2G_GetLoginKey() {Account = request.Account});
 
-			response.Address = config.InnerIPOutPort.ToString();
+			response.Address = config.InnerIPPort.ToString();
 			response.Key = g2RGetLoginKey.Key;
 			response.GateId = g2RGetLoginKey.GateId;
 		}

+ 1 - 1
Unity/Assets/Scripts/Hotfix/Server/Demo/Realm/FiberInit_Realm.cs

@@ -10,7 +10,7 @@ namespace ET.Server
             Fiber fiber = fiberInit.Fiber;
             
             StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.Get(fiber.Id);
-            fiber.Root.AddComponent<NetServerComponent, IPEndPoint>(startSceneConfig.InnerIPOutPort);
+            fiber.Root.AddComponent<NetServerComponent, IPEndPoint>(startSceneConfig.InnerIPPort);
         }
     }
 }

+ 2 - 2
Unity/Assets/Scripts/Hotfix/Server/Demo/Router/HttpGetRouterHandler.cs

@@ -13,11 +13,11 @@ namespace ET.Server
             HttpGetRouterResponse response = new();
             foreach (StartSceneConfig startSceneConfig in StartSceneConfigCategory.Instance.Realms)
             {
-                response.Realms.Add(startSceneConfig.InnerIPOutPort.ToString());
+                response.Realms.Add(startSceneConfig.InnerIPPort.ToString());
             }
             foreach (StartSceneConfig startSceneConfig in StartSceneConfigCategory.Instance.Routers)
             {
-                response.Routers.Add($"{startSceneConfig.StartProcessConfig.OuterIP}:{startSceneConfig.OuterPort}");
+                response.Routers.Add($"{startSceneConfig.StartProcessConfig.OuterIP}:{startSceneConfig.Port}");
             }
             HttpHelper.Response(context, response);
             await ETTask.CompletedTask;

+ 5 - 2
Unity/Assets/Scripts/Hotfix/Server/Module/Message/A2Net_MessageHandler.cs

@@ -1,4 +1,6 @@
-namespace ET.Server
+using System.Collections.Generic;
+
+namespace ET.Server
 {
     [ActorMessageHandler(SceneType.Net)]
     public class A2Net_MessageHandler: ActorMessageHandler<Scene, A2Net_Message>
@@ -6,7 +8,8 @@
         protected override async ETTask Run(Scene root, A2Net_Message message)
         {
             int process = message.ActorId.Process;
-            Session session = root.GetComponent<NetInnerComponent>().Get(process);
+            StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.Nets[process];
+            Session session = root.GetComponent<NetInnerComponent>().Get(startSceneConfig.Id);
             ActorId actorId = message.ActorId;
             actorId.Address = message.FromAddress;
             session.Send(actorId, message.MessageObject);

+ 1 - 1
Unity/Assets/Scripts/Hotfix/Server/Module/Message/NetInnerComponentSystem.cs

@@ -121,7 +121,7 @@ namespace ET.Server
                 return session;
             }
 
-            IPEndPoint ipEndPoint = StartProcessConfigCategory.Instance.Get((int) channelId).InnerIPPort;
+            IPEndPoint ipEndPoint = StartSceneConfigCategory.Instance.Get((int) channelId).InnerIPPort;
             session = self.CreateInner(channelId, ipEndPoint);
             return session;
         }

+ 1 - 1
Unity/Assets/Scripts/Hotfix/Server/Module/Router/FiberInit_RouterManager.cs

@@ -10,7 +10,7 @@ namespace ET.Server
             Scene root = fiberInit.Fiber.Root;
 
             StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.Get((int)root.Id);
-            root.AddComponent<HttpComponent, string>($"http://*:{startSceneConfig.OuterPort}/");
+            root.AddComponent<HttpComponent, string>($"http://*:{startSceneConfig.Port}/");
         }
     }
 }

+ 4 - 2
Unity/Assets/Scripts/Hotfix/Share/Module/Actor/ActorSenderComponentSystem.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 
 namespace ET
@@ -120,8 +121,9 @@ namespace ET
             netMessage.FromAddress = fiber.Address;
             netMessage.ActorId = actorId;
             netMessage.MessageObject = message;
-            // 扔到NetInner纤程
-            ActorMessageQueue.Instance.Send(new ActorId(actorId.Process, ConstFiberId.Net), netMessage);
+            // 扔到Net纤程
+            StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.Nets[fiber.Process];
+            ActorMessageQueue.Instance.Send(startSceneConfig.ActorId, netMessage);
         }
 
 

+ 0 - 2
Unity/Assets/Scripts/Model/Generate/ClientServer/Config/StartProcessConfig.cs

@@ -59,8 +59,6 @@ namespace ET
 		public int Id { get; set; }
 		/// <summary>所属机器</summary>
 		public int MachineId { get; set; }
-		/// <summary>内网端口</summary>
-		public int InnerPort { get; set; }
 
 	}
 }

+ 1 - 1
Unity/Assets/Scripts/Model/Generate/ClientServer/Config/StartSceneConfig.cs

@@ -66,7 +66,7 @@ namespace ET
 		/// <summary>名字</summary>
 		public string Name { get; set; }
 		/// <summary>外网端口</summary>
-		public int OuterPort { get; set; }
+		public int Port { get; set; }
 
 	}
 }

+ 0 - 15
Unity/Assets/Scripts/Model/Generate/ClientServer/ConfigPartial/StartProcessConfig.cs

@@ -4,21 +4,6 @@ namespace ET
 {
     public partial class StartProcessConfig
     {
-        private IPEndPoint innerIPPort;
-
-        public IPEndPoint InnerIPPort
-        {
-            get
-            {
-                if (this.innerIPPort == null)
-                {
-                    this.innerIPPort = NetworkHelper.ToIPEndPoint($"{this.InnerIP}:{this.InnerPort}");
-                }
-
-                return this.innerIPPort;
-            }
-        }
-
         public string InnerIP => this.StartMachineConfig.InnerIP;
 
         public string OuterIP => this.StartMachineConfig.OuterIP;

+ 20 - 20
Unity/Assets/Scripts/Model/Generate/ClientServer/ConfigPartial/StartSceneConfig.cs

@@ -6,25 +6,25 @@ namespace ET
 {
     public partial class StartSceneConfigCategory
     {
-        public MultiMap<int, StartSceneConfig> Gates = new MultiMap<int, StartSceneConfig>();
+        public MultiMap<int, StartSceneConfig> Gates = new();
         
-        public MultiMap<int, StartSceneConfig> ProcessScenes = new MultiMap<int, StartSceneConfig>();
+        public MultiMap<int, StartSceneConfig> ProcessScenes = new();
         
-        public Dictionary<long, Dictionary<string, StartSceneConfig>> ClientScenesByName = new Dictionary<long, Dictionary<string, StartSceneConfig>>();
+        public Dictionary<int, StartSceneConfig> Nets = new();
+        
+        public Dictionary<long, Dictionary<string, StartSceneConfig>> ClientScenesByName = new();
 
         public StartSceneConfig LocationConfig;
 
-        public List<StartSceneConfig> Realms = new List<StartSceneConfig>();
-        
-        public List<StartSceneConfig> Routers = new List<StartSceneConfig>();
+        public List<StartSceneConfig> Realms = new();
         
-        public List<StartSceneConfig> Robots = new List<StartSceneConfig>();
+        public List<StartSceneConfig> Routers = new();
         
-        public List<StartSceneConfig> Maps = new List<StartSceneConfig>();
+        public List<StartSceneConfig> Robots = new();
         
-        public StartSceneConfig Match;
+        public List<StartSceneConfig> Maps = new();
 
-        public StartSceneConfig BenchmarkServer;
+        public StartSceneConfig Match;
         
         public List<StartSceneConfig> GetByProcess(int process)
         {
@@ -35,7 +35,7 @@ namespace ET
         {
             return this.ClientScenesByName[zone][name];
         }
-
+        
         public override void EndInit()
         {
             foreach (StartSceneConfig startSceneConfig in this.GetAll().Values)
@@ -50,6 +50,9 @@ namespace ET
                 
                 switch (startSceneConfig.Type)
                 {
+                    case SceneType.Net:
+                        this.Nets.Add(startSceneConfig.Process, startSceneConfig);
+                        break;
                     case SceneType.Realm:
                         this.Realms.Add(startSceneConfig);
                         break;
@@ -65,9 +68,6 @@ namespace ET
                     case SceneType.Router:
                         this.Routers.Add(startSceneConfig);
                         break;
-                    case SceneType.BenchmarkServer:
-                        this.BenchmarkServer = startSceneConfig;
-                        break;
                     case SceneType.Map:
                         this.Maps.Add(startSceneConfig);
                         break;
@@ -102,18 +102,18 @@ namespace ET
         }
 
         // 内网地址外网端口,通过防火墙映射端口过来
-        private IPEndPoint innerIPOutPort;
+        private IPEndPoint innerIPPort;
 
-        public IPEndPoint InnerIPOutPort
+        public IPEndPoint InnerIPPort
         {
             get
             {
-                if (innerIPOutPort == null)
+                if (innerIPPort == null)
                 {
-                    this.innerIPOutPort = NetworkHelper.ToIPEndPoint($"{this.StartProcessConfig.InnerIP}:{this.OuterPort}");
+                    this.innerIPPort = NetworkHelper.ToIPEndPoint($"{this.StartProcessConfig.InnerIP}:{this.Port}");
                 }
 
-                return this.innerIPOutPort;
+                return this.innerIPPort;
             }
         }
 
@@ -126,7 +126,7 @@ namespace ET
             {
                 if (this.outerIPPort == null)
                 {
-                    this.outerIPPort = NetworkHelper.ToIPEndPoint($"{this.StartProcessConfig.OuterIP}:{this.OuterPort}");
+                    this.outerIPPort = NetworkHelper.ToIPEndPoint($"{this.StartProcessConfig.OuterIP}:{this.Port}");
                 }
 
                 return this.outerIPPort;

+ 0 - 2
Unity/Assets/Scripts/Model/Generate/Server/Config/StartProcessConfig.cs

@@ -59,8 +59,6 @@ namespace ET
 		public int Id { get; set; }
 		/// <summary>所属机器</summary>
 		public int MachineId { get; set; }
-		/// <summary>内网端口</summary>
-		public int InnerPort { get; set; }
 
 	}
 }

+ 1 - 1
Unity/Assets/Scripts/Model/Generate/Server/Config/StartSceneConfig.cs

@@ -66,7 +66,7 @@ namespace ET
 		/// <summary>名字</summary>
 		public string Name { get; set; }
 		/// <summary>外网端口</summary>
-		public int OuterPort { get; set; }
+		public int Port { get; set; }
 
 	}
 }

+ 1 - 16
Unity/Assets/Scripts/Model/Generate/Server/ConfigPartial/StartProcessConfig.cs

@@ -4,23 +4,8 @@ namespace ET
 {
     public partial class StartProcessConfig
     {
-        private IPEndPoint innerIPPort;
-
         public long SceneId;
 
-        public IPEndPoint InnerIPPort
-        {
-            get
-            {
-                if (this.innerIPPort == null)
-                {
-                    this.innerIPPort = NetworkHelper.ToIPEndPoint($"{this.InnerIP}:{this.InnerPort}");
-                }
-
-                return this.innerIPPort;
-            }
-        }
-
         public string InnerIP => this.StartMachineConfig.InnerIP;
 
         public string OuterIP => this.StartMachineConfig.OuterIP;
@@ -29,7 +14,7 @@ namespace ET
 
         public override void EndInit()
         {
-            InstanceIdStruct instanceIdStruct = new InstanceIdStruct(0, (uint)this.Id);
+            InstanceIdStruct instanceIdStruct = new(0, (uint)this.Id);
             this.SceneId = instanceIdStruct.ToLong();
             Log.Info($"StartProcess info: {this.MachineId} {this.Id} {this.SceneId}");
         }

+ 11 - 11
Unity/Assets/Scripts/Model/Generate/Server/ConfigPartial/StartSceneConfig.cs

@@ -10,6 +10,8 @@ namespace ET
         
         public MultiMap<int, StartSceneConfig> ProcessScenes = new();
         
+        public Dictionary<int, StartSceneConfig> Nets = new();
+        
         public Dictionary<long, Dictionary<string, StartSceneConfig>> ClientScenesByName = new();
 
         public StartSceneConfig LocationConfig;
@@ -22,8 +24,6 @@ namespace ET
         
         public List<StartSceneConfig> Maps = new();
 
-        public StartSceneConfig BenchmarkServer;
-
         public StartSceneConfig Match;
         
         public List<StartSceneConfig> GetByProcess(int process)
@@ -50,6 +50,9 @@ namespace ET
                 
                 switch (startSceneConfig.Type)
                 {
+                    case SceneType.Net:
+                        this.Nets.Add(startSceneConfig.Process, startSceneConfig);
+                        break;
                     case SceneType.Realm:
                         this.Realms.Add(startSceneConfig);
                         break;
@@ -65,9 +68,6 @@ namespace ET
                     case SceneType.Router:
                         this.Routers.Add(startSceneConfig);
                         break;
-                    case SceneType.BenchmarkServer:
-                        this.BenchmarkServer = startSceneConfig;
-                        break;
                     case SceneType.Map:
                         this.Maps.Add(startSceneConfig);
                         break;
@@ -102,18 +102,18 @@ namespace ET
         }
 
         // 内网地址外网端口,通过防火墙映射端口过来
-        private IPEndPoint innerIPOutPort;
+        private IPEndPoint innerIPPort;
 
-        public IPEndPoint InnerIPOutPort
+        public IPEndPoint InnerIPPort
         {
             get
             {
-                if (innerIPOutPort == null)
+                if (this.innerIPPort == null)
                 {
-                    this.innerIPOutPort = NetworkHelper.ToIPEndPoint($"{this.StartProcessConfig.InnerIP}:{this.OuterPort}");
+                    this.innerIPPort = NetworkHelper.ToIPEndPoint($"{this.StartProcessConfig.InnerIP}:{this.Port}");
                 }
 
-                return this.innerIPOutPort;
+                return this.innerIPPort;
             }
         }
 
@@ -126,7 +126,7 @@ namespace ET
             {
                 if (this.outerIPPort == null)
                 {
-                    this.outerIPPort = NetworkHelper.ToIPEndPoint($"{this.StartProcessConfig.OuterIP}:{this.OuterPort}");
+                    this.outerIPPort = NetworkHelper.ToIPEndPoint($"{this.StartProcessConfig.OuterIP}:{this.Port}");
                 }
 
                 return this.outerIPPort;