فهرست منبع

去掉了protobuf-net,网络消息用MemoryPack,配置文件用MongoBson

tanghai 2 سال پیش
والد
کامیت
e417966879
100فایلهای تغییر یافته به همراه238 افزوده شده و 288 حذف شده
  1. BIN
      Config/Excel/c/AIConfigCategory.bytes
  2. BIN
      Config/Excel/c/UnitConfigCategory.bytes
  3. BIN
      Config/Excel/cs/AIConfigCategory.bytes
  4. BIN
      Config/Excel/cs/StartConfig/Benchmark/StartMachineConfigCategory.bytes
  5. BIN
      Config/Excel/cs/StartConfig/Benchmark/StartProcessConfigCategory.bytes
  6. BIN
      Config/Excel/cs/StartConfig/Benchmark/StartSceneConfigCategory.bytes
  7. BIN
      Config/Excel/cs/StartConfig/Benchmark/StartZoneConfigCategory.bytes
  8. BIN
      Config/Excel/cs/StartConfig/Localhost/StartMachineConfigCategory.bytes
  9. BIN
      Config/Excel/cs/StartConfig/Localhost/StartProcessConfigCategory.bytes
  10. BIN
      Config/Excel/cs/StartConfig/Localhost/StartSceneConfigCategory.bytes
  11. BIN
      Config/Excel/cs/StartConfig/Localhost/StartZoneConfigCategory.bytes
  12. BIN
      Config/Excel/cs/StartConfig/LockStep/StartMachineConfigCategory.bytes
  13. BIN
      Config/Excel/cs/StartConfig/LockStep/StartProcessConfigCategory.bytes
  14. BIN
      Config/Excel/cs/StartConfig/LockStep/StartSceneConfigCategory.bytes
  15. BIN
      Config/Excel/cs/StartConfig/LockStep/StartZoneConfigCategory.bytes
  16. BIN
      Config/Excel/cs/StartConfig/Release/StartMachineConfigCategory.bytes
  17. BIN
      Config/Excel/cs/StartConfig/Release/StartProcessConfigCategory.bytes
  18. BIN
      Config/Excel/cs/StartConfig/Release/StartSceneConfigCategory.bytes
  19. BIN
      Config/Excel/cs/StartConfig/Release/StartZoneConfigCategory.bytes
  20. BIN
      Config/Excel/cs/StartConfig/RouterTest/StartMachineConfigCategory.bytes
  21. BIN
      Config/Excel/cs/StartConfig/RouterTest/StartProcessConfigCategory.bytes
  22. BIN
      Config/Excel/cs/StartConfig/RouterTest/StartSceneConfigCategory.bytes
  23. BIN
      Config/Excel/cs/StartConfig/RouterTest/StartZoneConfigCategory.bytes
  24. BIN
      Config/Excel/cs/UnitConfigCategory.bytes
  25. BIN
      Config/Excel/s/AIConfigCategory.bytes
  26. BIN
      Config/Excel/s/StartConfig/Benchmark/StartMachineConfigCategory.bytes
  27. BIN
      Config/Excel/s/StartConfig/Benchmark/StartProcessConfigCategory.bytes
  28. BIN
      Config/Excel/s/StartConfig/Benchmark/StartSceneConfigCategory.bytes
  29. BIN
      Config/Excel/s/StartConfig/Benchmark/StartZoneConfigCategory.bytes
  30. BIN
      Config/Excel/s/StartConfig/Localhost/StartMachineConfigCategory.bytes
  31. BIN
      Config/Excel/s/StartConfig/Localhost/StartProcessConfigCategory.bytes
  32. BIN
      Config/Excel/s/StartConfig/Localhost/StartSceneConfigCategory.bytes
  33. BIN
      Config/Excel/s/StartConfig/Localhost/StartZoneConfigCategory.bytes
  34. BIN
      Config/Excel/s/StartConfig/LockStep/StartMachineConfigCategory.bytes
  35. BIN
      Config/Excel/s/StartConfig/LockStep/StartProcessConfigCategory.bytes
  36. BIN
      Config/Excel/s/StartConfig/LockStep/StartSceneConfigCategory.bytes
  37. BIN
      Config/Excel/s/StartConfig/LockStep/StartZoneConfigCategory.bytes
  38. BIN
      Config/Excel/s/StartConfig/Release/StartMachineConfigCategory.bytes
  39. BIN
      Config/Excel/s/StartConfig/Release/StartProcessConfigCategory.bytes
  40. BIN
      Config/Excel/s/StartConfig/Release/StartSceneConfigCategory.bytes
  41. BIN
      Config/Excel/s/StartConfig/Release/StartZoneConfigCategory.bytes
  42. BIN
      Config/Excel/s/StartConfig/RouterTest/StartMachineConfigCategory.bytes
  43. BIN
      Config/Excel/s/StartConfig/RouterTest/StartProcessConfigCategory.bytes
  44. BIN
      Config/Excel/s/StartConfig/RouterTest/StartSceneConfigCategory.bytes
  45. BIN
      Config/Excel/s/StartConfig/RouterTest/StartZoneConfigCategory.bytes
  46. BIN
      Config/Excel/s/UnitConfigCategory.bytes
  47. 4 4
      Config/Json/c/AIConfig.txt
  48. 4 4
      Config/Json/c/UnitConfig.txt
  49. 4 4
      Config/Json/cs/AIConfig.txt
  50. 2 2
      Config/Json/cs/StartConfig/Benchmark/StartMachineConfig.txt
  51. 4 4
      Config/Json/cs/StartConfig/Benchmark/StartProcessConfig.txt
  52. 4 4
      Config/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt
  53. 2 2
      Config/Json/cs/StartConfig/Benchmark/StartZoneConfig.txt
  54. 2 2
      Config/Json/cs/StartConfig/Localhost/StartMachineConfig.txt
  55. 2 2
      Config/Json/cs/StartConfig/Localhost/StartProcessConfig.txt
  56. 13 13
      Config/Json/cs/StartConfig/Localhost/StartSceneConfig.txt
  57. 4 4
      Config/Json/cs/StartConfig/Localhost/StartZoneConfig.txt
  58. 2 2
      Config/Json/cs/StartConfig/LockStep/StartMachineConfig.txt
  59. 2 2
      Config/Json/cs/StartConfig/LockStep/StartProcessConfig.txt
  60. 16 16
      Config/Json/cs/StartConfig/LockStep/StartSceneConfig.txt
  61. 4 4
      Config/Json/cs/StartConfig/LockStep/StartZoneConfig.txt
  62. 2 2
      Config/Json/cs/StartConfig/Release/StartMachineConfig.txt
  63. 3 3
      Config/Json/cs/StartConfig/Release/StartProcessConfig.txt
  64. 8 8
      Config/Json/cs/StartConfig/Release/StartSceneConfig.txt
  65. 3 3
      Config/Json/cs/StartConfig/Release/StartZoneConfig.txt
  66. 2 2
      Config/Json/cs/StartConfig/RouterTest/StartMachineConfig.txt
  67. 8 8
      Config/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt
  68. 13 13
      Config/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt
  69. 4 4
      Config/Json/cs/StartConfig/RouterTest/StartZoneConfig.txt
  70. 5 5
      Config/Json/cs/UnitConfig.txt
  71. 4 4
      Config/Json/s/AIConfig.txt
  72. 2 2
      Config/Json/s/StartConfig/Benchmark/StartMachineConfig.txt
  73. 4 4
      Config/Json/s/StartConfig/Benchmark/StartProcessConfig.txt
  74. 4 4
      Config/Json/s/StartConfig/Benchmark/StartSceneConfig.txt
  75. 2 2
      Config/Json/s/StartConfig/Benchmark/StartZoneConfig.txt
  76. 2 2
      Config/Json/s/StartConfig/Localhost/StartMachineConfig.txt
  77. 2 2
      Config/Json/s/StartConfig/Localhost/StartProcessConfig.txt
  78. 13 13
      Config/Json/s/StartConfig/Localhost/StartSceneConfig.txt
  79. 4 4
      Config/Json/s/StartConfig/Localhost/StartZoneConfig.txt
  80. 2 2
      Config/Json/s/StartConfig/LockStep/StartMachineConfig.txt
  81. 2 2
      Config/Json/s/StartConfig/LockStep/StartProcessConfig.txt
  82. 16 16
      Config/Json/s/StartConfig/LockStep/StartSceneConfig.txt
  83. 4 4
      Config/Json/s/StartConfig/LockStep/StartZoneConfig.txt
  84. 2 2
      Config/Json/s/StartConfig/Release/StartMachineConfig.txt
  85. 3 3
      Config/Json/s/StartConfig/Release/StartProcessConfig.txt
  86. 8 8
      Config/Json/s/StartConfig/Release/StartSceneConfig.txt
  87. 3 3
      Config/Json/s/StartConfig/Release/StartZoneConfig.txt
  88. 2 2
      Config/Json/s/StartConfig/RouterTest/StartMachineConfig.txt
  89. 8 8
      Config/Json/s/StartConfig/RouterTest/StartProcessConfig.txt
  90. 13 13
      Config/Json/s/StartConfig/RouterTest/StartSceneConfig.txt
  91. 4 4
      Config/Json/s/StartConfig/RouterTest/StartZoneConfig.txt
  92. 4 4
      Config/Json/s/UnitConfig.txt
  93. 0 1
      DotNet/ThirdParty/DotNet.ThirdParty.csproj
  94. 7 34
      Share/Tool/ExcelExporter/ExcelExporter.cs
  95. 0 1
      Share/Tool/Init.cs
  96. 0 5
      Share/Tool/Proto2CS/Proto2CS.cs
  97. 5 21
      Share/Tool/Template.txt
  98. BIN
      Unity/Assets/Bundles/Config/AIConfigCategory.bytes
  99. BIN
      Unity/Assets/Bundles/Config/UnitConfigCategory.bytes
  100. 1 1
      Unity/Assets/Resources/GlobalConfig.asset

BIN
Config/Excel/c/AIConfigCategory.bytes


BIN
Config/Excel/c/UnitConfigCategory.bytes


BIN
Config/Excel/cs/AIConfigCategory.bytes


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


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


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


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


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


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


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


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


BIN
Config/Excel/cs/StartConfig/LockStep/StartMachineConfigCategory.bytes


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


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


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


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


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


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


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


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


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


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


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


BIN
Config/Excel/cs/UnitConfigCategory.bytes


BIN
Config/Excel/s/AIConfigCategory.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


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


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


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


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


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


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


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


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


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


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


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


BIN
Config/Excel/s/StartConfig/Release/StartZoneConfigCategory.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


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


BIN
Config/Excel/s/UnitConfigCategory.bytes


+ 4 - 4
Config/Json/c/AIConfig.txt

@@ -1,5 +1,5 @@
-{"list":[
-{"_t":"AIConfig","_id":101,"AIConfigId":1,"Order":1,"Name":"AI_Attack","NodeParams":[]},
-{"_t":"AIConfig","_id":102,"AIConfigId":1,"Order":2,"Name":"AI_XunLuo","NodeParams":[]},
-{"_t":"AIConfig","_id":201,"AIConfigId":2,"Order":1,"Name":"AI_XunLuo","NodeParams":[]},
+{"dict": [
+[101, {"_t":"AIConfig","_id":101,"AIConfigId":1,"Order":1,"Name":"AI_Attack","NodeParams":[]}],
+[102, {"_t":"AIConfig","_id":102,"AIConfigId":1,"Order":2,"Name":"AI_XunLuo","NodeParams":[]}],
+[201, {"_t":"AIConfig","_id":201,"AIConfigId":2,"Order":1,"Name":"AI_XunLuo","NodeParams":[]}],
 ]}

+ 4 - 4
Config/Json/c/UnitConfig.txt

@@ -1,5 +1,5 @@
-{"list":[
-{"_t":"UnitConfig","_id":1001,"Type":1,"Name":"米克尔","Position":1,"Height":178},
-{"_t":"UnitConfig","_id":1002,"Type":1,"Name":"米克尔2","Position":2,"Height":278},
-{"_t":"UnitConfig","_id":1004,"Type":1,"Name":"米克尔4","Position":2,"Height":278},
+{"dict": [
+[1001, {"_t":"UnitConfig","_id":1001,"Type":1,"Name":"米克尔","Position":1,"Height":178}],
+[1002, {"_t":"UnitConfig","_id":1002,"Type":1,"Name":"米克尔2","Position":2,"Height":278}],
+[1004, {"_t":"UnitConfig","_id":1004,"Type":1,"Name":"米克尔4","Position":2,"Height":278}],
 ]}

+ 4 - 4
Config/Json/cs/AIConfig.txt

@@ -1,5 +1,5 @@
-{"list":[
-{"_t":"AIConfig","_id":101,"AIConfigId":1,"Order":1,"Name":"AI_Attack","NodeParams":[]},
-{"_t":"AIConfig","_id":102,"AIConfigId":1,"Order":2,"Name":"AI_XunLuo","NodeParams":[]},
-{"_t":"AIConfig","_id":201,"AIConfigId":2,"Order":1,"Name":"AI_XunLuo","NodeParams":[]},
+{"dict": [
+[101, {"_t":"AIConfig","_id":101,"AIConfigId":1,"Order":1,"Name":"AI_Attack","NodeParams":[]}],
+[102, {"_t":"AIConfig","_id":102,"AIConfigId":1,"Order":2,"Name":"AI_XunLuo","NodeParams":[]}],
+[201, {"_t":"AIConfig","_id":201,"AIConfigId":2,"Order":1,"Name":"AI_XunLuo","NodeParams":[]}],
 ]}

+ 2 - 2
Config/Json/cs/StartConfig/Benchmark/StartMachineConfig.txt

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

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

@@ -1,5 +1,5 @@
-{"list":[
-{"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
-{"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102},
-{"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103},
+{"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 - 4
Config/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt

@@ -1,5 +1,5 @@
-{"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"BenchmarkServer","Name":"BenchmarkServer","OuterPort":30001},
-{"_t":"StartSceneConfig","_id":2,"Process":2,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient1","OuterPort":30002},
-{"_t":"StartSceneConfig","_id":3,"Process":3,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient2","OuterPort":30003},
+{"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}],
 ]}

+ 2 - 2
Config/Json/cs/StartConfig/Benchmark/StartZoneConfig.txt

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

+ 2 - 2
Config/Json/cs/StartConfig/Localhost/StartMachineConfig.txt

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

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

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

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

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

+ 4 - 4
Config/Json/cs/StartConfig/Localhost/StartZoneConfig.txt

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

+ 2 - 2
Config/Json/cs/StartConfig/LockStep/StartMachineConfig.txt

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

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

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

+ 16 - 16
Config/Json/cs/StartConfig/LockStep/StartSceneConfig.txt

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

+ 4 - 4
Config/Json/cs/StartConfig/LockStep/StartZoneConfig.txt

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-{"list":[
-{"_t":"StartZoneConfig","_id":1,"DBConnection":"mongodb://127.0.0.1","DBName":"ET1"},
-{"_t":"StartZoneConfig","_id":2,"DBConnection":"mongodb://127.0.0.1","DBName":"ET2"},
+{"dict": [
+[1, {"_t":"StartZoneConfig","_id":1,"DBConnection":"mongodb://127.0.0.1","DBName":"ET1"}],
+[2, {"_t":"StartZoneConfig","_id":2,"DBConnection":"mongodb://127.0.0.1","DBName":"ET2"}],
 ]}

+ 2 - 2
Config/Json/cs/StartConfig/RouterTest/StartMachineConfig.txt

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

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

@@ -1,9 +1,9 @@
-{"list":[
-{"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
-{"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102},
-{"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103},
-{"_t":"StartProcessConfig","_id":4,"MachineId":1,"InnerPort":20104},
-{"_t":"StartProcessConfig","_id":5,"MachineId":1,"InnerPort":20105},
-{"_t":"StartProcessConfig","_id":6,"MachineId":1,"InnerPort":20106},
-{"_t":"StartProcessConfig","_id":7,"MachineId":1,"InnerPort":20107},
+{"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}],
 ]}

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

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

+ 4 - 4
Config/Json/cs/StartConfig/RouterTest/StartZoneConfig.txt

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

+ 5 - 5
Config/Json/cs/UnitConfig.txt

@@ -1,6 +1,6 @@
-{"list":[
-{"_t":"UnitConfig","_id":1001,"Type":1,"Name":"米克尔","Position":1,"Height":178,"Weight":68},
-{"_t":"UnitConfig","_id":1002,"Type":1,"Name":"米克尔2","Position":2,"Height":278,"Weight":78},
-{"_t":"UnitConfig","_id":1003,"Type":1,"Name":"米克尔3","Position":1,"Height":178,"Weight":68},
-{"_t":"UnitConfig","_id":1004,"Type":1,"Name":"米克尔4","Position":2,"Height":278,"Weight":78},
+{"dict": [
+[1001, {"_t":"UnitConfig","_id":1001,"Type":1,"Name":"米克尔","Position":1,"Height":178,"Weight":68}],
+[1002, {"_t":"UnitConfig","_id":1002,"Type":1,"Name":"米克尔2","Position":2,"Height":278,"Weight":78}],
+[1003, {"_t":"UnitConfig","_id":1003,"Type":1,"Name":"米克尔3","Position":1,"Height":178,"Weight":68}],
+[1004, {"_t":"UnitConfig","_id":1004,"Type":1,"Name":"米克尔4","Position":2,"Height":278,"Weight":78}],
 ]}

+ 4 - 4
Config/Json/s/AIConfig.txt

@@ -1,5 +1,5 @@
-{"list":[
-{"_t":"AIConfig","_id":101,"AIConfigId":1,"Order":1,"Name":"AI_Attack","NodeParams":[]},
-{"_t":"AIConfig","_id":102,"AIConfigId":1,"Order":2,"Name":"AI_XunLuo","NodeParams":[]},
-{"_t":"AIConfig","_id":201,"AIConfigId":2,"Order":1,"Name":"AI_XunLuo","NodeParams":[]},
+{"dict": [
+[101, {"_t":"AIConfig","_id":101,"AIConfigId":1,"Order":1,"Name":"AI_Attack","NodeParams":[]}],
+[102, {"_t":"AIConfig","_id":102,"AIConfigId":1,"Order":2,"Name":"AI_XunLuo","NodeParams":[]}],
+[201, {"_t":"AIConfig","_id":201,"AIConfigId":2,"Order":1,"Name":"AI_XunLuo","NodeParams":[]}],
 ]}

+ 2 - 2
Config/Json/s/StartConfig/Benchmark/StartMachineConfig.txt

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

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

@@ -1,5 +1,5 @@
-{"list":[
-{"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
-{"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102},
-{"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103},
+{"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 - 4
Config/Json/s/StartConfig/Benchmark/StartSceneConfig.txt

@@ -1,5 +1,5 @@
-{"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"BenchmarkServer","Name":"BenchmarkServer","OuterPort":30001},
-{"_t":"StartSceneConfig","_id":2,"Process":2,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient1","OuterPort":30002},
-{"_t":"StartSceneConfig","_id":3,"Process":3,"Zone":1,"SceneType":"BenchmarkClient","Name":"BenchmarkClient2","OuterPort":30003},
+{"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}],
 ]}

+ 2 - 2
Config/Json/s/StartConfig/Benchmark/StartZoneConfig.txt

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

+ 2 - 2
Config/Json/s/StartConfig/Localhost/StartMachineConfig.txt

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

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

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

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

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

+ 4 - 4
Config/Json/s/StartConfig/Localhost/StartZoneConfig.txt

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

+ 2 - 2
Config/Json/s/StartConfig/LockStep/StartMachineConfig.txt

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

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

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

+ 16 - 16
Config/Json/s/StartConfig/LockStep/StartSceneConfig.txt

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

+ 4 - 4
Config/Json/s/StartConfig/LockStep/StartZoneConfig.txt

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-{"list":[
-{"_t":"StartZoneConfig","_id":1,"DBConnection":"mongodb://127.0.0.1","DBName":"ET1"},
-{"_t":"StartZoneConfig","_id":2,"DBConnection":"mongodb://127.0.0.1","DBName":"ET2"},
+{"dict": [
+[1, {"_t":"StartZoneConfig","_id":1,"DBConnection":"mongodb://127.0.0.1","DBName":"ET1"}],
+[2, {"_t":"StartZoneConfig","_id":2,"DBConnection":"mongodb://127.0.0.1","DBName":"ET2"}],
 ]}

+ 2 - 2
Config/Json/s/StartConfig/RouterTest/StartMachineConfig.txt

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

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

@@ -1,9 +1,9 @@
-{"list":[
-{"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
-{"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102},
-{"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103},
-{"_t":"StartProcessConfig","_id":4,"MachineId":1,"InnerPort":20104},
-{"_t":"StartProcessConfig","_id":5,"MachineId":1,"InnerPort":20105},
-{"_t":"StartProcessConfig","_id":6,"MachineId":1,"InnerPort":20106},
-{"_t":"StartProcessConfig","_id":7,"MachineId":1,"InnerPort":20107},
+{"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}],
 ]}

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

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

+ 4 - 4
Config/Json/s/StartConfig/RouterTest/StartZoneConfig.txt

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

+ 4 - 4
Config/Json/s/UnitConfig.txt

@@ -1,5 +1,5 @@
-{"list":[
-{"_t":"UnitConfig","_id":1001,"Type":1,"Name":"米克尔","Position":1,"Weight":68},
-{"_t":"UnitConfig","_id":1002,"Type":1,"Name":"米克尔2","Position":2,"Weight":78},
-{"_t":"UnitConfig","_id":1003,"Type":1,"Name":"米克尔3","Position":1,"Weight":68},
+{"dict": [
+[1001, {"_t":"UnitConfig","_id":1001,"Type":1,"Name":"米克尔","Position":1,"Weight":68}],
+[1002, {"_t":"UnitConfig","_id":1002,"Type":1,"Name":"米克尔2","Position":2,"Weight":78}],
+[1003, {"_t":"UnitConfig","_id":1003,"Type":1,"Name":"米克尔3","Position":1,"Weight":68}],
 ]}

+ 0 - 1
DotNet/ThirdParty/DotNet.ThirdParty.csproj

@@ -86,7 +86,6 @@
       <PackageReference Include="MemoryPack" Version="1.9.13" />
       <PackageReference Include="MongoDB.Driver" Version="2.17.1" />
       <PackageReference Include="NLog" Version="4.7.15" />
-      <PackageReference Include="protobuf-net" Version="2.4.6" />
       <PackageReference Include="SharpZipLib" Version="1.3.3" />
       <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.0.1" />
       <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />

+ 7 - 34
Share/Tool/ExcelExporter/ExcelExporter.cs

@@ -8,9 +8,9 @@ using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Emit;
+using MongoDB.Bson;
 using MongoDB.Bson.Serialization;
 using OfficeOpenXml;
-using ProtoBuf;
 using LicenseContext = OfficeOpenXml.LicenseContext;
 
 namespace ET
@@ -41,7 +41,6 @@ namespace ET
     }
 
     // 这里加个标签是为了防止编译时裁剪掉protobuf,因为整个tool工程没有用到protobuf,编译会去掉引用,然后动态编译就会出错
-    [ProtoContract]
     class Table
     {
         public bool C;
@@ -98,9 +97,6 @@ namespace ET
         {
             try
             {
-                //防止编译时裁剪掉protobuf
-                ProtoBuf.WireType.Fixed64.ToString();
-                
                 template = File.ReadAllText("Template.txt");
                 ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
 
@@ -431,7 +427,6 @@ namespace ET
                 }
 
                 sb.Append($"\t\t/// <summary>{headInfo.FieldDesc}</summary>\n");
-                sb.Append($"\t\t[ProtoMember({headInfo.FieldIndex})]\n");
                 string fieldType = headInfo.FieldType;
                 sb.Append($"\t\tpublic {fieldType} {headInfo.FieldName} {{ get; set; }}\n");
             }
@@ -448,7 +443,7 @@ namespace ET
         static void ExportExcelJson(ExcelPackage p, string name, Table table, ConfigType configType, string relativeDir)
         {
             StringBuilder sb = new StringBuilder();
-            sb.Append("{\"list\":[\n");
+            sb.Append("{\"dict\": [\n");
             foreach (ExcelWorksheet worksheet in p.Workbook.Worksheets)
             {
                 if (worksheet.Name.StartsWith("#"))
@@ -500,8 +495,7 @@ namespace ET
                     continue;
                 }
 
-                sb.Append("{");
-                sb.Append($"\"_t\":\"{name}\"");
+                sb.Append($"[{worksheet.Cells[row, 3].Text.Trim()}, {{\"_t\":\"{name}\"");
                 for (int col = 3; col <= worksheet.Dimension.End.Column; ++col)
                 {
                     string fieldName = worksheet.Cells[4, col].Text.Trim();
@@ -531,7 +525,7 @@ namespace ET
                     sb.Append($",\"{fieldN}\":{Convert(headInfo.FieldType, worksheet.Cells[row, col].Text.Trim())}");
                 }
 
-                sb.Append("},\n");
+                sb.Append("}],\n");
             }
         }
 
@@ -585,9 +579,6 @@ namespace ET
             Type type = ass.GetType($"ET.{protoName}Category");
             Type subType = ass.GetType($"ET.{protoName}");
 
-            Serializer.NonGeneric.PrepareSerializer(type);
-            Serializer.NonGeneric.PrepareSerializer(subType);
-
             IMerge final = Activator.CreateInstance(type) as IMerge;
 
             string p = Path.Combine(string.Format(jsonDir, configType, relativeDir));
@@ -604,34 +595,16 @@ namespace ET
                     object deserialize = BsonSerializer.Deserialize(json, type);
                     final.Merge(deserialize);
                 }
-                catch
+                catch (Exception e)
                 {
-                    #region 为了定位该文件中具体那一行出现了异常
-                    List<string> list = new List<string>(json.Split('\n'));
-                    if (list.Count > 0)
-                        list.RemoveAt(0);
-                    if (list.Count > 0)
-                        list.RemoveAt(list.Count-1);
-                    foreach (string s in list)
-                    {
-                        try
-                        {
-                            BsonSerializer.Deserialize(s.Substring(0, s.Length-1), subType);
-                        }
-                        catch (Exception)
-                        {
-                            Log.Console($"json : {s}");
-                            throw;
-                        }
-                    }
-                    #endregion
+                    throw new Exception($"json : {jsonPath} error", e);
                 }
             }
 
             string path = Path.Combine(dir, $"{protoName}Category.bytes");
 
             using FileStream file = File.Create(path);
-            Serializer.Serialize(file, final);
+            file.Write(final.ToBson());
         }
     }
 }

+ 0 - 1
Share/Tool/Init.cs

@@ -38,7 +38,6 @@ namespace ET.Server
                 Game.AddSingleton<Root>();
 
                 MongoHelper.Init();
-                ProtobufHelper.Init();
 				
                 Log.Info($"server start........................ {Root.Instance.Scene.Id}");
 				

+ 0 - 5
Share/Tool/Proto2CS/Proto2CS.cs

@@ -75,7 +75,6 @@ namespace ET
 
             StringBuilder sb = new StringBuilder();
             sb.Append("using ET;\n");
-            sb.Append("using ProtoBuf;\n");
             sb.Append("using MemoryPack;\n");
             sb.Append("using System.Collections.Generic;\n");
             sb.Append($"namespace {ns}\n");
@@ -119,7 +118,6 @@ namespace ET
                     msgOpcode.Add(new OpcodeInfo() { Name = msgName, Opcode = ++startOpcode });
 
                     sb.Append($"\t[Message({protoName}.{msgName})]\n");
-                    sb.Append($"\t[ProtoContract]\n");
                     sb.Append($"\t[MemoryPackable]\n");
                     sb.Append($"\tpublic partial class {msgName}: MessageObject");
                     if (parentClass == "IActorMessage" || parentClass == "IActorRequest" || parentClass == "IActorResponse")
@@ -230,7 +228,6 @@ namespace ET
             int n = int.Parse(ss[2]);
             
             sb.Append("\t\t[MongoDB.Bson.Serialization.Attributes.BsonDictionaryOptions(MongoDB.Bson.Serialization.Options.DictionaryRepresentation.ArrayOfArrays)]\n");
-            sb.Append($"\t\t[ProtoMember({n})]\n");
             sb.Append($"\t\t[MemoryPackOrder({n - 1})]\n");
             sb.Append($"\t\tpublic Dictionary<{keyType}, {valueType}> {v} {{ get; set; }}\n");
         }
@@ -247,7 +244,6 @@ namespace ET
                 string name = ss[2];
                 int n = int.Parse(ss[4]);
 
-                sb.Append($"\t\t[ProtoMember({n})]\n");
                 sb.Append($"\t\t[MemoryPackOrder({n - 1})]\n");
                 sb.Append($"\t\tpublic List<{type}> {name} {{ get; set; }}\n\n");
             }
@@ -306,7 +302,6 @@ namespace ET
                 int n = int.Parse(ss[3]);
                 string typeCs = ConvertType(type);
 
-                sb.Append($"\t\t[ProtoMember({n})]\n");
                 sb.Append($"\t\t[MemoryPackOrder({n - 1})]\n");
                 sb.Append($"\t\tpublic {typeCs} {name} {{ get; set; }}\n\n");
             }

+ 5 - 21
Share/Tool/Template.txt

@@ -1,39 +1,24 @@
 using System;
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization.Attributes;
-using ProtoBuf;
+using MongoDB.Bson.Serialization.Options;
 
 namespace ET
 {
-    [ProtoContract]
     [Config]
     public partial class (ConfigName)Category : ConfigSingleton<(ConfigName)Category>, IMerge
     {
-        [ProtoIgnore]
-        [BsonIgnore]
-        private Dictionary<int, (ConfigName)> dict = new Dictionary<int, (ConfigName)>();
-		
         [BsonElement]
-        [ProtoMember(1)]
-        private List<(ConfigName)> list = new List<(ConfigName)>();
+        [BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
+        private Dictionary<int, (ConfigName)> dict = new Dictionary<int, (ConfigName)>();
 		
         public void Merge(object o)
         {
             (ConfigName)Category s = o as (ConfigName)Category;
-            this.list.AddRange(s.list);
-        }
-		
-		[ProtoAfterDeserialization]        
-        public void ProtoEndInit()
-        {
-            foreach ((ConfigName) config in list)
+            foreach (var kv in s.dict)
             {
-                config.AfterEndInit();
-                this.dict.Add(config.Id, config);
+                this.dict.Add(kv.Key, kv.Value);
             }
-            this.list.Clear();
-            
-            this.AfterEndInit();
         }
 		
         public (ConfigName) Get(int id)
@@ -68,7 +53,6 @@ namespace ET
         }
     }
 
-    [ProtoContract]
 	public partial class (ConfigName): ProtoObject, IConfig
 	{
 (Fields)

BIN
Unity/Assets/Bundles/Config/AIConfigCategory.bytes


BIN
Unity/Assets/Bundles/Config/UnitConfigCategory.bytes


+ 1 - 1
Unity/Assets/Resources/GlobalConfig.asset

@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 36527db572638af47b03c805671cba75, type: 3}
   m_Name: GlobalConfig
   m_EditorClassIdentifier: 
-  CodeMode: 1
+  CodeMode: 3
   BuildType: 0

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است