Excel跟proto导出分成三种 1.客户端 2.服务端 3.客户端服务端

编辑器模式下配置加载不用ab包了，直接加载ET/Config目录下的，这样更方便根据不同CodeMode加载不同的配置

Config/Excel/c/UnitConfigCategory.bytes

@@ -0,0 +1,6 @@
+
+é
	米克尔 
(²

+ê

+米克尔2 (–
+ì

+米克尔4 (–

Config/Excel/cs/AIConfigCategory.bytes

@@ -0,0 +1,4 @@
+
+e

"	AI_Attack
+f
"	AI_XunLuo
+É

"	AI_XunLuo

Config/Excel/cs/UnitConfigCategory.bytes

@@ -0,0 +1,8 @@
+
+é
	米克尔 
(²
0D
+ê

+米克尔2 (–0N
+ë

+米克尔3 
(²
0D
+ì

+米克尔4 (–0N

Config/Excel/s/AIConfigCategory.bytes

@@ -0,0 +1,4 @@
+
+e

"	AI_Attack
+f
"	AI_XunLuo
+É

"	AI_XunLuo

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

@@ -0,0 +1,4 @@
+
+

�

+
�

+
�

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

@@ -0,0 +1,4 @@
+
++


"BenchmarkServer*BenchmarkServer0’N
+,
"BenchmarkClient*BenchmarkClient10“N
+,
"BenchmarkClient*BenchmarkClient20”N

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

@@ -0,0 +1,2 @@
+
+
mongodb://127.0.0.1ET1

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

@@ -0,0 +1,2 @@
+
+
	127.0.0.1	127.0.0.1"10000

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

@@ -0,0 +1,2 @@
+
+'

192.168.1.111
192.168.1.111"10000

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

@@ -0,0 +1,3 @@
+
+

�

+
�

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

@@ -0,0 +1,8 @@
+
+


"Realm*Realm0’N
+

"Gate*Gate10“N
+

"Gate*Gate20”N
+

"Location*Location
+

"Map*Map1
+

"Map*Map2
+È

"Robot*Robot01

Config/Excel/s/StartConfig/Release/StartZoneConfigCategory.bytes

@@ -0,0 +1,3 @@
+
+
mongodb://127.0.0.1ET1
+mongodb://127.0.0.1ET2

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

@@ -0,0 +1,2 @@
+
+
	127.0.0.1	127.0.0.1"10000

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

@@ -0,0 +1,8 @@
+
+

�

+
�

+
�

+
�

+
往

+
茅

+
享

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

@@ -0,0 +1,13 @@
+
+


"Realm*Realm0’N
+

"Gate*Gate10“N
+

"Gate*Gate20”N
+

"Location*Location
+

"Map*Map1
+

"Map*Map2
+È
"Robot*Robot01
+(�"
RouterManager*
RouterManager0¼P
+‘"Router*Router010½P
+’"Router*Router020¾P
+“"Router*Router030¿P
+”"Router*Router040ÀP

Config/Excel/s/UnitConfigCategory.bytes

@@ -0,0 +1,6 @@
+
+é
	米克尔 
0D
+ê

+米克尔2 0N
+ë

+米克尔3 
0D

Config/UnitConfigCategory.bytes

@@ -1,4 +0,0 @@
-
-1é
	米克尔"带有强力攻击技能(
0²
8D
-3ê

-米克尔2"带有强力攻击技能2(0–8N

DotNet/App/ConfigLoader.cs

@@ -23,11 +23,11 @@ namespace ET
                 string configFilePath;
                 if (startConfigs.Contains(configType.Name))
                 {
-                    configFilePath = $"../Config/{Options.Instance.StartConfig}/{configType.Name}.bytes";    
+                    configFilePath = $"../Config/Excel/s/{Options.Instance.StartConfig}/{configType.Name}.bytes";    
                 }
                 else
                 {
-                    configFilePath = $"../Config/{configType.Name}.bytes";
+                    configFilePath = $"../Config/Excel/s/{configType.Name}.bytes";
                 }
                 output[configType.Name] = File.ReadAllBytes(configFilePath);
             }

Share/Tool/ExcelExporter/ExcelExporter.cs

@@ -19,6 +19,7 @@ namespace ET
     {
         c = 0,
         s = 1,
+        cs = 2,
     }
 
     class HeadInfo
@@ -53,17 +54,19 @@ namespace ET
     {
         private static string template;
 
-        public const string ClientClassDir = "../Unity/Assets/Scripts/Codes/Model/Generate/Client/Config";
+        private const string ClientClassDir = "../Unity/Assets/Scripts/Codes/Model/Generate/Client/Config";
         // 服务端因为机器人的存在必须包含客户端所有配置，所以单独的c字段没有意义,单独的c就表示cs
-        public const string ServerClassDir = "../Unity/Assets/Scripts/Codes/Model/Generate/Server/Config";
+        private const string ServerClassDir = "../Unity/Assets/Scripts/Codes/Model/Generate/Server/Config";
+
+        private const string CSClassDir = "../Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Config";
 
         private const string excelDir = "../Unity/Assets/Config/Excel/";
 
         private const string jsonDir = "../Unity/Assets/Config/Excel/Json/{0}/{1}";
 
-        private const string clientProtoDir = "../Unity/Assets/Bundles/Config/{0}";
-        private const string serverProtoDir = "../Config/{0}";
-        private static Assembly[] configAssemblies = new Assembly[2];
+        private const string clientProtoDir = "../Unity/Assets/Bundles/Config";
+        private const string serverProtoDir = "../Config/Excel/{0}/{1}";
+        private static Assembly[] configAssemblies = new Assembly[3];
 
         private static Dictionary<string, Table> tables = new Dictionary<string, Table>();
         private static Dictionary<string, ExcelPackage> packages = new Dictionary<string, ExcelPackage>();
@@ -130,12 +133,6 @@ namespace ET
                         cs = ss[1];
                     }
 
-                    // 服务端因为机器人的存在必须包含客户端所有配置，所以单独的c字段没有意义,单独的c就表示cs
-                    if (cs == "c")
-                    {
-                        cs = "cs";
-                    }
-
                     if (cs == "")
                     {
                         cs = "cs";
@@ -170,16 +167,17 @@ namespace ET
                     {
                         ExportClass(kv.Key, kv.Value.HeadInfos, ConfigType.c);
                     }
-
                     if (kv.Value.S)
                     {
                         ExportClass(kv.Key, kv.Value.HeadInfos, ConfigType.s);
                     }
+                    ExportClass(kv.Key, kv.Value.HeadInfos, ConfigType.cs);
                 }
 
                 // 动态编译生成的配置代码
                 configAssemblies[(int) ConfigType.c] = DynamicBuild(ConfigType.c);
                 configAssemblies[(int) ConfigType.s] = DynamicBuild(ConfigType.s);
+                configAssemblies[(int) ConfigType.cs] = DynamicBuild(ConfigType.cs);
 
                 List<string> excels = FileHelper.GetAllFiles(excelDir, "*.xlsx");
                 
@@ -191,6 +189,12 @@ namespace ET
                 }
                 Task.WaitAll(tasks.ToArray());
                 
+                if (Directory.Exists(clientProtoDir))
+                {
+                    Directory.Delete(clientProtoDir, true);
+                }
+                FileHelper.CopyDirectory("../Config/Excel/c", clientProtoDir);
+                
                 Log.Console("Export Excel Sucess!");
             }
             catch (Exception e)
@@ -229,12 +233,6 @@ namespace ET
                 cs = ss[1];
             }
             
-            // 服务端因为机器人的存在必须包含客户端所有配置，所以单独的c字段没有意义,单独的c就表示cs
-            if (cs == "c")
-            {
-                cs = "cs";
-            }
-
             if (cs == "")
             {
                 cs = "cs";
@@ -261,16 +259,13 @@ namespace ET
                 ExportExcelJson(p, fileNameWithoutCS, table, ConfigType.s, relativePath);
                 ExportExcelProtobuf(ConfigType.s, protoName, relativePath);
             }
+            ExportExcelJson(p, fileNameWithoutCS, table, ConfigType.cs, relativePath);
+            ExportExcelProtobuf(ConfigType.cs, protoName, relativePath);
         }
 
         private static string GetProtoDir(ConfigType configType, string relativeDir)
         {
-            if (configType == ConfigType.c)
-            {
-                return string.Format(clientProtoDir, relativeDir);
-            }
-
-            return string.Format(serverProtoDir, relativeDir);
+            return string.Format(serverProtoDir, configType.ToString(), relativeDir);
         }
 
         private static Assembly GetAssembly(ConfigType configType)
@@ -280,12 +275,12 @@ namespace ET
 
         private static string GetClassDir(ConfigType configType)
         {
-            if (configType == ConfigType.c)
+            return configType switch
             {
-                return ClientClassDir;
-            }
-
-            return ServerClassDir;
+                ConfigType.c => ClientClassDir,
+                ConfigType.s => ServerClassDir,
+                _ => CSClassDir
+            };
         }
         
         // 动态编译生成的cs代码
@@ -389,12 +384,6 @@ namespace ET
                     table.HeadInfos[fieldName] = null;
                     continue;
                 }
-
-                // 服务端因为机器人的存在必须包含客户端所有配置，所以单独的c字段没有意义,单独的c就表示cs
-                if (fieldCS == "c")
-                {
-                    fieldCS = "cs";
-                }
                 
                 if (fieldCS == "")
                 {
@@ -439,7 +428,7 @@ namespace ET
                     continue;
                 }
 
-                if (!headInfo.FieldCS.Contains(configType.ToString()))
+                if (configType != ConfigType.cs && !headInfo.FieldCS.Contains(configType.ToString()))
                 {
                     continue;
                 }
@@ -504,13 +493,7 @@ namespace ET
                     prefix = "cs";
                 }
                 
-                // 服务端因为机器人的存在必须包含客户端所有配置，所以单独的c字段没有意义,单独的c就表示cs
-                if (prefix == "c")
-                {
-                    prefix = "cs";
-                }
-
-                if (!prefix.Contains(configTypeStr))
+                if (configType != ConfigType.cs && !prefix.Contains(configTypeStr))
                 {
                     continue;
                 }
@@ -537,7 +520,7 @@ namespace ET
                         continue;
                     }
 
-                    if (!headInfo.FieldCS.Contains(configTypeStr))
+                    if (configType != ConfigType.cs && !headInfo.FieldCS.Contains(configTypeStr))
                     {
                         continue;
                     }

Share/Tool/Proto2CS/Proto2CS.cs

@@ -26,6 +26,7 @@ namespace ET
         private const string protoDir = "../Unity/Assets/Config/Proto";
         private const string clientMessagePath = "../Unity/Assets/Scripts/Codes/Model/Generate/Client/Message/";
         private const string serverMessagePath = "../Unity/Assets/Scripts/Codes/Model/Generate/Server/Message/";
+        private const string clientServerMessagePath = "../Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Message/";
         private static readonly char[] splitChars = { ' ', '\t' };
         private static readonly List<OpcodeInfo> msgOpcode = new List<OpcodeInfo>();
 
@@ -42,6 +43,11 @@ namespace ET
             {
                 Directory.Delete(serverMessagePath, true);
             }
+            
+            if (Directory.Exists(clientServerMessagePath))
+            {
+                Directory.Delete(clientServerMessagePath, true);
+            }
 
             List<string> list = FileHelper.GetAllFiles(protoDir, "*proto");
             foreach (string s in list)
@@ -181,11 +187,13 @@ namespace ET
             {
                 GenerateCS(sb, clientMessagePath, proto);
                 GenerateCS(sb, serverMessagePath, proto);
+                GenerateCS(sb, clientServerMessagePath, proto);
             }
             
             if (cs.Contains("S"))
             {
                 GenerateCS(sb, serverMessagePath, proto);
+                GenerateCS(sb, clientServerMessagePath, proto);
             }
         }
 

Unity/Assets/Bundles/Config.meta

@@ -4,5 +4,5 @@ folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: config.unity3d
+  assetBundleName: 
   assetBundleVariant: 

Unity/Assets/Bundles/Config/StartConfig/Localhost/StartZoneConfigCategory.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4a2ef77ab3fb8144281a8c92484bfeca
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Bundles/Config/UnitConfigCategory.bytes

@@ -1,4 +1,6 @@
 
-/é
	米克尔"带有强力攻击技能(
0²

-1ê

-米克尔2"带有强力攻击技能2(0–
+é
	米克尔 
(²

+ê

+米克尔2 (–
+ì

+米克尔4 (–

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

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3f452063ceb5f4150bbbfe795c0aca90
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/c/UnitConfig.txt

@@ -1,4 +1,5 @@
 {"list":[
-{"_t":"UnitConfig","_id":1001,"Type":1,"Name":"米克尔","Desc":"带有强力攻击技能","Position":1,"Height":178},
-{"_t":"UnitConfig","_id":1002,"Type":1,"Name":"米克尔2","Desc":"带有强力攻击技能2","Position":2,"Height":278},
+{"_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},
 ]}

Unity/Assets/Scripts/Codes/Model/Share/Module/CoroutineLock.meta → Unity/Assets/Config/Excel/Json/cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d13fac97dbbdc4241a850daee9d8a45c
+guid: 9fead2c70bf58864ebddf01fa8c7a7e8
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Config/Excel/Json/cs/AIConfig.txt

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

Unity/Assets/Bundles/Config/StartConfig/Localhost/StartSceneConfigCategory.bytes.meta → Unity/Assets/Config/Excel/Json/cs/AIConfig.txt.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0e0b063e760dd85439a5034b9559cb9d
+guid: ad6100b431957f54c869aa5314baab1e
 TextScriptImporter:
   externalObjects: {}
   userData: 

Unity/Assets/Bundles/Config/StartConfig.meta → Unity/Assets/Config/Excel/Json/cs/StartConfig.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b4a5929ed1616464d8af53eede1db838
+guid: d369641a4804ce148b821699810d9d98
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Scripts/Codes/Model/Share/Module/ETTask.meta → Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c85829ff66fdfea44916f1b81e4fac8f
+guid: 588a8d6130a872549ba52dd4e1ff4a6a
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartMachineConfig.txt

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

Unity/Assets/Bundles/Config/AIConfigCategory.bytes.meta → Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartMachineConfig.txt.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 277d58db3067742a7b32f9994984b3bc
+guid: fb805c5ff5e2522479c20310c81e2b41
 TextScriptImporter:
   externalObjects: {}
   userData: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartProcessConfig.txt

@@ -0,0 +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},
+]}

Unity/Assets/Bundles/Config/StartConfig/Localhost/StartMachineConfigCategory.bytes.meta → Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartProcessConfig.txt.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d6a19dec94ad49b4bb4590b0ec870ea9
+guid: fbec212f33b49f945960af476f5953a6
 TextScriptImporter:
   externalObjects: {}
   userData: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt

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

Unity/Assets/Bundles/Config/StartConfig/Localhost/StartProcessConfigCategory.bytes.meta → Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartSceneConfig.txt.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c3552219078c36349831be9b76a5bed2
+guid: 8c7b67f365d71fe4e9a1ad1471e94943
 TextScriptImporter:
   externalObjects: {}
   userData: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartZoneConfig.txt

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

Unity/Assets/Config/Excel/Json/cs/StartConfig/Benchmark/StartZoneConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ca7edf35b312dd24c8a8fc5ffbec7d4c
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Bundles/Config/StartConfig/Localhost.meta → Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d15979c0a72d7f94e8d463f0c1af9788
+guid: 9d79a0e14f5e1604db1df69cb1d390be
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartMachineConfig.txt

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

Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartMachineConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cf594e826d7c72642ba0968e0b5ba866
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartProcessConfig.txt

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

Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartProcessConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ead15285d1d189d459bfbb9d920cd158
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartSceneConfig.txt

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

Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartSceneConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9a92dffb7d05fba4588369bb9e6d0360
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartZoneConfig.txt

@@ -0,0 +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":""},
+]}

Unity/Assets/Config/Excel/Json/cs/StartConfig/Localhost/StartZoneConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 26dafbf81698941499da2ce077f57133
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Codes/Model/Share/Module/Timer.meta → Unity/Assets/Config/Excel/Json/cs/StartConfig/Release.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 84a263c002572ca479f6bd8d5661be5c
+guid: 8a8cddcbf70fdb34a85a5880208873c6
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartMachineConfig.txt

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

Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartMachineConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 97fff97e87d362248910baf6eb277d40
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartProcessConfig.txt

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

Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartProcessConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 143403d48cdcf744b8612deea9cc3c4c
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartSceneConfig.txt

@@ -0,0 +1,9 @@
+{"list":[
+{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":10002},
+{"_t":"StartSceneConfig","_id":2,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate1","OuterPort":10003},
+{"_t":"StartSceneConfig","_id":3,"Process":1,"Zone":1,"SceneType":"Gate","Name":"Gate2","OuterPort":10004},
+{"_t":"StartSceneConfig","_id":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},
+]}

Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartSceneConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e1c4c5718bdb7e64c850f7f3178ce1cf
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartZoneConfig.txt

@@ -0,0 +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"},
+]}

Unity/Assets/Config/Excel/Json/cs/StartConfig/Release/StartZoneConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 89a53198cf57e7c4c8a4560e1360eaf0
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 19ae408cd53f0694485f737e1291227c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartMachineConfig.txt

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

Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartMachineConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 11fb64ba41b6571438a9824eca4ac9f5
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt

@@ -0,0 +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},
+]}

Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartProcessConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8d66d9fb63b0be24295c7e0b88ee37aa
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt

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

Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartSceneConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dfddc8ed9ef84e242845cfad9aac018b
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartZoneConfig.txt

@@ -0,0 +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":""},
+]}

Unity/Assets/Config/Excel/Json/cs/StartConfig/RouterTest/StartZoneConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 15327c9b35e98194f89ea85d7e07fe74
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/cs/UnitConfig.txt

@@ -0,0 +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},
+]}

Unity/Assets/Config/Excel/Json/cs/UnitConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b756c2dd289b1bd4e8994c0bc4cc33f3
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Config/Excel/Json/s/UnitConfig.txt

@@ -1,4 +1,5 @@
 {"list":[
-{"_t":"UnitConfig","_id":1001,"Type":1,"Name":"米克尔","Desc":"带有强力攻击技能","Position":1,"Height":178,"Weight":68},
-{"_t":"UnitConfig","_id":1002,"Type":1,"Name":"米克尔2","Desc":"带有强力攻击技能2","Position":2,"Height":278,"Weight":78},
+{"_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},
 ]}

Unity/Assets/Scripts/Codes/Model/Generate/Client/Config/UnitConfig.cs

@@ -80,14 +80,11 @@ namespace ET
 		/// <summary>名字</summary>
 		[ProtoMember(3)]
 		public string Name { get; set; }
-		/// <summary>描述</summary>
-		[ProtoMember(4)]
-		public string Desc { get; set; }
 		/// <summary>位置</summary>
-		[ProtoMember(5)]
+		[ProtoMember(4)]
 		public int Position { get; set; }
 		/// <summary>身高</summary>
-		[ProtoMember(6)]
+		[ProtoMember(5)]
 		public int Height { get; set; }
 
 	}

Unity/Assets/Scripts/Codes/Model/Generate/ClientServer.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f6cb781d7426010449c63c186cc69c24
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Codes/Model/Share/Module/Config.meta → Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Config.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4c6b8747b6c7bf84187a2827f922b101
+guid: 027f4382299e1a7499130098fd865aa1
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Config/AIConfig.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using MongoDB.Bson.Serialization.Attributes;
+using ProtoBuf;
+
+namespace ET
+{
+    [ProtoContract]
+    [Config]
+    public partial class AIConfigCategory : ConfigSingleton<AIConfigCategory>, IMerge
+    {
+        [ProtoIgnore]
+        [BsonIgnore]
+        private Dictionary<int, AIConfig> dict = new Dictionary<int, AIConfig>();
+		
+        [BsonElement]
+        [ProtoMember(1)]
+        private List<AIConfig> list = new List<AIConfig>();
+		
+        public void Merge(object o)
+        {
+            AIConfigCategory s = o as AIConfigCategory;
+            this.list.AddRange(s.list);
+        }
+		
+		[ProtoAfterDeserialization]        
+        public void ProtoEndInit()
+        {
+            foreach (AIConfig config in list)
+            {
+                config.AfterEndInit();
+                this.dict.Add(config.Id, config);
+            }
+            this.list.Clear();
+            
+            this.AfterEndInit();
+        }
+		
+        public AIConfig Get(int id)
+        {
+            this.dict.TryGetValue(id, out AIConfig item);
+
+            if (item == null)
+            {
+                throw new Exception($"配置找不到，配置表名: {nameof (AIConfig)}，配置id: {id}");
+            }
+
+            return item;
+        }
+		
+        public bool Contain(int id)
+        {
+            return this.dict.ContainsKey(id);
+        }
+
+        public Dictionary<int, AIConfig> GetAll()
+        {
+            return this.dict;
+        }
+
+        public AIConfig GetOne()
+        {
+            if (this.dict == null || this.dict.Count <= 0)
+            {
+                return null;
+            }
+            return this.dict.Values.GetEnumerator().Current;
+        }
+    }
+
+    [ProtoContract]
+	public partial class AIConfig: ProtoObject, IConfig
+	{
+		/// <summary>Id</summary>
+		[ProtoMember(1)]
+		public int Id { get; set; }
+		/// <summary>所属ai</summary>
+		[ProtoMember(2)]
+		public int AIConfigId { get; set; }
+		/// <summary>此ai中的顺序</summary>
+		[ProtoMember(3)]
+		public int Order { get; set; }
+		/// <summary>节点名字</summary>
+		[ProtoMember(4)]
+		public string Name { get; set; }
+		/// <summary>节点参数</summary>
+		[ProtoMember(5)]
+		public int[] NodeParams { get; set; }
+
+	}
+}

Unity/Assets/Scripts/Codes/Model/Generate/Client/Config/AIConfig.cs.meta → Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Config/AIConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 63eb883aff2778247b4f5781cc9a649f
+guid: d630eb5b27169034c960192b72954e6b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Config/StartMachineConfig.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using MongoDB.Bson.Serialization.Attributes;
+using ProtoBuf;
+
+namespace ET
+{
+    [ProtoContract]
+    [Config]
+    public partial class StartMachineConfigCategory : ConfigSingleton<StartMachineConfigCategory>, IMerge
+    {
+        [ProtoIgnore]
+        [BsonIgnore]
+        private Dictionary<int, StartMachineConfig> dict = new Dictionary<int, StartMachineConfig>();
+		
+        [BsonElement]
+        [ProtoMember(1)]
+        private List<StartMachineConfig> list = new List<StartMachineConfig>();
+		
+        public void Merge(object o)
+        {
+            StartMachineConfigCategory s = o as StartMachineConfigCategory;
+            this.list.AddRange(s.list);
+        }
+		
+		[ProtoAfterDeserialization]        
+        public void ProtoEndInit()
+        {
+            foreach (StartMachineConfig config in list)
+            {
+                config.AfterEndInit();
+                this.dict.Add(config.Id, config);
+            }
+            this.list.Clear();
+            
+            this.AfterEndInit();
+        }
+		
+        public StartMachineConfig Get(int id)
+        {
+            this.dict.TryGetValue(id, out StartMachineConfig item);
+
+            if (item == null)
+            {
+                throw new Exception($"配置找不到，配置表名: {nameof (StartMachineConfig)}，配置id: {id}");
+            }
+
+            return item;
+        }
+		
+        public bool Contain(int id)
+        {
+            return this.dict.ContainsKey(id);
+        }
+
+        public Dictionary<int, StartMachineConfig> GetAll()
+        {
+            return this.dict;
+        }
+
+        public StartMachineConfig GetOne()
+        {
+            if (this.dict == null || this.dict.Count <= 0)
+            {
+                return null;
+            }
+            return this.dict.Values.GetEnumerator().Current;
+        }
+    }
+
+    [ProtoContract]
+	public partial class StartMachineConfig: ProtoObject, IConfig
+	{
+		/// <summary>Id</summary>
+		[ProtoMember(1)]
+		public int Id { get; set; }
+		/// <summary>内网地址</summary>
+		[ProtoMember(2)]
+		public string InnerIP { get; set; }
+		/// <summary>外网地址</summary>
+		[ProtoMember(3)]
+		public string OuterIP { get; set; }
+		/// <summary>守护进程端口</summary>
+		[ProtoMember(4)]
+		public string WatcherPort { get; set; }
+
+	}
+}

Unity/Assets/Scripts/Codes/Model/Generate/Server/Config/StartMachineConfig.cs.meta → Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Config/StartMachineConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 563f0756420049a44a3bb5e2a477d595
+guid: 494fbdb8b84798344b40e09cf5e85ba6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Config/StartProcessConfig.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using MongoDB.Bson.Serialization.Attributes;
+using ProtoBuf;
+
+namespace ET
+{
+    [ProtoContract]
+    [Config]
+    public partial class StartProcessConfigCategory : ConfigSingleton<StartProcessConfigCategory>, IMerge
+    {
+        [ProtoIgnore]
+        [BsonIgnore]
+        private Dictionary<int, StartProcessConfig> dict = new Dictionary<int, StartProcessConfig>();
+		
+        [BsonElement]
+        [ProtoMember(1)]
+        private List<StartProcessConfig> list = new List<StartProcessConfig>();
+		
+        public void Merge(object o)
+        {
+            StartProcessConfigCategory s = o as StartProcessConfigCategory;
+            this.list.AddRange(s.list);
+        }
+		
+		[ProtoAfterDeserialization]        
+        public void ProtoEndInit()
+        {
+            foreach (StartProcessConfig config in list)
+            {
+                config.AfterEndInit();
+                this.dict.Add(config.Id, config);
+            }
+            this.list.Clear();
+            
+            this.AfterEndInit();
+        }
+		
+        public StartProcessConfig Get(int id)
+        {
+            this.dict.TryGetValue(id, out StartProcessConfig item);
+
+            if (item == null)
+            {
+                throw new Exception($"配置找不到，配置表名: {nameof (StartProcessConfig)}，配置id: {id}");
+            }
+
+            return item;
+        }
+		
+        public bool Contain(int id)
+        {
+            return this.dict.ContainsKey(id);
+        }
+
+        public Dictionary<int, StartProcessConfig> GetAll()
+        {
+            return this.dict;
+        }
+
+        public StartProcessConfig GetOne()
+        {
+            if (this.dict == null || this.dict.Count <= 0)
+            {
+                return null;
+            }
+            return this.dict.Values.GetEnumerator().Current;
+        }
+    }
+
+    [ProtoContract]
+	public partial class StartProcessConfig: ProtoObject, IConfig
+	{
+		/// <summary>Id</summary>
+		[ProtoMember(1)]
+		public int Id { get; set; }
+		/// <summary>所属机器</summary>
+		[ProtoMember(2)]
+		public int MachineId { get; set; }
+		/// <summary>内网端口</summary>
+		[ProtoMember(3)]
+		public int InnerPort { get; set; }
+
+	}
+}

Unity/Assets/Scripts/Codes/Model/Generate/Server/Config/StartProcessConfig.cs.meta → Unity/Assets/Scripts/Codes/Model/Generate/ClientServer/Config/StartProcessConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 33af398c5827a1e4e9d75cc717b24f19
+guid: 85b6d198d898a3e4cac5731a559ccdab
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2