Просмотр исходного кода

VProcess改名成Fiber,借用windows中纤程这个概念

tanghai 2 лет назад
Родитель
Сommit
f4c1d9a792
100 измененных файлов с 73 добавлено и 32 удалено
  1. 2 2
      DotNet/App/Program.cs
  2. 1 1
      DotNet/Loader/CodeLoader.cs
  3. 40 2
      Unity/Assets/Plugins/Android/libs/x86/libRecastDll.so.meta
  4. 0 0
      Unity/Assets/Scripts/Core/Entity.meta
  5. 0 0
      Unity/Assets/Scripts/Core/Entity/ComponentView.cs
  6. 0 0
      Unity/Assets/Scripts/Core/Entity/ComponentView.cs.meta
  7. 0 6
      Unity/Assets/Scripts/Core/Entity/Entity.cs
  8. 0 0
      Unity/Assets/Scripts/Core/Entity/Entity.cs.meta
  9. 2 2
      Unity/Assets/Scripts/Core/Entity/EntityHelper.cs
  10. 0 0
      Unity/Assets/Scripts/Core/Entity/EntityHelper.cs.meta
  11. 0 0
      Unity/Assets/Scripts/Core/Entity/EntityRef.cs
  12. 0 0
      Unity/Assets/Scripts/Core/Entity/EntityRef.cs.meta
  13. 0 0
      Unity/Assets/Scripts/Core/Entity/EntitySceneFactory.cs
  14. 0 0
      Unity/Assets/Scripts/Core/Entity/EntitySceneFactory.cs.meta
  15. 0 0
      Unity/Assets/Scripts/Core/Entity/EntitySystemAttribute.cs
  16. 0 0
      Unity/Assets/Scripts/Core/Entity/EntitySystemAttribute.cs.meta
  17. 0 0
      Unity/Assets/Scripts/Core/Entity/EntitySystemSingleton.cs
  18. 0 0
      Unity/Assets/Scripts/Core/Entity/EntitySystemSingleton.cs.meta
  19. 0 0
      Unity/Assets/Scripts/Core/Entity/IAddComponentSystem.cs
  20. 0 0
      Unity/Assets/Scripts/Core/Entity/IAddComponentSystem.cs.meta
  21. 0 0
      Unity/Assets/Scripts/Core/Entity/IAwakeSystem.cs
  22. 0 0
      Unity/Assets/Scripts/Core/Entity/IAwakeSystem.cs.meta
  23. 0 0
      Unity/Assets/Scripts/Core/Entity/IDeserializeSystem.cs
  24. 0 0
      Unity/Assets/Scripts/Core/Entity/IDeserializeSystem.cs.meta
  25. 0 0
      Unity/Assets/Scripts/Core/Entity/IDestroySystem.cs
  26. 0 0
      Unity/Assets/Scripts/Core/Entity/IDestroySystem.cs.meta
  27. 0 0
      Unity/Assets/Scripts/Core/Entity/IGetComponentSystem.cs
  28. 0 0
      Unity/Assets/Scripts/Core/Entity/IGetComponentSystem.cs.meta
  29. 0 0
      Unity/Assets/Scripts/Core/Entity/ILateUpdateSystem.cs
  30. 0 0
      Unity/Assets/Scripts/Core/Entity/ILateUpdateSystem.cs.meta
  31. 0 0
      Unity/Assets/Scripts/Core/Entity/ILoadSystem.cs
  32. 0 0
      Unity/Assets/Scripts/Core/Entity/ILoadSystem.cs.meta
  33. 0 0
      Unity/Assets/Scripts/Core/Entity/IScene.cs
  34. 0 0
      Unity/Assets/Scripts/Core/Entity/IScene.cs.meta
  35. 0 0
      Unity/Assets/Scripts/Core/Entity/ISerializeSystem.cs
  36. 0 0
      Unity/Assets/Scripts/Core/Entity/ISerializeSystem.cs.meta
  37. 0 0
      Unity/Assets/Scripts/Core/Entity/ISerializeToEntity.cs
  38. 0 0
      Unity/Assets/Scripts/Core/Entity/ISerializeToEntity.cs.meta
  39. 0 0
      Unity/Assets/Scripts/Core/Entity/ISystemType.cs
  40. 0 0
      Unity/Assets/Scripts/Core/Entity/ISystemType.cs.meta
  41. 0 0
      Unity/Assets/Scripts/Core/Entity/ITransfer.cs
  42. 0 0
      Unity/Assets/Scripts/Core/Entity/ITransfer.cs.meta
  43. 0 0
      Unity/Assets/Scripts/Core/Entity/IUpdateSystem.cs
  44. 0 0
      Unity/Assets/Scripts/Core/Entity/IUpdateSystem.cs.meta
  45. 0 0
      Unity/Assets/Scripts/Core/Entity/InstanceQueueIndex.cs
  46. 0 0
      Unity/Assets/Scripts/Core/Entity/InstanceQueueIndex.cs.meta
  47. 1 1
      Unity/Assets/Scripts/Core/Entity/Scene.cs
  48. 0 0
      Unity/Assets/Scripts/Core/Entity/Scene.cs.meta
  49. 0 0
      Unity/Assets/Scripts/Core/Entity/SceneType.cs
  50. 0 0
      Unity/Assets/Scripts/Core/Entity/SceneType.cs.meta
  51. 1 1
      Unity/Assets/Scripts/Core/Entity/SingletonEntity.cs
  52. 0 0
      Unity/Assets/Scripts/Core/Entity/SingletonEntity.cs.meta
  53. 0 0
      Unity/Assets/Scripts/Core/Fiber.meta
  54. 0 0
      Unity/Assets/Scripts/Core/Fiber/EntitySystem.cs
  55. 0 0
      Unity/Assets/Scripts/Core/Fiber/EntitySystem.cs.meta
  56. 13 4
      Unity/Assets/Scripts/Core/Fiber/Fiber.cs
  57. 0 0
      Unity/Assets/Scripts/Core/Fiber/Fiber.cs.meta
  58. 0 0
      Unity/Assets/Scripts/Core/Fiber/IdGenerater.cs
  59. 0 0
      Unity/Assets/Scripts/Core/Fiber/IdGenerater.cs.meta
  60. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module.meta
  61. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor.meta
  62. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorEntities.cs
  63. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorEntities.cs.meta
  64. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageHandlerAttribute.cs
  65. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageHandlerAttribute.cs.meta
  66. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageLocationHandlerAttribute.cs
  67. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageLocationHandlerAttribute.cs.meta
  68. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageSender.cs
  69. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageSender.cs.meta
  70. 1 1
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageSenderComponent.cs
  71. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageSenderComponent.cs.meta
  72. 9 9
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/FiberActor.cs
  73. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/FiberActor.cs.meta
  74. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/IMActorHandler.cs
  75. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/IMActorHandler.cs.meta
  76. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/MailBoxComponent.cs
  77. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/MailBoxComponent.cs.meta
  78. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/MailboxType.cs
  79. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Actor/MailboxType.cs.meta
  80. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock.meta
  81. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLock.cs
  82. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLock.cs.meta
  83. 1 1
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockComponent.cs
  84. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockComponent.cs.meta
  85. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockQueue.cs
  86. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockQueue.cs.meta
  87. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockQueueType.cs
  88. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockQueueType.cs.meta
  89. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockType.cs
  90. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockType.cs.meta
  91. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/WaitCoroutineLock.cs
  92. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/WaitCoroutineLock.cs.meta
  93. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Synchronization.meta
  94. 1 1
      Unity/Assets/Scripts/Core/Fiber/Module/Synchronization/MainThreadSynchronizationContext.cs
  95. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Synchronization/MainThreadSynchronizationContext.cs.meta
  96. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Timer.meta
  97. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Timer/ATimer.cs
  98. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Timer/ATimer.cs.meta
  99. 1 1
      Unity/Assets/Scripts/Core/Fiber/Module/Timer/TimerComponent.cs
  100. 0 0
      Unity/Assets/Scripts/Core/Fiber/Module/Timer/TimerComponent.cs.meta

+ 2 - 2
DotNet/App/Program.cs

@@ -22,8 +22,8 @@ namespace ET
                 Thread.Sleep(1);
                 try
                 {
-                    VProcessManager.MainThreadScheduler.Instance.Update();
-                    VProcessManager.MainThreadScheduler.Instance.LateUpdate();
+                    FiberManager.MainThreadScheduler.Instance.Update();
+                    FiberManager.MainThreadScheduler.Instance.LateUpdate();
                 }
                 catch (Exception e)
                 {

+ 1 - 1
DotNet/Loader/CodeLoader.cs

@@ -39,7 +39,7 @@ namespace ET
             byte[] pdbBytes = File.ReadAllBytes("./Hotfix.pdb");
             Assembly hotfixAssembly = assemblyLoadContext.LoadFromStream(new MemoryStream(dllBytes), new MemoryStream(pdbBytes));
 
-            Dictionary<string, Type> types = AssemblyHelper.GetAssemblyTypes(Assembly.GetEntryAssembly(), typeof(Init).Assembly, typeof (VProcess).Assembly, this.model, hotfixAssembly);
+            Dictionary<string, Type> types = AssemblyHelper.GetAssemblyTypes(Assembly.GetEntryAssembly(), typeof(Init).Assembly, typeof (Fiber).Assembly, this.model, hotfixAssembly);
 
             World.Instance.AddSingleton<EventSystem, Dictionary<string, Type>>(types);
             

+ 40 - 2
Unity/Assets/Plugins/Android/libs/x86/libRecastDll.so.meta

@@ -11,12 +11,24 @@ PluginImporter:
   isExplicitlyReferenced: 0
   validateReferences: 1
   platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 1
+        Exclude Editor: 1
+        Exclude Linux64: 1
+        Exclude OSXUniversal: 1
+        Exclude WebGL: 1
+        Exclude Win: 1
+        Exclude Win64: 1
   - first:
       Android: Android
     second:
-      enabled: 1
+      enabled: 0
       settings:
-        CPU: x86
+        CPU: X86
   - first:
       Any: 
     second:
@@ -27,7 +39,33 @@ PluginImporter:
     second:
       enabled: 0
       settings:
+        CPU: AnyCPU
         DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 0
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 0
+      settings:
+        CPU: x86
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 0
+      settings:
+        CPU: x86_64
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity.meta → Unity/Assets/Scripts/Core/Entity.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ComponentView.cs → Unity/Assets/Scripts/Core/Entity/ComponentView.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ComponentView.cs.meta → Unity/Assets/Scripts/Core/Entity/ComponentView.cs.meta


+ 0 - 6
Unity/Assets/Scripts/Core/VProcess/Module/Entity/Entity.cs → Unity/Assets/Scripts/Core/Entity/Entity.cs

@@ -34,12 +34,6 @@ namespace ET
         [BsonIgnore]
         public long InstanceId { get; protected set; }
 
-        public ActorId GetActorId()
-        {
-            VProcess root = this.Root();
-            return new ActorId(root.Process, (int)root.Id, this.InstanceId);
-        }
-
         protected Entity()
         {
         }

+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/Entity.cs.meta → Unity/Assets/Scripts/Core/Entity/Entity.cs.meta


+ 2 - 2
Unity/Assets/Scripts/Core/VProcess/Module/Entity/EntityHelper.cs → Unity/Assets/Scripts/Core/Entity/EntityHelper.cs

@@ -12,9 +12,9 @@ namespace ET
             return entity.IScene as Scene;
         }
         
-        public static VProcess Root(this Entity entity)
+        public static Fiber Root(this Entity entity)
         {
-            return entity.IScene.Root as VProcess;
+            return entity.IScene.Root as Fiber;
         }
     }
 }

+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/EntityHelper.cs.meta → Unity/Assets/Scripts/Core/Entity/EntityHelper.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/EntityRef.cs → Unity/Assets/Scripts/Core/Entity/EntityRef.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/EntityRef.cs.meta → Unity/Assets/Scripts/Core/Entity/EntityRef.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/EntitySceneFactory.cs → Unity/Assets/Scripts/Core/Entity/EntitySceneFactory.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/EntitySceneFactory.cs.meta → Unity/Assets/Scripts/Core/Entity/EntitySceneFactory.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/EntitySystemAttribute.cs → Unity/Assets/Scripts/Core/Entity/EntitySystemAttribute.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/EntitySystemAttribute.cs.meta → Unity/Assets/Scripts/Core/Entity/EntitySystemAttribute.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/EntitySystemSingleton.cs → Unity/Assets/Scripts/Core/Entity/EntitySystemSingleton.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/EntitySystemSingleton.cs.meta → Unity/Assets/Scripts/Core/Entity/EntitySystemSingleton.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IAddComponentSystem.cs → Unity/Assets/Scripts/Core/Entity/IAddComponentSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IAddComponentSystem.cs.meta → Unity/Assets/Scripts/Core/Entity/IAddComponentSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IAwakeSystem.cs → Unity/Assets/Scripts/Core/Entity/IAwakeSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IAwakeSystem.cs.meta → Unity/Assets/Scripts/Core/Entity/IAwakeSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IDeserializeSystem.cs → Unity/Assets/Scripts/Core/Entity/IDeserializeSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IDeserializeSystem.cs.meta → Unity/Assets/Scripts/Core/Entity/IDeserializeSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IDestroySystem.cs → Unity/Assets/Scripts/Core/Entity/IDestroySystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IDestroySystem.cs.meta → Unity/Assets/Scripts/Core/Entity/IDestroySystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IGetComponentSystem.cs → Unity/Assets/Scripts/Core/Entity/IGetComponentSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IGetComponentSystem.cs.meta → Unity/Assets/Scripts/Core/Entity/IGetComponentSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ILateUpdateSystem.cs → Unity/Assets/Scripts/Core/Entity/ILateUpdateSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ILateUpdateSystem.cs.meta → Unity/Assets/Scripts/Core/Entity/ILateUpdateSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ILoadSystem.cs → Unity/Assets/Scripts/Core/Entity/ILoadSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ILoadSystem.cs.meta → Unity/Assets/Scripts/Core/Entity/ILoadSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IScene.cs → Unity/Assets/Scripts/Core/Entity/IScene.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IScene.cs.meta → Unity/Assets/Scripts/Core/Entity/IScene.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ISerializeSystem.cs → Unity/Assets/Scripts/Core/Entity/ISerializeSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ISerializeSystem.cs.meta → Unity/Assets/Scripts/Core/Entity/ISerializeSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ISerializeToEntity.cs → Unity/Assets/Scripts/Core/Entity/ISerializeToEntity.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ISerializeToEntity.cs.meta → Unity/Assets/Scripts/Core/Entity/ISerializeToEntity.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ISystemType.cs → Unity/Assets/Scripts/Core/Entity/ISystemType.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ISystemType.cs.meta → Unity/Assets/Scripts/Core/Entity/ISystemType.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ITransfer.cs → Unity/Assets/Scripts/Core/Entity/ITransfer.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/ITransfer.cs.meta → Unity/Assets/Scripts/Core/Entity/ITransfer.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IUpdateSystem.cs → Unity/Assets/Scripts/Core/Entity/IUpdateSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/IUpdateSystem.cs.meta → Unity/Assets/Scripts/Core/Entity/IUpdateSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/InstanceQueueIndex.cs → Unity/Assets/Scripts/Core/Entity/InstanceQueueIndex.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/InstanceQueueIndex.cs.meta → Unity/Assets/Scripts/Core/Entity/InstanceQueueIndex.cs.meta


+ 1 - 1
Unity/Assets/Scripts/Core/VProcess/Module/Entity/Scene.cs → Unity/Assets/Scripts/Core/Entity/Scene.cs

@@ -8,7 +8,7 @@ namespace ET
     public class Scene: Entity, IScene
     {
         [BsonIgnore]
-        public VProcess VProcess { get; set; }
+        public Fiber Fiber { get; set; }
         
         [BsonIgnore]
         public IScene Root { get; set; }

+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/Scene.cs.meta → Unity/Assets/Scripts/Core/Entity/Scene.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/SceneType.cs → Unity/Assets/Scripts/Core/Entity/SceneType.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/SceneType.cs.meta → Unity/Assets/Scripts/Core/Entity/SceneType.cs.meta


+ 1 - 1
Unity/Assets/Scripts/Core/VProcess/Module/Entity/SingletonEntity.cs → Unity/Assets/Scripts/Core/Entity/SingletonEntity.cs

@@ -6,7 +6,7 @@
         {
             get
             {
-                return VProcess.Instance.GetComponent<T>();
+                return Fiber.Instance.GetComponent<T>();
             }
         }
     }

+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Entity/SingletonEntity.cs.meta → Unity/Assets/Scripts/Core/Entity/SingletonEntity.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess.meta → Unity/Assets/Scripts/Core/Fiber.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/EntitySystem/EntitySystem.cs → Unity/Assets/Scripts/Core/Fiber/EntitySystem.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/EntitySystem/EntitySystem.cs.meta → Unity/Assets/Scripts/Core/Fiber/EntitySystem.cs.meta


+ 13 - 4
Unity/Assets/Scripts/Core/VProcess/VProcess.cs → Unity/Assets/Scripts/Core/Fiber/Fiber.cs

@@ -3,13 +3,22 @@ using System.Collections.Generic;
 
 namespace ET
 {
-    public class VProcess: Entity, IScene, IEntitySystem, IIdGenerater
+    public static class FiberHelper
+    {
+        public static ActorId GetActorId(this Entity self)
+        {
+            Fiber root = self.Root();
+            return new ActorId(root.Process, (int)root.Id, self.InstanceId);
+        }
+    }
+    
+    public class Fiber: Entity, IScene, IEntitySystem, IIdGenerater
     {
         [ThreadStatic]
         [StaticField]
-        private static VProcess instance;
+        private static Fiber instance;
 
-        public static VProcess Instance
+        public static Fiber Instance
         {
             get
             {
@@ -37,7 +46,7 @@ namespace ET
 
         public bool IsRuning;
         
-        public VProcess(int id, int process, SceneType sceneType)
+        public Fiber(int id, int process, SceneType sceneType)
         {
             this.SceneType = sceneType;
             this.Id = id;

+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/VProcess.cs.meta → Unity/Assets/Scripts/Core/Fiber/Fiber.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/IdGenerater/IdGenerater.cs → Unity/Assets/Scripts/Core/Fiber/IdGenerater.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/IdGenerater/IdGenerater.cs.meta → Unity/Assets/Scripts/Core/Fiber/IdGenerater.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module.meta → Unity/Assets/Scripts/Core/Fiber/Module.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor.meta → Unity/Assets/Scripts/Core/Fiber/Module/Actor.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/ActorEntities.cs → Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorEntities.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/ActorEntities.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorEntities.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/ActorMessageHandlerAttribute.cs → Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageHandlerAttribute.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/ActorMessageHandlerAttribute.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageHandlerAttribute.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/ActorMessageLocationHandlerAttribute.cs → Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageLocationHandlerAttribute.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/ActorMessageLocationHandlerAttribute.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageLocationHandlerAttribute.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/ActorMessageSender.cs → Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageSender.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/ActorMessageSender.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageSender.cs.meta


+ 1 - 1
Unity/Assets/Scripts/Core/VProcess/Module/Actor/ActorMessageSenderComponent.cs → Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageSenderComponent.cs

@@ -2,7 +2,7 @@
 
 namespace ET
 {
-    [ComponentOf(typeof(VProcess))]
+    [ComponentOf(typeof(Fiber))]
     public class ActorMessageSenderComponent: SingletonEntity<ActorMessageSenderComponent>, IAwake, IDestroy
     {
         public const long TIMEOUT_TIME = 40 * 1000;

+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/ActorMessageSenderComponent.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/Actor/ActorMessageSenderComponent.cs.meta


+ 9 - 9
Unity/Assets/Scripts/Core/VProcess/Module/VProcessActor/VProcessActor.cs → Unity/Assets/Scripts/Core/Fiber/Module/Actor/FiberActor.cs

@@ -2,8 +2,8 @@
 
 namespace ET
 {
-    [ComponentOf(typeof(VProcess))]
-    public class VProcessActor: SingletonEntity<VProcessActor>, IAwake
+    [ComponentOf(typeof(Fiber))]
+    public class FiberActor: SingletonEntity<FiberActor>, IAwake
     {
         private readonly Dictionary<int, ETTask<IResponse>> requestCallbacks = new();
 
@@ -20,19 +20,19 @@ namespace ET
             
             base.Dispose();
             
-            ActorQueue.Instance.RemoveQueue((int)this.Root().Id);
+            ActorMessageQueue.Instance.RemoveQueue((int)this.Root().Id);
         }
 
         public void Awake()
         {
-            ActorQueue.Instance.AddQueue((int)this.Root().Id);
+            ActorMessageQueue.Instance.AddQueue((int)this.Root().Id);
         }
 
         public void Update()
         {
             this.list.Clear();
-            VProcess vProcess = this.Root();
-            ActorQueue.Instance.Fetch((int)vProcess.Id, 1000, this.list);
+            Fiber fiber = this.Root();
+            ActorMessageQueue.Instance.Fetch((int)fiber.Id, 1000, this.list);
             
             ActorMessageDispatcherComponent actorMessageDispatcherComponent = ActorMessageDispatcherComponent.Instance;
             foreach (ActorMessageInfo actorMessageInfo in this.list)
@@ -43,7 +43,7 @@ namespace ET
                     continue;
                 }
 
-                Entity entity = vProcess.ActorEntities.Get(actorMessageInfo.ActorId);
+                Entity entity = fiber.ActorEntities.Get(actorMessageInfo.ActorId);
                 actorMessageDispatcherComponent.Handle(entity, actorMessageInfo.ActorId, actorMessageInfo.MessageObject).Coroutine();    
             }
         }
@@ -55,8 +55,8 @@ namespace ET
         
         public void Send(ActorId actorId, MessageObject messageObject)
         {
-            VProcess vProcess = this.Root();
-            ActorQueue.Instance.Send(new Address(vProcess.Process, (int)vProcess.Id), actorId, messageObject);
+            Fiber fiber = this.Root();
+            ActorMessageQueue.Instance.Send(new Address(fiber.Process, (int)fiber.Id), actorId, messageObject);
         }
     }
 }

+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/VProcessActor/VProcessActor.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/Actor/FiberActor.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/IMActorHandler.cs → Unity/Assets/Scripts/Core/Fiber/Module/Actor/IMActorHandler.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/IMActorHandler.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/Actor/IMActorHandler.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/MailBoxComponent.cs → Unity/Assets/Scripts/Core/Fiber/Module/Actor/MailBoxComponent.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/MailBoxComponent.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/Actor/MailBoxComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/MailboxType.cs → Unity/Assets/Scripts/Core/Fiber/Module/Actor/MailboxType.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Actor/MailboxType.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/Actor/MailboxType.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock.meta → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/CoroutineLock.cs → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLock.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/CoroutineLock.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLock.cs.meta


+ 1 - 1
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/CoroutineLockComponent.cs → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockComponent.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace ET
 {
-    [ComponentOf(typeof(VProcess))]
+    [ComponentOf(typeof(Fiber))]
     public class CoroutineLockComponent: SingletonEntity<CoroutineLockComponent>, IAwake
     {
         private readonly Dictionary<int, CoroutineLockQueueType> dictionary = new();

+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/CoroutineLockComponent.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/CoroutineLockQueue.cs → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockQueue.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/CoroutineLockQueue.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockQueue.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/CoroutineLockQueueType.cs → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockQueueType.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/CoroutineLockQueueType.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockQueueType.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/CoroutineLockType.cs → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockType.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/CoroutineLockType.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/CoroutineLockType.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/WaitCoroutineLock.cs → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/WaitCoroutineLock.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/WaitCoroutineLock.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/CoroutineLock/WaitCoroutineLock.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Synchronization.meta → Unity/Assets/Scripts/Core/Fiber/Module/Synchronization.meta


+ 1 - 1
Unity/Assets/Scripts/Core/VProcess/Module/Synchronization/MainThreadSynchronizationContext.cs → Unity/Assets/Scripts/Core/Fiber/Module/Synchronization/MainThreadSynchronizationContext.cs

@@ -3,7 +3,7 @@ using System.Threading;
 
 namespace ET
 {
-    [ComponentOf(typeof(VProcess))]
+    [ComponentOf(typeof(Fiber))]
     public class MainThreadSynchronizationContext: SingletonEntity<MainThreadSynchronizationContext>, IAwake
     {
         private readonly ThreadSynchronizationContext threadSynchronizationContext = new();

+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Synchronization/MainThreadSynchronizationContext.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/Synchronization/MainThreadSynchronizationContext.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Timer.meta → Unity/Assets/Scripts/Core/Fiber/Module/Timer.meta


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Timer/ATimer.cs → Unity/Assets/Scripts/Core/Fiber/Module/Timer/ATimer.cs


+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Timer/ATimer.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/Timer/ATimer.cs.meta


+ 1 - 1
Unity/Assets/Scripts/Core/VProcess/Module/Timer/TimerComponent.cs → Unity/Assets/Scripts/Core/Fiber/Module/Timer/TimerComponent.cs

@@ -53,7 +53,7 @@ namespace ET
         public object Args;
     }
 
-    [ComponentOf(typeof(VProcess))]
+    [ComponentOf(typeof(Fiber))]
     public class TimerComponent: SingletonEntity<TimerComponent>, IAwake
     {
         /// <summary>

+ 0 - 0
Unity/Assets/Scripts/Core/VProcess/Module/Timer/TimerComponent.cs.meta → Unity/Assets/Scripts/Core/Fiber/Module/Timer/TimerComponent.cs.meta


Некоторые файлы не были показаны из-за большого количества измененных файлов