tanghai 1 год назад
Родитель
Сommit
0ada2c5bcb
51 измененных файлов с 93 добавлено и 176 удалено
  1. BIN
      Config/Excel/cs/StartConfig/Benchmark/StartProcessConfigCategory.bytes
  2. BIN
      Config/Excel/cs/StartConfig/Benchmark/StartSceneConfigCategory.bytes
  3. BIN
      Config/Excel/cs/StartConfig/Benchmark/StartZoneConfigCategory.bytes
  4. 0 0
      Config/Excel/cs/StartConfig/Example/StartMachineConfigCategory.bytes
  5. BIN
      Config/Excel/cs/StartConfig/Example/StartProcessConfigCategory.bytes
  6. BIN
      Config/Excel/cs/StartConfig/Example/StartSceneConfigCategory.bytes
  7. 0 0
      Config/Excel/cs/StartConfig/Example/StartZoneConfigCategory.bytes
  8. BIN
      Config/Excel/cs/StartConfig/Localhost/StartSceneConfigCategory.bytes
  9. BIN
      Config/Excel/cs/StartConfig/Release/StartSceneConfigCategory.bytes
  10. BIN
      Config/Excel/cs/StartConfig/RouterTest/StartProcessConfigCategory.bytes
  11. BIN
      Config/Excel/cs/StartConfig/RouterTest/StartSceneConfigCategory.bytes
  12. BIN
      Config/Excel/s/StartConfig/Benchmark/StartMachineConfigCategory.bytes
  13. BIN
      Config/Excel/s/StartConfig/Benchmark/StartProcessConfigCategory.bytes
  14. BIN
      Config/Excel/s/StartConfig/Benchmark/StartSceneConfigCategory.bytes
  15. BIN
      Config/Excel/s/StartConfig/Benchmark/StartZoneConfigCategory.bytes
  16. 0 0
      Config/Excel/s/StartConfig/Example/StartMachineConfigCategory.bytes
  17. BIN
      Config/Excel/s/StartConfig/Example/StartProcessConfigCategory.bytes
  18. BIN
      Config/Excel/s/StartConfig/Example/StartSceneConfigCategory.bytes
  19. 0 0
      Config/Excel/s/StartConfig/Example/StartZoneConfigCategory.bytes
  20. BIN
      Config/Excel/s/StartConfig/Localhost/StartSceneConfigCategory.bytes
  21. BIN
      Config/Excel/s/StartConfig/Release/StartSceneConfigCategory.bytes
  22. BIN
      Config/Excel/s/StartConfig/RouterTest/StartMachineConfigCategory.bytes
  23. BIN
      Config/Excel/s/StartConfig/RouterTest/StartProcessConfigCategory.bytes
  24. BIN
      Config/Excel/s/StartConfig/RouterTest/StartSceneConfigCategory.bytes
  25. 0 18
      Config/Json/cs/StartConfig/Benchmark/StartProcessConfig.txt
  26. 0 18
      Config/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt
  27. 0 3
      Config/Json/cs/StartConfig/Benchmark/StartZoneConfig.txt
  28. 0 0
      Config/Json/cs/StartConfig/Example/StartMachineConfig.txt
  29. 3 0
      Config/Json/cs/StartConfig/Example/StartProcessConfig.txt
  30. 13 0
      Config/Json/cs/StartConfig/Example/StartSceneConfig.txt
  31. 0 0
      Config/Json/cs/StartConfig/Example/StartZoneConfig.txt
  32. 12 11
      Config/Json/cs/StartConfig/Localhost/StartSceneConfig.txt
  33. 12 12
      Config/Json/cs/StartConfig/Release/StartSceneConfig.txt
  34. 0 9
      Config/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt
  35. 0 13
      Config/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt
  36. 0 3
      Config/Json/s/StartConfig/Benchmark/StartMachineConfig.txt
  37. 0 18
      Config/Json/s/StartConfig/Benchmark/StartProcessConfig.txt
  38. 0 18
      Config/Json/s/StartConfig/Benchmark/StartSceneConfig.txt
  39. 0 3
      Config/Json/s/StartConfig/Benchmark/StartZoneConfig.txt
  40. 0 0
      Config/Json/s/StartConfig/Example/StartMachineConfig.txt
  41. 3 0
      Config/Json/s/StartConfig/Example/StartProcessConfig.txt
  42. 13 0
      Config/Json/s/StartConfig/Example/StartSceneConfig.txt
  43. 0 0
      Config/Json/s/StartConfig/Example/StartZoneConfig.txt
  44. 12 11
      Config/Json/s/StartConfig/Localhost/StartSceneConfig.txt
  45. 12 12
      Config/Json/s/StartConfig/Release/StartSceneConfig.txt
  46. 0 3
      Config/Json/s/StartConfig/RouterTest/StartMachineConfig.txt
  47. 0 9
      Config/Json/s/StartConfig/RouterTest/StartProcessConfig.txt
  48. 0 13
      Config/Json/s/StartConfig/RouterTest/StartSceneConfig.txt
  49. 8 0
      Packages/cn.etetet.init/Editor/GlobalConfigEditor/GlobalConfigEditor.cs
  50. 3 2
      Packages/cn.etetet.init/Resources/GlobalConfig.asset
  51. 2 0
      Packages/cn.etetet.init/Runtime/GlobalConfig.cs

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


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


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


+ 0 - 0
Config/Excel/cs/StartConfig/Benchmark/StartMachineConfigCategory.bytes → Config/Excel/cs/StartConfig/Example/StartMachineConfigCategory.bytes


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


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


+ 0 - 0
Config/Excel/cs/StartConfig/RouterTest/StartZoneConfigCategory.bytes → Config/Excel/cs/StartConfig/Example/StartZoneConfigCategory.bytes


BIN
Config/Excel/cs/StartConfig/Localhost/StartSceneConfigCategory.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/StartMachineConfigCategory.bytes


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


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


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


+ 0 - 0
Config/Excel/cs/StartConfig/RouterTest/StartMachineConfigCategory.bytes → Config/Excel/s/StartConfig/Example/StartMachineConfigCategory.bytes


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


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


+ 0 - 0
Config/Excel/s/StartConfig/RouterTest/StartZoneConfigCategory.bytes → Config/Excel/s/StartConfig/Example/StartZoneConfigCategory.bytes


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


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


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


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


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


+ 0 - 18
Config/Json/cs/StartConfig/Benchmark/StartProcessConfig.txt

@@ -1,18 +0,0 @@
-{"dict": [
-[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}],
-[8, {"_t":"StartProcessConfig","_id":8,"MachineId":1,"Port":20008}],
-[9, {"_t":"StartProcessConfig","_id":9,"MachineId":1,"Port":20009}],
-[10, {"_t":"StartProcessConfig","_id":10,"MachineId":1,"Port":20010}],
-[11, {"_t":"StartProcessConfig","_id":11,"MachineId":1,"Port":20011}],
-[12, {"_t":"StartProcessConfig","_id":12,"MachineId":1,"Port":20012}],
-[13, {"_t":"StartProcessConfig","_id":13,"MachineId":1,"Port":20013}],
-[14, {"_t":"StartProcessConfig","_id":14,"MachineId":1,"Port":20014}],
-[15, {"_t":"StartProcessConfig","_id":15,"MachineId":1,"Port":20015}],
-[16, {"_t":"StartProcessConfig","_id":16,"MachineId":1,"Port":20016}],
-]}

+ 0 - 18
Config/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt

@@ -1,18 +0,0 @@
-{"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"BenchmarkServer","Name":"BenchmarkServer","Port":10001}],
-[2, {"_t":"StartSceneConfig","_id":2,"Process":2,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient1","Port":0}],
-[3, {"_t":"StartSceneConfig","_id":3,"Process":3,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient2","Port":0}],
-[4, {"_t":"StartSceneConfig","_id":4,"Process":4,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient3","Port":0}],
-[5, {"_t":"StartSceneConfig","_id":5,"Process":5,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient4","Port":0}],
-[6, {"_t":"StartSceneConfig","_id":6,"Process":6,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient5","Port":0}],
-[7, {"_t":"StartSceneConfig","_id":7,"Process":7,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient6","Port":0}],
-[8, {"_t":"StartSceneConfig","_id":8,"Process":8,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient7","Port":0}],
-[9, {"_t":"StartSceneConfig","_id":9,"Process":9,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient8","Port":0}],
-[10, {"_t":"StartSceneConfig","_id":10,"Process":10,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient9","Port":0}],
-[11, {"_t":"StartSceneConfig","_id":11,"Process":11,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient10","Port":0}],
-[12, {"_t":"StartSceneConfig","_id":12,"Process":12,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient11","Port":0}],
-[13, {"_t":"StartSceneConfig","_id":13,"Process":13,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient12","Port":0}],
-[14, {"_t":"StartSceneConfig","_id":14,"Process":14,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient13","Port":0}],
-[15, {"_t":"StartSceneConfig","_id":15,"Process":15,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient14","Port":0}],
-[16, {"_t":"StartSceneConfig","_id":16,"Process":16,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient15","Port":0}],
-]}

+ 0 - 3
Config/Json/cs/StartConfig/Benchmark/StartZoneConfig.txt

@@ -1,3 +0,0 @@
-{"dict": [
-[1, {"_t":"StartZoneConfig","_id":1,"DBConnection":"mongodb://127.0.0.1","DBName":"ET1"}],
-]}

+ 0 - 0
Config/Json/cs/StartConfig/Benchmark/StartMachineConfig.txt → Config/Json/cs/StartConfig/Example/StartMachineConfig.txt


+ 3 - 0
Config/Json/cs/StartConfig/Example/StartProcessConfig.txt

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

+ 13 - 0
Config/Json/cs/StartConfig/Example/StartSceneConfig.txt

@@ -0,0 +1,13 @@
+{"dict": [
+[101, {"_t":"StartSceneConfig","_id":101,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":10101}],
+[102, {"_t":"StartSceneConfig","_id":102,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","Port":10102}],
+[103, {"_t":"StartSceneConfig","_id":103,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","Port":10103}],
+[104, {"_t":"StartSceneConfig","_id":104,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","Port":10104}],
+[105, {"_t":"StartSceneConfig","_id":105,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","Port":10105}],
+[201, {"_t":"StartSceneConfig","_id":201,"Process":1,"Zone":2,"SceneType":"Realm","Name":"Realm","Port":20101}],
+[301, {"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Gate","Name":"Gate1","Port":30101}],
+[302, {"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Gate","Name":"Gate2","Port":30102}],
+[303, {"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Location","Name":"Location","Port":0}],
+[304, {"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
+[305, {"_t":"StartSceneConfig","_id":305,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
+]}

+ 0 - 0
Config/Json/cs/StartConfig/RouterTest/StartZoneConfig.txt → Config/Json/cs/StartConfig/Example/StartZoneConfig.txt


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

@@ -1,13 +1,14 @@
 {"dict": [
-[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}],
-[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}],
+[101, {"_t":"StartSceneConfig","_id":101,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":10101}],
+[102, {"_t":"StartSceneConfig","_id":102,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","Port":10102}],
+[103, {"_t":"StartSceneConfig","_id":103,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","Port":10103}],
+[104, {"_t":"StartSceneConfig","_id":104,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","Port":10104}],
+[105, {"_t":"StartSceneConfig","_id":105,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","Port":10105}],
+[201, {"_t":"StartSceneConfig","_id":201,"Process":1,"Zone":2,"SceneType":"Realm","Name":"Realm","Port":20101}],
+[301, {"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Gate","Name":"Gate1","Port":30101}],
+[302, {"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Gate","Name":"Gate2","Port":30102}],
+[303, {"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Location","Name":"Location","Port":0}],
+[304, {"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Match","Name":"Match","Port":0}],
+[305, {"_t":"StartSceneConfig","_id":305,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
+[306, {"_t":"StartSceneConfig","_id":306,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
 ]}

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

@@ -1,14 +1,14 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
-[2, {"_t":"StartSceneConfig","_id":2,"Process":2,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
-[3, {"_t":"StartSceneConfig","_id":3,"Process":3,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],
-[4, {"_t":"StartSceneConfig","_id":4,"Process":4,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
-[5, {"_t":"StartSceneConfig","_id":5,"Process":5,"Zone":1,"SceneType":"Match","Name":"Match","Port":0}],
-[6, {"_t":"StartSceneConfig","_id":6,"Process":6,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
-[7, {"_t":"StartSceneConfig","_id":7,"Process":7,"Zone":1,"SceneType":"Map","Name":"Map2","Port":0}],
-[300, {"_t":"StartSceneConfig","_id":300,"Process":8,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":30300}],
-[301, {"_t":"StartSceneConfig","_id":301,"Process":9,"Zone":3,"SceneType":"Router","Name":"Router01","Port":30301}],
-[302, {"_t":"StartSceneConfig","_id":302,"Process":10,"Zone":3,"SceneType":"Router","Name":"Router02","Port":30302}],
-[303, {"_t":"StartSceneConfig","_id":303,"Process":11,"Zone":3,"SceneType":"Router","Name":"Router03","Port":30303}],
-[304, {"_t":"StartSceneConfig","_id":304,"Process":12,"Zone":3,"SceneType":"Router","Name":"Router04","Port":30304}],
+[101, {"_t":"StartSceneConfig","_id":101,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":10101}],
+[102, {"_t":"StartSceneConfig","_id":102,"Process":2,"Zone":3,"SceneType":"Router","Name":"Router01","Port":10102}],
+[103, {"_t":"StartSceneConfig","_id":103,"Process":3,"Zone":3,"SceneType":"Router","Name":"Router02","Port":10103}],
+[104, {"_t":"StartSceneConfig","_id":104,"Process":4,"Zone":3,"SceneType":"Router","Name":"Router03","Port":10104}],
+[105, {"_t":"StartSceneConfig","_id":105,"Process":5,"Zone":3,"SceneType":"Router","Name":"Router04","Port":10105}],
+[201, {"_t":"StartSceneConfig","_id":201,"Process":6,"Zone":2,"SceneType":"Realm","Name":"Realm","Port":20101}],
+[301, {"_t":"StartSceneConfig","_id":301,"Process":6,"Zone":3,"SceneType":"Gate","Name":"Gate1","Port":30101}],
+[302, {"_t":"StartSceneConfig","_id":302,"Process":7,"Zone":3,"SceneType":"Gate","Name":"Gate2","Port":30102}],
+[303, {"_t":"StartSceneConfig","_id":303,"Process":8,"Zone":3,"SceneType":"Location","Name":"Location","Port":0}],
+[304, {"_t":"StartSceneConfig","_id":304,"Process":9,"Zone":3,"SceneType":"Match","Name":"Match","Port":0}],
+[305, {"_t":"StartSceneConfig","_id":305,"Process":10,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
+[306, {"_t":"StartSceneConfig","_id":306,"Process":11,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
 ]}

+ 0 - 9
Config/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt

@@ -1,9 +0,0 @@
-{"dict": [
-[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}],
-]}

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

@@ -1,13 +0,0 @@
-{"dict": [
-[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}],
-[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}],
-]}

+ 0 - 3
Config/Json/s/StartConfig/Benchmark/StartMachineConfig.txt

@@ -1,3 +0,0 @@
-{"dict": [
-[1, {"_t":"StartMachineConfig","_id":1,"InnerIP":"127.0.0.1","OuterIP":"127.0.0.1","WatcherPort":"10000"}],
-]}

+ 0 - 18
Config/Json/s/StartConfig/Benchmark/StartProcessConfig.txt

@@ -1,18 +0,0 @@
-{"dict": [
-[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}],
-[8, {"_t":"StartProcessConfig","_id":8,"MachineId":1,"Port":20008}],
-[9, {"_t":"StartProcessConfig","_id":9,"MachineId":1,"Port":20009}],
-[10, {"_t":"StartProcessConfig","_id":10,"MachineId":1,"Port":20010}],
-[11, {"_t":"StartProcessConfig","_id":11,"MachineId":1,"Port":20011}],
-[12, {"_t":"StartProcessConfig","_id":12,"MachineId":1,"Port":20012}],
-[13, {"_t":"StartProcessConfig","_id":13,"MachineId":1,"Port":20013}],
-[14, {"_t":"StartProcessConfig","_id":14,"MachineId":1,"Port":20014}],
-[15, {"_t":"StartProcessConfig","_id":15,"MachineId":1,"Port":20015}],
-[16, {"_t":"StartProcessConfig","_id":16,"MachineId":1,"Port":20016}],
-]}

+ 0 - 18
Config/Json/s/StartConfig/Benchmark/StartSceneConfig.txt

@@ -1,18 +0,0 @@
-{"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"BenchmarkServer","Name":"BenchmarkServer","Port":10001}],
-[2, {"_t":"StartSceneConfig","_id":2,"Process":2,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient1","Port":0}],
-[3, {"_t":"StartSceneConfig","_id":3,"Process":3,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient2","Port":0}],
-[4, {"_t":"StartSceneConfig","_id":4,"Process":4,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient3","Port":0}],
-[5, {"_t":"StartSceneConfig","_id":5,"Process":5,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient4","Port":0}],
-[6, {"_t":"StartSceneConfig","_id":6,"Process":6,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient5","Port":0}],
-[7, {"_t":"StartSceneConfig","_id":7,"Process":7,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient6","Port":0}],
-[8, {"_t":"StartSceneConfig","_id":8,"Process":8,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient7","Port":0}],
-[9, {"_t":"StartSceneConfig","_id":9,"Process":9,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient8","Port":0}],
-[10, {"_t":"StartSceneConfig","_id":10,"Process":10,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient9","Port":0}],
-[11, {"_t":"StartSceneConfig","_id":11,"Process":11,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient10","Port":0}],
-[12, {"_t":"StartSceneConfig","_id":12,"Process":12,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient11","Port":0}],
-[13, {"_t":"StartSceneConfig","_id":13,"Process":13,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient12","Port":0}],
-[14, {"_t":"StartSceneConfig","_id":14,"Process":14,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient13","Port":0}],
-[15, {"_t":"StartSceneConfig","_id":15,"Process":15,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient14","Port":0}],
-[16, {"_t":"StartSceneConfig","_id":16,"Process":16,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient15","Port":0}],
-]}

+ 0 - 3
Config/Json/s/StartConfig/Benchmark/StartZoneConfig.txt

@@ -1,3 +0,0 @@
-{"dict": [
-[1, {"_t":"StartZoneConfig","_id":1,"DBConnection":"mongodb://127.0.0.1","DBName":"ET1"}],
-]}

+ 0 - 0
Config/Json/cs/StartConfig/RouterTest/StartMachineConfig.txt → Config/Json/s/StartConfig/Example/StartMachineConfig.txt


+ 3 - 0
Config/Json/s/StartConfig/Example/StartProcessConfig.txt

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

+ 13 - 0
Config/Json/s/StartConfig/Example/StartSceneConfig.txt

@@ -0,0 +1,13 @@
+{"dict": [
+[101, {"_t":"StartSceneConfig","_id":101,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":10101}],
+[102, {"_t":"StartSceneConfig","_id":102,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","Port":10102}],
+[103, {"_t":"StartSceneConfig","_id":103,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","Port":10103}],
+[104, {"_t":"StartSceneConfig","_id":104,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","Port":10104}],
+[105, {"_t":"StartSceneConfig","_id":105,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","Port":10105}],
+[201, {"_t":"StartSceneConfig","_id":201,"Process":1,"Zone":2,"SceneType":"Realm","Name":"Realm","Port":20101}],
+[301, {"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Gate","Name":"Gate1","Port":30101}],
+[302, {"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Gate","Name":"Gate2","Port":30102}],
+[303, {"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Location","Name":"Location","Port":0}],
+[304, {"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
+[305, {"_t":"StartSceneConfig","_id":305,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
+]}

+ 0 - 0
Config/Json/s/StartConfig/RouterTest/StartZoneConfig.txt → Config/Json/s/StartConfig/Example/StartZoneConfig.txt


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

@@ -1,13 +1,14 @@
 {"dict": [
-[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}],
-[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}],
+[101, {"_t":"StartSceneConfig","_id":101,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":10101}],
+[102, {"_t":"StartSceneConfig","_id":102,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","Port":10102}],
+[103, {"_t":"StartSceneConfig","_id":103,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router02","Port":10103}],
+[104, {"_t":"StartSceneConfig","_id":104,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router03","Port":10104}],
+[105, {"_t":"StartSceneConfig","_id":105,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router04","Port":10105}],
+[201, {"_t":"StartSceneConfig","_id":201,"Process":1,"Zone":2,"SceneType":"Realm","Name":"Realm","Port":20101}],
+[301, {"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Gate","Name":"Gate1","Port":30101}],
+[302, {"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Gate","Name":"Gate2","Port":30102}],
+[303, {"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Location","Name":"Location","Port":0}],
+[304, {"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Match","Name":"Match","Port":0}],
+[305, {"_t":"StartSceneConfig","_id":305,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
+[306, {"_t":"StartSceneConfig","_id":306,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
 ]}

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

@@ -1,14 +1,14 @@
 {"dict": [
-[1, {"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","Port":30002}],
-[2, {"_t":"StartSceneConfig","_id":2,"Process":2,"Zone":1,"SceneType":"Gate","Name":"Gate1","Port":30003}],
-[3, {"_t":"StartSceneConfig","_id":3,"Process":3,"Zone":1,"SceneType":"Gate","Name":"Gate2","Port":30004}],
-[4, {"_t":"StartSceneConfig","_id":4,"Process":4,"Zone":1,"SceneType":"Location","Name":"Location","Port":0}],
-[5, {"_t":"StartSceneConfig","_id":5,"Process":5,"Zone":1,"SceneType":"Match","Name":"Match","Port":0}],
-[6, {"_t":"StartSceneConfig","_id":6,"Process":6,"Zone":1,"SceneType":"Map","Name":"Map1","Port":0}],
-[7, {"_t":"StartSceneConfig","_id":7,"Process":7,"Zone":1,"SceneType":"Map","Name":"Map2","Port":0}],
-[300, {"_t":"StartSceneConfig","_id":300,"Process":8,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":30300}],
-[301, {"_t":"StartSceneConfig","_id":301,"Process":9,"Zone":3,"SceneType":"Router","Name":"Router01","Port":30301}],
-[302, {"_t":"StartSceneConfig","_id":302,"Process":10,"Zone":3,"SceneType":"Router","Name":"Router02","Port":30302}],
-[303, {"_t":"StartSceneConfig","_id":303,"Process":11,"Zone":3,"SceneType":"Router","Name":"Router03","Port":30303}],
-[304, {"_t":"StartSceneConfig","_id":304,"Process":12,"Zone":3,"SceneType":"Router","Name":"Router04","Port":30304}],
+[101, {"_t":"StartSceneConfig","_id":101,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","Port":10101}],
+[102, {"_t":"StartSceneConfig","_id":102,"Process":2,"Zone":3,"SceneType":"Router","Name":"Router01","Port":10102}],
+[103, {"_t":"StartSceneConfig","_id":103,"Process":3,"Zone":3,"SceneType":"Router","Name":"Router02","Port":10103}],
+[104, {"_t":"StartSceneConfig","_id":104,"Process":4,"Zone":3,"SceneType":"Router","Name":"Router03","Port":10104}],
+[105, {"_t":"StartSceneConfig","_id":105,"Process":5,"Zone":3,"SceneType":"Router","Name":"Router04","Port":10105}],
+[201, {"_t":"StartSceneConfig","_id":201,"Process":6,"Zone":2,"SceneType":"Realm","Name":"Realm","Port":20101}],
+[301, {"_t":"StartSceneConfig","_id":301,"Process":6,"Zone":3,"SceneType":"Gate","Name":"Gate1","Port":30101}],
+[302, {"_t":"StartSceneConfig","_id":302,"Process":7,"Zone":3,"SceneType":"Gate","Name":"Gate2","Port":30102}],
+[303, {"_t":"StartSceneConfig","_id":303,"Process":8,"Zone":3,"SceneType":"Location","Name":"Location","Port":0}],
+[304, {"_t":"StartSceneConfig","_id":304,"Process":9,"Zone":3,"SceneType":"Match","Name":"Match","Port":0}],
+[305, {"_t":"StartSceneConfig","_id":305,"Process":10,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
+[306, {"_t":"StartSceneConfig","_id":306,"Process":11,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
 ]}

+ 0 - 3
Config/Json/s/StartConfig/RouterTest/StartMachineConfig.txt

@@ -1,3 +0,0 @@
-{"dict": [
-[1, {"_t":"StartMachineConfig","_id":1,"InnerIP":"127.0.0.1","OuterIP":"127.0.0.1","WatcherPort":"10000"}],
-]}

+ 0 - 9
Config/Json/s/StartConfig/RouterTest/StartProcessConfig.txt

@@ -1,9 +0,0 @@
-{"dict": [
-[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}],
-]}

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

@@ -1,13 +0,0 @@
-{"dict": [
-[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}],
-[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}],
-]}

+ 8 - 0
Packages/cn.etetet.init/Editor/GlobalConfigEditor/GlobalConfigEditor.cs

@@ -63,6 +63,14 @@ namespace ET
                 AssetDatabase.Refresh();
             }
             
+            string address = EditorGUILayout.TextField($"Address", globalConfig.Address);
+            if (address != globalConfig.Address)
+            {
+                globalConfig.Address = address;
+                EditorResHelper.SaveAssets(globalConfig);
+                AssetDatabase.Refresh();
+            }
+            
         }
     }
 }

+ 3 - 2
Packages/cn.etetet.init/Resources/GlobalConfig.asset

@@ -13,5 +13,6 @@ MonoBehaviour:
   m_Name: GlobalConfig
   m_EditorClassIdentifier: 
   CodeMode: 3
-  BuildType: 1
-  SceneName: StateSync
+  BuildType: 0
+  SceneName: LockStep
+  Address: 127.0.0.1:10101

+ 2 - 0
Packages/cn.etetet.init/Runtime/GlobalConfig.cs

@@ -23,5 +23,7 @@ namespace ET
         public BuildType BuildType;
 
         public string SceneName;
+
+        public string Address;
     }
 }