Ver código fonte

MailBoxType CoroutineLockType LocationType 都改成int,都带上PackageType,避免Package之间冲突

tanghai 1 ano atrás
pai
commit
0c88e2d2f4
51 arquivos alterados com 231 adições e 84 exclusões
  1. 7 0
      Unity/Assets/Bundles/Config/UnitConfigCategory.bytes.meta
  2. 1 1
      Unity/Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/FiberInit_Location.cs
  3. 4 4
      Unity/Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/LocationOneTypeSystem.cs
  4. 1 1
      Unity/Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MailBoxType_OrderedMessageHandler.cs
  5. 1 1
      Unity/Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MailBoxType_OrderedMessageHandler.cs.meta
  6. 3 3
      Unity/Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MessageLocationSenderComponentSystem.cs
  7. 8 0
      Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/CoroutineLockType.cs
  8. 1 1
      Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/CoroutineLockType.cs.meta
  9. 0 11
      Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/LocationComponent.cs
  10. 7 0
      Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/MailBoxType.cs
  11. 1 1
      Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/MailBoxType.cs.meta
  12. 0 2
      Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/MessageLocationSenderOneType.cs
  13. 0 0
      Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/TimerInvokeType.cs
  14. 1 1
      Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/TimerInvokeType.cs.meta
  15. 4 4
      Unity/Packages/cn.etetet.core/Runtime/Fiber/CoroutineLock/CoroutineLock.cs
  16. 5 5
      Unity/Packages/cn.etetet.core/Runtime/Fiber/CoroutineLock/CoroutineLockComponent.cs
  17. 5 5
      Unity/Packages/cn.etetet.core/Runtime/Fiber/CoroutineLock/CoroutineLockQueue.cs
  18. 1 1
      Unity/Packages/cn.etetet.core/Runtime/Fiber/CoroutineLock/CoroutineLockQueueType.cs
  19. 0 16
      Unity/Packages/cn.etetet.core/Runtime/Fiber/CoroutineLock/CoroutineLockType.cs
  20. 4 4
      Unity/Packages/cn.etetet.core/Runtime/Fiber/Mailbox/MailBoxComponent.cs
  21. 0 9
      Unity/Packages/cn.etetet.core/Runtime/Fiber/Mailbox/MailBoxType.cs
  22. 1 1
      Unity/Packages/cn.etetet.core/Scripts/Hotfix/Server/FiberInit_NetInner.cs
  23. 8 0
      Unity/Packages/cn.etetet.core/Scripts/Hotfix/Share.meta
  24. 1 1
      Unity/Packages/cn.etetet.core/Scripts/Hotfix/Share/MailBoxType_UnOrderedMessageHandler.cs
  25. 1 1
      Unity/Packages/cn.etetet.core/Scripts/Hotfix/Share/MailBoxType_UnOrderedMessageHandler.cs.meta
  26. 7 0
      Unity/Packages/cn.etetet.core/Scripts/Model/Share/CoroutineLockType.cs
  27. 11 0
      Unity/Packages/cn.etetet.core/Scripts/Model/Share/CoroutineLockType.cs.meta
  28. 7 0
      Unity/Packages/cn.etetet.core/Scripts/Model/Share/MailBoxType.cs
  29. 11 0
      Unity/Packages/cn.etetet.core/Scripts/Model/Share/MailBoxType.cs.meta
  30. 8 0
      Unity/Packages/cn.etetet.core/Scripts/Model/Share/Mailbox.meta
  31. 7 0
      Unity/Packages/cn.etetet.db/Scripts/Model/Server/CoroutineLockType.cs
  32. 11 0
      Unity/Packages/cn.etetet.db/Scripts/Model/Server/CoroutineLockType.cs.meta
  33. 7 0
      Unity/Packages/cn.etetet.db/Scripts/Model/Server/PackageType.cs
  34. 11 0
      Unity/Packages/cn.etetet.db/Scripts/Model/Server/PackageType.cs.meta
  35. 2 2
      Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Client/NetClient/FiberInit_NetClient.cs
  36. 2 2
      Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Gate/C2G_LoginGateHandler.cs
  37. 1 1
      Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Gate/FiberInit_Gate.cs
  38. 1 1
      Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Gate/GateMapFactory.cs
  39. 1 1
      Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Gate/MailBoxType_GateSessionHandler.cs
  40. 1 1
      Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Map/FiberInit_Map.cs
  41. 1 1
      Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Map/Transfer/M2M_UnitTransferRequestHandler.cs
  42. 1 1
      Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Realm/FiberInit_Realm.cs
  43. 1 1
      Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Share/EntryEvent1_InitShare.cs
  44. 9 0
      Unity/Packages/cn.etetet.statesync/Scripts/Model/Server/Gate/LocationType.cs
  45. 11 0
      Unity/Packages/cn.etetet.statesync/Scripts/Model/Server/Gate/LocationType.cs.meta
  46. 7 0
      Unity/Packages/cn.etetet.statesync/Scripts/Model/Server/MailBoxType.cs
  47. 11 0
      Unity/Packages/cn.etetet.statesync/Scripts/Model/Server/MailBoxType.cs.meta
  48. 8 0
      Unity/Packages/cn.etetet.yooassets/Scripts/ModelView/Client/CoroutineLockType.cs
  49. 11 0
      Unity/Packages/cn.etetet.yooassets/Scripts/ModelView/Client/CoroutineLockType.cs.meta
  50. 7 0
      Unity/Packages/cn.etetet.yooassets/Scripts/ModelView/Client/PackageType.cs
  51. 11 0
      Unity/Packages/cn.etetet.yooassets/Scripts/ModelView/Client/PackageType.cs.meta

+ 7 - 0
Unity/Assets/Bundles/Config/UnitConfigCategory.bytes.meta

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

+ 1 - 1
Unity/Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/FiberInit_Location.cs

@@ -8,7 +8,7 @@ namespace ET.Server
         public override async ETTask Handle(FiberInit fiberInit)
         {
             Scene root = fiberInit.Fiber.Root;
-            root.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
+            root.AddComponent<MailBoxComponent, int>(MailBoxType.UnOrderedMessage);
             root.AddComponent<TimerComponent>();
             root.AddComponent<CoroutineLockComponent>();
             root.AddComponent<ProcessInnerSender>();

+ 4 - 4
Unity/Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/LocationOneTypeSystem.cs

@@ -34,7 +34,7 @@ namespace ET.Server
         
         public static async ETTask Add(this LocationOneType self, long key, ActorId instanceId)
         {
-            int coroutineLockType = ((int)self.Id << 16) | CoroutineLockType.Location;
+            long coroutineLockType = (self.Id << 32) | CoroutineLockType.Location;
             using (await self.Root().GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, key))
             {
                 self.locations[key] = instanceId;
@@ -44,7 +44,7 @@ namespace ET.Server
 
         public static async ETTask Remove(this LocationOneType self, long key)
         {
-            int coroutineLockType = ((int)self.Id << 16) | CoroutineLockType.Location;
+            long coroutineLockType = (self.Id << 32) | CoroutineLockType.Location;
             using (await self.Root().GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, key))
             {
                 self.locations.Remove(key);
@@ -54,7 +54,7 @@ namespace ET.Server
 
         public static async ETTask Lock(this LocationOneType self, long key, ActorId actorId, int time = 0)
         {
-            int coroutineLockType = ((int)self.Id << 16) | CoroutineLockType.Location;
+            long coroutineLockType = (self.Id << 32) | CoroutineLockType.Location;
             CoroutineLock coroutineLock = await self.Root().GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, key);
 
             LockInfo lockInfo = self.AddChild<LockInfo, ActorId, CoroutineLock>(actorId, coroutineLock);
@@ -106,7 +106,7 @@ namespace ET.Server
 
         public static async ETTask<ActorId> Get(this LocationOneType self, long key)
         {
-            int coroutineLockType = ((int)self.Id << 16) | CoroutineLockType.Location;
+            long coroutineLockType = (self.Id << 32) | CoroutineLockType.Location;
             using (await self.Root().GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, key))
             {
                 self.locations.TryGetValue(key, out ActorId actorId);

+ 1 - 1
Unity/Packages/cn.etetet.core/Runtime/Fiber/Mailbox/MailBoxType_OrderedMessageHandler.cs → Unity/Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MailBoxType_OrderedMessageHandler.cs

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

+ 1 - 1
Unity/Packages/cn.etetet.core/Runtime/Fiber/Mailbox/MailBoxType_OrderedMessageHandler.cs.meta → Unity/Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MailBoxType_OrderedMessageHandler.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5570a3679a3fa4635aec82d8f06f773c
+guid: a9c4b26ad1534c74587a35a5a314b604
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 3
Unity/Packages/cn.etetet.actorlocation/Scripts/Hotfix/Server/MessageLocationSenderComponentSystem.cs

@@ -111,7 +111,7 @@ namespace ET.Server
             
             long instanceId = messageLocationSender.InstanceId;
             
-            int coroutineLockType = ((int)self.Id << 16) | CoroutineLockType.MessageLocationSender;
+            long coroutineLockType = (self.Id << 32) | CoroutineLockType.MessageLocationSender;
             using (await root.Root().GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, entityId))
             {
                 if (messageLocationSender.InstanceId != instanceId)
@@ -149,7 +149,7 @@ namespace ET.Server
             
             long instanceId = messageLocationSender.InstanceId;
             
-            int coroutineLockType = ((int)self.Id << 16) | CoroutineLockType.MessageLocationSender;
+            long coroutineLockType = (self.Id << 32) | CoroutineLockType.MessageLocationSender;
             using (await root.GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, entityId))
             {
                 if (messageLocationSender.InstanceId != instanceId)
@@ -183,7 +183,7 @@ namespace ET.Server
             Scene root = self.Root();
             Type iRequestType = iRequest.GetType();
             long actorLocationSenderInstanceId = messageLocationSender.InstanceId;
-            int coroutineLockType = ((int)self.Id << 16) | CoroutineLockType.MessageLocationSender;
+            long coroutineLockType = (self.Id << 32) | CoroutineLockType.MessageLocationSender;
             using (await root.GetComponent<CoroutineLockComponent>().Wait(coroutineLockType, entityId))
             {
                 if (messageLocationSender.InstanceId != actorLocationSenderInstanceId)

+ 8 - 0
Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/CoroutineLockType.cs

@@ -0,0 +1,8 @@
+namespace ET
+{
+    public static partial class CoroutineLockType
+    {
+        public const int Location = PackageType.ActorLocation * 1000 + 1;                  // location进程上使用
+        public const int MessageLocationSender = PackageType.ActorLocation * 1000 + 2;       // MessageLocationSender中队列消息 
+    }
+}

+ 1 - 1
Unity/Packages/cn.etetet.core/Runtime/Fiber/CoroutineLock/CoroutineLockType.cs.meta → Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/CoroutineLockType.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d66a751e8de660f4eb57de33db77e33a
+guid: c342e8ab590122c499caf23e5ea0d8b0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 11
Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/LocationComponent.cs

@@ -2,17 +2,6 @@ using System.Collections.Generic;
 
 namespace ET.Server
 {
-    [UniqueId(0, 100)]
-    public static class LocationType
-    {
-        public const int Unit = 0;
-        public const int Player = 1;
-        public const int Friend = 2;
-        public const int Chat = 3;
-        public const int GateSession = 4;
-        public const int Max = 10;
-    }
-    
     [ChildOf(typeof(LocationOneType))]
     public class LockInfo: Entity, IAwake<ActorId, CoroutineLock>, IDestroy
     {

+ 7 - 0
Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/MailBoxType.cs

@@ -0,0 +1,7 @@
+namespace ET
+{
+    public static partial class MailBoxType
+    {
+        public const int OrderedMessage = PackageType.ActorLocation * 1000 + 1;
+    }
+}

+ 1 - 1
Unity/Packages/cn.etetet.core/Runtime/Fiber/Mailbox/MailBoxType.cs.meta → Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/MailBoxType.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4423ac27285b74dd59d618696dae2303
+guid: 20650ec67eef9754392f6955bf38b8b1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 2
Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/MessageLocationSenderOneType.cs

@@ -13,8 +13,6 @@
     [ComponentOf(typeof(Scene))]
     public class MessageLocationSenderComponent: Entity, IAwake
     {
-        public const long TIMEOUT_TIME = 60 * 1000;
-
         public long CheckTimer;
     }
 }

+ 0 - 0
Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Share/TimerInvokeType.cs → Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/TimerInvokeType.cs


+ 1 - 1
Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Share/TimerInvokeType.cs.meta → Unity/Packages/cn.etetet.actorlocation/Scripts/Model/Server/TimerInvokeType.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 832a429214294684bad5fda11cbb7f9f
+guid: 4adf52c305547e04c922590aacd6ef9b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 4 - 4
Unity/Packages/cn.etetet.core/Runtime/Fiber/CoroutineLock/CoroutineLock.cs

@@ -6,7 +6,7 @@ namespace ET
     public static partial class CoroutineLockSystem
     {
         [EntitySystem]
-        private static void Awake(this CoroutineLock self, int type, long k, int count)
+        private static void Awake(this CoroutineLock self, long type, long k, int count)
         {
             self.type = type;
             self.key = k;
@@ -17,16 +17,16 @@ namespace ET
         private static void Destroy(this CoroutineLock self)
         {
             self.Scene<CoroutineLockComponent>().RunNextCoroutine(self.type, self.key, self.level + 1);
-            self.type = CoroutineLockType.None;
+            self.type = 0;
             self.key = 0;
             self.level = 0;
         }
     }
     
     [ChildOf(typeof(CoroutineLockQueue))]
-    public class CoroutineLock: Entity, IAwake<int, long, int>, IDestroy
+    public class CoroutineLock: Entity, IAwake<long, long, int>, IDestroy
     {
-        public int type;
+        public long type;
         public long key;
         public int level;
     }

+ 5 - 5
Unity/Packages/cn.etetet.core/Runtime/Fiber/CoroutineLock/CoroutineLockComponent.cs

@@ -17,12 +17,12 @@ namespace ET
             // 循环过程中会有对象继续加入队列
             while (self.nextFrameRun.Count > 0)
             {
-                (int coroutineLockType, long key, int count) = self.nextFrameRun.Dequeue();
+                (long coroutineLockType, long key, int count) = self.nextFrameRun.Dequeue();
                 self.Notify(coroutineLockType, key, count);
             }
         }
 
-        public static void RunNextCoroutine(this CoroutineLockComponent self, int coroutineLockType, long key, int level)
+        public static void RunNextCoroutine(this CoroutineLockComponent self, long coroutineLockType, long key, int level)
         {
             // 一个协程队列一帧处理超过100个,说明比较多了,打个warning,检查一下是否够正常
             if (level == 100)
@@ -33,13 +33,13 @@ namespace ET
             self.nextFrameRun.Enqueue((coroutineLockType, key, level));
         }
 
-        public static async ETTask<CoroutineLock> Wait(this CoroutineLockComponent self, int coroutineLockType, long key, int time = 60000)
+        public static async ETTask<CoroutineLock> Wait(this CoroutineLockComponent self, long coroutineLockType, long key, int time = 60000)
         {
             CoroutineLockQueueType coroutineLockQueueType = self.GetChild<CoroutineLockQueueType>(coroutineLockType) ?? self.AddChildWithId<CoroutineLockQueueType>(coroutineLockType);
             return await coroutineLockQueueType.Wait(key, time);
         }
 
-        private static void Notify(this CoroutineLockComponent self, int coroutineLockType, long key, int level)
+        private static void Notify(this CoroutineLockComponent self, long coroutineLockType, long key, int level)
         {
             CoroutineLockQueueType coroutineLockQueueType = self.GetChild<CoroutineLockQueueType>(coroutineLockType);
             if (coroutineLockQueueType == null)
@@ -56,6 +56,6 @@ namespace ET
         public Fiber Fiber { get; set; }
         public int SceneType { get; set; }
         
-        public readonly Queue<(int, long, int)> nextFrameRun = new();
+        public readonly Queue<(long, long, int)> nextFrameRun = new();
     }
 }

+ 5 - 5
Unity/Packages/cn.etetet.core/Runtime/Fiber/CoroutineLock/CoroutineLockQueue.cs

@@ -7,7 +7,7 @@ namespace ET
     public static partial class CoroutineLockQueueSystem
     {
         [EntitySystem]
-        private static void Awake(this CoroutineLockQueue self, int type)
+        private static void Awake(this CoroutineLockQueue self, long type)
         {
             self.type = type;
         }
@@ -24,7 +24,7 @@ namespace ET
         {
             if (self.CurrentCoroutineLock == null)
             {
-                self.CurrentCoroutineLock = self.AddChild<CoroutineLock, int, long, int>(self.type, self.Id, 1, true);
+                self.CurrentCoroutineLock = self.AddChild<CoroutineLock, long, long, int>(self.type, self.Id, 1, true);
                 return self.CurrentCoroutineLock;
             }
 
@@ -52,7 +52,7 @@ namespace ET
                     continue;
                 }
 
-                CoroutineLock coroutineLock = self.AddChild<CoroutineLock, int, long, int>(self.type, self.Id, level, true);
+                CoroutineLock coroutineLock = self.AddChild<CoroutineLock, long, long, int>(self.type, self.Id, level, true);
 
                 waitCoroutineLock.SetResult(coroutineLock);
                 return true;
@@ -62,9 +62,9 @@ namespace ET
     }
     
     [ChildOf(typeof(CoroutineLockQueueType))]
-    public class CoroutineLockQueue: Entity, IAwake<int>, IDestroy
+    public class CoroutineLockQueue: Entity, IAwake<long>, IDestroy
     {
-        public int type;
+        public long type;
 
         private EntityRef<CoroutineLock> currentCoroutineLock;
 

+ 1 - 1
Unity/Packages/cn.etetet.core/Runtime/Fiber/CoroutineLock/CoroutineLockQueueType.cs

@@ -17,7 +17,7 @@ namespace ET
 
         public static CoroutineLockQueue New(this CoroutineLockQueueType self, long key)
         {
-            CoroutineLockQueue queue = self.AddChildWithId<CoroutineLockQueue, int>(key, (int)self.Id, true);
+            CoroutineLockQueue queue = self.AddChildWithId<CoroutineLockQueue, long>(key, self.Id, true);
             return queue;
         }
 

+ 0 - 16
Unity/Packages/cn.etetet.core/Runtime/Fiber/CoroutineLock/CoroutineLockType.cs

@@ -1,16 +0,0 @@
-namespace ET
-{
-    public static class CoroutineLockType
-    {
-        public const int None = 0;
-        public const int Location = 1;                  // location进程上使用
-        public const int MessageLocationSender = 2;       // MessageLocationSender中队列消息 
-        public const int Mailbox = 3;                   // Mailbox中队列
-        public const int UnitId = 4;                    // Map服务器上线下线时使用
-        public const int DB = 5;
-        public const int Resources = 6;
-        public const int ResourcesLoader = 7;
-
-        public const int Max = 100; // 这个必须最大
-    }
-}

+ 4 - 4
Unity/Packages/cn.etetet.core/Runtime/Fiber/Mailbox/MailBoxComponent.cs

@@ -4,7 +4,7 @@
     public static partial class MailBoxComponentSystem
     {
         [EntitySystem]       
-        private static void Awake(this MailBoxComponent self, MailBoxType mailBoxType)
+        private static void Awake(this MailBoxComponent self, int mailBoxType)
         {
             Fiber fiber = self.Fiber();
             self.MailBoxType = mailBoxType;
@@ -22,7 +22,7 @@
         public static void Add(this MailBoxComponent self, Address fromAddress, MessageObject messageObject)
         {
             // 根据mailboxType进行分发处理
-            EventSystem.Instance.Invoke((long)self.MailBoxType, new MailBoxInvoker() {MailBoxComponent = self, MessageObject = messageObject, FromAddress = fromAddress});
+            EventSystem.Instance.Invoke(self.MailBoxType, new MailBoxInvoker() {MailBoxComponent = self, MessageObject = messageObject, FromAddress = fromAddress});
         }
     }
 
@@ -37,10 +37,10 @@
     /// 挂上这个组件表示该Entity是一个Actor,接收的消息将会队列处理
     /// </summary>
     [ComponentOf]
-    public class MailBoxComponent: Entity, IAwake<MailBoxType>, IDestroy
+    public class MailBoxComponent: Entity, IAwake<int>, IDestroy
     {
         public long ParentInstanceId { get; set; }
         // Mailbox的类型
-        public MailBoxType MailBoxType { get; set; }
+        public int MailBoxType { get; set; }
     }
 }

+ 0 - 9
Unity/Packages/cn.etetet.core/Runtime/Fiber/Mailbox/MailBoxType.cs

@@ -1,9 +0,0 @@
-namespace ET
-{
-    public enum MailBoxType
-    {
-        OrderedMessage = 1,
-        UnOrderedMessage,
-        GateSession,
-    }
-}

+ 1 - 1
Unity/Packages/cn.etetet.core/Scripts/Hotfix/Server/FiberInit_NetInner.cs

@@ -8,7 +8,7 @@ namespace ET.Server
         public override async ETTask Handle(FiberInit fiberInit)
         {
             Scene root = fiberInit.Fiber.Root;
-            root.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
+            root.AddComponent<MailBoxComponent, int>(MailBoxType.UnOrderedMessage);
             root.AddComponent<TimerComponent>();
             root.AddComponent<CoroutineLockComponent>();
             StartProcessConfig startProcessConfig = StartProcessConfigCategory.Instance.Get(fiberInit.Fiber.Process);

+ 8 - 0
Unity/Packages/cn.etetet.core/Scripts/Hotfix/Share.meta

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

+ 1 - 1
Unity/Packages/cn.etetet.core/Runtime/Fiber/Mailbox/MailBoxType_UnOrderedMessageHandler.cs → Unity/Packages/cn.etetet.core/Scripts/Hotfix/Share/MailBoxType_UnOrderedMessageHandler.cs

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

+ 1 - 1
Unity/Packages/cn.etetet.core/Runtime/Fiber/Mailbox/MailBoxType_UnOrderedMessageHandler.cs.meta → Unity/Packages/cn.etetet.core/Scripts/Hotfix/Share/MailBoxType_UnOrderedMessageHandler.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 96a2f003bff974fccbf6534779a73611
+guid: 03dc1baccebe10a4a91047fc3131b437
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 7 - 0
Unity/Packages/cn.etetet.core/Scripts/Model/Share/CoroutineLockType.cs

@@ -0,0 +1,7 @@
+namespace ET
+{
+    public static partial class CoroutineLockType
+    {
+        public const int Mailbox = PackageType.Core * 1000 + 1;                   // Mailbox中队列
+    }
+}

+ 11 - 0
Unity/Packages/cn.etetet.core/Scripts/Model/Share/CoroutineLockType.cs.meta

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

+ 7 - 0
Unity/Packages/cn.etetet.core/Scripts/Model/Share/MailBoxType.cs

@@ -0,0 +1,7 @@
+namespace ET
+{
+    public static partial class MailBoxType
+    {
+        public const int UnOrderedMessage = PackageType.Core * 1000 + 1;
+    }
+}

+ 11 - 0
Unity/Packages/cn.etetet.core/Scripts/Model/Share/MailBoxType.cs.meta

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

+ 8 - 0
Unity/Packages/cn.etetet.core/Scripts/Model/Share/Mailbox.meta

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

+ 7 - 0
Unity/Packages/cn.etetet.db/Scripts/Model/Server/CoroutineLockType.cs

@@ -0,0 +1,7 @@
+namespace ET
+{
+    public static partial class CoroutineLockType
+    {
+        public const int DB = PackageType.DB * 1000 + 1;
+    }
+}

+ 11 - 0
Unity/Packages/cn.etetet.db/Scripts/Model/Server/CoroutineLockType.cs.meta

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

+ 7 - 0
Unity/Packages/cn.etetet.db/Scripts/Model/Server/PackageType.cs

@@ -0,0 +1,7 @@
+namespace ET
+{
+    public static partial class PackageType
+    {
+        public const int DB = 6;
+    }
+}

+ 11 - 0
Unity/Packages/cn.etetet.db/Scripts/Model/Server/PackageType.cs.meta

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

+ 2 - 2
Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Client/NetClient/FiberInit_NetClient.cs

@@ -1,12 +1,12 @@
 namespace ET.Client
 {
-    [Invoke((long)SceneType.NetClient)]
+    [Invoke(SceneType.NetClient)]
     public class FiberInit_NetClient: AInvokeHandler<FiberInit, ETTask>
     {
         public override async ETTask Handle(FiberInit fiberInit)
         {
             Scene root = fiberInit.Fiber.Root;
-            root.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
+            root.AddComponent<MailBoxComponent, int>(MailBoxType.UnOrderedMessage);
             root.AddComponent<TimerComponent>();
             root.AddComponent<CoroutineLockComponent>();
             root.AddComponent<ProcessInnerSender>();

+ 2 - 2
Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Gate/C2G_LoginGateHandler.cs

@@ -26,10 +26,10 @@ namespace ET.Server
                 player = playerComponent.AddChild<Player, string>(account);
                 playerComponent.Add(player);
                 PlayerSessionComponent playerSessionComponent = player.AddComponent<PlayerSessionComponent>();
-                playerSessionComponent.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.GateSession);
+                playerSessionComponent.AddComponent<MailBoxComponent, int>(MailBoxType.GateSession);
                 await playerSessionComponent.AddLocation(LocationType.GateSession);
 			
-                player.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
+                player.AddComponent<MailBoxComponent, int>(MailBoxType.UnOrderedMessage);
                 await player.AddLocation(LocationType.Player);
 			
                 session.AddComponent<SessionPlayerComponent>().Player = player;

+ 1 - 1
Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Gate/FiberInit_Gate.cs

@@ -8,7 +8,7 @@ namespace ET.Server
         public override async ETTask Handle(FiberInit fiberInit)
         {
             Scene root = fiberInit.Fiber.Root;
-            root.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
+            root.AddComponent<MailBoxComponent, int>(MailBoxType.UnOrderedMessage);
             root.AddComponent<TimerComponent>();
             root.AddComponent<CoroutineLockComponent>();
             root.AddComponent<ProcessInnerSender>();

+ 1 - 1
Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Gate/GateMapFactory.cs

@@ -9,7 +9,7 @@ namespace ET.Server
 
             scene.AddComponent<UnitComponent>();
             scene.AddComponent<AOIManagerComponent>();
-            scene.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
+            scene.AddComponent<MailBoxComponent, int>(MailBoxType.UnOrderedMessage);
             
             return scene;
         }

+ 1 - 1
Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Gate/MailBoxType_GateSessionHandler.cs

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

+ 1 - 1
Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Map/FiberInit_Map.cs

@@ -8,7 +8,7 @@ namespace ET.Server
         public override async ETTask Handle(FiberInit fiberInit)
         {
             Scene root = fiberInit.Fiber.Root;
-            root.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
+            root.AddComponent<MailBoxComponent, int>(MailBoxType.UnOrderedMessage);
             root.AddComponent<TimerComponent>();
             root.AddComponent<CoroutineLockComponent>();
             root.AddComponent<ProcessInnerSender>();

+ 1 - 1
Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Map/Transfer/M2M_UnitTransferRequestHandler.cs

@@ -24,7 +24,7 @@ namespace ET.Server
             unit.AddComponent<PathfindingComponent, string>(scene.Name);
             unit.Position = new float3(-10, 0, -10);
 
-            unit.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.OrderedMessage);
+            unit.AddComponent<MailBoxComponent, int>(MailBoxType.OrderedMessage);
 
             // 通知客户端开始切场景
             M2C_StartSceneChange m2CStartSceneChange = M2C_StartSceneChange.Create();

+ 1 - 1
Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Server/Realm/FiberInit_Realm.cs

@@ -8,7 +8,7 @@ namespace ET.Server
         public override async ETTask Handle(FiberInit fiberInit)
         {
             Scene root = fiberInit.Fiber.Root;
-            root.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
+            root.AddComponent<MailBoxComponent, int>(MailBoxType.UnOrderedMessage);
             root.AddComponent<TimerComponent>();
             root.AddComponent<CoroutineLockComponent>();
             root.AddComponent<ProcessInnerSender>();

+ 1 - 1
Unity/Packages/cn.etetet.statesync/Scripts/Hotfix/Share/EntryEvent1_InitShare.cs

@@ -10,7 +10,7 @@ namespace ET
             root.AddComponent<TimerComponent>();
             root.AddComponent<CoroutineLockComponent>();
             root.AddComponent<ObjectWait>();
-            root.AddComponent<MailBoxComponent, MailBoxType>(MailBoxType.UnOrderedMessage);
+            root.AddComponent<MailBoxComponent, int>(MailBoxType.UnOrderedMessage);
             root.AddComponent<ProcessInnerSender>();
             
             MongoRegister.RegisterStruct<float2>();

+ 9 - 0
Unity/Packages/cn.etetet.statesync/Scripts/Model/Server/Gate/LocationType.cs

@@ -0,0 +1,9 @@
+namespace ET.Server
+{
+    public static partial class LocationType
+    {
+        public const int Unit = PackageType.StateSync * 1000 + 1;
+        public const int Player = PackageType.StateSync * 1000 + 2;
+        public const int GateSession = PackageType.StateSync * 1000 + 3;
+    }
+}

+ 11 - 0
Unity/Packages/cn.etetet.statesync/Scripts/Model/Server/Gate/LocationType.cs.meta

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

+ 7 - 0
Unity/Packages/cn.etetet.statesync/Scripts/Model/Server/MailBoxType.cs

@@ -0,0 +1,7 @@
+namespace ET
+{
+    public static partial class MailBoxType
+    {
+        public const int GateSession = PackageType.StateSync * 1000 + 1;
+    }
+}

+ 11 - 0
Unity/Packages/cn.etetet.statesync/Scripts/Model/Server/MailBoxType.cs.meta

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

+ 8 - 0
Unity/Packages/cn.etetet.yooassets/Scripts/ModelView/Client/CoroutineLockType.cs

@@ -0,0 +1,8 @@
+namespace ET
+{
+    public static partial class CoroutineLockType
+    {
+        public const int Resources = PackageType.YooAssets * 1000 + 1;
+        public const int ResourcesLoader = PackageType.YooAssets * 1000 + 2;
+    }
+}

+ 11 - 0
Unity/Packages/cn.etetet.yooassets/Scripts/ModelView/Client/CoroutineLockType.cs.meta

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

+ 7 - 0
Unity/Packages/cn.etetet.yooassets/Scripts/ModelView/Client/PackageType.cs

@@ -0,0 +1,7 @@
+namespace ET
+{
+    public static partial class PackageType
+    {
+        public const int YooAssets = 7;
+    }
+}

+ 11 - 0
Unity/Packages/cn.etetet.yooassets/Scripts/ModelView/Client/PackageType.cs.meta

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