根据传入的参数Options.Instance.StartConfig过滤起服配置

过滤数据

Author: singleTree

Config/Excel/c/AIConfigCategory.bytes

@@ -0,0 +1,2 @@
+/apple/apple/apple/apple/apple/apple/apple
+/apple_bad

Config/Excel/c/UnitConfigCategory.bytes

@@ -0,0 +1 @@
+

Config/Excel/c/democategory.bytes

@@ -0,0 +1,2 @@
+/apple/apple/apple/apple/apple/apple/apple
+/apple_bad

Config/Excel/c/oneconfigcategory.bytes

@@ -0,0 +1 @@
+
�@

Config/Excel/cs/AIConfigCategory.bytes

@@ -0,0 +1,2 @@
+	Benchmark
	127.0.0.1	127.0.0.110000	Localhost
	127.0.0.1	127.0.0.110000Release
	127.0.0.1	127.0.0.110000
+RouterTest
	127.0.0.1	127.0.0.110000

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

@@ -0,0 +1,9 @@
+	Benchmark

�N!	Benchmark
�N"	Benchmark
�N#	Benchmark
�N$	Benchmark
�N%	Benchmark
�N&	Benchmark
�N'	Localhost

�N!Release

�N!Release
�N"Release
�N#Release
�N$Release
�N%Release
�N&Release
�N'Release
�N(Release	
�N)Release
+
�N*Release
�N+Release
�N,
+RouterTest

�N!
+RouterTest
�N"
+RouterTest
�N#
+RouterTest
�N$
+RouterTest
�N%
+RouterTest
�N&
+RouterTest
�N'

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

@@ -0,0 +1,2 @@
+/apple/apple/apple/apple/apple/apple/apple
+/apple_bad

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

@@ -0,0 +1 @@
+
�@

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

@@ -0,0 +1,2 @@
+	Benchmark
	127.0.0.1	127.0.0.110000	Localhost
	127.0.0.1	127.0.0.110000Release
	127.0.0.1	127.0.0.110000
+RouterTest
	127.0.0.1	127.0.0.110000

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

@@ -0,0 +1,9 @@
+	Benchmark

�N!	Benchmark
�N"	Benchmark
�N#	Benchmark
�N$	Benchmark
�N%	Benchmark
�N&	Benchmark
�N'	Localhost

�N!Release

�N!Release
�N"Release
�N#Release
�N$Release
�N%Release
�N&Release
�N'Release
�N(Release	
�N)Release
+
�N*Release
�N+Release
�N,
+RouterTest

�N!
+RouterTest
�N"
+RouterTest
�N#
+RouterTest
�N$
+RouterTest
�N%
+RouterTest
�N&
+RouterTest
�N'

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

@@ -23,7 +23,7 @@ public override async ETTask<Dictionary<Type, byte[]>> Handle(ConfigLoader.GetAl
                 string configFilePath;
                 if (startConfigs.Contains(configType.Name))
                 {
-                    configFilePath = $"../Config/Excel/s/{Options.Instance.StartConfig}/{configType.Name}.bytes";    
+                    configFilePath = $"../Config/Excel/s/{configType.Name}.bytes";    
                 }
                 else
                 {

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Luban;
 #if DOTNET || UNITY_STANDALONE
 using System.Threading.Tasks;
 #endif
@@ -63,7 +64,7 @@ public async ETTask LoadAsync()
         private void LoadOneConfig(Type configType, byte[] oneConfigBytes)
         {
             // object category = MongoHelper.Deserialize(configType, oneConfigBytes, 0, oneConfigBytes.Length);
-            object category = Activator.CreateInstance(configType, oneConfigBytes);
+            object category = Activator.CreateInstance(configType, new ByteBuf(oneConfigBytes));
             ASingleton singleton = category as ASingleton;
             this.allConfig[configType] = category as IResolveRef;
             World.Instance.AddSingleton(singleton);

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

@@ -3,8 +3,8 @@
 
 namespace ET.Server
 {
-    [EntitySystemOf(typeof(WatcherComponent))]
-    [FriendOf(typeof(WatcherComponent))]
+    [EntitySystemOf(typeof (WatcherComponent))]
+    [FriendOf(typeof (WatcherComponent))]
     public static partial class WatcherComponentSystem
     {
         [EntitySystem]
@@ -14,10 +14,16 @@ public static void Awake(this WatcherComponent self)
             var processConfigs = StartProcessConfigCategory.Instance.DataList;
             foreach (StartProcessConfig startProcessConfig in processConfigs)
             {
+                if (!startProcessConfig.StartConfig.Equals(Options.Instance.StartConfig))
+                {
+                    continue;
+                }
+
                 if (!WatcherHelper.IsThisMachine(startProcessConfig.InnerIP, localIP))
                 {
                     continue;
                 }
+
                 System.Diagnostics.Process process = WatcherHelper.StartProcess(startProcessConfig.Id);
                 self.Processes.Add(startProcessConfig.Id, process);
             }

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

@@ -12,10 +12,16 @@ public static StartMachineConfig GetThisMachineConfig()
             StartMachineConfig startMachineConfig = null;
             foreach (StartMachineConfig config in StartMachineConfigCategory.Instance.DataList)
             {
+                if (!config.StartConfig.Equals(Options.Instance.StartConfig))
+                {
+                    continue;
+                }
+
                 if (!WatcherHelper.IsThisMachine(config.InnerIP, localIP))
                 {
                     continue;
                 }
+
                 startMachineConfig = config;
                 break;
             }
@@ -27,23 +33,24 @@ public static StartMachineConfig GetThisMachineConfig()
 
             return startMachineConfig;
         }
-        
+
         public static bool IsThisMachine(string ip, string[] localIPs)
         {
-            if (ip != "127.0.0.1" && ip != "0.0.0.0" && !((IList) localIPs).Contains(ip))
+            if (ip != "127.0.0.1" && ip != "0.0.0.0" && !((IList)localIPs).Contains(ip))
             {
                 return false;
             }
+
             return true;
         }
-        
+
         public static System.Diagnostics.Process StartProcess(int processId, int createScenes = 0)
         {
             StartProcessConfig startProcessConfig = StartProcessConfigCategory.Instance.Get(processId);
             const string exe = "dotnet";
-            string arguments = $"App.dll" + 
+            string arguments = $"App.dll" +
                     $" --Process={startProcessConfig.Id}" +
-                    $" --AppType=Server" +  
+                    $" --AppType=Server" +
                     $" --StartConfig={Options.Instance.StartConfig}" +
                     $" --Develop={Options.Instance.Develop}" +
                     $" --LogLevel={Options.Instance.LogLevel}" +

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

@@ -6,7 +6,7 @@ public class FiberInit_Main: AInvokeHandler<FiberInit, ETTask>
         public override async ETTask Handle(FiberInit fiberInit)
         {
             Scene root = fiberInit.Fiber.Root;
-           
+            
             await EventSystem.Instance.PublishAsync(root, new EntryEvent1());
             await EventSystem.Instance.PublishAsync(root, new EntryEvent2());
             await EventSystem.Instance.PublishAsync(root, new EntryEvent3());

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

@@ -7,45 +7,53 @@ namespace ET
     public partial class StartSceneConfigCategory
     {
         public MultiMap<int, StartSceneConfig> Gates = new();
-        
+
         public MultiMap<int, StartSceneConfig> ProcessScenes = new();
-        
+
         public Dictionary<long, Dictionary<string, StartSceneConfig>> ClientScenesByName = new();
 
         public StartSceneConfig LocationConfig;
 
         public List<StartSceneConfig> Realms = new();
-        
+
         public List<StartSceneConfig> Routers = new();
-        
+
         public List<StartSceneConfig> Maps = new();
 
         public StartSceneConfig Match;
 
         public StartSceneConfig Benchmark;
-        
+
         public List<StartSceneConfig> GetByProcess(int process)
         {
             return this.ProcessScenes[process];
         }
-        
+
         public StartSceneConfig GetBySceneName(int zone, string name)
         {
             return this.ClientScenesByName[zone][name];
         }
+
         public StartSceneConfig Get(int id) => this.Get(Options.Instance.StartConfig, id);
+
         partial void PostInit()
         {
             foreach (StartSceneConfig startSceneConfig in this.DataList)
             {
+                if (!startSceneConfig.StartConfig.Equals(Options.Instance.StartConfig))
+                {
+                    continue;
+                }
+
                 this.ProcessScenes.Add(startSceneConfig.Process, startSceneConfig);
-                
+
                 if (!this.ClientScenesByName.ContainsKey(startSceneConfig.Zone))
                 {
                     this.ClientScenesByName.Add(startSceneConfig.Zone, new Dictionary<string, StartSceneConfig>());
                 }
+
                 this.ClientScenesByName[startSceneConfig.Zone].Add(startSceneConfig.Name, startSceneConfig);
-                
+
                 switch (startSceneConfig.Type)
                 {
                     case SceneType.Realm:
@@ -73,11 +81,11 @@ partial void PostInit()
             }
         }
     }
-    
+
     public partial class StartSceneConfig
     {
         public ActorId ActorId;
-        
+
         public SceneType Type;
 
         public StartProcessConfig StartProcessConfig
@@ -87,7 +95,7 @@ public StartProcessConfig StartProcessConfig
                 return StartProcessConfigCategory.Instance.Get(this.Process);
             }
         }
-        
+
         public StartZoneConfig StartZoneConfig
         {
             get