调整类名，帧同步的类都用LS开头

Unity/Assets/Scripts/Hotfix/Client/LockStep/RoomClientUpdaterSystem.cs → Unity/Assets/Scripts/Hotfix/Client/LockStep/LSClientUpdaterSystem.cs

@@ -3,27 +3,27 @@ using System.IO;
 
 namespace ET.Client
 {
-    [FriendOf(typeof (RoomClientUpdater))]
-    public static class RoomClientUpdaterSystem
+    [FriendOf(typeof (LSClientUpdater))]
+    public static class LSClientUpdaterSystem
     {
-        public class AwakeSystem: AwakeSystem<RoomClientUpdater>
+        public class AwakeSystem: AwakeSystem<LSClientUpdater>
         {
-            protected override void Awake(RoomClientUpdater self)
+            protected override void Awake(LSClientUpdater self)
             {
                 Room room = self.GetParent<Room>();
                 self.MyId = room.GetParent<Scene>().GetComponent<PlayerComponent>().MyId;
             }
         }
         
-        public class UpdateSystem: UpdateSystem<RoomClientUpdater>
+        public class UpdateSystem: UpdateSystem<LSClientUpdater>
         {
-            protected override void Update(RoomClientUpdater self)
+            protected override void Update(LSClientUpdater self)
             {
                 self.Update();
             }
         }
 
-        private static void Update(this RoomClientUpdater self)
+        private static void Update(this LSClientUpdater self)
         {
             Room room = self.GetParent<Room>();
             long timeNow = TimeHelper.ServerFrameTime();
@@ -51,7 +51,7 @@ namespace ET.Client
             clientScene.GetComponent<SessionComponent>().Session.Send(frameMessage);
         }
 
-        private static OneFrameInputs GetOneFrameMessages(this RoomClientUpdater self, int frame)
+        private static OneFrameInputs GetOneFrameMessages(this LSClientUpdater self, int frame)
         {
             Room room = self.GetParent<Room>();
             FrameBuffer frameBuffer = room.FrameBuffer;

Unity/Assets/Scripts/HotfixView/Client/LockStep/Camera/CameraComponentSystem.cs.meta → Unity/Assets/Scripts/Hotfix/Client/LockStep/LSClientUpdaterSystem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a2200b625f39c40f2a3a29a6f2399804
+guid: 46f47e16ad6bc417391e3cdee1b5a851
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Hotfix/Client/LockStep/ReplayUpdaterSystem.cs → Unity/Assets/Scripts/Hotfix/Client/LockStep/LSReplayUpdaterSystem.cs

@@ -2,19 +2,19 @@ using System;
 
 namespace ET.Client
 {
-    [FriendOf(typeof(ReplayUpdater))]
-    public static class ReplayComponentSystem
+    [FriendOf(typeof(LSReplayUpdater))]
+    public static class LSReplayComponentSystem
     {
         [ObjectSystem]
-        public class UpdateSystem: UpdateSystem<ReplayUpdater>
+        public class UpdateSystem: UpdateSystem<LSReplayUpdater>
         {
-            protected override void Update(ReplayUpdater self)
+            protected override void Update(LSReplayUpdater self)
             {
                 self.Update();
             }
         }
 
-        private static void Update(this ReplayUpdater self)
+        private static void Update(this LSReplayUpdater self)
         {
             Room room = self.GetParent<Room>();
             long timeNow = TimeHelper.ServerFrameTime();

Unity/Assets/Scripts/Hotfix/Client/LockStep/ReplayHelper.cs.meta → Unity/Assets/Scripts/Hotfix/Client/LockStep/LSReplayUpdaterSystem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5710f0881cff2419e9fceba5bab8ebcb
+guid: 1f2dc3825dd2f4641bce36a7b8b7708e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Hotfix/Client/LockStep/LSSceneChangeHelper.cs

@@ -12,7 +12,7 @@ namespace ET.Client
             room.Name = sceneName;
 
             // 等待表现层订阅的事件完成
-            await EventSystem.Instance.PublishAsync(clientScene, new EventType.LockStepSceneChangeStart() {Room = room});
+            await EventSystem.Instance.PublishAsync(clientScene, new EventType.LSSceneChangeStart() {Room = room});
 
             clientScene.GetComponent<SessionComponent>().Session.Send(new C2Room_ChangeSceneFinish());
             
@@ -22,10 +22,10 @@ namespace ET.Client
             room.LSWorld = new LSWorld(SceneType.LockStepClient);
             room.Init(waitRoom2CStart.Message.UnitInfo, waitRoom2CStart.Message.StartTime);
             
-            room.AddComponent<RoomClientUpdater>();
+            room.AddComponent<LSClientUpdater>();
 
             // 这个事件中可以订阅取消loading
-            EventSystem.Instance.Publish(clientScene, new EventType.LockStepSceneInitFinish());
+            EventSystem.Instance.Publish(clientScene, new EventType.LSSceneInitFinish());
         }
         
         // 场景切换协程
@@ -39,15 +39,15 @@ namespace ET.Client
             room.Replay = replay;
 
             // 等待表现层订阅的事件完成
-            await EventSystem.Instance.PublishAsync(clientScene, new EventType.LockStepSceneChangeStart() {Room = room});
+            await EventSystem.Instance.PublishAsync(clientScene, new EventType.LSSceneChangeStart() {Room = room});
             
             room.LSWorld = new LSWorld(SceneType.LockStepClient);
             room.Init(replay.UnitInfos, TimeHelper.ServerFrameTime());
             
-            room.AddComponent<ReplayUpdater>();
+            room.AddComponent<LSReplayUpdater>();
 
             // 这个事件中可以订阅取消loading
-            EventSystem.Instance.Publish(clientScene, new EventType.LockStepSceneInitFinish());
+            EventSystem.Instance.Publish(clientScene, new EventType.LSSceneInitFinish());
         }
     }
 }

Unity/Assets/Scripts/Hotfix/Client/LockStep/ReplayHelper.cs

@@ -1,4 +0,0 @@
-namespace ET.Client
-{
-    public static class ReplayHelper {}
-}

Unity/Assets/Scripts/Hotfix/Client/LockStep/RoomClientUpdaterSystem.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 02844d37e8634a5693b9112b0312e5e8
-timeCreated: 1681820453

Unity/Assets/Scripts/Hotfix/Server/LockStep/Map/C2Room_ChangeSceneFinishHandler.cs

@@ -31,7 +31,7 @@ namespace ET.Server
 
             room.Init(room2CStart.UnitInfo, room2CStart.StartTime);
 
-            room.AddComponent<RoomServerUpdater>();
+            room.AddComponent<LSServerUpdater>();
 
             RoomMessageHelper.BroadCast(room, room2CStart);
         }

Unity/Assets/Scripts/Hotfix/Server/LockStep/Room/RoomServerUpdaterSystem.cs → Unity/Assets/Scripts/Hotfix/Server/LockStep/Room/LSServerUpdaterSystem.cs

@@ -3,19 +3,19 @@ using System.Collections.Generic;
 
 namespace ET.Server
 {
-    [FriendOf(typeof(RoomServerUpdater))]
-    public static class RoomServerUpdaterSystem
+    [FriendOf(typeof(LSServerUpdater))]
+    public static class LSServerUpdaterSystem
     {
         [ObjectSystem]
-        public class UpdateSystem: UpdateSystem<RoomServerUpdater>
+        public class UpdateSystem: UpdateSystem<LSServerUpdater>
         {
-            protected override void Update(RoomServerUpdater self)
+            protected override void Update(LSServerUpdater self)
             {
                 self.Update();
             }
         }
         
-        private static void Update(this RoomServerUpdater self)
+        private static void Update(this LSServerUpdater self)
         {
             Room room = self.GetParent<Room>();
             long timeNow = TimeHelper.ServerFrameTime();
@@ -38,7 +38,7 @@ namespace ET.Server
             room.Update(oneFrameInputs, frame);
         }
 
-        private static OneFrameInputs GetOneFrameMessage(this RoomServerUpdater self, int frame)
+        private static OneFrameInputs GetOneFrameMessage(this LSServerUpdater self, int frame)
         {
             Room room = self.GetParent<Room>();
             FrameBuffer frameBuffer = room.FrameBuffer;

Unity/Assets/Scripts/HotfixView/Client/LockStep/LockStepAfterUnitCreate_CreateUnitFView.cs.meta → Unity/Assets/Scripts/Hotfix/Server/LockStep/Room/LSServerUpdaterSystem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8fc2605e4c5b84e4f92bd5cf1c239600
+guid: 524fc1d8fab854147a900bad52d3b28f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Hotfix/Server/LockStep/Room/RoomServerUpdaterSystem.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 1fd45f7713d34ac0bb959a4d75aabc4b
-timeCreated: 1681817972

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

@@ -61,7 +61,7 @@ namespace ET
         // 重新调整预测消息，只需要调整其他玩家的输入
         public static void CopyOtherInputsTo(Room room, OneFrameInputs from, OneFrameInputs to)
         {
-            long myId = room.GetComponent<RoomClientUpdater>().MyId;
+            long myId = room.GetComponent<LSClientUpdater>().MyId;
             foreach (var kv in from.Inputs)
             {
                 if (kv.Key == myId)

Unity/Assets/Scripts/HotfixView/Client/LockStep/Camera/CameraComponentSystem.cs → Unity/Assets/Scripts/HotfixView/Client/LockStep/Camera/LSCameraComponentSystem.cs

@@ -2,34 +2,34 @@
 
 namespace ET.Client
 {
-	[FriendOf(typeof(CameraComponent))]
-	public static class CameraComponentSystem
+	[FriendOf(typeof(LSCameraComponent))]
+	public static class LSCameraComponentSystem
 	{
 		[ObjectSystem]
-		public class AwakeSystem : AwakeSystem<CameraComponent>
+		public class AwakeSystem : AwakeSystem<LSCameraComponent>
 		{
-			protected override void Awake(CameraComponent self)
+			protected override void Awake(LSCameraComponent self)
 			{
 				self.Awake();
 			}
 		}
 
 		[ObjectSystem]
-		public class LateUpdateSystem : LateUpdateSystem<CameraComponent>
+		public class LateUpdateSystem : LateUpdateSystem<LSCameraComponent>
 		{
-			protected override void LateUpdate(CameraComponent self)
+			protected override void LateUpdate(LSCameraComponent self)
 			{
 				self.LateUpdate();
 			}
 		}
 
-		private static void Awake(this CameraComponent self)
+		private static void Awake(this LSCameraComponent self)
 		{
 			self.Camera = Camera.main;
 			self.Camera.transform.rotation = Quaternion.Euler(new Vector3(20, 0, 0));
 		}
 
-		private static void LateUpdate(this CameraComponent self)
+		private static void LateUpdate(this LSCameraComponent self)
 		{
 			// 摄像机每帧更新位置
 			Room room = self.GetParent<Room>();

Unity/Assets/Scripts/Hotfix/Client/LockStep/ReplayUpdaterSystem.cs.meta → Unity/Assets/Scripts/HotfixView/Client/LockStep/Camera/LSCameraComponentSystem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 622cdcb6fe92843b08630e4b7e491f09
+guid: 1484c3702f5a74740939fba06e41c132
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/HotfixView/Client/LockStep/LockStepAfterUnitCreate_CreateUnitFView.cs → Unity/Assets/Scripts/HotfixView/Client/LockStep/LSAfterUnitCreate_CreateUnitFView.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 namespace ET.Client
 {
     [Event(SceneType.LockStepClient)]
-    public class LockStepAfterUnitCreate_CreateUnitFView: AEvent<LSWorld, LSAfterUnitCreate>
+    public class LSAfterUnitCreate_CreateUnitFView: AEvent<LSWorld, LSAfterUnitCreate>
     {
         protected override async ETTask Run(LSWorld lsWorld, LSAfterUnitCreate args)
         {

Unity/Assets/Scripts/HotfixView/Client/LockStep/LSAfterUnitCreate_CreateUnitFView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d331a561092d14702b60ce62cb54ec42
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/HotfixView/Client/LockStep/LSOperaComponentSystem.cs

@@ -3,10 +3,10 @@ using UnityEngine;
 
 namespace ET.Client
 {
-    [FriendOf(typeof(RoomClientUpdater))]
+    [FriendOf(typeof(LSClientUpdater))]
     public static class LSOperaComponentSystem
     {
-        [FriendOf(typeof(RoomClientUpdater))]
+        [FriendOf(typeof(LSClientUpdater))]
         public class UpdateSystem: UpdateSystem<LSOperaComponent>
         {
             protected override void Update(LSOperaComponent self)
@@ -32,8 +32,8 @@ namespace ET.Client
                     v.x += 1;
                 }
 
-                RoomClientUpdater roomClientUpdater = self.GetParent<Room>().GetComponent<RoomClientUpdater>();
-                roomClientUpdater.Input.V = v.normalized;
+                LSClientUpdater lsClientUpdater = self.GetParent<Room>().GetComponent<LSClientUpdater>();
+                lsClientUpdater.Input.V = v.normalized;
             }
         }
     }

Unity/Assets/Scripts/HotfixView/Client/LockStep/LockStepSceneChangeStart_AddComponent.cs → Unity/Assets/Scripts/HotfixView/Client/LockStep/LSSceneChangeStart_AddComponent.cs

@@ -3,9 +3,9 @@ using UnityEngine.SceneManagement;
 namespace ET.Client
 {
     [Event(SceneType.LockStep)]
-    public class LockStepSceneChangeStart_AddComponent: AEvent<Scene, EventType.LockStepSceneChangeStart>
+    public class LSSceneChangeStart_AddComponent: AEvent<Scene, EventType.LSSceneChangeStart>
     {
-        protected override async ETTask Run(Scene clientScene, EventType.LockStepSceneChangeStart args)
+        protected override async ETTask Run(Scene clientScene, EventType.LSSceneChangeStart args)
         {
             Room room = clientScene.GetComponent<Room>();
             room.AddComponent<ResourcesLoaderComponent>();

Unity/Assets/Scripts/HotfixView/Client/LockStep/LSSceneChangeStart_AddComponent.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0cd0e782889f141f5875cb20971b9568
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/HotfixView/Client/LockStep/LockStepSceneInitFinish_Finish.cs → Unity/Assets/Scripts/HotfixView/Client/LockStep/LSSceneInitFinish_Finish.cs

@@ -1,13 +1,13 @@
 namespace ET.Client
 {
     [Event(SceneType.LockStep)]
-    public class LockStepSceneInitFinish_Finish: AEvent<Scene, EventType.LockStepSceneInitFinish>
+    public class LSSceneInitFinish_Finish: AEvent<Scene, EventType.LSSceneInitFinish>
     {
-        protected override async ETTask Run(Scene clientScene, EventType.LockStepSceneInitFinish args)
+        protected override async ETTask Run(Scene clientScene, EventType.LSSceneInitFinish args)
         {
             Room room = clientScene.GetComponent<Room>();
             
-            room.AddComponent<CameraComponent>();
+            room.AddComponent<LSCameraComponent>();
             
             room.AddComponent<LSOperaComponent>();
             

Unity/Assets/Scripts/HotfixView/Client/LockStep/LSSceneInitFinish_Finish.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1ac911ac3f20c49c6a05014a9a2ee9d8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/HotfixView/Client/LockStep/LockStepSceneChangeStart_AddComponent.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 33ccce38474ec48118e4cf6c874b7837
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/HotfixView/Client/LockStep/LockStepSceneInitFinish_Finish.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: f15b18dfd9a74576bd11f41018782308
-timeCreated: 1681704784

Unity/Assets/Scripts/Model/Client/LockStep/EventType.cs

@@ -2,12 +2,12 @@
 {
     namespace EventType
     {
-        public struct LockStepSceneChangeStart
+        public struct LSSceneChangeStart
         {
             public Room Room;
         }
         
-        public struct LockStepSceneInitFinish
+        public struct LSSceneInitFinish
         {
         }
 

Unity/Assets/Scripts/Model/Client/LockStep/RoomClientUpdater.cs → Unity/Assets/Scripts/Model/Client/LockStep/LSClientUpdater.cs

@@ -3,7 +3,7 @@ using TrueSync;
 namespace ET.Client
 {
     [ComponentOf(typeof(Room))]
-    public class RoomClientUpdater: Entity, IAwake, IUpdate
+    public class LSClientUpdater: Entity, IAwake, IUpdate
     {
         public LSInput Input = new();
         

Unity/Assets/Scripts/Model/Client/LockStep/LSClientUpdater.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: df98480c286284118a69673bd00cc110
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Model/Client/LockStep/ReplayUpdater.cs → Unity/Assets/Scripts/Model/Client/LockStep/LSReplayUpdater.cs

@@ -1,7 +1,7 @@
 namespace ET.Client
 {
     [ComponentOf(typeof(Room))]
-    public class ReplayUpdater: Entity, IAwake, IUpdate
+    public class LSReplayUpdater: Entity, IAwake, IUpdate
     {
     }
 }

Unity/Assets/Scripts/Model/Client/LockStep/LSReplayUpdater.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6f2c0f572224746eba69f60e57c595bb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Model/Client/LockStep/ReplayUpdater.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: b8bc2dea400744f949883533fcd4ffb5
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Model/Client/LockStep/RoomClientUpdater.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 4c80dfbe057947abb9c98713689cec3a
-timeCreated: 1681820360

Unity/Assets/Scripts/Model/Server/LockStep/Room/RoomServerUpdater.cs → Unity/Assets/Scripts/Model/Server/LockStep/Room/LSServerUpdater.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 namespace ET.Server
 {
     [ComponentOf(typeof(Room))]
-    public class RoomServerUpdater: Entity, IAwake, IUpdate
+    public class LSServerUpdater: Entity, IAwake, IUpdate
     {
     }
 }

Unity/Assets/Scripts/Model/Server/LockStep/Room/LSServerUpdater.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f48eaf95cced640e8b7c6adc082dbd07
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Model/Server/LockStep/Room/RoomServerUpdater.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 7b46cd58659b4b738034aca72bf19b18
-timeCreated: 1681737911

Unity/Assets/Scripts/ModelView/Client/LockStep/Camera/CameraComponent.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a256bd12fa27f344fb931f76d8303e9d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/ModelView/Client/LockStep/Camera/CameraComponent.cs → Unity/Assets/Scripts/ModelView/Client/LockStep/Camera/LSCameraComponent.cs

@@ -3,7 +3,7 @@
 namespace ET.Client
 {
 	[ComponentOf(typeof(Room))]
-	public class CameraComponent : Entity, IAwake, ILateUpdate
+	public class LSCameraComponent : Entity, IAwake, ILateUpdate
 	{
 		// 战斗摄像机
 		private Camera camera;

Unity/Assets/Scripts/ModelView/Client/LockStep/Camera/LSCameraComponent.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3d7aa03ccc3624ec480be23a942597aa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: