调整代码目录结构

Unity/Assets/Scripts/Core/Entity/SceneType.cs

@@ -3,7 +3,7 @@
 namespace ET
 {
 	[Flags]
-	public enum SceneType: ulong
+	public enum SceneType: long
 	{
 		None = 0,
 		Process = 1,
@@ -25,12 +25,14 @@ namespace ET
 		LockStepServer = 1 << 17,
 		Main = 1 << 18,
 
-		// 客户端Model层
+		// 客户端
 		Demo = 1 << 30,
-		Current = 1ul << 31,
-		LockStep = 1ul << 32,
+		Current = 1L << 31,
+		LockStep = 1L << 32,
+		LockStepView = 1L << 33,
+		DemoView = 1L << 34,
 
-		All = ulong.MaxValue,
+		All = long.MaxValue,
 	}
 
 	public static class SceneTypeHelper

Unity/Assets/Scripts/Core/Fiber/IdGenerater.cs

@@ -143,7 +143,7 @@ namespace ET
             }
             ++this.instanceIdValue;
                 
-            if (this.instanceIdValue > Mask20bit - 1)
+            if (this.instanceIdValue >= int.MaxValue)
             {
                 this.instanceIdValue = 0;
             }

Unity/Assets/Scripts/Core/Fiber/MailBoxComponent.cs

@@ -23,7 +23,7 @@
         public static void Add(this MailBoxComponent self, Address fromAddress, MessageObject messageObject)
         {
             // 根据mailboxType进行分发处理
-            EventSystem.Instance.Invoke((int)self.MailBoxType, new MailBoxInvoker() {MailBoxComponent = self, MessageObject = messageObject, FromAddress = fromAddress});
+            EventSystem.Instance.Invoke((long)self.MailBoxType, new MailBoxInvoker() {MailBoxComponent = self, MessageObject = messageObject, FromAddress = fromAddress});
         }
     }
 

Unity/Assets/Scripts/Core/Fiber/MailBoxType.cs

@@ -3,7 +3,7 @@
     public enum MailBoxType
     {
         OrderedMessage = 1,
-        UnOrderMessage,
+        UnOrderedMessage,
         GateSession,
     }
 }

Unity/Assets/Scripts/Core/World/Module/EventSystem/EventSystem.cs

@@ -24,7 +24,7 @@ namespace ET
 
         private readonly Dictionary<Type, List<EventInfo>> allEvents = new();
         
-        private Dictionary<Type, Dictionary<int, object>> allInvokes = new(); 
+        private Dictionary<Type, Dictionary<long, object>> allInvokes = new(); 
         
         public void Awake(Dictionary<string, Type> addTypes)
         {
@@ -75,7 +75,7 @@ namespace ET
                 }
             }
 
-            this.allInvokes = new Dictionary<Type, Dictionary<int, object>>();
+            this.allInvokes = new Dictionary<Type, Dictionary<long, object>>();
             foreach (Type type in types[typeof (InvokeAttribute)])
             {
                 object obj = Activator.CreateInstance(type);
@@ -90,7 +90,7 @@ namespace ET
                 {
                     if (!this.allInvokes.TryGetValue(iInvoke.Type, out var dict))
                     {
-                        dict = new Dictionary<int, object>();
+                        dict = new Dictionary<long, object>();
                         this.allInvokes.Add(iInvoke.Type, dict);
                     }
                     
@@ -196,7 +196,7 @@ namespace ET
         // 既然Invoke跟函数一样，那么为什么不使用函数呢? 因为有时候不方便直接调用，比如Config加载，在客户端跟服务端加载方式不一样。比如TimerComponent需要根据Id分发
         // 注意，不要把Invoke当函数使用，这样会造成代码可读性降低，能用函数不要用Invoke
         // publish是事件，抛出去可以没人订阅，调用者跟被调用者属于两个模块，比如任务系统需要知道道具使用的信息，则订阅道具使用事件
-        public void Invoke<A>(int type, A args) where A: struct
+        public void Invoke<A>(long type, A args) where A: struct
         {
             if (!this.allInvokes.TryGetValue(typeof(A), out var invokeHandlers))
             {
@@ -216,7 +216,7 @@ namespace ET
             aInvokeHandler.Handle(args);
         }
         
-        public T Invoke<A, T>(int type, A args) where A: struct
+        public T Invoke<A, T>(long type, A args) where A: struct
         {
             if (!this.allInvokes.TryGetValue(typeof(A), out var invokeHandlers))
             {

Unity/Assets/Scripts/Core/World/Module/EventSystem/InvokeAttribute.cs

@@ -2,9 +2,9 @@
 {
     public class InvokeAttribute: BaseAttribute
     {
-        public int Type { get; }
+        public long Type { get; }
 
-        public InvokeAttribute(int type = 0)
+        public InvokeAttribute(long type = 0)
         {
             this.Type = type;
         }

Unity/Assets/Scripts/Core/World/Module/Fiber/FiberManager.cs

@@ -6,7 +6,7 @@ namespace ET
 {
     public partial class FiberManager: Singleton<FiberManager>, ISingletonAwake
     {
-        private int idGenerator = 1000; // 1000以下为保留的fiber id
+        private int idGenerator = 10000000; // 10000000以下为保留的用于StartSceneConfig的fiber id, 1个区配置1000个纤程，可以配置10000个区
         private readonly ConcurrentDictionary<int, Fiber> fibers = new();
         
         public void Awake()
@@ -15,20 +15,25 @@ namespace ET
         
         public int Create(int fiberId, SceneType sceneType)
         {
-            fiberId = Interlocked.Increment(ref this.idGenerator);
             Fiber fiber = new(fiberId, Options.Instance.Process, sceneType);
             
             fiber.AddComponent<TimerComponent>();
             fiber.AddComponent<CoroutineLockComponent>();
-            fiber.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderMessage);
+            fiber.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
                 
             // 根据Fiber的SceneType分发Init
-            EventSystem.Instance.Invoke((int)sceneType, new FiberInit() {Fiber = fiber});
+            EventSystem.Instance.Invoke((long)sceneType, new FiberInit() {Fiber = fiber});
                 
             this.fibers[(int)fiber.Id] = fiber;
             return fiberId;
         }
         
+        public int Create(SceneType sceneType)
+        {
+            int fiberId = Interlocked.Increment(ref this.idGenerator);
+            return Create(fiberId, sceneType);
+        }
+        
         // 不允许外部调用,只能由Schecher执行完成一帧调用，否则容易出现多线程问题
         private void Remove(int id)
         {

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Benchmark.meta → Unity/Assets/Scripts/Hotfix/Server/Demo/Benchmark.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fb5bd93163a7603438eb1431a0a211a3
+guid: 026ceb4c7b1a5b7439ad918fc35f7e0a
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Scripts/Hotfix/Server/Demo/EntryEvent2_InitServer.cs

@@ -8,7 +8,7 @@ namespace ET.Server
         protected override async ETTask Run(Fiber fiber, ET.EventType.EntryEvent2 args)
         {
             // 发送普通actor消息
-            fiber.AddComponent<ActorMessageSenderComponent>();
+            fiber.AddComponent<ActorSenderComponent>();
             // 发送location actor消息
             fiber.AddComponent<ActorLocationSenderComponent>();
             // 访问location server的组件

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Gate.meta → Unity/Assets/Scripts/Hotfix/Server/Demo/Gate.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 809d1d711564bc74d990a54937767a79
+guid: 1513fb8025bddeb49b07673e0fbcf7b5
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Gate/C2G_LoginGateHandler.cs → Unity/Assets/Scripts/Hotfix/Server/Demo/Gate/C2G_LoginGateHandler.cs

@@ -29,7 +29,7 @@ namespace ET.Server
                 playerSessionComponent.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.GateSession);
                 await playerSessionComponent.AddLocation(LocationType.GateSession);
 			
-                player.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderMessage);
+                player.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
                 await player.AddLocation(LocationType.Player);
 			
                 session.AddComponent<SessionPlayerComponent>().Player = player;
@@ -58,7 +58,7 @@ namespace ET.Server
         {
             await player.Fiber().WaitFrameFinish();
             
-            Room2G_Reconnect room2GateReconnect = await player.Fiber().GetComponent<ActorMessageSenderComponent>().Call(
+            Room2G_Reconnect room2GateReconnect = await player.Fiber().GetComponent<ActorSenderComponent>().Call(
                 player.GetComponent<PlayerRoomComponent>().RoomActorId,
                 new G2Room_Reconnect() { PlayerId = player.Id }) as Room2G_Reconnect;
             session.Send(new G2C_Reconnect() { StartTime = room2GateReconnect.StartTime, UnitInfos = room2GateReconnect.UnitInfos, Frame = room2GateReconnect.Frame});

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Gate/FiberInit_Gate.cs → Unity/Assets/Scripts/Hotfix/Server/Demo/Gate/FiberInit_Gate.cs

@@ -2,7 +2,7 @@
 
 namespace ET.Server
 {
-    [Invoke((int)SceneType.Gate)]
+    [Invoke((long)SceneType.Gate)]
     public class FiberInit_Gate: AInvokeHandler<FiberInit>
     {
         public override void Handle(FiberInit fiberInit)

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Gate/MailBoxType_GateSessionHandler.cs → Unity/Assets/Scripts/Hotfix/Server/Demo/Gate/MailBoxType_GateSessionHandler.cs

@@ -1,6 +1,6 @@
 namespace ET.Server
 {
-    [Invoke((int)MailBoxType.GateSession)]
+    [Invoke((long)MailBoxType.GateSession)]
     public class MailBoxType_GateSessionHandler: AInvokeHandler<MailBoxInvoker>
     {
         public override void Handle(MailBoxInvoker args)

Unity/Assets/Scripts/Hotfix/Server/Demo/Session/NetServerComponentOnReadEvent.cs → Unity/Assets/Scripts/Hotfix/Server/Demo/Gate/NetServerComponentOnReadEvent.cs

@@ -23,7 +23,7 @@
                     Player player = session.GetComponent<SessionPlayerComponent>().Player;
                     ActorId roomActorId = player.GetComponent<PlayerRoomComponent>().RoomActorId;
                     frameMessage.PlayerId = player.Id;
-                    fiber.GetComponent<ActorMessageSenderComponent>().Send(roomActorId, frameMessage);
+                    fiber.GetComponent<ActorSenderComponent>().Send(roomActorId, frameMessage);
                     break;
                 }
                 case IActorRoom actorRoom:
@@ -31,7 +31,7 @@
                     Player player = session.GetComponent<SessionPlayerComponent>().Player;
                     ActorId roomActorId = player.GetComponent<PlayerRoomComponent>().RoomActorId;
                     actorRoom.PlayerId = player.Id;
-                    fiber.GetComponent<ActorMessageSenderComponent>().Send(roomActorId, actorRoom);
+                    fiber.GetComponent<ActorSenderComponent>().Send(roomActorId, actorRoom);
                     break;
                 }
                 case IActorLocationMessage actorLocationMessage:

Unity/Assets/Scripts/Hotfix/Server/Demo/Session/NetServerComponentOnReadEvent.cs.meta → Unity/Assets/Scripts/Hotfix/Server/Demo/Gate/NetServerComponentOnReadEvent.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 87ee8355f07f23b4ab0c84c04d3e2f98
+guid: d8d62222c52da1d43975f204b0d24b07
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Hotfix/Server/Demo/Helper.meta

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

Unity/Assets/Scripts/Hotfix/Server/Demo/Helper/HttpHelper.cs.meta → Unity/Assets/Scripts/Hotfix/Server/Demo/HttpHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c66278a2d36bf754aaf5a7c1524d1880
+guid: d4a6cc30502b32b44b6f536b3fba5756
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Map.meta → Unity/Assets/Scripts/Hotfix/Server/Demo/Map.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5465ba9a6b420c8458ffaf84f2c50261
+guid: 0beef288928e88b4d8cad09b6a39c25d
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Map/Transfer/TransferHelper.cs → Unity/Assets/Scripts/Hotfix/Server/Demo/Map/Transfer/TransferHelper.cs

@@ -33,7 +33,7 @@ namespace ET.Server
             unit.Dispose();
             
             await fiber.GetComponent<LocationProxyComponent>().Lock(LocationType.Unit, unitId, request.OldActorId);
-            await fiber.GetComponent<ActorMessageSenderComponent>().Call(sceneInstanceId, request);
+            await fiber.GetComponent<ActorSenderComponent>().Call(sceneInstanceId, request);
         }
     }
 }

Unity/Assets/Scripts/Hotfix/Server/Demo/Helper/MessageHelper.cs → Unity/Assets/Scripts/Hotfix/Server/Demo/MessageHelper.cs

@@ -42,7 +42,7 @@ namespace ET.Server
         /// </summary>
         public static void SendActor(Fiber fiber, ActorId actorId, IActorMessage message)
         {
-            fiber.GetComponent<ActorMessageSenderComponent>().Send(actorId, message);
+            fiber.GetComponent<ActorSenderComponent>().Send(actorId, message);
         }
     }
 }

Unity/Assets/Scripts/Hotfix/Server/Demo/Helper/MessageHelper.cs.meta → Unity/Assets/Scripts/Hotfix/Server/Demo/MessageHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 48ea2db1b16277e44a92e593710fd747
+guid: f741e13c630658444812d605a1de756f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Realm.meta → Unity/Assets/Scripts/Hotfix/Server/Demo/Realm.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 37ff41fccda78ba48b3e8d21f2e74594
+guid: 80190480a51b8114fb16950142846bd7
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Realm/C2R_LoginHandler.cs → Unity/Assets/Scripts/Hotfix/Server/Demo/Realm/C2R_LoginHandler.cs

@@ -14,7 +14,7 @@ namespace ET.Server
 			Log.Debug($"gate address: {MongoHelper.ToJson(config)}");
 			
 			// 向gate请求一个key,客户端可以拿着这个key连接gate
-			G2R_GetLoginKey g2RGetLoginKey = (G2R_GetLoginKey) await session.Fiber().GetComponent<ActorMessageSenderComponent>().Call(
+			G2R_GetLoginKey g2RGetLoginKey = (G2R_GetLoginKey) await session.Fiber().GetComponent<ActorSenderComponent>().Call(
 				config.ActorId, new R2G_GetLoginKey() {Account = request.Account});
 
 			response.Address = config.InnerIPOutPort.ToString();

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Realm/FiberInit_Realm.cs → Unity/Assets/Scripts/Hotfix/Server/Demo/Realm/FiberInit_Realm.cs

@@ -2,7 +2,7 @@
 
 namespace ET.Server
 {
-    [Invoke((int)SceneType.Realm)]
+    [Invoke((long)SceneType.Realm)]
     public class FiberInit_Realm: AInvokeHandler<FiberInit>
     {
         public override void Handle(FiberInit fiberInit)

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Robot.meta → Unity/Assets/Scripts/Hotfix/Server/Demo/Robot.meta

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

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Robot/Scene/RobotSceneFactory.cs → Unity/Assets/Scripts/Hotfix/Server/Demo/Robot/Scene/RobotSceneFactory.cs

@@ -16,7 +16,7 @@ namespace ET.Server
             Log.Info($"create scene: {sceneType} {name} {zone}");
             Scene scene = EntitySceneFactory.CreateScene(id, instanceId, zone, sceneType, name, parent);
 
-            scene.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderMessage);
+            scene.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
 
             switch (scene.SceneType)
             {

Unity/Assets/Scripts/Hotfix/Server/Demo/Scenes/Router.meta → Unity/Assets/Scripts/Hotfix/Server/Demo/Router.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0f8d1eb2efc0cd345a6fd4d399373007
+guid: 3475a99ac00ec6a40ac4b9bb6b84ab8c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}