diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/CSPacketBase.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/CSPacketBase.cs index 52e5bc63..01da915b 100644 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/CSPacketBase.cs +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/CSPacketBase.cs @@ -2,12 +2,6 @@ { public abstract class CSPacketBase : PacketBase { - public override PacketType PacketType - { - get - { - return PacketType.ClientToServer; - } - } + } } \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/CSPacketHeader.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/CSPacketHeader.cs index ffcb3c8f..2e92199e 100644 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/CSPacketHeader.cs +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/CSPacketHeader.cs @@ -6,12 +6,6 @@ namespace TEngine.Runtime [Serializable, ProtoContract(Name = @"CSPacketHeader")] public sealed class CSPacketHeader : PacketHeaderBase { - public override PacketType PacketType - { - get - { - return PacketType.ClientToServer; - } - } + } } \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/NetworkChannelHelper.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/NetworkChannelHelper.cs index 64af289f..c137c08d 100644 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/NetworkChannelHelper.cs +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/NetworkChannelHelper.cs @@ -27,7 +27,7 @@ namespace TEngine.Runtime m_NetworkChannel = networkChannel; // 反射注册包和包处理函数。 - Type packetBaseType = typeof(SCPacketBase); + Type packetBaseType = typeof(CSPacketBase); Type packetHandlerBaseType = typeof(PacketHandlerBase); Assembly assembly = Assembly.GetExecutingAssembly(); Type[] types = assembly.GetTypes(); @@ -99,12 +99,6 @@ namespace TEngine.Runtime return false; } - if (packetImpl.PacketType != PacketType.ClientToServer) - { - Log.Warning("Send packet invalid."); - return false; - } - m_CachedStream.SetLength(m_CachedStream.Capacity); // 此行防止 Array.Copy 的数据无法写入 m_CachedStream.Position = 0L; @@ -131,24 +125,24 @@ namespace TEngine.Runtime // 注意:此函数并不在主线程调用! customErrorData = null; - SCPacketHeader scPacketHeader = packetHeader as SCPacketHeader; - if (scPacketHeader == null) + CSPacketHeader csPacketHeader = packetHeader as CSPacketHeader; + if (csPacketHeader == null) { Log.Warning("Packet header is invalid."); return null; } Packet packet = null; - if (scPacketHeader.IsValid) + if (csPacketHeader.IsValid) { - Type packetType = GetServerToClientPacketType(scPacketHeader.Id); + Type packetType = GetServerToClientPacketType(csPacketHeader.Id); if (packetType != null) { packet = (Packet)RuntimeTypeModel.Default.DeserializeWithLengthPrefix(source, MemoryPool.Acquire(packetType), packetType, PrefixStyle.Fixed32, 0); } else { - Log.Warning("Can not deserialize packet for packet id '{0}'.", scPacketHeader.Id.ToString()); + Log.Warning("Can not deserialize packet for packet id '{0}'.", csPacketHeader.Id.ToString()); } } else @@ -156,7 +150,7 @@ namespace TEngine.Runtime Log.Warning("Packet header is invalid."); } - MemoryPool.Release(scPacketHeader); + MemoryPool.Release(csPacketHeader); return packet; } @@ -164,7 +158,7 @@ namespace TEngine.Runtime { // 注意:此函数并不在主线程调用! customErrorData = null; - return (IPacketHeader)RuntimeTypeModel.Default.Deserialize(source, MemoryPool.Acquire(), typeof(SCPacketHeader)); + return (IPacketHeader)RuntimeTypeModel.Default.Deserialize(source, MemoryPool.Acquire(), typeof(CSPacketHeader)); } private Type GetServerToClientPacketType(int id) @@ -225,7 +219,7 @@ namespace TEngine.Runtime return; } - Log.Info("Network channel '{0}' miss heart beat '{1}' times.", ne.NetworkChannel.Name, ne.MissCount.ToString()); + Log.Warning("Network channel '{0}' miss heart beat '{1}' times.", ne.NetworkChannel.Name, ne.MissCount.ToString()); if (ne.MissCount < 2) { diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/Packet/SCHeartBeat.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/Packet/SCHeartBeat.cs deleted file mode 100644 index 8728d203..00000000 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/Packet/SCHeartBeat.cs +++ /dev/null @@ -1,20 +0,0 @@ -using ProtoBuf; -using System; - -namespace TEngine.Runtime -{ - [Serializable, ProtoContract(Name = @"SCHeartBeat")] - public class SCHeartBeat : SCPacketBase - { - public SCHeartBeat() - { - } - - public override int Id => 2; - - - public override void Clear() - { - } - } -} \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/Packet/SCHeartBeat.cs.meta b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/Packet/SCHeartBeat.cs.meta deleted file mode 100644 index f0b601b4..00000000 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/Packet/SCHeartBeat.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2c6c67efd23a0ea49b469cde0c44f234 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketBase.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketBase.cs index 159d4ebd..d89f039d 100644 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketBase.cs +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketBase.cs @@ -11,11 +11,6 @@ namespace TEngine.Runtime m_ExtensionObject = null; } - public abstract PacketType PacketType - { - get; - } - IExtension IExtensible.GetExtensionObject(bool createIfMissing) { return Extensible.GetExtensionObject(ref m_ExtensionObject, createIfMissing); diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler/SCHeartBeatHandler.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler/SCHeartBeatHandler.cs index 5f196e46..fec38b95 100644 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler/SCHeartBeatHandler.cs +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandler/SCHeartBeatHandler.cs @@ -1,6 +1,9 @@ namespace TEngine.Runtime { - public class SCHeartBeatHandler : PacketHandlerBase + /// + /// 心跳Handler + /// + public class CSHeartBeatHandler : PacketHandlerBase { public override int Id { @@ -12,7 +15,12 @@ public override void Handle(object sender, Packet packet) { - SCHeartBeat packetImpl = (SCHeartBeat)packet; + CSHeartBeat packetImpl = (CSHeartBeat)packet; + if (packetImpl == null) + { + Log.Fatal("Receive CSHeartBeat Failed !!!"); + return; + } Log.Info("Receive packet '{0}'.", packetImpl.Id.ToString()); } } diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandlerBase.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandlerBase.cs index 24b70660..59e4e642 100644 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandlerBase.cs +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHandlerBase.cs @@ -1,5 +1,8 @@ namespace TEngine.Runtime { + /// + /// PacketHandler处理,TEngine.Runtime程序集内无需手动注册,实现即可 + /// public abstract class PacketHandlerBase : IPacketHandler { public abstract int Id diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHeaderBase.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHeaderBase.cs index 9da97d0b..e99d169c 100644 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHeaderBase.cs +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketHeaderBase.cs @@ -2,11 +2,6 @@ { public abstract class PacketHeaderBase : IPacketHeader, IMemory { - public abstract PacketType PacketType - { - get; - } - public int Id { get; @@ -23,7 +18,7 @@ { get { - return PacketType != PacketType.Undefined && Id > 0 && PacketLength >= 0; + return Id > 0 && PacketLength >= 0; } } diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketType.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketType.cs deleted file mode 100644 index 5e61c1ce..00000000 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketType.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace TEngine -{ - public enum PacketType : byte - { - /// - /// 未定义。 - /// - Undefined = 0, - - /// - /// 客户端发往服务器的包。 - /// - ClientToServer, - - /// - /// 服务器发往客户端的包。 - /// - ServerToClient, - } -} \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketType.cs.meta b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketType.cs.meta deleted file mode 100644 index fe4dea65..00000000 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/PacketType.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 71e37d0b444a9f646984e673744d2bcf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/SCPacketBase.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/SCPacketBase.cs deleted file mode 100644 index 4fcdfce9..00000000 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/SCPacketBase.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace TEngine.Runtime -{ - public abstract class SCPacketBase : PacketBase - { - public override PacketType PacketType - { - get - { - return PacketType.ServerToClient; - } - } - } -} \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/SCPacketBase.cs.meta b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/SCPacketBase.cs.meta deleted file mode 100644 index a67e7e90..00000000 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/SCPacketBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9bf44767ac4b0ff43b0c6b86d8d255ec -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/SCPacketHeader.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/SCPacketHeader.cs deleted file mode 100644 index b55b44e7..00000000 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/SCPacketHeader.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace TEngine.Runtime -{ - public sealed class SCPacketHeader : PacketHeaderBase - { - public override PacketType PacketType - { - get - { - return PacketType.ServerToClient; - } - } - } -} \ No newline at end of file diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/SCPacketHeader.cs.meta b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/SCPacketHeader.cs.meta deleted file mode 100644 index 57c6308d..00000000 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Helper/SCPacketHeader.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2855018a5b9e3d641a4275143aed88f0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Network.cs b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Network.cs index 090a648b..166274f4 100644 --- a/Assets/TEngine/Scripts/Runtime/Core/NetWork/Network.cs +++ b/Assets/TEngine/Scripts/Runtime/Core/NetWork/Network.cs @@ -12,7 +12,12 @@ namespace TEngine.Runtime public class Network : UnitySingleton { private INetworkManager m_NetworkManager = null; - public NetworkManager NetworkManager; + + public NetworkManager NetworkManager + { + private set; + get; + } /// /// 获取网络频道数量。 @@ -32,9 +37,6 @@ namespace TEngine.Runtime protected override void OnLoad() { base.OnLoad(); - - GameEventMgr.Instance.AddEventListener(TEngineEvent.OnStartGame,OnStartGame); - m_NetworkManager = new NetworkManager(); NetworkManager = m_NetworkManager as NetworkManager; if (m_NetworkManager == null) @@ -73,11 +75,6 @@ namespace TEngine.Runtime } } - private void OnStartGame() - { - - } - /// /// 检查是否存在网络频道。 ///