소스 검색

1.NetInner纤程改成不需要配置StartSceneConfig,而是每个进程自动创建一个NetInner纤程
2.StartProcessConfig加回端口字段,有配置端口的自动加上NetInner纤程
3.这样做的原因是,假如gate由纤程改成一个独立的进程,老方式需要给gate配置NetInner纤程,这样挺麻烦的,现在的方式只需要给gate的进程配置一个端口就行了
4.不需要NetInner纤程的进程(比如Router),StartProcessConfig Port设置为0即可

tanghai 2 년 전
부모
커밋
8871509399
48개의 변경된 파일137개의 추가작업 그리고 110개의 파일을 삭제
  1. BIN
      Config/Excel/cs/StartConfig/Benchmark/StartProcessConfigCategory.bytes
  2. BIN
      Config/Excel/cs/StartConfig/Localhost/StartProcessConfigCategory.bytes
  3. BIN
      Config/Excel/cs/StartConfig/Localhost/StartSceneConfigCategory.bytes
  4. BIN
      Config/Excel/cs/StartConfig/Release/StartProcessConfigCategory.bytes
  5. BIN
      Config/Excel/cs/StartConfig/Release/StartSceneConfigCategory.bytes
  6. BIN
      Config/Excel/cs/StartConfig/RouterTest/StartProcessConfigCategory.bytes
  7. BIN
      Config/Excel/cs/StartConfig/RouterTest/StartSceneConfigCategory.bytes
  8. BIN
      Config/Excel/s/StartConfig/Benchmark/StartProcessConfigCategory.bytes
  9. BIN
      Config/Excel/s/StartConfig/Localhost/StartProcessConfigCategory.bytes
  10. BIN
      Config/Excel/s/StartConfig/Localhost/StartSceneConfigCategory.bytes
  11. BIN
      Config/Excel/s/StartConfig/Release/StartProcessConfigCategory.bytes
  12. BIN
      Config/Excel/s/StartConfig/Release/StartSceneConfigCategory.bytes
  13. BIN
      Config/Excel/s/StartConfig/RouterTest/StartProcessConfigCategory.bytes
  14. BIN
      Config/Excel/s/StartConfig/RouterTest/StartSceneConfigCategory.bytes
  15. 7 7
      Config/Json/cs/StartConfig/Benchmark/StartProcessConfig.txt
  16. 1 1
      Config/Json/cs/StartConfig/Localhost/StartProcessConfig.txt
  17. 7 8
      Config/Json/cs/StartConfig/Localhost/StartSceneConfig.txt
  18. 3 3
      Config/Json/cs/StartConfig/Release/StartProcessConfig.txt
  19. 7 9
      Config/Json/cs/StartConfig/Release/StartSceneConfig.txt
  20. 7 7
      Config/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt
  21. 6 7
      Config/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt
  22. 7 7
      Config/Json/s/StartConfig/Benchmark/StartProcessConfig.txt
  23. 1 1
      Config/Json/s/StartConfig/Localhost/StartProcessConfig.txt
  24. 7 8
      Config/Json/s/StartConfig/Localhost/StartSceneConfig.txt
  25. 3 3
      Config/Json/s/StartConfig/Release/StartProcessConfig.txt
  26. 7 9
      Config/Json/s/StartConfig/Release/StartSceneConfig.txt
  27. 7 7
      Config/Json/s/StartConfig/RouterTest/StartProcessConfig.txt
  28. 6 7
      Config/Json/s/StartConfig/RouterTest/StartSceneConfig.txt
  29. BIN
      Unity/Assets/Config/Excel/StartConfig/Benchmark/StartProcessConfig@s.xlsx
  30. BIN
      Unity/Assets/Config/Excel/StartConfig/Localhost/StartProcessConfig@s.xlsx
  31. BIN
      Unity/Assets/Config/Excel/StartConfig/Localhost/StartSceneConfig@s.xlsx
  32. BIN
      Unity/Assets/Config/Excel/StartConfig/Release/StartProcessConfig@s.xlsx
  33. BIN
      Unity/Assets/Config/Excel/StartConfig/Release/StartSceneConfig@s.xlsx
  34. BIN
      Unity/Assets/Config/Excel/StartConfig/RouterTest/StartProcessConfig@s.xlsx
  35. BIN
      Unity/Assets/Config/Excel/StartConfig/RouterTest/StartSceneConfig@s.xlsx
  36. 0 1
      Unity/Assets/Scripts/Hotfix/Server/Benchmark/FiberInit_BenchmarkClient.cs
  37. 0 1
      Unity/Assets/Scripts/Hotfix/Server/Benchmark/FiberInit_BenchmarkServer.cs
  38. 8 1
      Unity/Assets/Scripts/Hotfix/Server/Demo/EntryEvent2_InitServer.cs
  39. 4 4
      Unity/Assets/Scripts/Hotfix/Server/Module/Message/MessageSenderSystem.cs
  40. 4 4
      Unity/Assets/Scripts/Hotfix/Server/Module/Message/ProcessOuterSenderSystem.cs
  41. 2 3
      Unity/Assets/Scripts/Hotfix/Server/Module/NetInner/FiberInit_NetInner.cs
  42. 2 0
      Unity/Assets/Scripts/Model/Generate/ClientServer/Config/StartProcessConfig.cs
  43. 16 0
      Unity/Assets/Scripts/Model/Generate/ClientServer/ConfigPartial/StartProcessConfig.cs
  44. 0 5
      Unity/Assets/Scripts/Model/Generate/ClientServer/ConfigPartial/StartSceneConfig.cs
  45. 2 0
      Unity/Assets/Scripts/Model/Generate/Server/Config/StartProcessConfig.cs
  46. 20 0
      Unity/Assets/Scripts/Model/Generate/Server/ConfigPartial/StartProcessConfig.cs
  47. 0 5
      Unity/Assets/Scripts/Model/Generate/Server/ConfigPartial/StartSceneConfig.cs
  48. 3 2
      Unity/Assets/Scripts/Model/Share/ConstFiberId.cs

BIN
Config/Excel/cs/StartConfig/Benchmark/StartProcessConfigCategory.bytes


BIN
Config/Excel/cs/StartConfig/Localhost/StartProcessConfigCategory.bytes


BIN
Config/Excel/cs/StartConfig/Localhost/StartSceneConfigCategory.bytes


BIN
Config/Excel/cs/StartConfig/Release/StartProcessConfigCategory.bytes


BIN
Config/Excel/cs/StartConfig/Release/StartSceneConfigCategory.bytes


BIN
Config/Excel/cs/StartConfig/RouterTest/StartProcessConfigCategory.bytes


BIN
Config/Excel/cs/StartConfig/RouterTest/StartSceneConfigCategory.bytes


BIN
Config/Excel/s/StartConfig/Benchmark/StartProcessConfigCategory.bytes


BIN
Config/Excel/s/StartConfig/Localhost/StartProcessConfigCategory.bytes


BIN
Config/Excel/s/StartConfig/Localhost/StartSceneConfigCategory.bytes


BIN
Config/Excel/s/StartConfig/Release/StartProcessConfigCategory.bytes


BIN
Config/Excel/s/StartConfig/Release/StartSceneConfigCategory.bytes


BIN
Config/Excel/s/StartConfig/RouterTest/StartProcessConfigCategory.bytes


BIN
Config/Excel/s/StartConfig/RouterTest/StartSceneConfigCategory.bytes


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

@@ -1,9 +1,9 @@
 {"dict": [
-[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}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"Port":20001}],
+[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1,"Port":20002}],
+[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1,"Port":20003}],
+[4, {"_t":"StartProcessConfig","_id":4,"MachineId":1,"Port":20004}],
+[5, {"_t":"StartProcessConfig","_id":5,"MachineId":1,"Port":20005}],
+[6, {"_t":"StartProcessConfig","_id":6,"MachineId":1,"Port":20006}],
+[7, {"_t":"StartProcessConfig","_id":7,"MachineId":1,"Port":20007}],
 ]}

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

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

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

@@ -1,12 +1,11 @@
 {"dict": [
-[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}],
-[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}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
+[2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
+[3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],
+[4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
+[5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Match","Name":"Match","Port":0}],
+[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
+[7, {"_t":"StartSceneConfig","_id":7,"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}],

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

@@ -1,5 +1,5 @@
 {"dict": [
-[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1}],
-[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1}],
-[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"Port":20001}],
+[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1,"Port":20002}],
+[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1,"Port":0}],
 ]}

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

@@ -1,13 +1,11 @@
 {"dict": [
-[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}],
-[11, {"_t":"StartSceneConfig","_id":11,"Process":2,"Zone":1,"SceneType":"NetInner","Name":"NetInner2","Port":30011}],
-[12, {"_t":"StartSceneConfig","_id":12,"Process":2,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
-[13, {"_t":"StartSceneConfig","_id":13,"Process":2,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
-[14, {"_t":"StartSceneConfig","_id":14,"Process":2,"Zone":1,"SceneType":"Map","Name":"Map2","Port":0}],
-[15, {"_t":"StartSceneConfig","_id":15,"Process":2,"Zone":1,"SceneType":"Match","Name":"Match","Port":0}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
+[2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
+[3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],
+[11, {"_t":"StartSceneConfig","_id":11,"Process":2,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
+[12, {"_t":"StartSceneConfig","_id":12,"Process":2,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
+[13, {"_t":"StartSceneConfig","_id":13,"Process":2,"Zone":1,"SceneType":"Map","Name":"Map2","Port":0}],
+[14, {"_t":"StartSceneConfig","_id":14,"Process":2,"Zone":1,"SceneType":"Match","Name":"Match","Port":0}],
 [30, {"_t":"StartSceneConfig","_id":30,"Process":3,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":30300}],
 [31, {"_t":"StartSceneConfig","_id":31,"Process":3,"Zone":3,"SceneType":"Router","Name":"Router01","Port":30301}],
 [32, {"_t":"StartSceneConfig","_id":32,"Process":3,"Zone":3,"SceneType":"Router","Name":"Router02","Port":30302}],

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

@@ -1,9 +1,9 @@
 {"dict": [
-[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}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"Port":20001}],
+[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1,"Port":20002}],
+[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1,"Port":20003}],
+[4, {"_t":"StartProcessConfig","_id":4,"MachineId":1,"Port":20004}],
+[5, {"_t":"StartProcessConfig","_id":5,"MachineId":1,"Port":20005}],
+[6, {"_t":"StartProcessConfig","_id":6,"MachineId":1,"Port":20006}],
+[7, {"_t":"StartProcessConfig","_id":7,"MachineId":1,"Port":20007}],
 ]}

+ 6 - 7
Config/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt

@@ -1,11 +1,10 @@
 {"dict": [
-[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}],
-[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}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
+[2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
+[3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],
+[4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
+[5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
+[6, {"_t":"StartSceneConfig","_id":6,"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}],

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

@@ -1,9 +1,9 @@
 {"dict": [
-[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}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"Port":20001}],
+[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1,"Port":20002}],
+[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1,"Port":20003}],
+[4, {"_t":"StartProcessConfig","_id":4,"MachineId":1,"Port":20004}],
+[5, {"_t":"StartProcessConfig","_id":5,"MachineId":1,"Port":20005}],
+[6, {"_t":"StartProcessConfig","_id":6,"MachineId":1,"Port":20006}],
+[7, {"_t":"StartProcessConfig","_id":7,"MachineId":1,"Port":20007}],
 ]}

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

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

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

@@ -1,12 +1,11 @@
 {"dict": [
-[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}],
-[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}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
+[2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
+[3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],
+[4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
+[5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Match","Name":"Match","Port":0}],
+[6, {"_t":"StartSceneConfig","_id":6,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
+[7, {"_t":"StartSceneConfig","_id":7,"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}],

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

@@ -1,5 +1,5 @@
 {"dict": [
-[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1}],
-[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1}],
-[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"Port":20001}],
+[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1,"Port":20002}],
+[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1,"Port":0}],
 ]}

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

@@ -1,13 +1,11 @@
 {"dict": [
-[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}],
-[11, {"_t":"StartSceneConfig","_id":11,"Process":2,"Zone":1,"SceneType":"NetInner","Name":"NetInner2","Port":30011}],
-[12, {"_t":"StartSceneConfig","_id":12,"Process":2,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
-[13, {"_t":"StartSceneConfig","_id":13,"Process":2,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
-[14, {"_t":"StartSceneConfig","_id":14,"Process":2,"Zone":1,"SceneType":"Map","Name":"Map2","Port":0}],
-[15, {"_t":"StartSceneConfig","_id":15,"Process":2,"Zone":1,"SceneType":"Match","Name":"Match","Port":0}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
+[2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
+[3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],
+[11, {"_t":"StartSceneConfig","_id":11,"Process":2,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
+[12, {"_t":"StartSceneConfig","_id":12,"Process":2,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
+[13, {"_t":"StartSceneConfig","_id":13,"Process":2,"Zone":1,"SceneType":"Map","Name":"Map2","Port":0}],
+[14, {"_t":"StartSceneConfig","_id":14,"Process":2,"Zone":1,"SceneType":"Match","Name":"Match","Port":0}],
 [30, {"_t":"StartSceneConfig","_id":30,"Process":3,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":30300}],
 [31, {"_t":"StartSceneConfig","_id":31,"Process":3,"Zone":3,"SceneType":"Router","Name":"Router01","Port":30301}],
 [32, {"_t":"StartSceneConfig","_id":32,"Process":3,"Zone":3,"SceneType":"Router","Name":"Router02","Port":30302}],

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

@@ -1,9 +1,9 @@
 {"dict": [
-[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}],
+[1, {"_t":"StartProcessConfig","_id":1,"MachineId":1,"Port":20001}],
+[2, {"_t":"StartProcessConfig","_id":2,"MachineId":1,"Port":20002}],
+[3, {"_t":"StartProcessConfig","_id":3,"MachineId":1,"Port":20003}],
+[4, {"_t":"StartProcessConfig","_id":4,"MachineId":1,"Port":20004}],
+[5, {"_t":"StartProcessConfig","_id":5,"MachineId":1,"Port":20005}],
+[6, {"_t":"StartProcessConfig","_id":6,"MachineId":1,"Port":20006}],
+[7, {"_t":"StartProcessConfig","_id":7,"MachineId":1,"Port":20007}],
 ]}

+ 6 - 7
Config/Json/s/StartConfig/RouterTest/StartSceneConfig.txt

@@ -1,11 +1,10 @@
 {"dict": [
-[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}],
-[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}],
+[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
+[2, {"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
+[3, {"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],
+[4, {"_t":"StartSceneConfig","_id":4,"Process":1,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
+[5, {"_t":"StartSceneConfig","_id":5,"Process":1,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
+[6, {"_t":"StartSceneConfig","_id":6,"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}],

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


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


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


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


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


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


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


+ 0 - 1
Unity/Assets/Scripts/Hotfix/Server/Benchmark/FiberInit_BenchmarkClient.cs

@@ -14,7 +14,6 @@ namespace ET.Server
             //root.AddComponent<TimerComponent>();
             //root.AddComponent<CoroutineLockComponent>();
             //root.AddComponent<ActorInnerComponent>();
-            //root.AddComponent<ActorSenderComponent>();
             //root.AddComponent<PlayerComponent>();
             //root.AddComponent<GateSessionKeyComponent>();
             //root.AddComponent<LocationProxyComponent>();

+ 0 - 1
Unity/Assets/Scripts/Hotfix/Server/Benchmark/FiberInit_BenchmarkServer.cs

@@ -14,7 +14,6 @@ namespace ET.Server
             //root.AddComponent<TimerComponent>();
             //root.AddComponent<CoroutineLockComponent>();
             //root.AddComponent<ActorInnerComponent>();
-            //root.AddComponent<ActorSenderComponent>();
             //root.AddComponent<PlayerComponent>();
             //root.AddComponent<GateSessionKeyComponent>();
             //root.AddComponent<LocationProxyComponent>();

+ 8 - 1
Unity/Assets/Scripts/Hotfix/Server/Demo/EntryEvent2_InitServer.cs

@@ -12,8 +12,15 @@ namespace ET.Server
             {
                 case AppType.Server:
                 {
+                    int process = root.Fiber.Process;
+                    StartProcessConfig startProcessConfig = StartProcessConfigCategory.Instance.Get(process);
+                    if (startProcessConfig.Port != 0)
+                    {
+                        await FiberManager.Instance.Create(SchedulerType.ThreadPool, ConstFiberId.NetInner, 0, SceneType.NetInner, "NetInner");
+                    }
+
                     // 根据配置创建纤程
-                    var processScenes = StartSceneConfigCategory.Instance.GetByProcess(root.Fiber().Process);
+                    var processScenes = StartSceneConfigCategory.Instance.GetByProcess(process);
                     foreach (StartSceneConfig startConfig in processScenes)
                     {
                         await FiberManager.Instance.Create(SchedulerType.ThreadPool, startConfig.Id, startConfig.Zone, startConfig.Type, startConfig.Name);

+ 4 - 4
Unity/Assets/Scripts/Hotfix/Server/Module/Message/MessageSenderSystem.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
 
 namespace ET.Server
 {
@@ -23,8 +24,7 @@ namespace ET.Server
             a2NetInnerMessage.ActorId = actorId;
             a2NetInnerMessage.MessageObject = message;
 
-            StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.NetInners[fiber.Process];
-            MessageQueue.Instance.Send(startSceneConfig.ActorId, a2NetInnerMessage);
+            MessageQueue.Instance.Send(new ActorId(fiber.Process, ConstFiberId.NetInner), a2NetInnerMessage);
         }
 
         public static int GetRpcId(this MessageSender self)
@@ -72,9 +72,9 @@ namespace ET.Server
             A2NetInner_Request a2NetInner_Request = A2NetInner_Request.Create();
             a2NetInner_Request.ActorId = actorId;
             a2NetInner_Request.MessageObject = request;
-            StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.NetInners[fiber.Process];
+            
             A2NetInner_Response a2NetInnerResponse = await fiber.ProcessInnerSender.Call(
-                startSceneConfig.ActorId, a2NetInner_Request) as A2NetInner_Response;
+                new ActorId(fiber.Process, ConstFiberId.NetInner), a2NetInner_Request) as A2NetInner_Response;
             IResponse response = a2NetInnerResponse.MessageObject;
             
             if (response.Error == ErrorCore.ERR_MessageTimeout)

+ 4 - 4
Unity/Assets/Scripts/Hotfix/Server/Module/Message/ProcessOuterSenderSystem.cs

@@ -128,7 +128,7 @@ namespace ET.Server
                 return session;
             }
 
-            IPEndPoint ipEndPoint = StartSceneConfigCategory.Instance.Get((int) channelId).InnerIPPort;
+            IPEndPoint ipEndPoint = StartProcessConfigCategory.Instance.Get((int) channelId).IPEndPoint;
             session = self.CreateInner(channelId, ipEndPoint);
             return session;
         }
@@ -178,9 +178,9 @@ namespace ET.Server
             {
                 throw new Exception($"actor is the same process: {fiber.Process} {actorId.Process}");
             }
-
-            StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.NetInners[actorId.Process];
-            Session session = self.Get(startSceneConfig.Id);
+            
+            StartProcessConfig startProcessConfig = StartProcessConfigCategory.Instance.Get(actorId.Process);
+            Session session = self.Get(startProcessConfig.Id);
             actorId.Process = fiber.Process;
             session.Send(actorId, message);
         }

+ 2 - 3
Unity/Assets/Scripts/Hotfix/Server/Module/NetInner/FiberInit_NetInner.cs

@@ -11,10 +11,9 @@ namespace ET.Server
             root.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
             root.AddComponent<TimerComponent>();
             root.AddComponent<CoroutineLockComponent>();
-            StartSceneConfig startSceneConfig = StartSceneConfigCategory.Instance.Get(fiberInit.Fiber.Id);
-            root.AddComponent<ProcessOuterSender, IPEndPoint, int>(startSceneConfig.InnerIPPort, ProcessOuterSenderInvokerType.NetInner);
+            StartProcessConfig startProcessConfig = StartProcessConfigCategory.Instance.Get(fiberInit.Fiber.Process);
+            root.AddComponent<ProcessOuterSender, IPEndPoint, int>(startProcessConfig.IPEndPoint, ProcessOuterSenderInvokerType.NetInner);
             root.AddComponent<ProcessInnerSender>();
-            //root.AddComponent<ActorSenderComponent>();
 
             await ETTask.CompletedTask;
         }

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

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

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

@@ -7,6 +7,22 @@ namespace ET
         public string InnerIP => this.StartMachineConfig.InnerIP;
 
         public string OuterIP => this.StartMachineConfig.OuterIP;
+        
+        // 内网地址外网端口,通过防火墙映射端口过来
+        private IPEndPoint ipEndPoint;
+
+        public IPEndPoint IPEndPoint
+        {
+            get
+            {
+                if (ipEndPoint == null)
+                {
+                    this.ipEndPoint = NetworkHelper.ToIPEndPoint(this.InnerIP, this.Port);
+                }
+
+                return this.ipEndPoint;
+            }
+        }
 
         public StartMachineConfig StartMachineConfig => StartMachineConfigCategory.Instance.Get(this.MachineId);
 

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

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

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

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

+ 20 - 0
Unity/Assets/Scripts/Model/Generate/Server/ConfigPartial/StartProcessConfig.cs

@@ -7,7 +7,27 @@ namespace ET
         public string InnerIP => this.StartMachineConfig.InnerIP;
 
         public string OuterIP => this.StartMachineConfig.OuterIP;
+        
+        // 内网地址外网端口,通过防火墙映射端口过来
+        private IPEndPoint ipEndPoint;
+
+        public IPEndPoint IPEndPoint
+        {
+            get
+            {
+                if (ipEndPoint == null)
+                {
+                    this.ipEndPoint = NetworkHelper.ToIPEndPoint(this.InnerIP, this.Port);
+                }
+
+                return this.ipEndPoint;
+            }
+        }
 
         public StartMachineConfig StartMachineConfig => StartMachineConfigCategory.Instance.Get(this.MachineId);
+
+        public override void EndInit()
+        {
+        }
     }
 }

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

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

+ 3 - 2
Unity/Assets/Scripts/Model/Share/ConstFiberId.cs

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