From e76a4fe0cbc5a79f183b606ea87cd82b47b23166 Mon Sep 17 00:00:00 2001 From: tanghai Date: Wed, 29 Jul 2020 22:32:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1=E7=AB=AF?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Excel/StartMachineConfig.xlsx | Bin 9102 -> 9109 bytes .../Module/Message/NetInnerComponentSystem.cs | 4 +- .../Demo/ConfigPartial/StartProcessConfig.cs | 2 +- Server/Model/Server.Model.csproj | 1 - Unity/Assets/HotfixView/AppStart_Init.cs | 2 +- Unity/Assets/Model/Base/Event/IEvent.cs | 2 +- Unity/Assets/Model/Base/TryLocker.cs | 35 ------------------ Unity/Assets/Model/Base/TryLocker.cs.meta | 12 ------ Unity/Assets/Model/Define.cs | 18 --------- .../Message/Network/TCP/PacketParser.cs | 31 ++++------------ .../Module/Message/Network/TCP/TChannel.cs | 30 ++++----------- .../Module/Message/Network/TCP/TService.cs | 8 +--- .../Model/Module/Message/NetworkComponent.cs | 8 ++-- Unity/Unity.Model.csproj | 1 - 14 files changed, 25 insertions(+), 129 deletions(-) delete mode 100644 Unity/Assets/Model/Base/TryLocker.cs delete mode 100644 Unity/Assets/Model/Base/TryLocker.cs.meta diff --git a/Excel/StartMachineConfig.xlsx b/Excel/StartMachineConfig.xlsx index 5616411737bc27907e461a5986b9fbe5a2a35a81..ce79cee7979b08377f4614ead7c83a42064f92c8 100644 GIT binary patch delta 4644 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 Tzw+O*R%jbe0RklJzn=d9!Bo0n delta 4601 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 diff --git a/Server/Hotfix/Module/Message/NetInnerComponentSystem.cs b/Server/Hotfix/Module/Message/NetInnerComponentSystem.cs index 6b5e2e42..c03ed37e 100644 --- a/Server/Hotfix/Module/Message/NetInnerComponentSystem.cs +++ b/Server/Hotfix/Module/Message/NetInnerComponentSystem.cs @@ -7,7 +7,7 @@ namespace ET public override void Awake(NetInnerComponent self) { NetInnerComponent.Instance = self; - self.Awake(NetworkProtocol.TCP, Packet.PacketSizeLength4); + self.Awake(NetworkProtocol.TCP); self.MessagePacker = new MongoPacker(); self.MessageDispatcher = new InnerMessageDispatcher(); } @@ -18,7 +18,7 @@ namespace ET public override void Awake(NetInnerComponent self, string a) { NetInnerComponent.Instance = self; - self.Awake(NetworkProtocol.TCP, a, Packet.PacketSizeLength4); + self.Awake(NetworkProtocol.TCP, a); self.MessagePacker = new MongoPacker(); self.MessageDispatcher = new InnerMessageDispatcher(); } diff --git a/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs b/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs index 21c437da..0c82c60c 100644 --- a/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs +++ b/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs @@ -19,7 +19,7 @@ namespace ET { if (this.innerAddress == null) { - this.innerAddress = $"{StartMachineConfigCategory.Instance.Get(this.MachineId)}:{this.InnerPort}"; + this.innerAddress = $"{StartMachineConfigCategory.Instance.Get(this.MachineId).InnerIP}:{this.InnerPort}"; } return this.innerAddress; } diff --git a/Server/Model/Server.Model.csproj b/Server/Model/Server.Model.csproj index 6ba8c403..d663396c 100644 --- a/Server/Model/Server.Model.csproj +++ b/Server/Model/Server.Model.csproj @@ -214,7 +214,6 @@ - diff --git a/Unity/Assets/HotfixView/AppStart_Init.cs b/Unity/Assets/HotfixView/AppStart_Init.cs index 59c58532..2cf6266a 100644 --- a/Unity/Assets/HotfixView/AppStart_Init.cs +++ b/Unity/Assets/HotfixView/AppStart_Init.cs @@ -11,7 +11,7 @@ namespace ET //await BundleHelper.DownloadBundle("1111"); // 加载配置 - Game.Scene.GetComponent().LoadBundle("config.unity3d"); + Game.Scene.AddComponent().LoadBundle("config.unity3d"); Game.Scene.AddComponent(); Game.Scene.GetComponent().UnloadBundle("config.unity3d"); Game.Scene.AddComponent(); diff --git a/Unity/Assets/Model/Base/Event/IEvent.cs b/Unity/Assets/Model/Base/Event/IEvent.cs index 1333fb78..68537abd 100644 --- a/Unity/Assets/Model/Base/Event/IEvent.cs +++ b/Unity/Assets/Model/Base/Event/IEvent.cs @@ -7,7 +7,7 @@ namespace ET Type GetEventType(); } - + [Event] public abstract class AEvent: IEvent where A: struct { public Type GetEventType() diff --git a/Unity/Assets/Model/Base/TryLocker.cs b/Unity/Assets/Model/Base/TryLocker.cs deleted file mode 100644 index 29c14273..00000000 --- a/Unity/Assets/Model/Base/TryLocker.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Threading; - -namespace ET -{ - public class TryLock : IDisposable - { - private object locked; - - public bool HasLock { get; private set; } - - public TryLock(object obj) - { - if (!Monitor.TryEnter(obj)) - { - return; - } - - this.HasLock = true; - this.locked = obj; - } - - public void Dispose() - { - if (!this.HasLock) - { - return; - } - - Monitor.Exit(this.locked); - this.locked = null; - this.HasLock = false; - } - } -} diff --git a/Unity/Assets/Model/Base/TryLocker.cs.meta b/Unity/Assets/Model/Base/TryLocker.cs.meta deleted file mode 100644 index 972a879c..00000000 --- a/Unity/Assets/Model/Base/TryLocker.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: b17c37646ccfe6d4d96df611e5664f8c -timeCreated: 1476430040 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Model/Define.cs b/Unity/Assets/Model/Define.cs index 973eef8f..965d5f6a 100644 --- a/Unity/Assets/Model/Define.cs +++ b/Unity/Assets/Model/Define.cs @@ -7,23 +7,5 @@ #else public static bool IsAsync = true; #endif - -#if UNITY_EDITOR - public static bool IsEditorMode = true; -#else - public static bool IsEditorMode = false; -#endif - -#if DEVELOPMENT_BUILD - public static bool IsDevelopmentBuild = true; -#else - public static bool IsDevelopmentBuild = false; -#endif - -#if ILRuntime - public static bool IsILRuntime = true; -#else - public static bool IsILRuntime = false; -#endif } } \ No newline at end of file diff --git a/Unity/Assets/Model/Module/Message/Network/TCP/PacketParser.cs b/Unity/Assets/Model/Module/Message/Network/TCP/PacketParser.cs index cada1df4..98f2e30e 100644 --- a/Unity/Assets/Model/Module/Message/Network/TCP/PacketParser.cs +++ b/Unity/Assets/Model/Module/Message/Network/TCP/PacketParser.cs @@ -11,8 +11,7 @@ namespace ET public static class Packet { - public const int PacketSizeLength2 = 2; - public const int PacketSizeLength4 = 4; + public const int PacketSizeLength = 4; public const int MinPacketSize = 2; public const int OpcodeIndex = 0; public const int MessageIndex = 2; @@ -25,11 +24,9 @@ namespace ET private ParserState state; public MemoryStream memoryStream; private bool isOK; - private readonly int packetSizeLength; - public PacketParser(int packetSizeLength, CircularBuffer buffer, MemoryStream memoryStream) + public PacketParser(CircularBuffer buffer, MemoryStream memoryStream) { - this.packetSizeLength = packetSizeLength; this.buffer = buffer; this.memoryStream = memoryStream; } @@ -47,32 +44,18 @@ namespace ET switch (this.state) { case ParserState.PacketSize: - if (this.buffer.Length < this.packetSizeLength) + if (this.buffer.Length < Packet.PacketSizeLength) { finish = true; } else { - this.buffer.Read(this.memoryStream.GetBuffer(), 0, this.packetSizeLength); + this.buffer.Read(this.memoryStream.GetBuffer(), 0, Packet.PacketSizeLength); - switch (this.packetSizeLength) + this.packetSize = BitConverter.ToInt32(this.memoryStream.GetBuffer(), 0); + if (this.packetSize > ushort.MaxValue * 16 || this.packetSize < Packet.MinPacketSize) { - case Packet.PacketSizeLength4: - this.packetSize = BitConverter.ToInt32(this.memoryStream.GetBuffer(), 0); - if (this.packetSize > ushort.MaxValue * 16 || this.packetSize < Packet.MinPacketSize) - { - throw new Exception($"recv packet size error, 可能是外网探测端口: {this.packetSize}"); - } - break; - case Packet.PacketSizeLength2: - this.packetSize = BitConverter.ToUInt16(this.memoryStream.GetBuffer(), 0); - if (this.packetSize > ushort.MaxValue || this.packetSize < Packet.MinPacketSize) - { - throw new Exception($"recv packet size error:, 可能是外网探测端口: {this.packetSize}"); - } - break; - default: - throw new Exception("packet size byte count must be 2 or 4!"); + throw new Exception($"recv packet size error, 可能是外网探测端口: {this.packetSize}"); } this.state = ParserState.PacketBody; } diff --git a/Unity/Assets/Model/Module/Message/Network/TCP/TChannel.cs b/Unity/Assets/Model/Module/Message/Network/TCP/TChannel.cs index 62471ef5..9dccbe27 100644 --- a/Unity/Assets/Model/Module/Message/Network/TCP/TChannel.cs +++ b/Unity/Assets/Model/Module/Message/Network/TCP/TChannel.cs @@ -34,13 +34,12 @@ namespace ET public TChannel(IPEndPoint ipEndPoint, TService service): base(service, ChannelType.Connect) { - int packetSize = service.PacketSizeLength; - this.packetSizeCache = new byte[packetSize]; + this.packetSizeCache = new byte[4]; this.memoryStream = service.MemoryStreamManager.GetStream("message", ushort.MaxValue); this.socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); this.socket.NoDelay = true; - this.parser = new PacketParser(packetSize, this.recvBuffer, this.memoryStream); + this.parser = new PacketParser(this.recvBuffer, this.memoryStream); this.innArgs.Completed += this.OnComplete; this.outArgs.Completed += this.OnComplete; @@ -52,13 +51,12 @@ namespace ET public TChannel(Socket socket, TService service): base(service, ChannelType.Accept) { - int packetSize = service.PacketSizeLength; - this.packetSizeCache = new byte[packetSize]; + this.packetSizeCache = new byte[Packet.PacketSizeLength]; this.memoryStream = service.MemoryStreamManager.GetStream("message", ushort.MaxValue); this.socket = socket; this.socket.NoDelay = true; - this.parser = new PacketParser(packetSize, this.recvBuffer, this.memoryStream); + this.parser = new PacketParser(this.recvBuffer, this.memoryStream); this.innArgs.Completed += this.OnComplete; this.outArgs.Completed += this.OnComplete; @@ -118,25 +116,11 @@ namespace ET throw new Exception("TChannel已经被Dispose, 不能发送消息"); } - switch (this.GetService().PacketSizeLength) + if (stream.Length > ushort.MaxValue * 16) { - case Packet.PacketSizeLength4: - if (stream.Length > ushort.MaxValue * 16) - { - throw new Exception($"send packet too large: {stream.Length}"); - } - this.packetSizeCache.WriteTo(0, (int) stream.Length); - break; - case Packet.PacketSizeLength2: - if (stream.Length > ushort.MaxValue) - { - throw new Exception($"send packet too large: {stream.Length}"); - } - this.packetSizeCache.WriteTo(0, (ushort) stream.Length); - break; - default: - throw new Exception("packet size must be 2 or 4!"); + throw new Exception($"send packet too large: {stream.Length}"); } + this.packetSizeCache.WriteTo(0, (int) stream.Length); this.sendBuffer.Write(this.packetSizeCache, 0, this.packetSizeCache.Length); this.sendBuffer.Write(stream); diff --git a/Unity/Assets/Model/Module/Message/Network/TCP/TService.cs b/Unity/Assets/Model/Module/Message/Network/TCP/TService.cs index 91deb05c..8e2b5ebd 100644 --- a/Unity/Assets/Model/Module/Message/Network/TCP/TService.cs +++ b/Unity/Assets/Model/Module/Message/Network/TCP/TService.cs @@ -18,14 +18,11 @@ namespace ET public List needStartSendChannel = new List(); - public int PacketSizeLength { get; } - /// /// 即可做client也可做server /// - public TService(int packetSizeLength, IPEndPoint ipEndPoint, Action acceptCallback) + public TService(IPEndPoint ipEndPoint, Action acceptCallback) { - this.PacketSizeLength = packetSizeLength; this.AcceptCallback += acceptCallback; this.acceptor = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); @@ -38,9 +35,8 @@ namespace ET this.AcceptAsync(); } - public TService(int packetSizeLength) + public TService() { - this.PacketSizeLength = packetSizeLength; } public override void Dispose() diff --git a/Unity/Assets/Model/Module/Message/NetworkComponent.cs b/Unity/Assets/Model/Module/Message/NetworkComponent.cs index 80a545b5..3cfdaa9d 100644 --- a/Unity/Assets/Model/Module/Message/NetworkComponent.cs +++ b/Unity/Assets/Model/Module/Message/NetworkComponent.cs @@ -14,7 +14,7 @@ namespace ET public IMessageDispatcher MessageDispatcher { get; set; } - public void Awake(NetworkProtocol protocol, int packetSize = Packet.PacketSizeLength4) + public void Awake(NetworkProtocol protocol) { switch (protocol) { @@ -22,7 +22,7 @@ namespace ET this.Service = new KService() { Parent = this }; break; case NetworkProtocol.TCP: - this.Service = new TService(packetSize) { Parent = this }; + this.Service = new TService() { Parent = this }; break; case NetworkProtocol.WebSocket: this.Service = new WService() { Parent = this }; @@ -30,7 +30,7 @@ namespace ET } } - public void Awake(NetworkProtocol protocol, string address, int packetSize = Packet.PacketSizeLength4) + public void Awake(NetworkProtocol protocol, string address) { try { @@ -43,7 +43,7 @@ namespace ET break; case NetworkProtocol.TCP: ipEndPoint = NetworkHelper.ToIPEndPoint(address); - this.Service = new TService(packetSize, ipEndPoint, (channel)=> { this.OnAccept(channel); }) { Parent = this }; + this.Service = new TService(ipEndPoint, (channel)=> { this.OnAccept(channel); }) { Parent = this }; break; case NetworkProtocol.WebSocket: string[] prefixs = address.Split(';'); diff --git a/Unity/Unity.Model.csproj b/Unity/Unity.Model.csproj index 39e61be9..aeacaa16 100644 --- a/Unity/Unity.Model.csproj +++ b/Unity/Unity.Model.csproj @@ -127,7 +127,6 @@ - -- GitLab