ProcessActor通信机制

Share/Tool/Share.Tool.csproj

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

Unity/Assets/Scripts/Core/Game.meta

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

Unity/Assets/Scripts/Core/World/Game.cs → Unity/Assets/Scripts/Core/Game/Game.cs

@@ -114,16 +114,7 @@ namespace ET
         }
 
         #endregion
-
-
-        public void Send(int processId, MessageObject messageObject)
-        {
-            if (this.processes.TryGetValue(processId, out Process process))
-            {
-                return;
-            }
-            process.AddMessage(messageObject);
-        }
+        
         
         // 为了保证线程安全，只允许在Start之前AddSingleton，主要用于线程共用的一些东西
         public T AddSingleton<T>() where T: Singleton<T>, new()

Unity/Assets/Scripts/Core/Game/Module.meta

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

Unity/Assets/Scripts/Core/Module/Config.meta → Unity/Assets/Scripts/Core/Game/Module/Config.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 49ccd2dc1f78414428420ba5772e1b3d
+guid: fdea67585847303418ec523256daa007
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Scripts/Core/Module/Config/ConfigComponent.cs → Unity/Assets/Scripts/Core/Game/Module/Config/ConfigComponent.cs

@@ -7,7 +7,7 @@ namespace ET
 	/// <summary>
     /// Config组件会扫描所有的有ConfigAttribute标签的配置,加载进来
     /// </summary>
-    public class ConfigComponent: ProcessSingleton<ConfigComponent>
+    public class ConfigComponent: Singleton<ConfigComponent>
     {
         public struct GetAllConfigBytes
         {
@@ -18,7 +18,7 @@ namespace ET
             public string ConfigName;
         }
 		
-        private readonly Dictionary<Type, IProcessSingleton> allConfig = new Dictionary<Type, IProcessSingleton>();
+        private readonly Dictionary<Type, ISingleton> allConfig = new();
 
 		public override void Dispose()
 		{
@@ -30,7 +30,7 @@ namespace ET
 
 		public object LoadOneConfig(Type configType)
 		{
-			this.allConfig.TryGetValue(configType, out IProcessSingleton oneConfig);
+			this.allConfig.TryGetValue(configType, out ISingleton oneConfig);
 			if (oneConfig != null)
 			{
 				oneConfig.Destroy();
@@ -39,7 +39,7 @@ namespace ET
 			byte[] oneConfigBytes = EventSystem.Instance.Invoke<GetOneConfigBytes, byte[]>(new GetOneConfigBytes() {ConfigName = configType.FullName});
 
 			object category = MongoHelper.Deserialize(configType, oneConfigBytes, 0, oneConfigBytes.Length);
-			IProcessSingleton singleton = category as IProcessSingleton;
+			ISingleton singleton = category as ISingleton;
 			singleton.Register();
 			
 			this.allConfig[configType] = singleton;
@@ -81,7 +81,7 @@ namespace ET
 			
 			lock (this)
 			{
-				IProcessSingleton singleton = category as IProcessSingleton;
+				ISingleton singleton = category as ISingleton;
 				singleton.Register();
 				this.allConfig[configType] = singleton;
 			}

Unity/Assets/Scripts/Core/Module/EventSystem.meta → Unity/Assets/Scripts/Core/Game/Module/EventSystem.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b553c30d9e74bf4449d6a1371894ddc7
+guid: 6f63520dc272ce84894929d06d86966b
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Scripts/Core/Game/Module/GameActor.meta

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

Unity/Assets/Scripts/Core/Game/Module/GameActor/GameActor.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System;
+
+namespace ET
+{
+    public class GameActor: Singleton<GameActor>, ISingletonAwake, ISingletonLoad
+    {
+        private readonly Dictionary<Type, List<IProcessActorHandler>> handlers = new();
+
+        private readonly ConcurrentDictionary<int, ConcurrentQueue<MessageObject>> messages = new();
+        
+        public void Awake()
+        {
+            this.Load();
+        }
+
+        public void Load()
+        {
+            var types = EventSystem.Instance.GetTypes(typeof (ProcessActorHandlerAttribute));
+            foreach (Type type in types)
+            {
+                IProcessActorHandler processActorHandler = Activator.CreateInstance(type) as IProcessActorHandler;
+                if (processActorHandler == null)
+                {
+                    Log.Error($"Process Actor Handler {type.Name} 需要继承 IProcessActorHandler");
+                    continue;
+                }
+
+                Type messageType = processActorHandler.GetMessageType();
+                if (!this.handlers.TryGetValue(messageType, out var list))
+                {
+                    list = new List<IProcessActorHandler>();
+                    this.handlers.Add(messageType, list);
+                }
+                list.Add(processActorHandler);
+            }
+        }
+
+        public void Handle(MessageObject messageObject)
+        {
+            if (!this.handlers.TryGetValue(messageObject.GetType(), out var list))
+            {
+                throw new Exception($"not found process actor handler: {messageObject.GetType().FullName}");
+            }
+
+            foreach (IProcessActorHandler processActorHandler in list)
+            {
+                processActorHandler.Handle(messageObject);
+            }
+        }
+        
+        public void Send(int processId, MessageObject messageObject)
+        {
+            if (!this.messages.TryGetValue(processId, out var queue))
+            {
+                return;
+            }
+            queue.Enqueue(messageObject);
+        }
+        
+        public MessageObject Fetch(int processId)
+        {
+            if (!this.messages.TryGetValue(processId, out var queue))
+            {
+                return null;
+            }
+
+            if (!queue.TryDequeue(out var message))
+            {
+                return null;
+            }
+
+            return message;
+        }
+
+        public void AddActor(int processId)
+        {
+            var queue = new ConcurrentQueue<MessageObject>();
+            this.messages[processId] = queue;
+        }
+        
+        public void RemoveActor(int processId)
+        {
+            this.messages.TryRemove(processId, out _);
+        }
+    }
+}

Unity/Assets/Scripts/Core/Singleton/ISingletonAwake.cs.meta → Unity/Assets/Scripts/Core/Game/Module/GameActor/GameActor.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 60e674069f8984b75b16d7027540547e
+guid: 8927ee74103a4e94c92e48f9b8b302d5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Core/Game/Module/GameActor/IProcessActorHandler.cs

@@ -0,0 +1,8 @@
+namespace ET
+{
+    public interface IProcessActorHandler
+    {
+        void Handle(MessageObject messageObject);
+        System.Type GetMessageType();
+    }
+}

Unity/Assets/Scripts/Core/Singleton/ISingletonLateUpdate.cs.meta → Unity/Assets/Scripts/Core/Game/Module/GameActor/IProcessActorHandler.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 80e79c8701e539f49abb8f05eb75dd64
+guid: 9873c9c556253924fa03cae8c0181b6c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Core/Game/Module/GameActor/ProcessActorHandler.cs

@@ -0,0 +1,45 @@
+using System;
+
+namespace ET
+{
+    [ProcessActorHandler]
+    public abstract class ProcessActorHandler<T>: IProcessActorHandler where T : MessageObject, IProcessActorMessage
+    {
+        protected abstract void Run(T messageObject);
+
+        public void Handle(MessageObject messageObject)
+        {
+            this.Run((T)messageObject);
+        }
+
+        public Type GetMessageType()
+        {
+            return typeof (T);
+        }
+    }
+    
+    [ProcessActorHandler]
+    public abstract class ProcessActorHandler<Request, Response>: IProcessActorHandler where Request : MessageObject, IProcessActorRequest where Response: MessageObject, IProcessActorResponse, new()
+    {
+        protected abstract void Run(Request request, Response response);
+
+        public void Handle(MessageObject messageObject)
+        {
+            Request request = (Request)messageObject;
+            int processId = request.ProcessId;
+            Response response = new();
+            this.Run(request, response);
+            ProcessActor.Instance.Send(processId, response);
+        }
+
+        public Type GetMessageType()
+        {
+            return typeof (Request);
+        }
+        
+        public Type GetResponseType()
+        {
+            return typeof (Response);
+        }
+    }
+}

Unity/Assets/Scripts/Core/Singleton/ISingletonLoad.cs.meta → Unity/Assets/Scripts/Core/Game/Module/GameActor/ProcessActorHandler.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8ef1119ffe67d423f9988b71ba3e528c
+guid: c4cfbabc72cfd0040acb0af4e6053e4e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Core/Game/Module/GameActor/ProcessActorHandlerAttribute.cs

@@ -0,0 +1,7 @@
+namespace ET
+{
+    public class ProcessActorHandlerAttribute: BaseAttribute
+    {
+        
+    }
+}

Unity/Assets/Scripts/Core/Singleton/ISingletonUpdate.cs.meta → Unity/Assets/Scripts/Core/Game/Module/GameActor/ProcessActorHandlerAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a6595c55919c53d47b6a79d0e24b00c1
+guid: 64e18cdb4bb9fed4f90e69bc23b62c10
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Scripts/Core/Game/Module/GameActor/ProcessActorMessage.cs

@@ -0,0 +1,18 @@
+namespace ET
+{
+    public interface IProcessActorMessage
+    {
+
+    }
+    
+    public interface IProcessActorRequest
+    {
+        int ProcessId { get; set; }
+        int RpcId { get; set; }
+    }
+    
+    public interface IProcessActorResponse
+    {
+
+    }
+}

Unity/Assets/Scripts/Core/Game/Module/GameActor/ProcessActorMessage.cs.meta

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

Unity/Assets/Scripts/Core/Module/Log.meta → Unity/Assets/Scripts/Core/Game/Module/Log.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: de55781370d7d2342912082763b105e3
+guid: 057d576e460d8e44182a6f4b62585eb0
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Scripts/Core/Module/Network.meta → Unity/Assets/Scripts/Core/Game/Module/Network.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cd3d3e2288d73f14ba84f19fdde8df9b
+guid: 7c722632550408348b2b382876995b75
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}