diff --git a/F6/MsgHandler.cs b/F6/MsgHandler.cs index 6b80f98..ea12722 100644 --- a/F6/MsgHandler.cs +++ b/F6/MsgHandler.cs @@ -9,8 +9,8 @@ using pbr = global::Google.Protobuf.Reflection; namespace F6 { - public delegate Google.Protobuf.IMessage CreateMsg(); - public delegate void HandlerMsg(Google.Protobuf.IMessage msg); + internal delegate Google.Protobuf.IMessage CreateMsg(); + internal delegate void HandlerMsg(Google.Protobuf.IMessage msg); internal class HandlerRec { internal CreateMsg createMsg; @@ -19,8 +19,7 @@ namespace F6 class MsgHandler { - public delegate void HandlerDelegate(int msgId, byte[] msg); - public delegate void HandlerDelegateEx(T msg); + public delegate void HandlerDelegate(T msg); private Type cmMsgType; private Type smMsgType; @@ -60,7 +59,7 @@ namespace F6 return 0; } - protected void RegisterHandler(HandlerDelegateEx handler) where T : IMessage ,new() + protected void RegisterHandler(HandlerDelegate handler) where T : IMessage ,new() { int msgId = this.GetSMMsgId(typeof(T).Name); HandlerRec handler1; diff --git a/Net/BattleHandler.cs b/Net/BattleHandler.cs index c4bced4..a669539 100644 --- a/Net/BattleHandler.cs +++ b/Net/BattleHandler.cs @@ -8,7 +8,7 @@ namespace Net { class BattleHandler : F6.MsgHandler { - public HandlerDelegateEx SMKcpHandshakeHandler; + public HandlerDelegate SMKcpHandshakeHandler; public BattleHandler(): base(typeof(battle.cs.CMMessageId_e), typeof(battle.cs.SMMessageId_e)) { diff --git a/Net/ClientNet.cs b/Net/ClientNet.cs index ebdf0b2..f9bb014 100644 --- a/Net/ClientNet.cs +++ b/Net/ClientNet.cs @@ -96,6 +96,7 @@ namespace Net data[9] = (byte)((magicCode & 0xFFFF) >> 8); data[10] = 0; data[11] = 0; + msg.ToByteArray().CopyTo(data, 12); this.ws.Send(data); }catch(Exception e)