tanghai пре 2 година
родитељ
комит
4411d1af95

+ 1 - 1
Unity/Assets/Scripts/Codes/Hotfix/Client/Module/Message/NetClientComponentSystem.cs

@@ -36,7 +36,7 @@ namespace ET.Client
 
             session.LastRecvTime = TimeHelper.ClientNow();
             
-            OpcodeHelper.LogMsg(self.DomainZone(), message);
+            OpcodeHelper.LogMsg(self.DomainScene(), message);
             
             EventSystem.Instance.Publish(Root.Instance.Scene, new NetClientComponentOnRead() {Session = session, Message = message});
         }

+ 1 - 0
Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Helper/SceneFactory.cs

@@ -34,6 +34,7 @@ namespace ET.Server
                 case SceneType.Map:
                     scene.AddComponent<UnitComponent>();
                     scene.AddComponent<AOIManagerComponent>();
+                    scene.AddComponent<RoomManagerComponent>();
                     break;
                 case SceneType.Location:
                     scene.AddComponent<LocationManagerComoponent>();

+ 2 - 0
Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Room/Match2Map_GetRoomHandler.cs

@@ -8,9 +8,11 @@ namespace ET.Server
 	{
 		protected override async ETTask Run(Scene scene, Match2Map_GetRoom request, Map2Match_GetRoom response)
 		{
+			Log.Debug($"11111111111111111111111111111111111111a1");
 			RoomManagerComponent roomManagerComponent = scene.GetComponent<RoomManagerComponent>();
 			Scene room = await roomManagerComponent.CreateRoom();
 			response.InstanceId = room.InstanceId;
+			Log.Debug($"11111111111111111111111111111111111111a2");
 			await ETTask.CompletedTask;
 		}
 	}

+ 4 - 2
Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Match/MatchComponentSystem.cs

@@ -32,10 +32,12 @@ namespace ET.Server
             }
             
             // 申请一个房间
-            StartSceneConfig startSceneConfig = RandomGenerator.RandomArray(StartSceneConfigCategory.Instance.Robots);
+            StartSceneConfig startSceneConfig = RandomGenerator.RandomArray(StartSceneConfigCategory.Instance.Maps);
+            
+            Log.Debug($"11111111111111111111111111111111111111");
             Map2Match_GetRoom map2MatchGetRoom = await ActorMessageSenderComponent.Instance.Call(
                 startSceneConfig.InstanceId, new Match2Map_GetRoom()) as Map2Match_GetRoom;
-
+            Log.Debug($"11111111111111111111111111111111111112");
             for (int i = 0; i < MatchCount; ++i)
             {
                 ActorMessageSenderComponent.Instance.Send(

+ 1 - 0
Unity/Assets/Scripts/Codes/Hotfix/Server/Module/Message/NetInnerComponentSystem.cs

@@ -83,6 +83,7 @@ namespace ET.Server
 
         public static void HandleMessage(this NetInnerComponent self, long actorId, object message)
         {
+            OpcodeHelper.LogMsg(self.DomainScene(), message);
             EventSystem.Instance.Publish(Root.Instance.Scene, new NetInnerComponentOnRead() { ActorId = actorId, Message = message });
         }
 

+ 1 - 1
Unity/Assets/Scripts/Codes/Hotfix/Server/Module/Message/NetServerComponentSystem.cs

@@ -62,7 +62,7 @@ namespace ET.Server
             }
             session.LastRecvTime = TimeHelper.ClientNow();
             
-            OpcodeHelper.LogMsg(self.DomainZone(), message);
+            OpcodeHelper.LogMsg(self.DomainScene(), message);
 			
             EventSystem.Instance.Publish(Root.Instance.Scene, new NetServerComponentOnRead() {Session = session, Message = message});
         }

+ 1 - 1
Unity/Assets/Scripts/Codes/Model/Server/Demo/Map/Room/RoomManagerComponent.cs

@@ -1,7 +1,7 @@
 namespace ET.Server
 {
     [ComponentOf(typeof(Scene))]
-    public class RoomManagerComponent: Entity
+    public class RoomManagerComponent: Entity, IAwake
     {
 
     }

+ 2 - 13
Unity/Assets/Scripts/Codes/Model/Share/Module/Message/OpcodeHelper.cs

@@ -34,7 +34,7 @@ namespace ET
             return opcode >= OpcodeRangeDefine.InnerMinOpcode;
         }
 
-        public static void LogMsg(int zone, object message)
+        public static void LogMsg(Scene scene, object message)
         {
             ushort opcode = NetServices.Instance.GetOpcode(message.GetType());
             if (!IsNeedLogMessage(opcode))
@@ -42,18 +42,7 @@ namespace ET
                 return;
             }
             
-            Logger.Instance.Debug("zone: {0} {1}", zone, message);
-        }
-        
-        public static void LogMsg(long actorId, object message)
-        {
-            ushort opcode = NetServices.Instance.GetOpcode(message.GetType());
-            if (!IsNeedLogMessage(opcode))
-            {
-                return;
-            }
-            
-            Logger.Instance.Debug("actorId: {0} {1}", actorId, message);
+            Logger.Instance.Debug($"{scene.Name} {message}");
         }
     }
 }

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

@@ -125,7 +125,7 @@ namespace ET
         public static void Send(this Session self, long actorId, IMessage message)
         {
             self.LastSendTime = TimeHelper.ClientNow();
-            OpcodeHelper.LogMsg(self.DomainZone(), message);
+            OpcodeHelper.LogMsg(self.DomainScene(), message);
             NetServices.Instance.SendMessage(self.ServiceId, self.Id, actorId, message);
         }
     }