diff --git a/Lib/HaoYueNet.ClientNetwork.dll b/Lib/HaoYueNet.ClientNetwork.dll index 4047ac2..bda3d91 100644 Binary files a/Lib/HaoYueNet.ClientNetwork.dll and b/Lib/HaoYueNet.ClientNetwork.dll differ diff --git a/Lib/HaoYueNet.ServerNetwork.dll b/Lib/HaoYueNet.ServerNetwork.dll index 7258049..86b01ec 100644 Binary files a/Lib/HaoYueNet.ServerNetwork.dll and b/Lib/HaoYueNet.ServerNetwork.dll differ diff --git a/NoSugarNet.ServerCore/Manager/ClientManager.cs b/NoSugarNet.ServerCore/Manager/ClientManager.cs index b2b1128..542aadf 100644 --- a/NoSugarNet.ServerCore/Manager/ClientManager.cs +++ b/NoSugarNet.ServerCore/Manager/ClientManager.cs @@ -11,6 +11,7 @@ namespace ServerCore.Manager public Socket _socket { get; set; } public bool IsOffline { get; set; } = false; public DateTime LogOutDT { get; set; } + } public class ClientManager @@ -64,7 +65,6 @@ namespace ServerCore.Manager public ClientInfo JoinNewClient(Protobuf_Login data, Socket _socket) { //也许这个函数需加lock - ClientInfo cinfo = GetClientForSocket(_socket); //如果连接还在 if (cinfo != null) diff --git a/NoSugarNet.ServerCore/Manager/LocalClientManager.cs b/NoSugarNet.ServerCore/Manager/LocalClientManager.cs index a27d414..345caee 100644 --- a/NoSugarNet.ServerCore/Manager/LocalClientManager.cs +++ b/NoSugarNet.ServerCore/Manager/LocalClientManager.cs @@ -1,5 +1,5 @@ using AxibugProtobuf; -using ClientCore.Network; +using NoSugarNet.ClientCore.Network; using Google.Protobuf; using NoSugarNet.ServerCore.Common; using ServerCore.Common; @@ -17,9 +17,14 @@ namespace ServerCore.Manager } Dictionary mDictTunnelID2Cfg = new Dictionary(); - Dictionary> mDictUid2ServerLocalClients = new Dictionary>(); + Dictionary mDictCommKey2ServerLocalClients = new Dictionary(); CompressAdapter mCompressAdapter; + static long GetCommKey(long Uid, int Tunnel, int Idx) + { + return (Uid * 10000000) + (Tunnel * 10000) + Idx; + } + public LocalClientManager() { //初始化压缩适配器,暂时使用0,代表压缩类型 @@ -37,84 +42,78 @@ namespace ServerCore.Manager /// /// /// - void AddServerLocalClient(long uid, byte tunnelId, ServerLocalClient serverClient) + void AddServerLocalClient(long uid, byte tunnelId,byte Idx, ServerLocalClient serverClient) { - lock (mDictUid2ServerLocalClients) + long CommKey = GetCommKey(uid, tunnelId, Idx); + lock (mDictCommKey2ServerLocalClients) { - if (!mDictUid2ServerLocalClients.ContainsKey(uid)) - mDictUid2ServerLocalClients[uid] = new Dictionary(); - - mDictUid2ServerLocalClients[uid][tunnelId] = serverClient; + mDictCommKey2ServerLocalClients[CommKey] = serverClient; } } + /// /// 删除连接 /// /// /// - void RemoveServerLocalClient(long uid, byte tunnelId) + void RemoveServerLocalClient(long uid, byte tunnelId, byte Idx) { - lock (mDictUid2ServerLocalClients) + lock (mDictCommKey2ServerLocalClients) { - if (!mDictUid2ServerLocalClients.ContainsKey(uid)) + long CommKey = GetCommKey(uid, tunnelId, Idx); + + if (!mDictCommKey2ServerLocalClients.ContainsKey(CommKey)) return; - - if (!mDictUid2ServerLocalClients[uid].ContainsKey(tunnelId)) - return; - - mDictUid2ServerLocalClients[uid].Remove(tunnelId); - - if (mDictUid2ServerLocalClients[uid].Count < 1) - mDictUid2ServerLocalClients.Remove(uid); + mDictCommKey2ServerLocalClients.Remove(CommKey); } } - bool GetServerLocalClient(long uid, byte tunnelId,out ServerLocalClient serverLocalClient) + + bool GetServerLocalClient(long uid, byte tunnelId, byte Idx,out ServerLocalClient serverLocalClient) { serverLocalClient = null; - if (!mDictUid2ServerLocalClients.ContainsKey(uid)) + + long CommKey = GetCommKey(uid, tunnelId, Idx); + + if (!mDictCommKey2ServerLocalClients.ContainsKey(CommKey)) return false; - if (!mDictUid2ServerLocalClients[uid].ContainsKey(tunnelId)) - return false; - - serverLocalClient = mDictUid2ServerLocalClients[uid][tunnelId]; + serverLocalClient = mDictCommKey2ServerLocalClients[CommKey]; return true; } #endregion - #region 解析客户端上行数据 public void Recive_TunnelC2SConnect(Socket sk, byte[] reqData) { ClientInfo _c = ServerManager.g_ClientMgr.GetClientForSocket(sk); ServerManager.g_Log.Debug("OnTunnelC2SConnect"); Protobuf_C2S_Connect msg = ProtoBufHelper.DeSerizlize(reqData); - OnClientLocalConnect(_c.UID, (byte)msg.TunnelID); + OnClientLocalConnect(_c.UID, (byte)msg.TunnelID, (byte)msg.Idx); } + public void Recive_TunnelC2SDisconnect(Socket sk, byte[] reqData) { ClientInfo _c = ServerManager.g_ClientMgr.GetClientForSocket(sk); ServerManager.g_Log.Debug("Recive_TunnelC2SDisconnect"); Protobuf_C2S_Disconnect msg = ProtoBufHelper.DeSerizlize(reqData); - OnClientLocalDisconnect(_c.UID, (byte)msg.TunnelID); + OnClientLocalDisconnect(_c.UID, (byte)msg.TunnelID,(byte)msg.Idx); } public void Recive_TunnelC2SData(Socket sk, byte[] reqData) { ClientInfo _c = ServerManager.g_ClientMgr.GetClientForSocket(sk); ServerManager.g_Log.Debug("OnTunnelC2SData"); Protobuf_C2S_DATA msg = ProtoBufHelper.DeSerizlize(reqData); - OnClientTunnelDataCallBack(_c.UID, (byte)msg.TunnelID, msg.HunterNetCoreData.ToArray()); + OnClientTunnelDataCallBack(_c.UID, (byte)msg.TunnelID, (byte)msg.Idx, msg.HunterNetCoreData.ToArray()); } #endregion - #region 两端本地端口连接事件通知 /// /// 当客户端本地端口连接 /// /// /// - void OnClientLocalConnect(long uid, byte tunnelId) + void OnClientLocalConnect(long uid, byte tunnelId,int Idx) { if (!ServerManager.g_ClientMgr.GetClientByUID(uid, out ClientInfo client)) return; @@ -127,7 +126,7 @@ namespace ServerCore.Manager { //服务器本地局域网连接指定端口 TunnelClientData tunnelDataCfg = mDictTunnelID2Cfg[tunnelId]; - ServerLocalClient serverLocalClient = new ServerLocalClient(tunnelId); + ServerLocalClient serverLocalClient = new ServerLocalClient(tunnelId, (byte)Idx); //连接成功 if (!serverLocalClient.Init(tunnelDataCfg.IP, tunnelDataCfg.Port)) { @@ -142,17 +141,17 @@ namespace ServerCore.Manager /// /// /// - void OnClientLocalDisconnect(long uid, byte tunnelId) + void OnClientLocalDisconnect(long uid, byte tunnelId,byte Idx) { if (!ServerManager.g_ClientMgr.GetClientByUID(uid, out ClientInfo client)) return; //隧道ID定位投递服务端本地连接 - if (!GetServerLocalClient(uid, tunnelId, out ServerLocalClient serverLocalClient)) + if (!GetServerLocalClient(uid, tunnelId, Idx, out ServerLocalClient serverLocalClient)) return; //清楚服务器数据 - RemoveServerLocalClient(uid, tunnelId); + RemoveServerLocalClient(uid, tunnelId, Idx); //断开服务端本地客户端连接 serverLocalClient.CloseConntect(); } @@ -161,17 +160,18 @@ namespace ServerCore.Manager /// /// /// - public void OnServerLocalConnect(long uid, byte tunnelId, ServerLocalClient serverLocalClient) + public void OnServerLocalConnect(long uid, byte tunnelId, byte Idx, ServerLocalClient serverLocalClient) { if (!ServerManager.g_ClientMgr.GetClientByUID(uid, out ClientInfo client)) return; //添加到服务端本地连接列表 - AddServerLocalClient(uid, tunnelId, serverLocalClient); + AddServerLocalClient(uid, tunnelId, Idx, serverLocalClient); byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_S2C_Connect() { TunnelID = tunnelId, + Idx = Idx, }); //发送给客户端,指定服务端本地端口已连接 ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CConnect, (int)ErrorCode.ErrorOk, respData); @@ -181,16 +181,17 @@ namespace ServerCore.Manager /// /// /// - public void OnServerLocalDisconnect(long uid, byte tunnelId, ServerLocalClient serverLocalClient) + public void OnServerLocalDisconnect(long uid, byte tunnelId, byte Idx, ServerLocalClient serverLocalClient) { if (!ServerManager.g_ClientMgr.GetClientByUID(uid, out ClientInfo client)) return; //添加到服务端本地连接列表 - RemoveServerLocalClient(uid, tunnelId); + RemoveServerLocalClient(uid, tunnelId, Idx); byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_S2C_Disconnect() { TunnelID = tunnelId, + Idx= Idx, }); //发送给客户端,指定服务端本地端口连接已断开 ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CDisconnect, (int)ErrorCode.ErrorOk, respData); @@ -204,7 +205,7 @@ namespace ServerCore.Manager /// /// /// - public void OnServerLocalDataCallBack(long uid, byte tunnelId, byte[] data) + public void OnServerLocalDataCallBack(long uid, byte tunnelId,byte Idx, byte[] data) { if (!ServerManager.g_ClientMgr.GetClientByUID(uid, out ClientInfo client)) return; @@ -214,6 +215,7 @@ namespace ServerCore.Manager byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_C2S_DATA() { TunnelID = tunnelId, + Idx = Idx, HunterNetCoreData = ByteString.CopyFrom(data) }); @@ -226,10 +228,10 @@ namespace ServerCore.Manager /// /// /// - public void OnClientTunnelDataCallBack(long uid, byte tunnelId, byte[] data) + public void OnClientTunnelDataCallBack(long uid, byte tunnelId, byte Idx, byte[] data) { //隧道ID定位投递服务端本地连接 - if (!GetServerLocalClient(uid, tunnelId, out ServerLocalClient serverLocalClient)) + if (!GetServerLocalClient(uid, tunnelId, Idx, out ServerLocalClient serverLocalClient)) return; //解压 diff --git a/NoSugarNet.ServerCore/Manager/ServerLocalClient/ServerLocalClient.cs b/NoSugarNet.ServerCore/Manager/ServerLocalClient/ServerLocalClient.cs index b13a35e..8adf70f 100644 --- a/NoSugarNet.ServerCore/Manager/ServerLocalClient/ServerLocalClient.cs +++ b/NoSugarNet.ServerCore/Manager/ServerLocalClient/ServerLocalClient.cs @@ -1,7 +1,7 @@ -using HaoYueNet.ClientNetwork; +using HaoYueNet.ClientNetwork.OtherMode; using ServerCore.Manager; -namespace ClientCore.Network +namespace NoSugarNet.ClientCore.Network { /// /// 继承网络库,以支持网络功能 @@ -10,9 +10,11 @@ namespace ClientCore.Network { public long mUID; public byte mTunnelID; - public ServerLocalClient(byte TunnelID) + public byte mIdx; + public ServerLocalClient(byte TunnelID, byte Idx) { mTunnelID = TunnelID; + mIdx = Idx; //指定接收服务器数据事件 OnReceiveData += GetDataCallBack; //断开连接 @@ -27,7 +29,7 @@ namespace ClientCore.Network NetworkDeBugLog($"NetworkConnected:{IsConnect}"); if (IsConnect) { - ServerManager.g_Local.OnServerLocalConnect(mUID, mTunnelID,this); + ServerManager.g_Local.OnServerLocalConnect(mUID, mTunnelID, mIdx, this); } else { @@ -55,7 +57,7 @@ namespace ClientCore.Network try { //抛出网络数据 - ServerManager.g_Local.OnServerLocalDataCallBack(mUID, mTunnelID, data); + ServerManager.g_Local.OnServerLocalDataCallBack(mUID, mTunnelID, mIdx, data); } catch (Exception ex) { @@ -70,7 +72,7 @@ namespace ClientCore.Network public void OnConnectClose() { NetworkDeBugLog("OnConnectClose"); - ServerManager.g_Local.OnServerLocalDisconnect(mUID, mTunnelID,this); + ServerManager.g_Local.OnServerLocalDisconnect(mUID, mTunnelID,mIdx,this); } } } diff --git a/NoSugarNet.ServerCore/Protobuf/ProtobufNoSugar.cs b/NoSugarNet.ServerCore/Protobuf/ProtobufNoSugar.cs index 4fa9bc6..44acd31 100644 --- a/NoSugarNet.ServerCore/Protobuf/ProtobufNoSugar.cs +++ b/NoSugarNet.ServerCore/Protobuf/ProtobufNoSugar.cs @@ -31,40 +31,47 @@ namespace AxibugProtobuf { "cmQYBCABKAkifwoTUHJvdG9idWZfTG9naW5fUkVTUBINCgVUb2tlbhgBIAEo", "CRIVCg1MYXN0TG9naW5EYXRlGAIgASgJEg8KB1JlZ0RhdGUYAyABKAkSMQoG", "U3RhdHVzGAQgASgOMiEuQXhpYnVnUHJvdG9idWYuTG9naW5SZXN1bHRTdGF0", - "dXMiIwoQUHJvdG9idWZfQ2hhdE1zZxIPCgdDaGF0TXNnGAEgASgJIkgKFVBy", - "b3RvYnVmX0NoYXRNc2dfUkVTUBIQCghOaWNrTmFtZRgBIAEoCRIPCgdDaGF0", - "TXNnGAIgASgJEgwKBERhdGUYAyABKAMiKAoUUHJvdG9idWZfQzJTX0Nvbm5l", - "Y3QSEAoIVHVubmVsSUQYASABKAUiKAoUUHJvdG9idWZfUzJDX0Nvbm5lY3QS", - "EAoIVHVubmVsSUQYASABKAUiKwoXUHJvdG9idWZfQzJTX0Rpc2Nvbm5lY3QS", - "EAoIVHVubmVsSUQYASABKAUiKwoXUHJvdG9idWZfUzJDX0Rpc2Nvbm5lY3QS", - "EAoIVHVubmVsSUQYASABKAUiQQoRUHJvdG9idWZfQzJTX0RBVEESEAoIVHVu", - "bmVsSUQYASABKAUSGgoSSHVudGVyTmV0Q29yZV9EYXRhGAIgASgMIkEKEVBy", - "b3RvYnVmX1MyQ19EQVRBEhAKCFR1bm5lbElEGAEgASgFEhoKEkh1bnRlck5l", - "dENvcmVfRGF0YRgCIAEoDCrrAQoJQ29tbWFuZElEEg4KCkNNRF9ERUZBVUwQ", - "ABIOCglDTURfTE9HSU4Q0Q8SEAoLQ01EX0NIQVRNU0cQoR8SGwoWQ01EX1RV", - "Tk5FTF9DMlNfQ09OTkVDVBCIJxIbChZDTURfVFVOTkVMX1MyQ19DT05ORUNU", - "EIknEh4KGUNNRF9UVU5ORUxfQzJTX0RJU0NPTk5FQ1QQiicSHgoZQ01EX1RV", - "Tk5FTF9TMkNfRElTQ09OTkVDVBCLJxIYChNDTURfVFVOTkVMX0MyU19EQVRB", - "EIwnEhgKE0NNRF9UVU5ORUxfUzJDX0RBVEEQjScqKwoJRXJyb3JDb2RlEhAK", - "DEVSUk9SX0RFRkFVTBAAEgwKCEVSUk9SX09LEAEqPgoJTG9naW5UeXBlEg8K", - "C0Jhc2VEZWZhdWx0EAASDgoKSGFvWXVlQXV0aBABEgcKA0JGMxADEgcKA0JG", - "NBAEKksKCkRldmljZVR5cGUSFgoSRGV2aWNlVHlwZV9EZWZhdWx0EAASBgoC", - "UEMQARILCgdBbmRyb2lkEAISBwoDSU9TEAMSBwoDUFNWEAQqTgoRTG9naW5S", - "ZXN1bHRTdGF0dXMSIQodTG9naW5SZXN1bHRTdGF0dXNfQmFzZURlZmF1bHQQ", - "ABIGCgJPSxABEg4KCkFjY291bnRFcnIQAkICSAFiBnByb3RvMw==")); + "dXMiQwoNUHJvdG9idWZfQ2ZncxIyCgRjZmdzGAEgAygLMiQuQXhpYnVnUHJv", + "dG9idWYuUHJvdG9idWZfQ2Znc19TaW5nbGUiQgoUUHJvdG9idWZfQ2Znc19T", + "aW5nbGUSEAoIVHVubmVsSUQYASABKA0SCgoCSVAYAiABKAkSDAoEUG9ydBgD", + "IAEoBSIjChBQcm90b2J1Zl9DaGF0TXNnEg8KB0NoYXRNc2cYASABKAkiSAoV", + "UHJvdG9idWZfQ2hhdE1zZ19SRVNQEhAKCE5pY2tOYW1lGAEgASgJEg8KB0No", + "YXRNc2cYAiABKAkSDAoERGF0ZRgDIAEoAyI1ChRQcm90b2J1Zl9DMlNfQ29u", + "bmVjdBIQCghUdW5uZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iNQoUUHJvdG9i", + "dWZfUzJDX0Nvbm5lY3QSEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgN", + "IjgKF1Byb3RvYnVmX0MyU19EaXNjb25uZWN0EhAKCFR1bm5lbElEGAEgASgN", + "EgsKA0lkeBgCIAEoDSI4ChdQcm90b2J1Zl9TMkNfRGlzY29ubmVjdBIQCghU", + "dW5uZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iTgoRUHJvdG9idWZfQzJTX0RB", + "VEESEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNEhoKEkh1bnRlck5l", + "dENvcmVfRGF0YRgDIAEoDCJOChFQcm90b2J1Zl9TMkNfREFUQRIQCghUdW5u", + "ZWxJRBgBIAEoDRILCgNJZHgYAiABKA0SGgoSSHVudGVyTmV0Q29yZV9EYXRh", + "GAMgASgMKvoBCglDb21tYW5kSUQSDgoKQ01EX0RFRkFVTBAAEg4KCUNNRF9M", + "T0dJThDRDxINCghDTURfQ0ZHUxC5FxIQCgtDTURfQ0hBVE1TRxChHxIbChZD", + "TURfVFVOTkVMX0MyU19DT05ORUNUEIgnEhsKFkNNRF9UVU5ORUxfUzJDX0NP", + "Tk5FQ1QQiScSHgoZQ01EX1RVTk5FTF9DMlNfRElTQ09OTkVDVBCKJxIeChlD", + "TURfVFVOTkVMX1MyQ19ESVNDT05ORUNUEIsnEhgKE0NNRF9UVU5ORUxfQzJT", + "X0RBVEEQjCcSGAoTQ01EX1RVTk5FTF9TMkNfREFUQRCNJyorCglFcnJvckNv", + "ZGUSEAoMRVJST1JfREVGQVVMEAASDAoIRVJST1JfT0sQASo+CglMb2dpblR5", + "cGUSDwoLQmFzZURlZmF1bHQQABIOCgpIYW9ZdWVBdXRoEAESBwoDQkYzEAMS", + "BwoDQkY0EAQqSwoKRGV2aWNlVHlwZRIWChJEZXZpY2VUeXBlX0RlZmF1bHQQ", + "ABIGCgJQQxABEgsKB0FuZHJvaWQQAhIHCgNJT1MQAxIHCgNQU1YQBCpOChFM", + "b2dpblJlc3VsdFN0YXR1cxIhCh1Mb2dpblJlc3VsdFN0YXR1c19CYXNlRGVm", + "YXVsdBAAEgYKAk9LEAESDgoKQWNjb3VudEVychACQgJIAWIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Login), global::AxibugProtobuf.Protobuf_Login.Parser, new[]{ "LoginType", "DeviceType", "Account", "Password" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Login_RESP), global::AxibugProtobuf.Protobuf_Login_RESP.Parser, new[]{ "Token", "LastLoginDate", "RegDate", "Status" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs), global::AxibugProtobuf.Protobuf_Cfgs.Parser, new[]{ "Cfgs" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs_Single), global::AxibugProtobuf.Protobuf_Cfgs_Single.Parser, new[]{ "TunnelID", "IP", "Port" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_ChatMsg), global::AxibugProtobuf.Protobuf_ChatMsg.Parser, new[]{ "ChatMsg" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_ChatMsg_RESP), global::AxibugProtobuf.Protobuf_ChatMsg_RESP.Parser, new[]{ "NickName", "ChatMsg", "Date" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Connect), global::AxibugProtobuf.Protobuf_C2S_Connect.Parser, new[]{ "TunnelID" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Connect), global::AxibugProtobuf.Protobuf_S2C_Connect.Parser, new[]{ "TunnelID" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Disconnect), global::AxibugProtobuf.Protobuf_C2S_Disconnect.Parser, new[]{ "TunnelID" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Disconnect), global::AxibugProtobuf.Protobuf_S2C_Disconnect.Parser, new[]{ "TunnelID" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_DATA), global::AxibugProtobuf.Protobuf_C2S_DATA.Parser, new[]{ "TunnelID", "HunterNetCoreData" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_DATA), global::AxibugProtobuf.Protobuf_S2C_DATA.Parser, new[]{ "TunnelID", "HunterNetCoreData" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Connect), global::AxibugProtobuf.Protobuf_C2S_Connect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Connect), global::AxibugProtobuf.Protobuf_S2C_Connect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Disconnect), global::AxibugProtobuf.Protobuf_C2S_Disconnect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Disconnect), global::AxibugProtobuf.Protobuf_S2C_Disconnect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_DATA), global::AxibugProtobuf.Protobuf_C2S_DATA.Parser, new[]{ "TunnelID", "Idx", "HunterNetCoreData" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_DATA), global::AxibugProtobuf.Protobuf_S2C_DATA.Parser, new[]{ "TunnelID", "Idx", "HunterNetCoreData" }, null, null, null, null) })); } #endregion @@ -77,11 +84,15 @@ namespace AxibugProtobuf { /// [pbr::OriginalName("CMD_DEFAUL")] CmdDefaul = 0, /// - ///登录上行 | 下行 对应 Protobuf_Login | Protobuf_Login_RESP + ///自动登录上行 | 下行 对应 Protobuf_Login | Protobuf_Login_RESP /// [pbr::OriginalName("CMD_LOGIN")] CmdLogin = 2001, /// - ///登录上行 | 下行 对应 Protobuf_ChatMsg | Protobuf_ChatMsg_RESP + ///配置信息 下行 对应 Protobuf_Cfgs + /// + [pbr::OriginalName("CMD_CFGS")] CmdCfgs = 3001, + /// + ///广播信息上行 | 下行 对应 Protobuf_ChatMsg | Protobuf_ChatMsg_RESP /// [pbr::OriginalName("CMD_CHATMSG")] CmdChatmsg = 4001, /// @@ -744,6 +755,426 @@ namespace AxibugProtobuf { } + /// + ///配置下行 + /// + public sealed partial class Protobuf_Cfgs : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Protobuf_Cfgs()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[2]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Protobuf_Cfgs() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Protobuf_Cfgs(Protobuf_Cfgs other) : this() { + cfgs_ = other.cfgs_.Clone(); + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Protobuf_Cfgs Clone() { + return new Protobuf_Cfgs(this); + } + + /// Field number for the "cfgs" field. + public const int CfgsFieldNumber = 1; + private static readonly pb::FieldCodec _repeated_cfgs_codec + = pb::FieldCodec.ForMessage(10, global::AxibugProtobuf.Protobuf_Cfgs_Single.Parser); + private readonly pbc::RepeatedField cfgs_ = new pbc::RepeatedField(); + /// + ///配置 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField Cfgs { + get { return cfgs_; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as Protobuf_Cfgs); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(Protobuf_Cfgs other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if(!cfgs_.Equals(other.cfgs_)) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + hash ^= cfgs_.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + cfgs_.WriteTo(output, _repeated_cfgs_codec); + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + cfgs_.WriteTo(ref output, _repeated_cfgs_codec); + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + size += cfgs_.CalculateSize(_repeated_cfgs_codec); + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(Protobuf_Cfgs other) { + if (other == null) { + return; + } + cfgs_.Add(other.cfgs_); + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + cfgs_.AddEntriesFrom(input, _repeated_cfgs_codec); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 10: { + cfgs_.AddEntriesFrom(ref input, _repeated_cfgs_codec); + break; + } + } + } + } + #endif + + } + + public sealed partial class Protobuf_Cfgs_Single : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Protobuf_Cfgs_Single()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[3]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Protobuf_Cfgs_Single() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Protobuf_Cfgs_Single(Protobuf_Cfgs_Single other) : this() { + tunnelID_ = other.tunnelID_; + iP_ = other.iP_; + port_ = other.port_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Protobuf_Cfgs_Single Clone() { + return new Protobuf_Cfgs_Single(this); + } + + /// Field number for the "TunnelID" field. + public const int TunnelIDFieldNumber = 1; + private uint tunnelID_; + /// + ///TunnelID + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint TunnelID { + get { return tunnelID_; } + set { + tunnelID_ = value; + } + } + + /// Field number for the "IP" field. + public const int IPFieldNumber = 2; + private string iP_ = ""; + /// + ///IP + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string IP { + get { return iP_; } + set { + iP_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "Port" field. + public const int PortFieldNumber = 3; + private int port_; + /// + ///端口 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int Port { + get { return port_; } + set { + port_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as Protobuf_Cfgs_Single); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(Protobuf_Cfgs_Single other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (TunnelID != other.TunnelID) return false; + if (IP != other.IP) return false; + if (Port != other.Port) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (IP.Length != 0) hash ^= IP.GetHashCode(); + if (Port != 0) hash ^= Port.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (TunnelID != 0) { + output.WriteRawTag(8); + output.WriteUInt32(TunnelID); + } + if (IP.Length != 0) { + output.WriteRawTag(18); + output.WriteString(IP); + } + if (Port != 0) { + output.WriteRawTag(24); + output.WriteInt32(Port); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (TunnelID != 0) { + output.WriteRawTag(8); + output.WriteUInt32(TunnelID); + } + if (IP.Length != 0) { + output.WriteRawTag(18); + output.WriteString(IP); + } + if (Port != 0) { + output.WriteRawTag(24); + output.WriteInt32(Port); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (TunnelID != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (IP.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(IP); + } + if (Port != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Port); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(Protobuf_Cfgs_Single other) { + if (other == null) { + return; + } + if (other.TunnelID != 0) { + TunnelID = other.TunnelID; + } + if (other.IP.Length != 0) { + IP = other.IP; + } + if (other.Port != 0) { + Port = other.Port; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 8: { + TunnelID = input.ReadUInt32(); + break; + } + case 18: { + IP = input.ReadString(); + break; + } + case 24: { + Port = input.ReadInt32(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 8: { + TunnelID = input.ReadUInt32(); + break; + } + case 18: { + IP = input.ReadString(); + break; + } + case 24: { + Port = input.ReadInt32(); + break; + } + } + } + } + #endif + + } + /// ///聊天 上行 /// @@ -759,7 +1190,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[2]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[4]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -937,7 +1368,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[3]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[5]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -997,7 +1428,7 @@ namespace AxibugProtobuf { public const int DateFieldNumber = 3; private long date_; /// - ///消息 + ///时间 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public long Date { @@ -1190,7 +1621,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[4]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[6]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1208,6 +1639,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_C2S_Connect(Protobuf_C2S_Connect other) : this() { tunnelID_ = other.tunnelID_; + idx_ = other.idx_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1218,18 +1650,32 @@ namespace AxibugProtobuf { /// Field number for the "TunnelID" field. public const int TunnelIDFieldNumber = 1; - private int tunnelID_; + private uint tunnelID_; /// ///TunnelID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int TunnelID { + public uint TunnelID { get { return tunnelID_; } set { tunnelID_ = value; } } + /// Field number for the "Idx" field. + public const int IdxFieldNumber = 2; + private uint idx_; + /// + ///单个隧道连接下标 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Idx { + get { return idx_; } + set { + idx_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Protobuf_C2S_Connect); @@ -1244,6 +1690,7 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; + if (Idx != other.Idx) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1251,6 +1698,7 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (Idx != 0) hash ^= Idx.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -1269,7 +1717,11 @@ namespace AxibugProtobuf { #else if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -1282,7 +1734,11 @@ namespace AxibugProtobuf { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -1294,7 +1750,10 @@ namespace AxibugProtobuf { public int CalculateSize() { int size = 0; if (TunnelID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TunnelID); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (Idx != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -1310,6 +1769,9 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } + if (other.Idx != 0) { + Idx = other.Idx; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -1325,7 +1787,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1343,7 +1809,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1365,7 +1835,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[5]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[7]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1383,6 +1853,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_S2C_Connect(Protobuf_S2C_Connect other) : this() { tunnelID_ = other.tunnelID_; + idx_ = other.idx_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1393,18 +1864,32 @@ namespace AxibugProtobuf { /// Field number for the "TunnelID" field. public const int TunnelIDFieldNumber = 1; - private int tunnelID_; + private uint tunnelID_; /// ///TunnelID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int TunnelID { + public uint TunnelID { get { return tunnelID_; } set { tunnelID_ = value; } } + /// Field number for the "Idx" field. + public const int IdxFieldNumber = 2; + private uint idx_; + /// + ///单个隧道连接下标 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Idx { + get { return idx_; } + set { + idx_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Protobuf_S2C_Connect); @@ -1419,6 +1904,7 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; + if (Idx != other.Idx) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1426,6 +1912,7 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (Idx != 0) hash ^= Idx.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -1444,7 +1931,11 @@ namespace AxibugProtobuf { #else if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -1457,7 +1948,11 @@ namespace AxibugProtobuf { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -1469,7 +1964,10 @@ namespace AxibugProtobuf { public int CalculateSize() { int size = 0; if (TunnelID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TunnelID); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (Idx != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -1485,6 +1983,9 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } + if (other.Idx != 0) { + Idx = other.Idx; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -1500,7 +2001,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1518,7 +2023,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1540,7 +2049,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[6]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[8]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1558,6 +2067,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_C2S_Disconnect(Protobuf_C2S_Disconnect other) : this() { tunnelID_ = other.tunnelID_; + idx_ = other.idx_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1568,18 +2078,32 @@ namespace AxibugProtobuf { /// Field number for the "TunnelID" field. public const int TunnelIDFieldNumber = 1; - private int tunnelID_; + private uint tunnelID_; /// ///TunnelID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int TunnelID { + public uint TunnelID { get { return tunnelID_; } set { tunnelID_ = value; } } + /// Field number for the "Idx" field. + public const int IdxFieldNumber = 2; + private uint idx_; + /// + ///单个隧道连接下标 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Idx { + get { return idx_; } + set { + idx_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Protobuf_C2S_Disconnect); @@ -1594,6 +2118,7 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; + if (Idx != other.Idx) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1601,6 +2126,7 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (Idx != 0) hash ^= Idx.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -1619,7 +2145,11 @@ namespace AxibugProtobuf { #else if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -1632,7 +2162,11 @@ namespace AxibugProtobuf { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -1644,7 +2178,10 @@ namespace AxibugProtobuf { public int CalculateSize() { int size = 0; if (TunnelID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TunnelID); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (Idx != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -1660,6 +2197,9 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } + if (other.Idx != 0) { + Idx = other.Idx; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -1675,7 +2215,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1693,7 +2237,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1715,7 +2263,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[7]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[9]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1733,6 +2281,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_S2C_Disconnect(Protobuf_S2C_Disconnect other) : this() { tunnelID_ = other.tunnelID_; + idx_ = other.idx_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1743,18 +2292,32 @@ namespace AxibugProtobuf { /// Field number for the "TunnelID" field. public const int TunnelIDFieldNumber = 1; - private int tunnelID_; + private uint tunnelID_; /// ///TunnelID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int TunnelID { + public uint TunnelID { get { return tunnelID_; } set { tunnelID_ = value; } } + /// Field number for the "Idx" field. + public const int IdxFieldNumber = 2; + private uint idx_; + /// + ///单个隧道连接下标 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Idx { + get { return idx_; } + set { + idx_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Protobuf_S2C_Disconnect); @@ -1769,6 +2332,7 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; + if (Idx != other.Idx) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1776,6 +2340,7 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (Idx != 0) hash ^= Idx.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -1794,7 +2359,11 @@ namespace AxibugProtobuf { #else if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -1807,7 +2376,11 @@ namespace AxibugProtobuf { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -1819,7 +2392,10 @@ namespace AxibugProtobuf { public int CalculateSize() { int size = 0; if (TunnelID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TunnelID); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (Idx != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -1835,6 +2411,9 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } + if (other.Idx != 0) { + Idx = other.Idx; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -1850,7 +2429,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1868,7 +2451,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1890,7 +2477,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[8]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[10]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1908,6 +2495,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_C2S_DATA(Protobuf_C2S_DATA other) : this() { tunnelID_ = other.tunnelID_; + idx_ = other.idx_; hunterNetCoreData_ = other.hunterNetCoreData_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1919,20 +2507,34 @@ namespace AxibugProtobuf { /// Field number for the "TunnelID" field. public const int TunnelIDFieldNumber = 1; - private int tunnelID_; + private uint tunnelID_; /// ///TunnelID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int TunnelID { + public uint TunnelID { get { return tunnelID_; } set { tunnelID_ = value; } } + /// Field number for the "Idx" field. + public const int IdxFieldNumber = 2; + private uint idx_; + /// + ///单个隧道连接下标 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Idx { + get { return idx_; } + set { + idx_ = value; + } + } + /// Field number for the "HunterNetCore_Data" field. - public const int HunterNetCoreDataFieldNumber = 2; + public const int HunterNetCoreDataFieldNumber = 3; private pb::ByteString hunterNetCoreData_ = pb::ByteString.Empty; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public pb::ByteString HunterNetCoreData { @@ -1956,6 +2558,7 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; + if (Idx != other.Idx) return false; if (HunterNetCoreData != other.HunterNetCoreData) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1964,6 +2567,7 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (Idx != 0) hash ^= Idx.GetHashCode(); if (HunterNetCoreData.Length != 0) hash ^= HunterNetCoreData.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -1983,10 +2587,14 @@ namespace AxibugProtobuf { #else if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (HunterNetCoreData.Length != 0) { - output.WriteRawTag(18); + output.WriteRawTag(26); output.WriteBytes(HunterNetCoreData); } if (_unknownFields != null) { @@ -2000,10 +2608,14 @@ namespace AxibugProtobuf { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (HunterNetCoreData.Length != 0) { - output.WriteRawTag(18); + output.WriteRawTag(26); output.WriteBytes(HunterNetCoreData); } if (_unknownFields != null) { @@ -2016,7 +2628,10 @@ namespace AxibugProtobuf { public int CalculateSize() { int size = 0; if (TunnelID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TunnelID); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (Idx != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } if (HunterNetCoreData.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeBytesSize(HunterNetCoreData); @@ -2035,6 +2650,9 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } + if (other.Idx != 0) { + Idx = other.Idx; + } if (other.HunterNetCoreData.Length != 0) { HunterNetCoreData = other.HunterNetCoreData; } @@ -2053,10 +2671,14 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); break; } - case 18: { + case 16: { + Idx = input.ReadUInt32(); + break; + } + case 26: { HunterNetCoreData = input.ReadBytes(); break; } @@ -2075,10 +2697,14 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); break; } - case 18: { + case 16: { + Idx = input.ReadUInt32(); + break; + } + case 26: { HunterNetCoreData = input.ReadBytes(); break; } @@ -2101,7 +2727,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[9]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[11]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -2119,6 +2745,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_S2C_DATA(Protobuf_S2C_DATA other) : this() { tunnelID_ = other.tunnelID_; + idx_ = other.idx_; hunterNetCoreData_ = other.hunterNetCoreData_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -2130,20 +2757,34 @@ namespace AxibugProtobuf { /// Field number for the "TunnelID" field. public const int TunnelIDFieldNumber = 1; - private int tunnelID_; + private uint tunnelID_; /// ///TunnelID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int TunnelID { + public uint TunnelID { get { return tunnelID_; } set { tunnelID_ = value; } } + /// Field number for the "Idx" field. + public const int IdxFieldNumber = 2; + private uint idx_; + /// + ///单个隧道连接下标 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Idx { + get { return idx_; } + set { + idx_ = value; + } + } + /// Field number for the "HunterNetCore_Data" field. - public const int HunterNetCoreDataFieldNumber = 2; + public const int HunterNetCoreDataFieldNumber = 3; private pb::ByteString hunterNetCoreData_ = pb::ByteString.Empty; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public pb::ByteString HunterNetCoreData { @@ -2167,6 +2808,7 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; + if (Idx != other.Idx) return false; if (HunterNetCoreData != other.HunterNetCoreData) return false; return Equals(_unknownFields, other._unknownFields); } @@ -2175,6 +2817,7 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (Idx != 0) hash ^= Idx.GetHashCode(); if (HunterNetCoreData.Length != 0) hash ^= HunterNetCoreData.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -2194,10 +2837,14 @@ namespace AxibugProtobuf { #else if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (HunterNetCoreData.Length != 0) { - output.WriteRawTag(18); + output.WriteRawTag(26); output.WriteBytes(HunterNetCoreData); } if (_unknownFields != null) { @@ -2211,10 +2858,14 @@ namespace AxibugProtobuf { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (HunterNetCoreData.Length != 0) { - output.WriteRawTag(18); + output.WriteRawTag(26); output.WriteBytes(HunterNetCoreData); } if (_unknownFields != null) { @@ -2227,7 +2878,10 @@ namespace AxibugProtobuf { public int CalculateSize() { int size = 0; if (TunnelID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TunnelID); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (Idx != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } if (HunterNetCoreData.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeBytesSize(HunterNetCoreData); @@ -2246,6 +2900,9 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } + if (other.Idx != 0) { + Idx = other.Idx; + } if (other.HunterNetCoreData.Length != 0) { HunterNetCoreData = other.HunterNetCoreData; } @@ -2264,10 +2921,14 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); break; } - case 18: { + case 16: { + Idx = input.ReadUInt32(); + break; + } + case 26: { HunterNetCoreData = input.ReadBytes(); break; } @@ -2286,10 +2947,14 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); break; } - case 18: { + case 16: { + Idx = input.ReadUInt32(); + break; + } + case 26: { HunterNetCoreData = input.ReadBytes(); break; } diff --git a/ProtobufCore/out/CS/ProtobufNoSugar.cs b/ProtobufCore/out/CS/ProtobufNoSugar.cs index 4fa9bc6..44acd31 100644 --- a/ProtobufCore/out/CS/ProtobufNoSugar.cs +++ b/ProtobufCore/out/CS/ProtobufNoSugar.cs @@ -31,40 +31,47 @@ namespace AxibugProtobuf { "cmQYBCABKAkifwoTUHJvdG9idWZfTG9naW5fUkVTUBINCgVUb2tlbhgBIAEo", "CRIVCg1MYXN0TG9naW5EYXRlGAIgASgJEg8KB1JlZ0RhdGUYAyABKAkSMQoG", "U3RhdHVzGAQgASgOMiEuQXhpYnVnUHJvdG9idWYuTG9naW5SZXN1bHRTdGF0", - "dXMiIwoQUHJvdG9idWZfQ2hhdE1zZxIPCgdDaGF0TXNnGAEgASgJIkgKFVBy", - "b3RvYnVmX0NoYXRNc2dfUkVTUBIQCghOaWNrTmFtZRgBIAEoCRIPCgdDaGF0", - "TXNnGAIgASgJEgwKBERhdGUYAyABKAMiKAoUUHJvdG9idWZfQzJTX0Nvbm5l", - "Y3QSEAoIVHVubmVsSUQYASABKAUiKAoUUHJvdG9idWZfUzJDX0Nvbm5lY3QS", - "EAoIVHVubmVsSUQYASABKAUiKwoXUHJvdG9idWZfQzJTX0Rpc2Nvbm5lY3QS", - "EAoIVHVubmVsSUQYASABKAUiKwoXUHJvdG9idWZfUzJDX0Rpc2Nvbm5lY3QS", - "EAoIVHVubmVsSUQYASABKAUiQQoRUHJvdG9idWZfQzJTX0RBVEESEAoIVHVu", - "bmVsSUQYASABKAUSGgoSSHVudGVyTmV0Q29yZV9EYXRhGAIgASgMIkEKEVBy", - "b3RvYnVmX1MyQ19EQVRBEhAKCFR1bm5lbElEGAEgASgFEhoKEkh1bnRlck5l", - "dENvcmVfRGF0YRgCIAEoDCrrAQoJQ29tbWFuZElEEg4KCkNNRF9ERUZBVUwQ", - "ABIOCglDTURfTE9HSU4Q0Q8SEAoLQ01EX0NIQVRNU0cQoR8SGwoWQ01EX1RV", - "Tk5FTF9DMlNfQ09OTkVDVBCIJxIbChZDTURfVFVOTkVMX1MyQ19DT05ORUNU", - "EIknEh4KGUNNRF9UVU5ORUxfQzJTX0RJU0NPTk5FQ1QQiicSHgoZQ01EX1RV", - "Tk5FTF9TMkNfRElTQ09OTkVDVBCLJxIYChNDTURfVFVOTkVMX0MyU19EQVRB", - "EIwnEhgKE0NNRF9UVU5ORUxfUzJDX0RBVEEQjScqKwoJRXJyb3JDb2RlEhAK", - "DEVSUk9SX0RFRkFVTBAAEgwKCEVSUk9SX09LEAEqPgoJTG9naW5UeXBlEg8K", - "C0Jhc2VEZWZhdWx0EAASDgoKSGFvWXVlQXV0aBABEgcKA0JGMxADEgcKA0JG", - "NBAEKksKCkRldmljZVR5cGUSFgoSRGV2aWNlVHlwZV9EZWZhdWx0EAASBgoC", - "UEMQARILCgdBbmRyb2lkEAISBwoDSU9TEAMSBwoDUFNWEAQqTgoRTG9naW5S", - "ZXN1bHRTdGF0dXMSIQodTG9naW5SZXN1bHRTdGF0dXNfQmFzZURlZmF1bHQQ", - "ABIGCgJPSxABEg4KCkFjY291bnRFcnIQAkICSAFiBnByb3RvMw==")); + "dXMiQwoNUHJvdG9idWZfQ2ZncxIyCgRjZmdzGAEgAygLMiQuQXhpYnVnUHJv", + "dG9idWYuUHJvdG9idWZfQ2Znc19TaW5nbGUiQgoUUHJvdG9idWZfQ2Znc19T", + "aW5nbGUSEAoIVHVubmVsSUQYASABKA0SCgoCSVAYAiABKAkSDAoEUG9ydBgD", + "IAEoBSIjChBQcm90b2J1Zl9DaGF0TXNnEg8KB0NoYXRNc2cYASABKAkiSAoV", + "UHJvdG9idWZfQ2hhdE1zZ19SRVNQEhAKCE5pY2tOYW1lGAEgASgJEg8KB0No", + "YXRNc2cYAiABKAkSDAoERGF0ZRgDIAEoAyI1ChRQcm90b2J1Zl9DMlNfQ29u", + "bmVjdBIQCghUdW5uZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iNQoUUHJvdG9i", + "dWZfUzJDX0Nvbm5lY3QSEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgN", + "IjgKF1Byb3RvYnVmX0MyU19EaXNjb25uZWN0EhAKCFR1bm5lbElEGAEgASgN", + "EgsKA0lkeBgCIAEoDSI4ChdQcm90b2J1Zl9TMkNfRGlzY29ubmVjdBIQCghU", + "dW5uZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iTgoRUHJvdG9idWZfQzJTX0RB", + "VEESEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNEhoKEkh1bnRlck5l", + "dENvcmVfRGF0YRgDIAEoDCJOChFQcm90b2J1Zl9TMkNfREFUQRIQCghUdW5u", + "ZWxJRBgBIAEoDRILCgNJZHgYAiABKA0SGgoSSHVudGVyTmV0Q29yZV9EYXRh", + "GAMgASgMKvoBCglDb21tYW5kSUQSDgoKQ01EX0RFRkFVTBAAEg4KCUNNRF9M", + "T0dJThDRDxINCghDTURfQ0ZHUxC5FxIQCgtDTURfQ0hBVE1TRxChHxIbChZD", + "TURfVFVOTkVMX0MyU19DT05ORUNUEIgnEhsKFkNNRF9UVU5ORUxfUzJDX0NP", + "Tk5FQ1QQiScSHgoZQ01EX1RVTk5FTF9DMlNfRElTQ09OTkVDVBCKJxIeChlD", + "TURfVFVOTkVMX1MyQ19ESVNDT05ORUNUEIsnEhgKE0NNRF9UVU5ORUxfQzJT", + "X0RBVEEQjCcSGAoTQ01EX1RVTk5FTF9TMkNfREFUQRCNJyorCglFcnJvckNv", + "ZGUSEAoMRVJST1JfREVGQVVMEAASDAoIRVJST1JfT0sQASo+CglMb2dpblR5", + "cGUSDwoLQmFzZURlZmF1bHQQABIOCgpIYW9ZdWVBdXRoEAESBwoDQkYzEAMS", + "BwoDQkY0EAQqSwoKRGV2aWNlVHlwZRIWChJEZXZpY2VUeXBlX0RlZmF1bHQQ", + "ABIGCgJQQxABEgsKB0FuZHJvaWQQAhIHCgNJT1MQAxIHCgNQU1YQBCpOChFM", + "b2dpblJlc3VsdFN0YXR1cxIhCh1Mb2dpblJlc3VsdFN0YXR1c19CYXNlRGVm", + "YXVsdBAAEgYKAk9LEAESDgoKQWNjb3VudEVychACQgJIAWIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Login), global::AxibugProtobuf.Protobuf_Login.Parser, new[]{ "LoginType", "DeviceType", "Account", "Password" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Login_RESP), global::AxibugProtobuf.Protobuf_Login_RESP.Parser, new[]{ "Token", "LastLoginDate", "RegDate", "Status" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs), global::AxibugProtobuf.Protobuf_Cfgs.Parser, new[]{ "Cfgs" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs_Single), global::AxibugProtobuf.Protobuf_Cfgs_Single.Parser, new[]{ "TunnelID", "IP", "Port" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_ChatMsg), global::AxibugProtobuf.Protobuf_ChatMsg.Parser, new[]{ "ChatMsg" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_ChatMsg_RESP), global::AxibugProtobuf.Protobuf_ChatMsg_RESP.Parser, new[]{ "NickName", "ChatMsg", "Date" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Connect), global::AxibugProtobuf.Protobuf_C2S_Connect.Parser, new[]{ "TunnelID" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Connect), global::AxibugProtobuf.Protobuf_S2C_Connect.Parser, new[]{ "TunnelID" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Disconnect), global::AxibugProtobuf.Protobuf_C2S_Disconnect.Parser, new[]{ "TunnelID" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Disconnect), global::AxibugProtobuf.Protobuf_S2C_Disconnect.Parser, new[]{ "TunnelID" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_DATA), global::AxibugProtobuf.Protobuf_C2S_DATA.Parser, new[]{ "TunnelID", "HunterNetCoreData" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_DATA), global::AxibugProtobuf.Protobuf_S2C_DATA.Parser, new[]{ "TunnelID", "HunterNetCoreData" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Connect), global::AxibugProtobuf.Protobuf_C2S_Connect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Connect), global::AxibugProtobuf.Protobuf_S2C_Connect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Disconnect), global::AxibugProtobuf.Protobuf_C2S_Disconnect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Disconnect), global::AxibugProtobuf.Protobuf_S2C_Disconnect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_DATA), global::AxibugProtobuf.Protobuf_C2S_DATA.Parser, new[]{ "TunnelID", "Idx", "HunterNetCoreData" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_DATA), global::AxibugProtobuf.Protobuf_S2C_DATA.Parser, new[]{ "TunnelID", "Idx", "HunterNetCoreData" }, null, null, null, null) })); } #endregion @@ -77,11 +84,15 @@ namespace AxibugProtobuf { /// [pbr::OriginalName("CMD_DEFAUL")] CmdDefaul = 0, /// - ///登录上行 | 下行 对应 Protobuf_Login | Protobuf_Login_RESP + ///自动登录上行 | 下行 对应 Protobuf_Login | Protobuf_Login_RESP /// [pbr::OriginalName("CMD_LOGIN")] CmdLogin = 2001, /// - ///登录上行 | 下行 对应 Protobuf_ChatMsg | Protobuf_ChatMsg_RESP + ///配置信息 下行 对应 Protobuf_Cfgs + /// + [pbr::OriginalName("CMD_CFGS")] CmdCfgs = 3001, + /// + ///广播信息上行 | 下行 对应 Protobuf_ChatMsg | Protobuf_ChatMsg_RESP /// [pbr::OriginalName("CMD_CHATMSG")] CmdChatmsg = 4001, /// @@ -744,6 +755,426 @@ namespace AxibugProtobuf { } + /// + ///配置下行 + /// + public sealed partial class Protobuf_Cfgs : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Protobuf_Cfgs()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[2]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Protobuf_Cfgs() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Protobuf_Cfgs(Protobuf_Cfgs other) : this() { + cfgs_ = other.cfgs_.Clone(); + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Protobuf_Cfgs Clone() { + return new Protobuf_Cfgs(this); + } + + /// Field number for the "cfgs" field. + public const int CfgsFieldNumber = 1; + private static readonly pb::FieldCodec _repeated_cfgs_codec + = pb::FieldCodec.ForMessage(10, global::AxibugProtobuf.Protobuf_Cfgs_Single.Parser); + private readonly pbc::RepeatedField cfgs_ = new pbc::RepeatedField(); + /// + ///配置 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField Cfgs { + get { return cfgs_; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as Protobuf_Cfgs); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(Protobuf_Cfgs other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if(!cfgs_.Equals(other.cfgs_)) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + hash ^= cfgs_.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + cfgs_.WriteTo(output, _repeated_cfgs_codec); + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + cfgs_.WriteTo(ref output, _repeated_cfgs_codec); + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + size += cfgs_.CalculateSize(_repeated_cfgs_codec); + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(Protobuf_Cfgs other) { + if (other == null) { + return; + } + cfgs_.Add(other.cfgs_); + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + cfgs_.AddEntriesFrom(input, _repeated_cfgs_codec); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 10: { + cfgs_.AddEntriesFrom(ref input, _repeated_cfgs_codec); + break; + } + } + } + } + #endif + + } + + public sealed partial class Protobuf_Cfgs_Single : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new Protobuf_Cfgs_Single()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[3]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Protobuf_Cfgs_Single() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Protobuf_Cfgs_Single(Protobuf_Cfgs_Single other) : this() { + tunnelID_ = other.tunnelID_; + iP_ = other.iP_; + port_ = other.port_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public Protobuf_Cfgs_Single Clone() { + return new Protobuf_Cfgs_Single(this); + } + + /// Field number for the "TunnelID" field. + public const int TunnelIDFieldNumber = 1; + private uint tunnelID_; + /// + ///TunnelID + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint TunnelID { + get { return tunnelID_; } + set { + tunnelID_ = value; + } + } + + /// Field number for the "IP" field. + public const int IPFieldNumber = 2; + private string iP_ = ""; + /// + ///IP + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string IP { + get { return iP_; } + set { + iP_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "Port" field. + public const int PortFieldNumber = 3; + private int port_; + /// + ///端口 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int Port { + get { return port_; } + set { + port_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as Protobuf_Cfgs_Single); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(Protobuf_Cfgs_Single other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (TunnelID != other.TunnelID) return false; + if (IP != other.IP) return false; + if (Port != other.Port) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (IP.Length != 0) hash ^= IP.GetHashCode(); + if (Port != 0) hash ^= Port.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (TunnelID != 0) { + output.WriteRawTag(8); + output.WriteUInt32(TunnelID); + } + if (IP.Length != 0) { + output.WriteRawTag(18); + output.WriteString(IP); + } + if (Port != 0) { + output.WriteRawTag(24); + output.WriteInt32(Port); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (TunnelID != 0) { + output.WriteRawTag(8); + output.WriteUInt32(TunnelID); + } + if (IP.Length != 0) { + output.WriteRawTag(18); + output.WriteString(IP); + } + if (Port != 0) { + output.WriteRawTag(24); + output.WriteInt32(Port); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (TunnelID != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (IP.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(IP); + } + if (Port != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(Port); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(Protobuf_Cfgs_Single other) { + if (other == null) { + return; + } + if (other.TunnelID != 0) { + TunnelID = other.TunnelID; + } + if (other.IP.Length != 0) { + IP = other.IP; + } + if (other.Port != 0) { + Port = other.Port; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 8: { + TunnelID = input.ReadUInt32(); + break; + } + case 18: { + IP = input.ReadString(); + break; + } + case 24: { + Port = input.ReadInt32(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 8: { + TunnelID = input.ReadUInt32(); + break; + } + case 18: { + IP = input.ReadString(); + break; + } + case 24: { + Port = input.ReadInt32(); + break; + } + } + } + } + #endif + + } + /// ///聊天 上行 /// @@ -759,7 +1190,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[2]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[4]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -937,7 +1368,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[3]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[5]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -997,7 +1428,7 @@ namespace AxibugProtobuf { public const int DateFieldNumber = 3; private long date_; /// - ///消息 + ///时间 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public long Date { @@ -1190,7 +1621,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[4]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[6]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1208,6 +1639,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_C2S_Connect(Protobuf_C2S_Connect other) : this() { tunnelID_ = other.tunnelID_; + idx_ = other.idx_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1218,18 +1650,32 @@ namespace AxibugProtobuf { /// Field number for the "TunnelID" field. public const int TunnelIDFieldNumber = 1; - private int tunnelID_; + private uint tunnelID_; /// ///TunnelID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int TunnelID { + public uint TunnelID { get { return tunnelID_; } set { tunnelID_ = value; } } + /// Field number for the "Idx" field. + public const int IdxFieldNumber = 2; + private uint idx_; + /// + ///单个隧道连接下标 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Idx { + get { return idx_; } + set { + idx_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Protobuf_C2S_Connect); @@ -1244,6 +1690,7 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; + if (Idx != other.Idx) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1251,6 +1698,7 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (Idx != 0) hash ^= Idx.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -1269,7 +1717,11 @@ namespace AxibugProtobuf { #else if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -1282,7 +1734,11 @@ namespace AxibugProtobuf { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -1294,7 +1750,10 @@ namespace AxibugProtobuf { public int CalculateSize() { int size = 0; if (TunnelID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TunnelID); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (Idx != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -1310,6 +1769,9 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } + if (other.Idx != 0) { + Idx = other.Idx; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -1325,7 +1787,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1343,7 +1809,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1365,7 +1835,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[5]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[7]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1383,6 +1853,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_S2C_Connect(Protobuf_S2C_Connect other) : this() { tunnelID_ = other.tunnelID_; + idx_ = other.idx_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1393,18 +1864,32 @@ namespace AxibugProtobuf { /// Field number for the "TunnelID" field. public const int TunnelIDFieldNumber = 1; - private int tunnelID_; + private uint tunnelID_; /// ///TunnelID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int TunnelID { + public uint TunnelID { get { return tunnelID_; } set { tunnelID_ = value; } } + /// Field number for the "Idx" field. + public const int IdxFieldNumber = 2; + private uint idx_; + /// + ///单个隧道连接下标 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Idx { + get { return idx_; } + set { + idx_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Protobuf_S2C_Connect); @@ -1419,6 +1904,7 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; + if (Idx != other.Idx) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1426,6 +1912,7 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (Idx != 0) hash ^= Idx.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -1444,7 +1931,11 @@ namespace AxibugProtobuf { #else if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -1457,7 +1948,11 @@ namespace AxibugProtobuf { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -1469,7 +1964,10 @@ namespace AxibugProtobuf { public int CalculateSize() { int size = 0; if (TunnelID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TunnelID); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (Idx != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -1485,6 +1983,9 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } + if (other.Idx != 0) { + Idx = other.Idx; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -1500,7 +2001,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1518,7 +2023,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1540,7 +2049,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[6]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[8]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1558,6 +2067,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_C2S_Disconnect(Protobuf_C2S_Disconnect other) : this() { tunnelID_ = other.tunnelID_; + idx_ = other.idx_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1568,18 +2078,32 @@ namespace AxibugProtobuf { /// Field number for the "TunnelID" field. public const int TunnelIDFieldNumber = 1; - private int tunnelID_; + private uint tunnelID_; /// ///TunnelID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int TunnelID { + public uint TunnelID { get { return tunnelID_; } set { tunnelID_ = value; } } + /// Field number for the "Idx" field. + public const int IdxFieldNumber = 2; + private uint idx_; + /// + ///单个隧道连接下标 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Idx { + get { return idx_; } + set { + idx_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Protobuf_C2S_Disconnect); @@ -1594,6 +2118,7 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; + if (Idx != other.Idx) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1601,6 +2126,7 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (Idx != 0) hash ^= Idx.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -1619,7 +2145,11 @@ namespace AxibugProtobuf { #else if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -1632,7 +2162,11 @@ namespace AxibugProtobuf { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -1644,7 +2178,10 @@ namespace AxibugProtobuf { public int CalculateSize() { int size = 0; if (TunnelID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TunnelID); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (Idx != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -1660,6 +2197,9 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } + if (other.Idx != 0) { + Idx = other.Idx; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -1675,7 +2215,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1693,7 +2237,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1715,7 +2263,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[7]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[9]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1733,6 +2281,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_S2C_Disconnect(Protobuf_S2C_Disconnect other) : this() { tunnelID_ = other.tunnelID_; + idx_ = other.idx_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1743,18 +2292,32 @@ namespace AxibugProtobuf { /// Field number for the "TunnelID" field. public const int TunnelIDFieldNumber = 1; - private int tunnelID_; + private uint tunnelID_; /// ///TunnelID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int TunnelID { + public uint TunnelID { get { return tunnelID_; } set { tunnelID_ = value; } } + /// Field number for the "Idx" field. + public const int IdxFieldNumber = 2; + private uint idx_; + /// + ///单个隧道连接下标 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Idx { + get { return idx_; } + set { + idx_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Protobuf_S2C_Disconnect); @@ -1769,6 +2332,7 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; + if (Idx != other.Idx) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1776,6 +2340,7 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (Idx != 0) hash ^= Idx.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -1794,7 +2359,11 @@ namespace AxibugProtobuf { #else if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -1807,7 +2376,11 @@ namespace AxibugProtobuf { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -1819,7 +2392,10 @@ namespace AxibugProtobuf { public int CalculateSize() { int size = 0; if (TunnelID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TunnelID); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (Idx != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -1835,6 +2411,9 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } + if (other.Idx != 0) { + Idx = other.Idx; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -1850,7 +2429,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1868,7 +2451,11 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); + break; + } + case 16: { + Idx = input.ReadUInt32(); break; } } @@ -1890,7 +2477,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[8]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[10]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1908,6 +2495,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_C2S_DATA(Protobuf_C2S_DATA other) : this() { tunnelID_ = other.tunnelID_; + idx_ = other.idx_; hunterNetCoreData_ = other.hunterNetCoreData_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1919,20 +2507,34 @@ namespace AxibugProtobuf { /// Field number for the "TunnelID" field. public const int TunnelIDFieldNumber = 1; - private int tunnelID_; + private uint tunnelID_; /// ///TunnelID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int TunnelID { + public uint TunnelID { get { return tunnelID_; } set { tunnelID_ = value; } } + /// Field number for the "Idx" field. + public const int IdxFieldNumber = 2; + private uint idx_; + /// + ///单个隧道连接下标 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Idx { + get { return idx_; } + set { + idx_ = value; + } + } + /// Field number for the "HunterNetCore_Data" field. - public const int HunterNetCoreDataFieldNumber = 2; + public const int HunterNetCoreDataFieldNumber = 3; private pb::ByteString hunterNetCoreData_ = pb::ByteString.Empty; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public pb::ByteString HunterNetCoreData { @@ -1956,6 +2558,7 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; + if (Idx != other.Idx) return false; if (HunterNetCoreData != other.HunterNetCoreData) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1964,6 +2567,7 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (Idx != 0) hash ^= Idx.GetHashCode(); if (HunterNetCoreData.Length != 0) hash ^= HunterNetCoreData.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -1983,10 +2587,14 @@ namespace AxibugProtobuf { #else if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (HunterNetCoreData.Length != 0) { - output.WriteRawTag(18); + output.WriteRawTag(26); output.WriteBytes(HunterNetCoreData); } if (_unknownFields != null) { @@ -2000,10 +2608,14 @@ namespace AxibugProtobuf { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (HunterNetCoreData.Length != 0) { - output.WriteRawTag(18); + output.WriteRawTag(26); output.WriteBytes(HunterNetCoreData); } if (_unknownFields != null) { @@ -2016,7 +2628,10 @@ namespace AxibugProtobuf { public int CalculateSize() { int size = 0; if (TunnelID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TunnelID); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (Idx != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } if (HunterNetCoreData.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeBytesSize(HunterNetCoreData); @@ -2035,6 +2650,9 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } + if (other.Idx != 0) { + Idx = other.Idx; + } if (other.HunterNetCoreData.Length != 0) { HunterNetCoreData = other.HunterNetCoreData; } @@ -2053,10 +2671,14 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); break; } - case 18: { + case 16: { + Idx = input.ReadUInt32(); + break; + } + case 26: { HunterNetCoreData = input.ReadBytes(); break; } @@ -2075,10 +2697,14 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); break; } - case 18: { + case 16: { + Idx = input.ReadUInt32(); + break; + } + case 26: { HunterNetCoreData = input.ReadBytes(); break; } @@ -2101,7 +2727,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public static pbr::MessageDescriptor Descriptor { - get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[9]; } + get { return global::AxibugProtobuf.ProtobufNoSugarReflection.Descriptor.MessageTypes[11]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -2119,6 +2745,7 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_S2C_DATA(Protobuf_S2C_DATA other) : this() { tunnelID_ = other.tunnelID_; + idx_ = other.idx_; hunterNetCoreData_ = other.hunterNetCoreData_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -2130,20 +2757,34 @@ namespace AxibugProtobuf { /// Field number for the "TunnelID" field. public const int TunnelIDFieldNumber = 1; - private int tunnelID_; + private uint tunnelID_; /// ///TunnelID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int TunnelID { + public uint TunnelID { get { return tunnelID_; } set { tunnelID_ = value; } } + /// Field number for the "Idx" field. + public const int IdxFieldNumber = 2; + private uint idx_; + /// + ///单个隧道连接下标 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Idx { + get { return idx_; } + set { + idx_ = value; + } + } + /// Field number for the "HunterNetCore_Data" field. - public const int HunterNetCoreDataFieldNumber = 2; + public const int HunterNetCoreDataFieldNumber = 3; private pb::ByteString hunterNetCoreData_ = pb::ByteString.Empty; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public pb::ByteString HunterNetCoreData { @@ -2167,6 +2808,7 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; + if (Idx != other.Idx) return false; if (HunterNetCoreData != other.HunterNetCoreData) return false; return Equals(_unknownFields, other._unknownFields); } @@ -2175,6 +2817,7 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); + if (Idx != 0) hash ^= Idx.GetHashCode(); if (HunterNetCoreData.Length != 0) hash ^= HunterNetCoreData.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -2194,10 +2837,14 @@ namespace AxibugProtobuf { #else if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (HunterNetCoreData.Length != 0) { - output.WriteRawTag(18); + output.WriteRawTag(26); output.WriteBytes(HunterNetCoreData); } if (_unknownFields != null) { @@ -2211,10 +2858,14 @@ namespace AxibugProtobuf { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { if (TunnelID != 0) { output.WriteRawTag(8); - output.WriteInt32(TunnelID); + output.WriteUInt32(TunnelID); + } + if (Idx != 0) { + output.WriteRawTag(16); + output.WriteUInt32(Idx); } if (HunterNetCoreData.Length != 0) { - output.WriteRawTag(18); + output.WriteRawTag(26); output.WriteBytes(HunterNetCoreData); } if (_unknownFields != null) { @@ -2227,7 +2878,10 @@ namespace AxibugProtobuf { public int CalculateSize() { int size = 0; if (TunnelID != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(TunnelID); + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); + } + if (Idx != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } if (HunterNetCoreData.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeBytesSize(HunterNetCoreData); @@ -2246,6 +2900,9 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } + if (other.Idx != 0) { + Idx = other.Idx; + } if (other.HunterNetCoreData.Length != 0) { HunterNetCoreData = other.HunterNetCoreData; } @@ -2264,10 +2921,14 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); break; } - case 18: { + case 16: { + Idx = input.ReadUInt32(); + break; + } + case 26: { HunterNetCoreData = input.ReadBytes(); break; } @@ -2286,10 +2947,14 @@ namespace AxibugProtobuf { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - TunnelID = input.ReadInt32(); + TunnelID = input.ReadUInt32(); break; } - case 18: { + case 16: { + Idx = input.ReadUInt32(); + break; + } + case 26: { HunterNetCoreData = input.ReadBytes(); break; } diff --git a/ProtobufCore/proto/protobuf_NoSugar.proto b/ProtobufCore/proto/protobuf_NoSugar.proto index 40a1796..cdc651d 100644 --- a/ProtobufCore/proto/protobuf_NoSugar.proto +++ b/ProtobufCore/proto/protobuf_NoSugar.proto @@ -6,8 +6,11 @@ enum CommandID { CMD_DEFAUL = 0;//缺省不使用 + CMD_LOGIN = 2001; //自动登录上行 | 下行 对应 Protobuf_Login | Protobuf_Login_RESP + CMD_CFGS = 3001; //配置信息 下行 对应 Protobuf_Cfgs + CMD_CHATMSG = 4001; //广播信息上行 | 下行 对应 Protobuf_ChatMsg | Protobuf_ChatMsg_RESP CMD_TUNNEL_C2S_CONNECT = 5000; //客户端告知服务端 客户端本地连接建立 上行 Protobuf_C2S_Connect @@ -66,6 +69,18 @@ message Protobuf_Login_RESP LoginResultStatus Status = 4;//账号状态 (预留) [1]正常[0]被禁封 } +//配置下行 +message Protobuf_Cfgs +{ + repeated Protobuf_Cfgs_Single cfgs = 1;//配置 +} + +message Protobuf_Cfgs_Single +{ + uint32 TunnelID = 1;//TunnelID + string IP = 2;//IP + int32 Port = 3;//端口 +} //聊天 上行 message Protobuf_ChatMsg @@ -78,38 +93,44 @@ message Protobuf_ChatMsg_RESP { string NickName = 1;//昵称 string ChatMsg = 2;//消息 - int64 Date = 3;//消息 + int64 Date = 3;//时间 } message Protobuf_C2S_Connect { - int32 TunnelID = 1;//TunnelID + uint32 TunnelID = 1;//TunnelID + uint32 Idx = 2;//单个隧道连接下标 } message Protobuf_S2C_Connect { - int32 TunnelID = 1;//TunnelID + uint32 TunnelID = 1;//TunnelID + uint32 Idx = 2;//单个隧道连接下标 } message Protobuf_C2S_Disconnect { - int32 TunnelID = 1;//TunnelID + uint32 TunnelID = 1;//TunnelID + uint32 Idx = 2;//单个隧道连接下标 } message Protobuf_S2C_Disconnect { - int32 TunnelID = 1;//TunnelID + uint32 TunnelID = 1;//TunnelID + uint32 Idx = 2;//单个隧道连接下标 } message Protobuf_C2S_DATA { - int32 TunnelID = 1;//TunnelID - bytes HunterNetCore_Data = 2; + uint32 TunnelID = 1;//TunnelID + uint32 Idx = 2;//单个隧道连接下标 + bytes HunterNetCore_Data = 3; } message Protobuf_S2C_DATA { - int32 TunnelID = 1;//TunnelID - bytes HunterNetCore_Data = 2; + uint32 TunnelID = 1;//TunnelID + uint32 Idx = 2;//单个隧道连接下标 + bytes HunterNetCore_Data = 3; } \ No newline at end of file