From 27acfdff08259b49f41abc2de0d761022a3c3d96 Mon Sep 17 00:00:00 2001 From: rfi Date: Mon, 19 Feb 2024 21:48:37 +0700 Subject: [PATCH] Okayish pcap parser --- BLHX.Server.Common/Proto/common_pb.cs | 2 +- BLHX.Server.Common/Proto/guild_pb.cs | 2 +- BLHX.Server.Common/Proto/p10_pb.cs | 2 +- BLHX.Server.Common/Proto/p11_pb.cs | 38 +++--- BLHX.Server.Common/Proto/p12_pb.cs | 24 ++-- BLHX.Server.Common/Proto/p13_pb.cs | 22 ++-- BLHX.Server.Common/Proto/p14_pb.cs | 8 +- BLHX.Server.Common/Proto/p15_pb.cs | 4 +- BLHX.Server.Common/Proto/p16_pb.cs | 10 +- BLHX.Server.Common/Proto/p17_pb.cs | 2 +- BLHX.Server.Common/Proto/p18_pb.cs | 12 +- BLHX.Server.Common/Proto/p19_pb.cs | 2 +- BLHX.Server.Common/Proto/p20_pb.cs | 16 +-- BLHX.Server.Common/Proto/p22_pb.cs | 4 +- BLHX.Server.Common/Proto/p24_pb.cs | 14 +- BLHX.Server.Common/Proto/p25_pb.cs | 16 +-- BLHX.Server.Common/Proto/p26_pb.cs | 26 ++-- BLHX.Server.Common/Proto/p27_pb.cs | 2 +- BLHX.Server.Common/Proto/p30_pb.cs | 2 +- BLHX.Server.Common/Proto/p33_pb.cs | 24 ++-- BLHX.Server.Common/Proto/p34_pb.cs | 10 +- BLHX.Server.Common/Proto/p40_pb.cs | 10 +- BLHX.Server.Common/Proto/p50_pb.cs | 8 +- BLHX.Server.Common/Proto/p60_pb.cs | 12 +- BLHX.Server.Common/Proto/p61_pb.cs | 10 +- BLHX.Server.Common/Proto/p62_pb.cs | 14 +- BLHX.Server.Common/Proto/p63_pb.cs | 26 ++-- BLHX.Server.Common/Proto/p64_pb.cs | 6 +- BLHX.Server.Common/Proto/p70_pb.cs | 6 +- BLHX.Server.Game/Connection.cs | 5 +- BLHX.Server.Game/Handlers/P10.cs | 17 ++- BLHX.Server.PcapParser/App.config | 14 ++ .../BLHX.Server.PcapParser.csproj | 121 ++++++++++++++++++ BLHX.Server.PcapParser/PcapParser.cs | 119 +++++++++++++++++ .../Properties/AssemblyInfo.cs | 36 ++++++ BLHX.Server.PcapParser/packages.config | 12 ++ BLHX.Server.sln | 8 +- 37 files changed, 489 insertions(+), 177 deletions(-) create mode 100644 BLHX.Server.PcapParser/App.config create mode 100644 BLHX.Server.PcapParser/BLHX.Server.PcapParser.csproj create mode 100644 BLHX.Server.PcapParser/PcapParser.cs create mode 100644 BLHX.Server.PcapParser/Properties/AssemblyInfo.cs create mode 100644 BLHX.Server.PcapParser/packages.config diff --git a/BLHX.Server.Common/Proto/common_pb.cs b/BLHX.Server.Common/Proto/common_pb.cs index 910cc51..94e27e2 100644 --- a/BLHX.Server.Common/Proto/common_pb.cs +++ b/BLHX.Server.Common/Proto/common_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.common +namespace BLHX.Server.Common.Proto.common { [global::ProtoBuf.ProtoContract(Name = @"appreciationinfo")] diff --git a/BLHX.Server.Common/Proto/guild_pb.cs b/BLHX.Server.Common/Proto/guild_pb.cs index 871206a..2e96ec8 100644 --- a/BLHX.Server.Common/Proto/guild_pb.cs +++ b/BLHX.Server.Common/Proto/guild_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.guild +namespace BLHX.Server.Common.Proto.guild { [global::ProtoBuf.ProtoContract(Name = @"capital_log")] diff --git a/BLHX.Server.Common/Proto/p10_pb.cs b/BLHX.Server.Common/Proto/p10_pb.cs index a3b23bf..b710050 100644 --- a/BLHX.Server.Common/Proto/p10_pb.cs +++ b/BLHX.Server.Common/Proto/p10_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p10 +namespace BLHX.Server.Common.Proto.p10 { [global::ProtoBuf.ProtoContract(Name = @"cs_10001")] diff --git a/BLHX.Server.Common/Proto/p11_pb.cs b/BLHX.Server.Common/Proto/p11_pb.cs index bca8708..db09c20 100644 --- a/BLHX.Server.Common/Proto/p11_pb.cs +++ b/BLHX.Server.Common/Proto/p11_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p11 +namespace BLHX.Server.Common.Proto.p11 { [global::ProtoBuf.ProtoContract(Name = @"activityinfo")] @@ -81,10 +81,10 @@ namespace BHXY.Server.Common.Proto.p11 public global::System.Collections.Generic.List InsMessageLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(13, Name = @"collection_list")] - public global::System.Collections.Generic.List CollectionLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CollectionLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(14, Name = @"task_list")] - public global::System.Collections.Generic.List TaskLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List TaskLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(15, Name = @"buff_list")] public global::System.Collections.Generic.List BuffLists { get; set; } = new global::System.Collections.Generic.List(); @@ -407,7 +407,7 @@ namespace BHXY.Server.Common.Proto.p11 public global::System.Collections.Generic.List ArgList2s { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(8, Name = @"kvargs1")] - public global::System.Collections.Generic.List Kvargs1s { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Kvargs1s { get; set; } = new global::System.Collections.Generic.List(); } @@ -713,7 +713,7 @@ namespace BHXY.Server.Common.Proto.p11 public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"commanders")] - public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); } @@ -922,7 +922,7 @@ namespace BHXY.Server.Common.Proto.p11 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"user", IsRequired = true)] - public global::BHXY.Server.Common.Proto.common.Usersimpleinfo User { get; set; } + public global::BLHX.Server.Common.Proto.common.Usersimpleinfo User { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"pt", IsRequired = true)] public uint Pt { get; set; } @@ -1063,25 +1063,25 @@ namespace BHXY.Server.Common.Proto.p11 public global::System.Collections.Generic.List MedalIds { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(32, Name = @"icon_frame_list")] - public global::System.Collections.Generic.List IconFrameLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List IconFrameLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(33, Name = @"chat_frame_list")] - public global::System.Collections.Generic.List ChatFrameLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ChatFrameLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(34, Name = @"display")] - public global::BHXY.Server.Common.Proto.common.Displayinfo Display { get; set; } + public global::BLHX.Server.Common.Proto.common.Displayinfo Display { get; set; } [global::ProtoBuf.ProtoMember(35, Name = @"rmb", IsRequired = true)] public uint Rmb { get; set; } [global::ProtoBuf.ProtoMember(36, Name = @"appreciation", IsRequired = true)] - public global::BHXY.Server.Common.Proto.common.Appreciationinfo Appreciation { get; set; } + public global::BLHX.Server.Common.Proto.common.Appreciationinfo Appreciation { get; set; } [global::ProtoBuf.ProtoMember(37, Name = @"theme_upload_not_allowed_time", IsRequired = true)] public uint ThemeUploadNotAllowedTime { get; set; } [global::ProtoBuf.ProtoMember(38, Name = @"refund_shop_info_list")] - public global::System.Collections.Generic.List RefundShopInfoLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List RefundShopInfoLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(39, Name = @"cartoon_read_mark")] public global::System.Collections.Generic.List CartoonReadMarks { get; set; } = new global::System.Collections.Generic.List(); @@ -1204,7 +1204,7 @@ namespace BHXY.Server.Common.Proto.p11 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -1243,7 +1243,7 @@ namespace BHXY.Server.Common.Proto.p11 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"shop_info")] - public global::System.Collections.Generic.List ShopInfoes { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ShopInfoes { get; set; } = new global::System.Collections.Generic.List(); } @@ -1332,10 +1332,10 @@ namespace BHXY.Server.Common.Proto.p11 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"award_list")] - public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"build")] - public global::System.Collections.Generic.List Builds { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Builds { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"number")] public global::System.Collections.Generic.List Numbers { get; set; } = new global::System.Collections.Generic.List(); @@ -1347,10 +1347,10 @@ namespace BHXY.Server.Common.Proto.p11 public InsMessage InsMessage { get; set; } [global::ProtoBuf.ProtoMember(7, Name = @"collection_list")] - public global::System.Collections.Generic.List CollectionLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CollectionLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(8, Name = @"task_list")] - public global::System.Collections.Generic.List TaskLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List TaskLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -1794,7 +1794,7 @@ namespace BHXY.Server.Common.Proto.p11 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"award_list")] - public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -1809,7 +1809,7 @@ namespace BHXY.Server.Common.Proto.p11 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"award_list")] - public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p12_pb.cs b/BLHX.Server.Common/Proto/p12_pb.cs index a022ac9..edeb169 100644 --- a/BLHX.Server.Common/Proto/p12_pb.cs +++ b/BLHX.Server.Common/Proto/p12_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p12 +namespace BLHX.Server.Common.Proto.p12 { [global::ProtoBuf.ProtoContract(Name = @"build_info")] @@ -431,7 +431,7 @@ namespace BHXY.Server.Common.Proto.p12 public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"commanders")] - public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); } @@ -443,7 +443,7 @@ namespace BHXY.Server.Common.Proto.p12 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"shiplist")] - public global::System.Collections.Generic.List Shiplists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Shiplists { get; set; } = new global::System.Collections.Generic.List(); } @@ -458,7 +458,7 @@ namespace BHXY.Server.Common.Proto.p12 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"build_info")] - public global::System.Collections.Generic.List BuildInfoes { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List BuildInfoes { get; set; } = new global::System.Collections.Generic.List(); } @@ -512,7 +512,7 @@ namespace BHXY.Server.Common.Proto.p12 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"ship_list")] - public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -587,7 +587,7 @@ namespace BHXY.Server.Common.Proto.p12 public uint WorklistCount { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"worklist_list")] - public global::System.Collections.Generic.List WorklistLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List WorklistLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"draw_count_1", IsRequired = true)] public uint DrawCount1 { get; set; } @@ -611,7 +611,7 @@ namespace BHXY.Server.Common.Proto.p12 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"ship_list")] - public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -638,7 +638,7 @@ namespace BHXY.Server.Common.Proto.p12 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"ship_list")] - public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -725,7 +725,7 @@ namespace BHXY.Server.Common.Proto.p12 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"ship_list")] - public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -764,7 +764,7 @@ namespace BHXY.Server.Common.Proto.p12 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -824,7 +824,7 @@ namespace BHXY.Server.Common.Proto.p12 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"skin_list")] - public global::System.Collections.Generic.List SkinLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List SkinLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(2, Name = @"forbidden_skin_list")] public global::System.Collections.Generic.List ForbiddenSkinLists { get; set; } = new global::System.Collections.Generic.List(); @@ -890,7 +890,7 @@ namespace BHXY.Server.Common.Proto.p12 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"ship_list")] - public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p13_pb.cs b/BLHX.Server.Common/Proto/p13_pb.cs index d6574f4..3fbaf56 100644 --- a/BLHX.Server.Common/Proto/p13_pb.cs +++ b/BLHX.Server.Common/Proto/p13_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p13 +namespace BLHX.Server.Common.Proto.p13 { [global::ProtoBuf.ProtoContract(Name = @"ai_act")] @@ -566,7 +566,7 @@ namespace BHXY.Server.Common.Proto.p13 public global::System.Collections.Generic.List MainIds { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"commanders")] - public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); } @@ -671,7 +671,7 @@ namespace BHXY.Server.Common.Proto.p13 public Chaptercellpos StartPos { get; set; } [global::ProtoBuf.ProtoMember(10, Name = @"commander_list")] - public global::System.Collections.Generic.List CommanderLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CommanderLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(11, Name = @"move_step_down", IsRequired = true)] public uint MoveStepDown { get; set; } @@ -776,7 +776,7 @@ namespace BHXY.Server.Common.Proto.p13 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"collection_list")] - public global::System.Collections.Generic.List CollectionLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CollectionLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(2, Name = @"max_team", IsRequired = true)] public uint MaxTeam { get; set; } @@ -809,10 +809,10 @@ namespace BHXY.Server.Common.Proto.p13 public uint Exp { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"new_collection")] - public global::System.Collections.Generic.List NewCollections { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List NewCollections { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(5, Name = @"is_cri", IsRequired = true)] public uint IsCri { get; set; } @@ -842,7 +842,7 @@ namespace BHXY.Server.Common.Proto.p13 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"collection_list")] - public global::System.Collections.Generic.List CollectionLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CollectionLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -854,7 +854,7 @@ namespace BHXY.Server.Common.Proto.p13 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"collection")] - public global::System.Collections.Generic.List Collections { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Collections { get; set; } = new global::System.Collections.Generic.List(); } @@ -887,7 +887,7 @@ namespace BHXY.Server.Common.Proto.p13 public global::System.Collections.Generic.List MovePaths { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"map_update")] public global::System.Collections.Generic.List MapUpdates { get; set; } = new global::System.Collections.Generic.List(); @@ -1022,7 +1022,7 @@ namespace BHXY.Server.Common.Proto.p13 public global::System.Collections.Generic.List EscortInfoes { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -1109,7 +1109,7 @@ namespace BHXY.Server.Common.Proto.p13 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p14_pb.cs b/BLHX.Server.Common/Proto/p14_pb.cs index 550deca..fddd1c0 100644 --- a/BLHX.Server.Common/Proto/p14_pb.cs +++ b/BLHX.Server.Common/Proto/p14_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p14 +namespace BLHX.Server.Common.Proto.p14 { [global::ProtoBuf.ProtoContract(Name = @"cs_14002")] @@ -242,7 +242,7 @@ namespace BHXY.Server.Common.Proto.p14 public global::System.Collections.Generic.List ShipIdLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"spweapon_list")] - public global::System.Collections.Generic.List SpweaponLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List SpweaponLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"spweapon_bag_size", IsRequired = true)] public uint SpweaponBagSize { get; set; } @@ -353,7 +353,7 @@ namespace BHXY.Server.Common.Proto.p14 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"spweapon_list")] - public global::System.Collections.Generic.List SpweaponLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List SpweaponLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -422,7 +422,7 @@ namespace BHXY.Server.Common.Proto.p14 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"spweapon")] - public global::BHXY.Server.Common.Proto.common.Spweaponinfo Spweapon { get; set; } + public global::BLHX.Server.Common.Proto.common.Spweaponinfo Spweapon { get; set; } } diff --git a/BLHX.Server.Common/Proto/p15_pb.cs b/BLHX.Server.Common/Proto/p15_pb.cs index c3f1da7..1e5ab26 100644 --- a/BLHX.Server.Common/Proto/p15_pb.cs +++ b/BLHX.Server.Common/Proto/p15_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p15 +namespace BLHX.Server.Common.Proto.p15 { [global::ProtoBuf.ProtoContract(Name = @"cs_15002")] @@ -167,7 +167,7 @@ namespace BHXY.Server.Common.Proto.p15 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p16_pb.cs b/BLHX.Server.Common/Proto/p16_pb.cs index b16a3b5..c268721 100644 --- a/BLHX.Server.Common/Proto/p16_pb.cs +++ b/BLHX.Server.Common/Proto/p16_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p16 +namespace BLHX.Server.Common.Proto.p16 { [global::ProtoBuf.ProtoContract(Name = @"cs_16001")] @@ -149,7 +149,7 @@ namespace BHXY.Server.Common.Proto.p16 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -164,7 +164,7 @@ namespace BHXY.Server.Common.Proto.p16 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"ship_list")] - public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -218,7 +218,7 @@ namespace BHXY.Server.Common.Proto.p16 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -254,7 +254,7 @@ namespace BHXY.Server.Common.Proto.p16 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p17_pb.cs b/BLHX.Server.Common/Proto/p17_pb.cs index 8d69f88..b661772 100644 --- a/BLHX.Server.Common/Proto/p17_pb.cs +++ b/BLHX.Server.Common/Proto/p17_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p17 +namespace BLHX.Server.Common.Proto.p17 { [global::ProtoBuf.ProtoContract(Name = @"achievement_info")] diff --git a/BLHX.Server.Common/Proto/p18_pb.cs b/BLHX.Server.Common/Proto/p18_pb.cs index 76cb810..95e811a 100644 --- a/BLHX.Server.Common/Proto/p18_pb.cs +++ b/BLHX.Server.Common/Proto/p18_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p18 +namespace BLHX.Server.Common.Proto.p18 { [global::ProtoBuf.ProtoContract(Name = @"arenarank")] @@ -29,7 +29,7 @@ namespace BHXY.Server.Common.Proto.p18 public uint Score { get; set; } [global::ProtoBuf.ProtoMember(5, Name = @"display")] - public global::BHXY.Server.Common.Proto.common.Displayinfo Display { get; set; } + public global::BLHX.Server.Common.Proto.common.Displayinfo Display { get; set; } } @@ -205,7 +205,7 @@ namespace BHXY.Server.Common.Proto.p18 public uint ArenaRank { get; set; } [global::ProtoBuf.ProtoMember(6, Name = @"display")] - public global::BHXY.Server.Common.Proto.common.Displayinfo Display { get; set; } + public global::BLHX.Server.Common.Proto.common.Displayinfo Display { get; set; } } @@ -394,13 +394,13 @@ namespace BHXY.Server.Common.Proto.p18 public uint Rank { get; set; } [global::ProtoBuf.ProtoMember(6, Name = @"vanguard_ship_list")] - public global::System.Collections.Generic.List VanguardShipLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List VanguardShipLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(7, Name = @"main_ship_list")] - public global::System.Collections.Generic.List MainShipLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List MainShipLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(8, Name = @"display")] - public global::BHXY.Server.Common.Proto.common.Displayinfo Display { get; set; } + public global::BLHX.Server.Common.Proto.common.Displayinfo Display { get; set; } } diff --git a/BLHX.Server.Common/Proto/p19_pb.cs b/BLHX.Server.Common/Proto/p19_pb.cs index d646a8d..0c673df 100644 --- a/BLHX.Server.Common/Proto/p19_pb.cs +++ b/BLHX.Server.Common/Proto/p19_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p19 +namespace BLHX.Server.Common.Proto.p19 { [global::ProtoBuf.ProtoContract(Name = @"childinfo")] diff --git a/BLHX.Server.Common/Proto/p20_pb.cs b/BLHX.Server.Common/Proto/p20_pb.cs index 60d49da..57588da 100644 --- a/BLHX.Server.Common/Proto/p20_pb.cs +++ b/BLHX.Server.Common/Proto/p20_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p20 +namespace BLHX.Server.Common.Proto.p20 { [global::ProtoBuf.ProtoContract(Name = @"act_task")] @@ -50,7 +50,7 @@ namespace BHXY.Server.Common.Proto.p20 public uint Id { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"choice_award")] - public global::System.Collections.Generic.List ChoiceAwards { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ChoiceAwards { get; set; } = new global::System.Collections.Generic.List(); } @@ -164,7 +164,7 @@ namespace BHXY.Server.Common.Proto.p20 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"info")] - public global::System.Collections.Generic.List Infoes { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Infoes { get; set; } = new global::System.Collections.Generic.List(); } @@ -215,7 +215,7 @@ namespace BHXY.Server.Common.Proto.p20 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"award_list")] - public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -257,7 +257,7 @@ namespace BHXY.Server.Common.Proto.p20 public global::System.Collections.Generic.List IdLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(2, Name = @"award_list")] - public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -272,7 +272,7 @@ namespace BHXY.Server.Common.Proto.p20 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"award_list")] - public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -392,7 +392,7 @@ namespace BHXY.Server.Common.Proto.p20 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"award_list")] - public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -455,7 +455,7 @@ namespace BHXY.Server.Common.Proto.p20 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"award_list")] - public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p22_pb.cs b/BLHX.Server.Common/Proto/p22_pb.cs index 9174348..94cf135 100644 --- a/BLHX.Server.Common/Proto/p22_pb.cs +++ b/BLHX.Server.Common/Proto/p22_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p22 +namespace BLHX.Server.Common.Proto.p22 { [global::ProtoBuf.ProtoContract(Name = @"cs_22009")] @@ -32,7 +32,7 @@ namespace BHXY.Server.Common.Proto.p22 public uint ShipId { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"books")] - public global::System.Collections.Generic.List Books { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Books { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p24_pb.cs b/BLHX.Server.Common/Proto/p24_pb.cs index 15d8b99..b19a81a 100644 --- a/BLHX.Server.Common/Proto/p24_pb.cs +++ b/BLHX.Server.Common/Proto/p24_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p24 +namespace BLHX.Server.Common.Proto.p24 { [global::ProtoBuf.ProtoContract(Name = @"userchallengeinfo")] @@ -53,7 +53,7 @@ namespace BHXY.Server.Common.Proto.p24 public uint Pos { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"commanderinfo", IsRequired = true)] - public global::BHXY.Server.Common.Proto.common.Commanderinfo Commanderinfo { get; set; } + public global::BLHX.Server.Common.Proto.common.Commanderinfo Commanderinfo { get; set; } } @@ -140,7 +140,7 @@ namespace BHXY.Server.Common.Proto.p24 public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"commanders")] - public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); } @@ -227,10 +227,10 @@ namespace BHXY.Server.Common.Proto.p24 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"times")] - public global::System.Collections.Generic.List Times { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Times { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"awards")] - public global::System.Collections.Generic.List Awards { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Awards { get; set; } = new global::System.Collections.Generic.List(); } @@ -245,7 +245,7 @@ namespace BHXY.Server.Common.Proto.p24 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -275,7 +275,7 @@ namespace BHXY.Server.Common.Proto.p24 public uint HpRant { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"ship_info", IsRequired = true)] - public global::BHXY.Server.Common.Proto.common.Shipinfo ShipInfo { get; set; } + public global::BLHX.Server.Common.Proto.common.Shipinfo ShipInfo { get; set; } } diff --git a/BLHX.Server.Common/Proto/p25_pb.cs b/BLHX.Server.Common/Proto/p25_pb.cs index eea6f7e..1a5f27c 100644 --- a/BLHX.Server.Common/Proto/p25_pb.cs +++ b/BLHX.Server.Common/Proto/p25_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p25 +namespace BLHX.Server.Common.Proto.p25 { [global::ProtoBuf.ProtoContract(Name = @"commanderboxinfo")] @@ -229,7 +229,7 @@ namespace BHXY.Server.Common.Proto.p25 public uint Id { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"commandersid")] - public global::System.Collections.Generic.List Commandersids { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Commandersids { get; set; } = new global::System.Collections.Generic.List(); } @@ -355,7 +355,7 @@ namespace BHXY.Server.Common.Proto.p25 public uint Id { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"commandersid")] - public global::System.Collections.Generic.List Commandersids { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Commandersids { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"name", IsRequired = true)] public string Name { get; set; } @@ -370,7 +370,7 @@ namespace BHXY.Server.Common.Proto.p25 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"commanders")] - public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(2, Name = @"box")] public global::System.Collections.Generic.List Boxs { get; set; } = new global::System.Collections.Generic.List(); @@ -409,7 +409,7 @@ namespace BHXY.Server.Common.Proto.p25 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"commander", IsRequired = true)] - public global::BHXY.Server.Common.Proto.common.Commanderinfo Commander { get; set; } + public global::BLHX.Server.Common.Proto.common.Commanderinfo Commander { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"finish_time", IsRequired = true)] public uint FinishTime { get; set; } @@ -502,7 +502,7 @@ namespace BHXY.Server.Common.Proto.p25 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"awards")] - public global::System.Collections.Generic.List Awards { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Awards { get; set; } = new global::System.Collections.Generic.List(); } @@ -580,7 +580,7 @@ namespace BHXY.Server.Common.Proto.p25 public uint Exp { get; set; } [global::ProtoBuf.ProtoMember(4, Name = @"awards")] - public global::System.Collections.Generic.List Awards { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Awards { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(5, Name = @"op_time", IsRequired = true)] public uint OpTime { get; set; } @@ -652,7 +652,7 @@ namespace BHXY.Server.Common.Proto.p25 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"commander_list")] - public global::System.Collections.Generic.List CommanderLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CommanderLists { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p26_pb.cs b/BLHX.Server.Common/Proto/p26_pb.cs index dab18e8..4382a89 100644 --- a/BLHX.Server.Common/Proto/p26_pb.cs +++ b/BLHX.Server.Common/Proto/p26_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p26 +namespace BLHX.Server.Common.Proto.p26 { [global::ProtoBuf.ProtoContract(Name = @"act_goods_buy")] @@ -53,7 +53,7 @@ namespace BHXY.Server.Common.Proto.p26 public uint Id { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"award_list")] - public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -248,7 +248,7 @@ namespace BHXY.Server.Common.Proto.p26 public uint RecipeId { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"items")] - public global::System.Collections.Generic.List Items { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Items { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"times", IsRequired = true)] public uint Times { get; set; } @@ -500,7 +500,7 @@ namespace BHXY.Server.Common.Proto.p26 public uint Score { get; set; } [global::ProtoBuf.ProtoMember(4, Name = @"display", IsRequired = true)] - public global::BHXY.Server.Common.Proto.common.Displayinfo Display { get; set; } + public global::BLHX.Server.Common.Proto.common.Displayinfo Display { get; set; } } @@ -633,7 +633,7 @@ namespace BHXY.Server.Common.Proto.p26 private uint? __pbn__Ultimate; [global::ProtoBuf.ProtoMember(5, Name = @"maxscores")] - public global::System.Collections.Generic.List Maxscores { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Maxscores { get; set; } = new global::System.Collections.Generic.List(); } @@ -741,7 +741,7 @@ namespace BHXY.Server.Common.Proto.p26 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -909,7 +909,7 @@ namespace BHXY.Server.Common.Proto.p26 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -924,10 +924,10 @@ namespace BHXY.Server.Common.Proto.p26 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"items")] - public global::System.Collections.Generic.List Items { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Items { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"recipes")] - public global::System.Collections.Generic.List Recipes { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Recipes { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"slots")] public global::System.Collections.Generic.List Slots { get; set; } = new global::System.Collections.Generic.List(); @@ -945,7 +945,7 @@ namespace BHXY.Server.Common.Proto.p26 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"award_list")] - public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -984,7 +984,7 @@ namespace BHXY.Server.Common.Proto.p26 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"award_list")] - public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AwardLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"hub")] public Minigamehub Hub { get; set; } @@ -1095,7 +1095,7 @@ namespace BHXY.Server.Common.Proto.p26 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -1137,7 +1137,7 @@ namespace BHXY.Server.Common.Proto.p26 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p27_pb.cs b/BLHX.Server.Common/Proto/p27_pb.cs index d7c236d..149f11d 100644 --- a/BLHX.Server.Common/Proto/p27_pb.cs +++ b/BLHX.Server.Common/Proto/p27_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p27 +namespace BLHX.Server.Common.Proto.p27 { [global::ProtoBuf.ProtoContract(Name = @"child_attr")] diff --git a/BLHX.Server.Common/Proto/p30_pb.cs b/BLHX.Server.Common/Proto/p30_pb.cs index 6d292c0..0c3d8be 100644 --- a/BLHX.Server.Common/Proto/p30_pb.cs +++ b/BLHX.Server.Common/Proto/p30_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p30 +namespace BLHX.Server.Common.Proto.p30 { [global::ProtoBuf.ProtoContract(Name = @"attachment")] diff --git a/BLHX.Server.Common/Proto/p33_pb.cs b/BLHX.Server.Common/Proto/p33_pb.cs index d263263..73806c2 100644 --- a/BLHX.Server.Common/Proto/p33_pb.cs +++ b/BLHX.Server.Common/Proto/p33_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p33 +namespace BLHX.Server.Common.Proto.p33 { [global::ProtoBuf.ProtoContract(Name = @"ai_act")] @@ -456,7 +456,7 @@ namespace BHXY.Server.Common.Proto.p33 public global::System.Collections.Generic.List ShipIdLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(2, Name = @"commanders")] - public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); } @@ -549,7 +549,7 @@ namespace BHXY.Server.Common.Proto.p33 public global::System.Collections.Generic.List BuffLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(13, Name = @"commander_list")] - public global::System.Collections.Generic.List CommanderLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CommanderLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(14, Name = @"kill_count", IsRequired = true)] public uint KillCount { get; set; } @@ -696,7 +696,7 @@ namespace BHXY.Server.Common.Proto.p33 public global::System.Collections.Generic.List ChapterAwards { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(11, Name = @"fleet_list")] - public global::System.Collections.Generic.List FleetLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List FleetLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(12, Name = @"new_flag_port_list")] public global::System.Collections.Generic.List NewFlagPortLists { get; set; } = new global::System.Collections.Generic.List(); @@ -747,7 +747,7 @@ namespace BHXY.Server.Common.Proto.p33 public global::System.Collections.Generic.List MovePaths { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"enter_map_id")] public uint EnterMapId @@ -880,7 +880,7 @@ namespace BHXY.Server.Common.Proto.p33 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"time", IsRequired = true)] public uint Time { get; set; } @@ -973,7 +973,7 @@ namespace BHXY.Server.Common.Proto.p33 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drops")] - public global::System.Collections.Generic.List Drops { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Drops { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"exp", IsRequired = true)] public uint Exp { get; set; } @@ -994,7 +994,7 @@ namespace BHXY.Server.Common.Proto.p33 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -1021,7 +1021,7 @@ namespace BHXY.Server.Common.Proto.p33 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -1147,7 +1147,7 @@ namespace BHXY.Server.Common.Proto.p33 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drops")] - public global::System.Collections.Generic.List Drops { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Drops { get; set; } = new global::System.Collections.Generic.List(); } @@ -1342,7 +1342,7 @@ namespace BHXY.Server.Common.Proto.p33 public uint EnterMapId { get; set; } [global::ProtoBuf.ProtoMember(17, Name = @"cd_list")] - public global::System.Collections.Generic.List CdLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CdLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(18, Name = @"buff_list")] public global::System.Collections.Generic.List BuffLists { get; set; } = new global::System.Collections.Generic.List(); @@ -1354,7 +1354,7 @@ namespace BHXY.Server.Common.Proto.p33 public global::System.Collections.Generic.List SairenChapters { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(21, Name = @"month_boss")] - public global::System.Collections.Generic.List MonthBosses { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List MonthBosses { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p34_pb.cs b/BLHX.Server.Common/Proto/p34_pb.cs index e3f5058..b6ba773 100644 --- a/BLHX.Server.Common/Proto/p34_pb.cs +++ b/BLHX.Server.Common/Proto/p34_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p34 +namespace BLHX.Server.Common.Proto.p34 { [global::ProtoBuf.ProtoContract(Name = @"cs_34001")] @@ -246,7 +246,7 @@ namespace BHXY.Server.Common.Proto.p34 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -339,7 +339,7 @@ namespace BHXY.Server.Common.Proto.p34 public WorldbossInfo BossInfo { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"user_info", IsRequired = true)] - public global::BHXY.Server.Common.Proto.common.Usersimpleinfo UserInfo { get; set; } + public global::BLHX.Server.Common.Proto.common.Usersimpleinfo UserInfo { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"type", IsRequired = true)] public uint Type { get; set; } @@ -384,7 +384,7 @@ namespace BHXY.Server.Common.Proto.p34 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drops")] - public global::System.Collections.Generic.List Drops { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Drops { get; set; } = new global::System.Collections.Generic.List(); } @@ -435,7 +435,7 @@ namespace BHXY.Server.Common.Proto.p34 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"ship_list")] - public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ShipLists { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p40_pb.cs b/BLHX.Server.Common/Proto/p40_pb.cs index c3683a5..31647c0 100644 --- a/BLHX.Server.Common/Proto/p40_pb.cs +++ b/BLHX.Server.Common/Proto/p40_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p40 +namespace BLHX.Server.Common.Proto.p40 { [global::ProtoBuf.ProtoContract(Name = @"commander_exp")] @@ -201,7 +201,7 @@ namespace BHXY.Server.Common.Proto.p40 public uint Hp { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_info")] - public global::System.Collections.Generic.List DropInfoes { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropInfoes { get; set; } = new global::System.Collections.Generic.List(); } @@ -228,7 +228,7 @@ namespace BHXY.Server.Common.Proto.p40 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -268,10 +268,10 @@ namespace BHXY.Server.Common.Proto.p40 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_info")] - public global::System.Collections.Generic.List DropInfoes { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropInfoes { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"extra_drop_info")] - public global::System.Collections.Generic.List ExtraDropInfoes { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ExtraDropInfoes { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"player_exp", IsRequired = true)] public uint PlayerExp { get; set; } diff --git a/BLHX.Server.Common/Proto/p50_pb.cs b/BLHX.Server.Common/Proto/p50_pb.cs index 4bef0c7..c6e2c9f 100644 --- a/BLHX.Server.Common/Proto/p50_pb.cs +++ b/BLHX.Server.Common/Proto/p50_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p50 +namespace BLHX.Server.Common.Proto.p50 { [global::ProtoBuf.ProtoContract(Name = @"ad_arg")] @@ -272,7 +272,7 @@ namespace BHXY.Server.Common.Proto.p50 public global::System.Collections.Generic.List MedalIds { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(17, Name = @"display")] - public global::BHXY.Server.Common.Proto.common.Displayinfo Display { get; set; } + public global::BLHX.Server.Common.Proto.common.Displayinfo Display { get; set; } } @@ -302,7 +302,7 @@ namespace BHXY.Server.Common.Proto.p50 public uint PreOnlineTime { get; set; } [global::ProtoBuf.ProtoMember(7, Name = @"display")] - public global::BHXY.Server.Common.Proto.common.Displayinfo Display { get; set; } + public global::BLHX.Server.Common.Proto.common.Displayinfo Display { get; set; } } @@ -341,7 +341,7 @@ namespace BHXY.Server.Common.Proto.p50 public uint Lv { get; set; } [global::ProtoBuf.ProtoMember(4, Name = @"display")] - public global::BHXY.Server.Common.Proto.common.Displayinfo Display { get; set; } + public global::BLHX.Server.Common.Proto.common.Displayinfo Display { get; set; } } diff --git a/BLHX.Server.Common/Proto/p60_pb.cs b/BLHX.Server.Common/Proto/p60_pb.cs index ffe35c0..ca36cff 100644 --- a/BLHX.Server.Common/Proto/p60_pb.cs +++ b/BLHX.Server.Common/Proto/p60_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p60 +namespace BLHX.Server.Common.Proto.p60 { [global::ProtoBuf.ProtoContract(Name = @"cs_60001")] @@ -371,13 +371,13 @@ namespace BHXY.Server.Common.Proto.p60 public uint Capital { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"this_weekly_tasks", IsRequired = true)] - public global::BHXY.Server.Common.Proto.guild.WeeklyTask ThisWeeklyTasks { get; set; } + public global::BLHX.Server.Common.Proto.guild.WeeklyTask ThisWeeklyTasks { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"benefit_finish_time", IsRequired = true)] public uint BenefitFinishTime { get; set; } [global::ProtoBuf.ProtoMember(4, Name = @"technologys")] - public global::System.Collections.Generic.List Technologys { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Technologys { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(5, Name = @"retreat_cnt", IsRequired = true)] public uint RetreatCnt { get; set; } @@ -519,7 +519,7 @@ namespace BHXY.Server.Common.Proto.p60 public uint PreOnlineTime { get; set; } [global::ProtoBuf.ProtoMember(9, Name = @"display")] - public global::BHXY.Server.Common.Proto.common.Displayinfo Display { get; set; } + public global::BLHX.Server.Common.Proto.common.Displayinfo Display { get; set; } [global::ProtoBuf.ProtoMember(12, Name = @"join_time", IsRequired = true)] public uint JoinTime { get; set; } @@ -561,7 +561,7 @@ namespace BHXY.Server.Common.Proto.p60 public uint Lv { get; set; } [global::ProtoBuf.ProtoMember(4, Name = @"display")] - public global::BHXY.Server.Common.Proto.common.Displayinfo Display { get; set; } + public global::BLHX.Server.Common.Proto.common.Displayinfo Display { get; set; } } @@ -831,7 +831,7 @@ namespace BHXY.Server.Common.Proto.p60 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p61_pb.cs b/BLHX.Server.Common/Proto/p61_pb.cs index 1aae26b..7f98b4c 100644 --- a/BLHX.Server.Common/Proto/p61_pb.cs +++ b/BLHX.Server.Common/Proto/p61_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p61 +namespace BLHX.Server.Common.Proto.p61 { [global::ProtoBuf.ProtoContract(Name = @"bosseventfleet")] @@ -23,7 +23,7 @@ namespace BHXY.Server.Common.Proto.p61 public global::System.Collections.Generic.List Ships { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"commanders")] - public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Commanders { get; set; } = new global::System.Collections.Generic.List(); } @@ -617,7 +617,7 @@ namespace BHXY.Server.Common.Proto.p61 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -797,7 +797,7 @@ namespace BHXY.Server.Common.Proto.p61 public uint Pos { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"ship", IsRequired = true)] - public global::BHXY.Server.Common.Proto.common.Shipinfo Ship { get; set; } + public global::BLHX.Server.Common.Proto.common.Shipinfo Ship { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"last_time", IsRequired = true)] public uint LastTime { get; set; } @@ -830,7 +830,7 @@ namespace BHXY.Server.Common.Proto.p61 public uint UserId { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"ships")] - public global::System.Collections.Generic.List Ships { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Ships { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p62_pb.cs b/BLHX.Server.Common/Proto/p62_pb.cs index 10096ac..d01a171 100644 --- a/BLHX.Server.Common/Proto/p62_pb.cs +++ b/BLHX.Server.Common/Proto/p62_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p62 +namespace BLHX.Server.Common.Proto.p62 { [global::ProtoBuf.ProtoContract(Name = @"cs_62002")] @@ -194,7 +194,7 @@ namespace BHXY.Server.Common.Proto.p62 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"this_weekly_tasks", IsRequired = true)] - public global::BHXY.Server.Common.Proto.guild.WeeklyTask ThisWeeklyTasks { get; set; } + public global::BLHX.Server.Common.Proto.guild.WeeklyTask ThisWeeklyTasks { get; set; } } @@ -245,7 +245,7 @@ namespace BHXY.Server.Common.Proto.p62 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -260,13 +260,13 @@ namespace BHXY.Server.Common.Proto.p62 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"inclog")] - public global::System.Collections.Generic.List Inclogs { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Inclogs { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"declog")] - public global::System.Collections.Generic.List Declogs { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Declogs { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"otherlog")] - public global::System.Collections.Generic.List Otherlogs { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Otherlogs { get; set; } = new global::System.Collections.Generic.List(); } @@ -413,7 +413,7 @@ namespace BHXY.Server.Common.Proto.p62 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"technologys")] - public global::System.Collections.Generic.List Technologys { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Technologys { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p63_pb.cs b/BLHX.Server.Common/Proto/p63_pb.cs index cb75d0d..d631e8a 100644 --- a/BLHX.Server.Common/Proto/p63_pb.cs +++ b/BLHX.Server.Common/Proto/p63_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p63 +namespace BLHX.Server.Common.Proto.p63 { [global::ProtoBuf.ProtoContract(Name = @"bluprintinfo")] @@ -396,7 +396,7 @@ namespace BHXY.Server.Common.Proto.p63 public uint SkillId { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"books")] - public global::System.Collections.Generic.List Books { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Books { get; set; } = new global::System.Collections.Generic.List(); } @@ -516,19 +516,19 @@ namespace BHXY.Server.Common.Proto.p63 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"common_list")] - public global::System.Collections.Generic.List CommonLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CommonLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"refresh_list")] public global::System.Collections.Generic.List RefreshLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(5, Name = @"catchup_list")] - public global::System.Collections.Generic.List CatchupLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CatchupLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(6, Name = @"catchupact_list")] - public global::System.Collections.Generic.List CatchupactLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CatchupactLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -660,7 +660,7 @@ namespace BHXY.Server.Common.Proto.p63 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"ship")] - public global::BHXY.Server.Common.Proto.common.Shipinfo Ship { get; set; } + public global::BLHX.Server.Common.Proto.common.Shipinfo Ship { get; set; } } @@ -735,7 +735,7 @@ namespace BHXY.Server.Common.Proto.p63 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"ship")] - public global::BHXY.Server.Common.Proto.common.Shipinfo Ship { get; set; } + public global::BLHX.Server.Common.Proto.common.Shipinfo Ship { get; set; } } @@ -786,7 +786,7 @@ namespace BHXY.Server.Common.Proto.p63 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"ship")] - public global::BHXY.Server.Common.Proto.common.Shipinfo Ship { get; set; } + public global::BLHX.Server.Common.Proto.common.Shipinfo Ship { get; set; } } @@ -1001,16 +1001,16 @@ namespace BHXY.Server.Common.Proto.p63 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"common_list")] - public global::System.Collections.Generic.List CommonLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CommonLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] - public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"catchup_list")] - public global::System.Collections.Generic.List CatchupLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CatchupLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"catchupact_list")] - public global::System.Collections.Generic.List CatchupactLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CatchupactLists { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p64_pb.cs b/BLHX.Server.Common/Proto/p64_pb.cs index 173bbfc..335e3ef 100644 --- a/BLHX.Server.Common/Proto/p64_pb.cs +++ b/BLHX.Server.Common/Proto/p64_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p64 +namespace BLHX.Server.Common.Proto.p64 { [global::ProtoBuf.ProtoContract(Name = @"cs_64001")] @@ -149,7 +149,7 @@ namespace BHXY.Server.Common.Proto.p64 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"rewards")] - public global::System.Collections.Generic.List Rewards { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Rewards { get; set; } = new global::System.Collections.Generic.List(); } @@ -164,7 +164,7 @@ namespace BHXY.Server.Common.Proto.p64 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"rewards")] - public global::System.Collections.Generic.List Rewards { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Rewards { get; set; } = new global::System.Collections.Generic.List(); } diff --git a/BLHX.Server.Common/Proto/p70_pb.cs b/BLHX.Server.Common/Proto/p70_pb.cs index 377e2ef..59caef4 100644 --- a/BLHX.Server.Common/Proto/p70_pb.cs +++ b/BLHX.Server.Common/Proto/p70_pb.cs @@ -6,7 +6,7 @@ #region Designer generated code #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BHXY.Server.Common.Proto.p70 +namespace BLHX.Server.Common.Proto.p70 { [global::ProtoBuf.ProtoContract(Name = @"cs_70001")] @@ -56,7 +56,7 @@ namespace BHXY.Server.Common.Proto.p70 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"meta_char_list")] - public global::System.Collections.Generic.List MetaCharLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List MetaCharLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -95,7 +95,7 @@ namespace BHXY.Server.Common.Proto.p70 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"ship")] - public global::BHXY.Server.Common.Proto.common.Shipinfo Ship { get; set; } + public global::BLHX.Server.Common.Proto.common.Shipinfo Ship { get; set; } } diff --git a/BLHX.Server.Game/Connection.cs b/BLHX.Server.Game/Connection.cs index 8f878d0..e1c6518 100644 --- a/BLHX.Server.Game/Connection.cs +++ b/BLHX.Server.Game/Connection.cs @@ -1,13 +1,10 @@ -using BHXY.Server.Common.Proto.p10; -using BLHX.Server.Common.Proto; +using BLHX.Server.Common.Proto; using BLHX.Server.Common.Utils; using ProtoBuf; using System.Buffers.Binary; using System.Net; using System.Net.Sockets; -using System.Security.AccessControl; using System.Text; -using System.Text.Json; namespace BLHX.Server.Game { diff --git a/BLHX.Server.Game/Handlers/P10.cs b/BLHX.Server.Game/Handlers/P10.cs index c90a99f..4684425 100644 --- a/BLHX.Server.Game/Handlers/P10.cs +++ b/BLHX.Server.Game/Handlers/P10.cs @@ -1,4 +1,4 @@ -using BHXY.Server.Common.Proto.p10; +using BLHX.Server.Common.Proto.p10; using BLHX.Server.Common.Database; using BLHX.Server.Common.Proto; using BLHX.Server.Common.Utils; @@ -9,7 +9,7 @@ namespace BLHX.Server.Game.Handlers { #region GateCommands [PacketHandler(Command.Cs10800)] - static void Cs10800Handler(Connection connection, Packet packet) + static void VersionHandler(Connection connection, Packet packet) { var req = packet.Decode(); connection.Send(new Sc10801() @@ -37,7 +37,7 @@ namespace BLHX.Server.Game.Handlers } [PacketHandler(Command.Cs10020)] - static void Cs10020Handler(Connection connection, Packet packet) + static void UserLoginHandler(Connection connection, Packet packet) { // Arg2 uid // Arg3 accessToken @@ -65,20 +65,27 @@ namespace BLHX.Server.Game.Handlers #endregion [PacketHandler(Command.Cs10022)] - static void Cs10022Handler(Connection connection, Packet packet) + static void ServerLoginHandler(Connection connection, Packet packet) { var req = packet.Decode(); var rsp = new Sc10023(); var account = DBManager.AccountContext.Accounts.SingleOrDefault(x => x.Uid == req.AccountId); - if (account is null) + if (account is null || account.Token != req.ServerTicket) { rsp.Result = 1; connection.Send(rsp); return; } // TODO: Create/access player data! + rsp.ServerTicket = req.ServerTicket; connection.Send(rsp); } + + [PacketHandler(Command.Cs10100)] + static void HeartbeatHandler(Connection connection, Packet packet) + { + connection.Send(new Sc10101() { State = 1 }); + } } } diff --git a/BLHX.Server.PcapParser/App.config b/BLHX.Server.PcapParser/App.config new file mode 100644 index 0000000..5f986e8 --- /dev/null +++ b/BLHX.Server.PcapParser/App.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/BLHX.Server.PcapParser/BLHX.Server.PcapParser.csproj b/BLHX.Server.PcapParser/BLHX.Server.PcapParser.csproj new file mode 100644 index 0000000..51cd527 --- /dev/null +++ b/BLHX.Server.PcapParser/BLHX.Server.PcapParser.csproj @@ -0,0 +1,121 @@ + + + + + Debug + AnyCPU + {D48CCDD2-F7E5-47EA-95EA-E9B791E9BFAE} + Exe + BLHX.Server.PcapParser + BLHX.Server.PcapParser + v4.8.1 + 512 + true + true + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + x64 + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Pcap.Net.x64.1.0.4.1\lib\net45\PcapDotNet.Base.dll + + + ..\packages\Pcap.Net.x64.1.0.4.1\lib\net45\PcapDotNet.Core.dll + + + ..\packages\Pcap.Net.x64.1.0.4.1\lib\net45\PcapDotNet.Core.Extensions.dll + + + ..\packages\Pcap.Net.x64.1.0.4.1\lib\net45\PcapDotNet.Packets.dll + + + ..\packages\protobuf-net.3.2.30\lib\net462\protobuf-net.dll + + + ..\packages\protobuf-net.Core.3.2.30\lib\net462\protobuf-net.Core.dll + + + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\packages\System.Collections.Immutable.7.0.0\lib\net462\System.Collections.Immutable.dll + + + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + + + + + + + + + + + + + + + + + + False + Microsoft .NET Framework 4.8.1 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + \ No newline at end of file diff --git a/BLHX.Server.PcapParser/PcapParser.cs b/BLHX.Server.PcapParser/PcapParser.cs new file mode 100644 index 0000000..a660340 --- /dev/null +++ b/BLHX.Server.PcapParser/PcapParser.cs @@ -0,0 +1,119 @@ +using System; +using System.Buffers.Binary; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using Newtonsoft.Json; +using BLHX.Server.Common.Proto; +using PcapDotNet.Core; +using PcapDotNet.Packets; +using ProtoBuf; + +namespace BLHX.Server.PcapParser +{ + class PcapParser + { + static MemoryStream memoryStream = new MemoryStream(); + + static void Main(string[] args) + { + // Check command line + if (args.Length != 1) + { + Console.WriteLine("usage: " + Environment.GetCommandLineArgs()[0] + " "); + return; + } + + // Create the offline device + OfflinePacketDevice selectedDevice = new OfflinePacketDevice(args[0]); + + // Open the capture file + using (PacketCommunicator communicator = + selectedDevice.Open(65536, // portion of the packet to capture + // 65536 guarantees that the whole packet will be captured on all the link layers + PacketDeviceOpenAttributes.Promiscuous, // promiscuous mode + 1000)) // read timeout + { + // Read and dispatch packets until EOF is reached + communicator.ReceivePackets(0, DispatcherHandler); + } + + ProcessPackets(); + } + + private static void DispatcherHandler(Packet packet) + { + var payload = packet.Ethernet.IpV4.Tcp.Payload; + if (payload.Length < 1) + return; + + // print packet timestamp and packet length + Console.WriteLine(packet.Timestamp.ToString("yyyy-MM-dd hh:mm:ss.fff") + " length:" + payload.Length); + memoryStream.Write(payload.ToArray(), 0, payload.Length); + } + + private static void ProcessPackets() + { + List packets = new List(); + + byte[] msBytes = memoryStream.ToArray(); + int readLen = 0; + while (readLen < msBytes.Length) + { + var gamePacket = new BLHXPacket(msBytes.AsSpan(readLen).ToArray()); + readLen += gamePacket.length + BLHXPacket.LENGTH_SIZE; + packets.Add(gamePacket); + + try + { + var protoClass = Assembly.GetExecutingAssembly().GetType($"BLHX.Server.Common.Proto.p{gamePacket.command.ToCategory()}.{gamePacket.command}"); + using (var ms = new MemoryStream(gamePacket.bytes)) + { + gamePacket.body = Serializer.Deserialize(protoClass, ms); + } + } + catch (Exception) + { + Console.WriteLine($"{gamePacket.command} failed to deserialize, {BitConverter.ToString(gamePacket.bytes).Replace("-", "")}"); + } + } + + Console.WriteLine($"Got {packets.Count} packet(s)"); + File.WriteAllText("packets.json", JsonConvert.SerializeObject(packets)); + } + } + + static class CommandExtensions + { + public static string ToCategory(this Command command) + { + string cmdStr = ((ushort)command).ToString(); + return cmdStr.Substring(0, Math.Min(2, cmdStr.Length)); ; + } + } + + class BLHXPacket + { + public const int LENGTH_SIZE = 2; + public const int HEADER_SIZE = 5; + public readonly ushort length; + public readonly byte flag; + public readonly Command command; + public readonly ushort id; + public readonly byte[] bytes; + public object body; + + public BLHXPacket(byte[] recv) + { + length = BinaryPrimitives.ReadUInt16BigEndian(recv); + flag = recv[LENGTH_SIZE]; + command = (Command)BinaryPrimitives.ReadUInt16BigEndian(recv.AsSpan(LENGTH_SIZE + 1)); + id = BinaryPrimitives.ReadUInt16BigEndian(recv.AsSpan(HEADER_SIZE)); + bytes = new byte[length - HEADER_SIZE]; + Array.Copy(recv, HEADER_SIZE + LENGTH_SIZE, bytes, 0, length - HEADER_SIZE); + } + + public T Decode() where T : IExtensible => Serializer.Deserialize(bytes.AsSpan()); + } +} \ No newline at end of file diff --git a/BLHX.Server.PcapParser/Properties/AssemblyInfo.cs b/BLHX.Server.PcapParser/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..d1efab7 --- /dev/null +++ b/BLHX.Server.PcapParser/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("BLHX.Server.PcapParser")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("BLHX.Server.PcapParser")] +[assembly: AssemblyCopyright("Copyright © 2024")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("d48ccdd2-f7e5-47ea-95ea-e9b791e9bfae")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/BLHX.Server.PcapParser/packages.config b/BLHX.Server.PcapParser/packages.config new file mode 100644 index 0000000..7487fa4 --- /dev/null +++ b/BLHX.Server.PcapParser/packages.config @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/BLHX.Server.sln b/BLHX.Server.sln index bebc0b3..8a2fe88 100644 --- a/BLHX.Server.sln +++ b/BLHX.Server.sln @@ -9,7 +9,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BLHX.Server.Game", "BLHX.Se EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BLHX.Server.Common", "BLHX.Server.Common\BLHX.Server.Common.csproj", "{BA896C61-5025-4CBB-B56C-18A59D3D0D7D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BLHX.Server.SDK", "BLHX.Server.SDK\BLHX.Server.SDK.csproj", "{DBEE7F5B-FA2F-43BE-9B80-7E3D9A6267F2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BLHX.Server.SDK", "BLHX.Server.SDK\BLHX.Server.SDK.csproj", "{DBEE7F5B-FA2F-43BE-9B80-7E3D9A6267F2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BLHX.Server.PcapParser", "BLHX.Server.PcapParser\BLHX.Server.PcapParser.csproj", "{D48CCDD2-F7E5-47EA-95EA-E9B791E9BFAE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -33,6 +35,10 @@ Global {DBEE7F5B-FA2F-43BE-9B80-7E3D9A6267F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {DBEE7F5B-FA2F-43BE-9B80-7E3D9A6267F2}.Release|Any CPU.ActiveCfg = Release|Any CPU {DBEE7F5B-FA2F-43BE-9B80-7E3D9A6267F2}.Release|Any CPU.Build.0 = Release|Any CPU + {D48CCDD2-F7E5-47EA-95EA-E9B791E9BFAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D48CCDD2-F7E5-47EA-95EA-E9B791E9BFAE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D48CCDD2-F7E5-47EA-95EA-E9B791E9BFAE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D48CCDD2-F7E5-47EA-95EA-E9B791E9BFAE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE