From 6765125f25097e71c6af8b552d7a08de31495770 Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Tue, 30 Aug 2022 17:20:12 +0800 Subject: [PATCH] Update Update --- .../Core/NetWork/Helper/CSPacketHeader.cs | 6 +++++- .../NetWork/Helper/NetworkChannelHelper.cs | 11 +++++++++-- .../Core/NetWork/Helper/PacketHandler.meta | 3 +++ .../PacketHandler/SCHeartBeatHandler.cs | 19 +++++++++++++++++++ .../PacketHandler/SCHeartBeatHandler.cs.meta | 3 +++ 5 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler.meta create mode 100644 Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler/SCHeartBeatHandler.cs create mode 100644 Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler/SCHeartBeatHandler.cs.meta diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/CSPacketHeader.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/CSPacketHeader.cs index 5690669f..ffcb3c8f 100644 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/CSPacketHeader.cs +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/CSPacketHeader.cs @@ -1,5 +1,9 @@ -namespace TEngine.Runtime +using System; +using ProtoBuf; + +namespace TEngine.Runtime { + [Serializable, ProtoContract(Name = @"CSPacketHeader")] public sealed class CSPacketHeader : PacketHeaderBase { public override PacketType PacketType diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/NetworkChannelHelper.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/NetworkChannelHelper.cs index cb52245e..64af289f 100644 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/NetworkChannelHelper.cs +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/NetworkChannelHelper.cs @@ -199,6 +199,11 @@ namespace TEngine.Runtime { return; } + + if (ne.NetworkChannel.Socket == null) + { + return; + } Log.Info("Network channel '{0}' connected, local address '{1}', remote address '{2}'.", ne.NetworkChannel.Name, ne.NetworkChannel.Socket.LocalEndPoint.ToString(), ne.NetworkChannel.Socket.RemoteEndPoint.ToString()); } @@ -209,7 +214,7 @@ namespace TEngine.Runtime { return; } - Log.Info("Network channel '{0}' closed.", ne.NetworkChannel.Name); + Log.Warning("Network channel '{0}' closed.", ne.NetworkChannel.Name); } private void OnNetworkMissHeartBeat(object sender, GameEventArgs e) @@ -237,7 +242,7 @@ namespace TEngine.Runtime return; } - Log.Info("Network channel '{0}' error, error code is '{1}', error message is '{2}'.", ne.NetworkChannel.Name, ne.ErrorCode.ToString(), ne.ErrorMessage); + Log.Fatal("Network channel '{0}' error, error code is '{1}', error message is '{2}'.", ne.NetworkChannel.Name, ne.ErrorCode.ToString(), ne.ErrorMessage); ne.NetworkChannel.Close(); } @@ -249,6 +254,8 @@ namespace TEngine.Runtime { return; } + + Log.Fatal("Network channel '{0}' error, error code is '{1}', error message is '{2}'.", ne.NetworkChannel.Name, ne.CustomErrorData.ToString()); } #endregion } diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler.meta b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler.meta new file mode 100644 index 00000000..9c57d0f7 --- /dev/null +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0396e29af93d424fb252e3cf5a948fa6 +timeCreated: 1661850708 \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler/SCHeartBeatHandler.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler/SCHeartBeatHandler.cs new file mode 100644 index 00000000..5f196e46 --- /dev/null +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler/SCHeartBeatHandler.cs @@ -0,0 +1,19 @@ +namespace TEngine.Runtime +{ + public class SCHeartBeatHandler : PacketHandlerBase + { + public override int Id + { + get + { + return 2; + } + } + + public override void Handle(object sender, Packet packet) + { + SCHeartBeat packetImpl = (SCHeartBeat)packet; + Log.Info("Receive packet '{0}'.", packetImpl.Id.ToString()); + } + } +} \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler/SCHeartBeatHandler.cs.meta b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler/SCHeartBeatHandler.cs.meta new file mode 100644 index 00000000..571942fb --- /dev/null +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler/SCHeartBeatHandler.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 553b96ca58c647d39802bed84a356608 +timeCreated: 1661850718 \ No newline at end of file