帧同步跟状态同步使用同一份配置

Config/Json/cs/StartConfig/Localhost/StartSceneConfig.txt

@@ -3,8 +3,9 @@
 [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}],
+[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}],
 [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}],

Config/Json/s/StartConfig/Localhost/StartSceneConfig.txt

@@ -3,8 +3,9 @@
 [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}],
+[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}],
 [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}],

Share/Tool/Init.cs

@@ -34,6 +34,8 @@ namespace ET.Server
                 Game.AddSingleton<EventSystem>();
                 Dictionary<string, Type> types = AssemblyHelper.GetAssemblyTypes(typeof (Game).Assembly);
                 EventSystem.Instance.Add(types);
+
+                Game.AddSingleton<EntitySystemSingleton>();
                 
                 Game.AddSingleton<Root>();
 

Unity/Assets/Config/Excel/StartConfig/Demo/StartMachineConfig@s.xlsx.meta

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

Unity/Assets/Config/Excel/StartConfig/Demo/StartProcessConfig@s.xlsx.meta

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

Unity/Assets/Config/Excel/StartConfig/Demo/StartSceneConfig@s.xlsx.meta

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

Unity/Assets/Config/Excel/StartConfig/Demo/StartZoneConfig@s.xlsx.meta

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

Unity/Assets/Config/Excel/StartConfig/LockStep/StartMachineConfig@s.xlsx.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 52fbccc1702714111875f35075abd321
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Config/Excel/StartConfig/LockStep/StartProcessConfig@s.xlsx.meta

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

Unity/Assets/Config/Excel/StartConfig/LockStep/StartSceneConfig@s.xlsx.meta

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

Unity/Assets/Config/Excel/StartConfig/LockStep/StartZoneConfig@s.xlsx.meta

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

Unity/Assets/Scripts/Editor/BuildEditor/BuildEditor.cs

@@ -149,24 +149,5 @@ namespace ET
 
 			GUILayout.Space(5);
 		}
-		
-		private static void AfterCompiling()
-		{
-			Directory.CreateDirectory(Define.CodeDir);
-
-			// 设置ab包
-			AssetImporter assetImporter = AssetImporter.GetAtPath("Assets/Bundles/Code");
-			assetImporter.assetBundleName = "Code.unity3d";
-			AssetDatabase.SaveAssets();
-			AssetDatabase.Refresh();
-            
-			Debug.Log("build success!");
-		}
-		
-		public static void ShowNotification(string tips)
-		{
-			EditorWindow game = EditorWindow.GetWindow(typeof(EditorWindow).Assembly.GetType("UnityEditor.GameView"));
-			game?.ShowNotification(new GUIContent($"{tips}"));
-		}
 	}
 }

Unity/Assets/Scripts/Hotfix/Share/LockStep/RoomSystem.cs

@@ -83,13 +83,11 @@ namespace ET
             OneFrameInputs saveInput = new();
             oneFrameInputs.CopyTo(saveInput);
             self.Replay.FrameInputs.Add(saveInput);
-            Log.Debug($"111111111111111111111111: {frame}");
             if (frame % LSConstValue.SaveLSWorldFrameCount == 0)
             {
                 MemoryBuffer memoryBuffer = self.FrameBuffer.Snapshot(frame);
                 byte[] bytes = memoryBuffer.ToArray();
                 self.Replay.Snapshots.Add(bytes);
-                Log.Debug($"1111111111111111111111112: {frame} {bytes.Length}");
             }
         }
     }

Unity/Assets/Scripts/Loader/MonoBehaviour/Init.cs

@@ -18,7 +18,7 @@ namespace ET
 				
 			Game.AddSingleton<MainThreadSynchronizationContext>();
 
-			GlobalComponent globalComponent = Game.AddSingleton<GlobalComponent>();
+			Game.AddSingleton<GlobalComponent>();
 			
 			// 命令行参数
 			string[] args = "".Split(" ");
@@ -26,7 +26,7 @@ namespace ET
 				.WithNotParsed(error => throw new Exception($"命令行格式错误! {error}"))
 				.WithParsed(Game.AddSingleton);
 			
-			Options.Instance.StartConfig = $"StartConfig/{globalComponent.GlobalConfig.SceneType}";
+			Options.Instance.StartConfig = $"StartConfig/Localhost";
 
 			Game.AddSingleton<TimeInfo>();
 			Game.AddSingleton<Logger>().ILog = new UnityLogger();