大量调整

DotNet/App/Program.cs

@@ -19,12 +19,11 @@ namespace ET
             
             while (true)
             {
-                System.Threading.Thread.Sleep(1);
+                Thread.Sleep(1);
                 try
                 {
-                    Init.Update();
-                    Init.LateUpdate();
-                    Init.FrameFinishUpdate();
+                    VProcessManager.MainThreadScheduler.Instance.Update();
+                    VProcessManager.MainThreadScheduler.Instance.LateUpdate();
                 }
                 catch (Exception e)
                 {

DotNet/Loader/CodeLoader.cs

@@ -7,13 +7,13 @@ using System.Runtime.Loader;
 namespace ET
 {
    
-    public class CodeLoader: VProcessSingleton<CodeLoader>
+    public class CodeLoader: Singleton<CodeLoader>, ISingletonAwake
     {
         private AssemblyLoadContext assemblyLoadContext;
 
         private Assembly model;
 
-        public void Start()
+        public void Awake()
         {
             Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
             foreach (Assembly assembly in assemblies)
@@ -40,8 +40,8 @@ namespace ET
             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);
-			
-            EventSystem.Instance.Add(types);
+
+            World.Instance.AddSingleton<EventSystem, Dictionary<string, Type>>(types);
         }
     }
 }

DotNet/Loader/Init.cs

@@ -7,8 +7,6 @@ namespace ET
 {
 	public static class Init
 	{
-		private static VProcess vProcess;
-		
 		public static void Start()
 		{
 			try
@@ -24,46 +22,24 @@ namespace ET
 						.WithParsed(World.Instance.AddSingleton);
 				World.Instance.AddSingleton<Logger>().ILog = new NLogger(Options.Instance.AppType.ToString(), Options.Instance.Process, "../Config/NLog/NLog.config");
 				ETTask.ExceptionHandler += Log.Error;
-				
-				World.Instance.AddSingleton<VProcessSingleton>();
-				World.Instance.AddSingleton<EventSystem>();
 				World.Instance.AddSingleton<ObjectPool>();
-				ThreadPoolScheduler threadPoolScheduler = World.Instance.AddSingleton<ThreadPoolScheduler>();
-				threadPoolScheduler.ThreadCount = 10;
+				World.Instance.AddSingleton<WorldActor>();
+				World.Instance.AddSingleton<CodeLoader>();
+				World.Instance.AddSingleton<VProcessManager>();
 
-				vProcess = VProcessSingleton.Instance.Create();
+				VProcessManager.ThreadPoolScheduler threadPoolScheduler = World.Instance.AddSingleton<VProcessManager.ThreadPoolScheduler>();
+				threadPoolScheduler.ThreadCount = 10;
 				
-				// 异步方法全部会回掉到主线程
-				vProcess.AddSingleton<MainThreadSynchronizationContext>();
-				vProcess.AddSingleton<TimeInfo>();
-				vProcess.AddSingleton<IdGenerater>();
-				vProcess.AddSingleton<TimerComponent>();
-				vProcess.AddSingleton<CoroutineLockComponent>();
+				int vProcessId = VProcessManager.Instance.Create();
 				
+				WorldActor.Instance.Send(vProcessId, null);
 				
 				Log.Console($"{Parser.Default.FormatCommandLine(Options.Instance)}");
-
-				vProcess.AddSingleton<CodeLoader>().Start();
 			}
 			catch (Exception e)
 			{
 				Log.Error(e);
 			}
 		}
-
-		public static void Update()
-		{
-			vProcess.Update();
-		}
-
-		public static void LateUpdate()
-		{
-			vProcess.LateUpdate();
-		}
-
-		public static void FrameFinishUpdate()
-		{
-			vProcess.FrameFinishUpdate();
-		}
 	}
 }

Share/Tool/Share.Tool.csproj

@@ -43,7 +43,7 @@
             <Link>Module\Log\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Assets\Scripts\Core\Game\Module\Network\OpcodeRangeDefine.cs">
+        <Compile Include="..\..\Unity\Assets\Scripts\Core\World\Module\Network\OpcodeRangeDefine.cs">
             <Link>Module\Message\OpcodeRangeDefine.cs</Link>
         </Compile>
     </ItemGroup>

Unity/Assets/Scripts/Core/MainVProcessInit.cs

@@ -0,0 +1,10 @@
+namespace ET
+{
+    public static class MainVProcessInit
+    {
+        public static void Init(VProcess vProcess)
+        {
+
+        }
+    }
+}

Unity/Assets/Scripts/Core/World/ISingletonLoad.cs.meta → Unity/Assets/Scripts/Core/MainVProcessInit.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3fa0792974d89624fae8eae847872e2f
+guid: 584a06f5adb4a7a44b6850003fc91493
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Core/Process/Module/ProcessActor/ProcessActor.cs.meta

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

Unity/Assets/Scripts/Core/Process.meta → Unity/Assets/Scripts/Core/VProcess.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6142a53ee34a39348909678c7e82f85b
+guid: 2fd29b3ff6f09434a9de8b2a26016ea8
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Scripts/Core/Process/Module/CoroutineLock/CoroutineLockComponent.cs → Unity/Assets/Scripts/Core/VProcess/Module/CoroutineLock/CoroutineLockComponent.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace ET
 {
-    public class CoroutineLockComponent: VProcessSingleton<CoroutineLockComponent>, ISingletonUpdate
+    public class CoroutineLockComponent: VProcessSingleton<CoroutineLockComponent>, IVProcessSingletonUpdate
     {
         private readonly Dictionary<int, CoroutineLockQueueType> dictionary = new();
         private readonly Queue<(int, long, int)> nextFrameRun = new Queue<(int, long, int)>();

Unity/Assets/Scripts/Core/Process/Module/Entity/EntitySystemSingleton.cs → Unity/Assets/Scripts/Core/VProcess/Module/Entity/EntitySystemSingleton.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace ET
 {
-    public class EntitySystemSingleton: VProcessSingleton<EntitySystemSingleton>, ISingletonAwake, ISingletonUpdate, ISingletonLateUpdate, ISingletonLoad
+    public class EntitySystemSingleton: VProcessSingleton<EntitySystemSingleton>, ISingletonAwake, IVProcessSingletonUpdate, IVProcessSingletonLateUpdate, IVProcessSingletonLoad
     {
         private TypeSystems typeSystems;
 

Unity/Assets/Scripts/Core/Process/Module/Entity/Root.cs → Unity/Assets/Scripts/Core/VProcess/Module/Entity/Root.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 
 namespace ET
 {

Unity/Assets/Scripts/Core/VProcess/Module/Entity/SingletonEntity.cs

@@ -0,0 +1,27 @@
+using System;
+
+namespace ET
+{
+    public class SingletonEntity<T>: Entity where T : SingletonEntity<T>
+    {
+        public static T Instance
+        {
+            get
+            {
+                return VProcess.Instance.GetInstance<T>();
+            }
+        }
+
+        public SingletonEntity()
+        {
+            VProcess.Instance.AddInstance((T)this);
+        }
+
+        public override void Dispose()
+        {
+            base.Dispose();
+
+            VProcess.Instance.RemoveInstance(typeof(T));
+        }
+    }
+}

Unity/Assets/Scripts/Core/World/ISingletonUpdate.cs.meta → Unity/Assets/Scripts/Core/VProcess/Module/Entity/SingletonEntity.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 506c9105819d27445b72fde0de08f43a
+guid: d86de9deead0da44aae57ff954999773
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Core/Process/Module/Synchronization/MainThreadSynchronizationContext.cs → Unity/Assets/Scripts/Core/VProcess/Module/Synchronization/MainThreadSynchronizationContext.cs

@@ -4,9 +4,9 @@ using System.Threading;
 namespace ET
 {
 
-    public class MainThreadSynchronizationContext: VProcessSingleton<MainThreadSynchronizationContext>, ISingletonUpdate
+    public class MainThreadSynchronizationContext: VProcessSingleton<MainThreadSynchronizationContext>, IVProcessSingletonUpdate
     {
-        private readonly ThreadSynchronizationContext threadSynchronizationContext = new ThreadSynchronizationContext();
+        private readonly ThreadSynchronizationContext threadSynchronizationContext = new();
 
         public MainThreadSynchronizationContext()
         {

Unity/Assets/Scripts/Core/Process/Module/Time/TimeInfo.cs → Unity/Assets/Scripts/Core/VProcess/Module/Time/TimeInfo.cs

@@ -2,7 +2,7 @@ using System;
 
 namespace ET
 {
-    public class TimeInfo: VProcessSingleton<TimeInfo>, ISingletonUpdate
+    public class TimeInfo: VProcessSingleton<TimeInfo>, IVProcessSingletonUpdate
     {
         private int timeZone;
         

Unity/Assets/Scripts/Core/Process/Module/Timer/TimerComponent.cs → Unity/Assets/Scripts/Core/VProcess/Module/Timer/TimerComponent.cs

@@ -53,7 +53,7 @@ namespace ET
         public object Args;
     }
 
-    public class TimerComponent: VProcessSingleton<TimerComponent>, ISingletonUpdate
+    public class TimerComponent: VProcessSingleton<TimerComponent>, IVProcessSingletonUpdate
     {
         /// <summary>
         /// key: time, value: timer id

Unity/Assets/Scripts/Core/Process/Module/ProcessActor.meta → Unity/Assets/Scripts/Core/VProcess/Module/VProcessActor.meta

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

Unity/Assets/Scripts/Core/Process/Module/ProcessActor/ProcessActor.cs → Unity/Assets/Scripts/Core/VProcess/Module/VProcessActor/VProcessActor.cs

@@ -2,7 +2,7 @@
 
 namespace ET
 {
-    public class IvVProcessActor: VProcessSingleton<IvVProcessActor>, IVProcessSingletonUpdate, IVProcessSingletonAwake
+    public class VProcessActor: VProcessSingleton<VProcessActor>, IVProcessSingletonUpdate, IVProcessSingletonAwake
     {
         private readonly Dictionary<int, ETTask<IResponse>> requestCallbacks = new();