tanghai 2 лет назад
Родитель
Сommit
4cea4b4763

+ 2 - 2
Unity/Assets/Scripts/Hotfix/Client/Module/Message/NetComponentOnReadInvoker_NetClient.cs

@@ -3,9 +3,9 @@
 namespace ET.Client
 {
     [Invoke((long)SceneType.NetClient)]
-    public class NetComponentOnReadInvoker_NetClient: AInvokeHandler<NetOuterComponentOnRead>
+    public class NetComponentOnReadInvoker_NetClient: AInvokeHandler<NetComponentOnRead>
     {
-        public override void Handle(NetOuterComponentOnRead args)
+        public override void Handle(NetComponentOnRead args)
         {
             Session session = args.Session;
             object message = args.Message;

+ 23 - 0
Unity/Assets/Scripts/Hotfix/Server/Benchmark/NetComponentOnReadInvoker_BenchmarkClient.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace ET.Server
+{
+    [Invoke((long)SceneType.BenchmarkClient)]
+    public class NetComponentOnReadInvoker_BenchmarkClient: AInvokeHandler<NetComponentOnRead>
+    {
+        public override void Handle(NetComponentOnRead args)
+        {
+            Session session = args.Session;
+            object message = args.Message;
+            // 根据消息接口判断是不是Actor消息,不同的接口做不同的处理,比如需要转发给Chat Scene,可以做一个IChatMessage接口
+            switch (message)
+            {
+                case IResponse response:
+                {
+                    session.OnResponse(response);
+                    break;
+                }
+            }
+        }
+    }
+}

+ 11 - 0
Unity/Assets/Scripts/Hotfix/Server/Benchmark/NetComponentOnReadInvoker_BenchmarkClient.cs.meta

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

+ 2 - 2
Unity/Assets/Scripts/Hotfix/Server/Benchmark/NetComponentOnReadInvoker_BenchmarkServer.cs

@@ -3,9 +3,9 @@
 namespace ET.Server
 {
     [Invoke((long)SceneType.BenchmarkServer)]
-    public class NetComponentOnReadInvoker_BenchmarkServer: AInvokeHandler<NetOuterComponentOnRead>
+    public class NetComponentOnReadInvoker_BenchmarkServer: AInvokeHandler<NetComponentOnRead>
     {
-        public override void Handle(NetOuterComponentOnRead args)
+        public override void Handle(NetComponentOnRead args)
         {
             Session session = args.Session;
             object message = args.Message;

+ 3 - 3
Unity/Assets/Scripts/Hotfix/Server/Demo/Gate/NetComponentOnReadInvoker_Gate.cs

@@ -3,14 +3,14 @@
 namespace ET.Server
 {
     [Invoke((long)SceneType.Gate)]
-    public class NetComponentOnReadInvoker_Gate: AInvokeHandler<NetOuterComponentOnRead>
+    public class NetComponentOnReadInvoker_Gate: AInvokeHandler<NetComponentOnRead>
     {
-        public override void Handle(NetOuterComponentOnRead args)
+        public override void Handle(NetComponentOnRead args)
         {
             HandleAsync(args).Coroutine();
         }
 
-        private async ETTask HandleAsync(NetOuterComponentOnRead args)
+        private async ETTask HandleAsync(NetComponentOnRead args)
         {
             Session session = args.Session;
             object message = args.Message;

+ 2 - 2
Unity/Assets/Scripts/Hotfix/Server/Demo/Realm/NetComponentOnReadInvoker_Realm.cs

@@ -3,9 +3,9 @@
 namespace ET.Server
 {
     [Invoke((long)SceneType.Realm)]
-    public class NetComponentOnReadInvoker_Realm: AInvokeHandler<NetOuterComponentOnRead>
+    public class NetComponentOnReadInvoker_Realm: AInvokeHandler<NetComponentOnRead>
     {
-        public override void Handle(NetOuterComponentOnRead args)
+        public override void Handle(NetComponentOnRead args)
         {
             Session session = args.Session;
             object message = args.Message;

+ 4 - 4
Unity/Assets/Scripts/Hotfix/Share/Module/Message/NetComponentSystem.cs

@@ -5,12 +5,12 @@ namespace ET
 {
     [EntitySystemOf(typeof(NetComponent))]
     [FriendOf(typeof(NetComponent))]
-    public static partial class NetOuterComponentSystem
+    public static partial class NetComponentSystem
     {
         [EntitySystem]
         private static void Awake(this NetComponent self, IPEndPoint address)
         {
-            self.AService = new KService(address, ServiceType.Outer, self.Fiber().Log);
+            self.AService = new TService(address, ServiceType.Outer, self.Fiber().Log);
             self.AService.AcceptCallback = self.OnAccept;
             self.AService.ReadCallback = self.OnRead;
             self.AService.ErrorCallback = self.OnError;
@@ -19,7 +19,7 @@ namespace ET
         [EntitySystem]
         private static void Awake(this NetComponent self, AddressFamily addressFamily)
         {
-            self.AService = new KService(addressFamily, ServiceType.Outer, self.Fiber().Log);
+            self.AService = new TService(addressFamily, ServiceType.Outer, self.Fiber().Log);
             self.AService.ReadCallback = self.OnRead;
             self.AService.ErrorCallback = self.OnError;
         }
@@ -74,7 +74,7 @@ namespace ET
             
             LogMsg.Instance.Debug(self.Fiber(), message);
             
-            EventSystem.Instance.Invoke((long)self.IScene.SceneType, new NetOuterComponentOnRead() {Session = session, Message = message});
+            EventSystem.Instance.Invoke((long)self.IScene.SceneType, new NetComponentOnRead() {Session = session, Message = message});
         }
         
         public static Session Create(this NetComponent self, IPEndPoint realIPEndPoint)

+ 1 - 1
Unity/Assets/Scripts/Model/Share/Module/Message/NetComponent.cs

@@ -3,7 +3,7 @@ using System.Net.Sockets;
 
 namespace ET
 {
-    public struct NetOuterComponentOnRead
+    public struct NetComponentOnRead
     {
         public Session Session;
         public object Message;