diff --git a/BLHX.Server.Common/Proto/Command.cs b/BLHX.Server.Common/Proto/Command.cs index 228b920..3783f77 100644 --- a/BLHX.Server.Common/Proto/Command.cs +++ b/BLHX.Server.Common/Proto/Command.cs @@ -3,23 +3,29 @@ public enum Command : ushort { Cs10001 = 10001, + Cs10018 = 10018, Cs10020 = 10020, Cs10022 = 10022, Cs10024 = 10024, Cs10026 = 10026, Cs10100 = 10100, + Cs10700 = 10700, Cs10800 = 10800, + Cs10802 = 10802, Cs10992 = 10992, Cs10993 = 10993, Cs10994 = 10994, Cs10996 = 10996, Sc10002 = 10002, + Sc10019 = 10019, Sc10021 = 10021, Sc10023 = 10023, Sc10025 = 10025, Sc10027 = 10027, Sc10101 = 10101, + Sc10701 = 10701, Sc10801 = 10801, + Sc10803 = 10803, Sc10995 = 10995, Sc10997 = 10997, Sc10998 = 10998, @@ -37,11 +43,14 @@ Cs11023 = 11023, Cs11025 = 11025, Cs11027 = 11027, + Cs11029 = 11029, + Cs11030 = 11030, Cs11100 = 11100, Cs11202 = 11202, Cs11204 = 11204, Cs11206 = 11206, Cs11208 = 11208, + Cs11212 = 11212, Cs11401 = 11401, Cs11501 = 11501, Cs11504 = 11504, @@ -76,6 +85,7 @@ Sc11024 = 11024, Sc11026 = 11026, Sc11028 = 11028, + Sc11031 = 11031, Sc11101 = 11101, Sc11200 = 11200, Sc11201 = 11201, @@ -393,6 +403,7 @@ Cs20108 = 20108, Cs20110 = 20110, Cs20205 = 20205, + Cs20207 = 20207, Sc20001 = 20001, Sc20002 = 20002, Sc20003 = 20003, @@ -416,6 +427,7 @@ Sc20203 = 20203, Sc20204 = 20204, Sc20206 = 20206, + Sc20208 = 20208, Cs22009 = 22009, Cs22011 = 22011, Cs22014 = 22014, @@ -508,6 +520,7 @@ Cs26154 = 26154, Cs26156 = 26156, Cs26158 = 26158, + Cs26160 = 26160, Sc26001 = 26001, Sc26003 = 26003, Sc26005 = 26005, @@ -535,6 +548,7 @@ Sc26155 = 26155, Sc26157 = 26157, Sc26159 = 26159, + Sc26161 = 26161, Cs27000 = 27000, Cs27002 = 27002, Cs27004 = 27004, @@ -582,17 +596,52 @@ Sc27044 = 27044, Sc27046 = 27046, Sc27048 = 27048, + Cs28001 = 28001, + Cs28003 = 28003, + Cs28005 = 28005, + Cs28007 = 28007, + Cs28009 = 28009, + Cs28011 = 28011, + Cs28013 = 28013, + Cs28015 = 28015, + Cs28017 = 28017, + Cs28019 = 28019, + Cs28090 = 28090, + Sc28000 = 28000, + Sc28002 = 28002, + Sc28004 = 28004, + Sc28006 = 28006, + Sc28008 = 28008, + Sc28010 = 28010, + Sc28012 = 28012, + Sc28014 = 28014, + Sc28016 = 28016, + Sc28018 = 28018, + Sc28020 = 28020, Cs30002 = 30002, Cs30004 = 30004, Cs30006 = 30006, Cs30008 = 30008, Cs30010 = 30010, + Cs30012 = 30012, + Cs30014 = 30014, + Cs30016 = 30016, + Cs30018 = 30018, + Cs30102 = 30102, + Cs30104 = 30104, Sc30001 = 30001, Sc30003 = 30003, Sc30005 = 30005, Sc30007 = 30007, Sc30009 = 30009, Sc30011 = 30011, + Sc30013 = 30013, + Sc30015 = 30015, + Sc30017 = 30017, + Sc30019 = 30019, + Sc30101 = 30101, + Sc30103 = 30103, + Sc30105 = 30105, Cs33000 = 33000, Cs33101 = 33101, Cs33103 = 33103, @@ -886,12 +935,12 @@ Sc64006 = 64006, Sc64008 = 64008, Sc64010 = 64010, - /*Cs70001 = 70001, - Cs70003 = 70003, - Cs70005 = 70005, - Sc70000 = 70000, - Sc70002 = 70002, - Sc70004 = 70004, - Sc70006 = 70006*/ + //Cs70001 = 70001, + //Cs70003 = 70003, + //Cs70005 = 70005, + //Sc70000 = 70000, + //Sc70002 = 70002, + //Sc70004 = 70004, + //Sc70006 = 70006, } } diff --git a/BLHX.Server.Common/Proto/common_pb.cs b/BLHX.Server.Common/Proto/common_pb.cs index 94e27e2..03e6a4b 100644 --- a/BLHX.Server.Common/Proto/common_pb.cs +++ b/BLHX.Server.Common/Proto/common_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.common { @@ -300,6 +300,24 @@ namespace BLHX.Server.Common.Proto.common } + [global::ProtoBuf.ProtoContract(Name = @"kvdata2")] + public partial class Kvdata2 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"key", IsRequired = true)] + public uint Key { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"value1", IsRequired = true)] + public uint Value1 { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"value2", IsRequired = true)] + public uint Value2 { get; set; } + + } + [global::ProtoBuf.ProtoContract(Name = @"refund_shopinfo")] public partial class RefundShopinfo : global::ProtoBuf.IExtensible { @@ -667,5 +685,5 @@ namespace BLHX.Server.Common.Proto.common } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/guild_pb.cs b/BLHX.Server.Common/Proto/guild_pb.cs index 2e96ec8..8a362b7 100644 --- a/BLHX.Server.Common/Proto/guild_pb.cs +++ b/BLHX.Server.Common/Proto/guild_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.guild { @@ -86,5 +86,5 @@ namespace BLHX.Server.Common.Proto.guild } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p10_pb.cs b/BLHX.Server.Common/Proto/p10_pb.cs index 692153f..74057e3 100644 --- a/BLHX.Server.Common/Proto/p10_pb.cs +++ b/BLHX.Server.Common/Proto/p10_pb.cs @@ -5,11 +5,13 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 -namespace BLHX.Server.Common.Proto.p10 { +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +namespace BLHX.Server.Common.Proto.p10 +{ [global::ProtoBuf.ProtoContract(Name = @"cs_10001")] - public partial class Cs10001 : global::ProtoBuf.IExtensible { + public partial class Cs10001 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -25,8 +27,21 @@ namespace BLHX.Server.Common.Proto.p10 { } + [global::ProtoBuf.ProtoContract(Name = @"cs_10018")] + public partial class Cs10018 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"arg", IsRequired = true)] + public uint Arg { get; set; } + + } + [global::ProtoBuf.ProtoContract(Name = @"cs_10020")] - public partial class Cs10020 : global::ProtoBuf.IExtensible { + public partial class Cs10020 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -39,7 +54,8 @@ namespace BLHX.Server.Common.Proto.p10 { [global::ProtoBuf.ProtoMember(3, Name = @"arg2")] [global::System.ComponentModel.DefaultValue("")] - public string Arg2 { + public string Arg2 + { get => __pbn__Arg2 ?? ""; set => __pbn__Arg2 = value; } @@ -49,7 +65,8 @@ namespace BLHX.Server.Common.Proto.p10 { [global::ProtoBuf.ProtoMember(4, Name = @"arg3")] [global::System.ComponentModel.DefaultValue("")] - public string Arg3 { + public string Arg3 + { get => __pbn__Arg3 ?? ""; set => __pbn__Arg3 = value; } @@ -59,7 +76,8 @@ namespace BLHX.Server.Common.Proto.p10 { [global::ProtoBuf.ProtoMember(5, Name = @"arg4")] [global::System.ComponentModel.DefaultValue("")] - public string Arg4 { + public string Arg4 + { get => __pbn__Arg4 ?? ""; set => __pbn__Arg4 = value; } @@ -71,7 +89,8 @@ namespace BLHX.Server.Common.Proto.p10 { public string CheckKey { get; set; } [global::ProtoBuf.ProtoMember(7, Name = @"device")] - public uint Device { + public uint Device + { get => __pbn__Device.GetValueOrDefault(); set => __pbn__Device = value; } @@ -82,7 +101,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"cs_10022")] - public partial class Cs10022 : global::ProtoBuf.IExtensible { + public partial class Cs10022 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -108,7 +128,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"cs_10024")] - public partial class Cs10024 : global::ProtoBuf.IExtensible { + public partial class Cs10024 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -125,7 +146,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"cs_10026")] - public partial class Cs10026 : global::ProtoBuf.IExtensible { + public partial class Cs10026 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -136,7 +158,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"cs_10100")] - public partial class Cs10100 : global::ProtoBuf.IExtensible { + public partial class Cs10100 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -146,8 +169,27 @@ namespace BLHX.Server.Common.Proto.p10 { } + [global::ProtoBuf.ProtoContract(Name = @"cs_10700")] + public partial class Cs10700 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"platform", IsRequired = true)] + public string Platform { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"sub_platform", IsRequired = true)] + public string SubPlatform { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"pack_index", IsRequired = true)] + public uint PackIndex { get; set; } + + } + [global::ProtoBuf.ProtoContract(Name = @"cs_10800")] - public partial class Cs10800 : global::ProtoBuf.IExtensible { + public partial class Cs10800 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -160,8 +202,24 @@ namespace BLHX.Server.Common.Proto.p10 { } + [global::ProtoBuf.ProtoContract(Name = @"cs_10802")] + public partial class Cs10802 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"state", IsRequired = true)] + public uint State { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"platform", IsRequired = true)] + public uint Platform { get; set; } + + } + [global::ProtoBuf.ProtoContract(Name = @"cs_10992")] - public partial class Cs10992 : global::ProtoBuf.IExtensible { + public partial class Cs10992 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -180,10 +238,12 @@ namespace BLHX.Server.Common.Proto.p10 { [global::ProtoBuf.ProtoMember(5, Name = @"para3", IsRequired = true)] public string Para3 { get; set; } + } [global::ProtoBuf.ProtoContract(Name = @"cs_10993")] - public partial class Cs10993 : global::ProtoBuf.IExtensible { + public partial class Cs10993 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -198,7 +258,8 @@ namespace BLHX.Server.Common.Proto.p10 { public string ActionDes { get; set; } [global::ProtoBuf.ProtoMember(4, Name = @"action_arg")] - public uint ActionArg { + public uint ActionArg + { get => __pbn__ActionArg.GetValueOrDefault(); set => __pbn__ActionArg = value; } @@ -209,7 +270,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"cs_10994")] - public partial class Cs10994 : global::ProtoBuf.IExtensible { + public partial class Cs10994 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -220,7 +282,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"cs_10996")] - public partial class Cs10996 : global::ProtoBuf.IExtensible { + public partial class Cs10996 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -233,8 +296,51 @@ namespace BLHX.Server.Common.Proto.p10 { } + [global::ProtoBuf.ProtoContract(Name = @"login_addr")] + public partial class LoginAddr : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"desc", IsRequired = true)] + public string Desc { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"ip", IsRequired = true)] + public string Ip { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"port", IsRequired = true)] + public uint Port { get; set; } + + [global::ProtoBuf.ProtoMember(4, Name = @"proxy_ip")] + [global::System.ComponentModel.DefaultValue("")] + public string ProxyIp + { + get => __pbn__ProxyIp ?? ""; + set => __pbn__ProxyIp = value; + } + public bool ShouldSerializeProxyIp() => __pbn__ProxyIp != null; + public void ResetProxyIp() => __pbn__ProxyIp = null; + private string __pbn__ProxyIp; + + [global::ProtoBuf.ProtoMember(5, Name = @"proxy_port")] + public uint ProxyPort + { + get => __pbn__ProxyPort.GetValueOrDefault(); + set => __pbn__ProxyPort = value; + } + public bool ShouldSerializeProxyPort() => __pbn__ProxyPort != null; + public void ResetProxyPort() => __pbn__ProxyPort = null; + private uint? __pbn__ProxyPort; + + [global::ProtoBuf.ProtoMember(6, Name = @"type", IsRequired = true)] + public uint Type { get; set; } + + } + [global::ProtoBuf.ProtoContract(Name = @"noticeinfo")] - public partial class Noticeinfo : global::ProtoBuf.IExtensible { + public partial class Noticeinfo : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -251,7 +357,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"sc_10002")] - public partial class Sc10002 : global::ProtoBuf.IExtensible { + public partial class Sc10002 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -261,8 +368,21 @@ namespace BLHX.Server.Common.Proto.p10 { } + [global::ProtoBuf.ProtoContract(Name = @"sc_10019")] + public partial class Sc10019 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"serverlist")] + public global::System.Collections.Generic.List Serverlists { get; set; } = new global::System.Collections.Generic.List(); + + } + [global::ProtoBuf.ProtoContract(Name = @"sc_10021")] - public partial class Sc10021 : global::ProtoBuf.IExtensible { + public partial class Sc10021 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -283,7 +403,8 @@ namespace BLHX.Server.Common.Proto.p10 { public global::System.Collections.Generic.List NoticeLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(6, Name = @"device")] - public uint Device { + public uint Device + { get => __pbn__Device.GetValueOrDefault(); set => __pbn__Device = value; } @@ -297,7 +418,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"sc_10023")] - public partial class Sc10023 : global::ProtoBuf.IExtensible { + public partial class Sc10023 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -312,7 +434,8 @@ namespace BLHX.Server.Common.Proto.p10 { public string ServerTicket { get; set; } [global::ProtoBuf.ProtoMember(4, Name = @"server_load")] - public uint ServerLoad { + public uint ServerLoad + { get => __pbn__ServerLoad.GetValueOrDefault(); set => __pbn__ServerLoad = value; } @@ -321,7 +444,8 @@ namespace BLHX.Server.Common.Proto.p10 { private uint? __pbn__ServerLoad; [global::ProtoBuf.ProtoMember(5, Name = @"db_load")] - public uint DbLoad { + public uint DbLoad + { get => __pbn__DbLoad.GetValueOrDefault(); set => __pbn__DbLoad = value; } @@ -332,7 +456,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"sc_10025")] - public partial class Sc10025 : global::ProtoBuf.IExtensible { + public partial class Sc10025 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -346,7 +471,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"sc_10027")] - public partial class Sc10027 : global::ProtoBuf.IExtensible { + public partial class Sc10027 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -360,7 +486,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"sc_10101")] - public partial class Sc10101 : global::ProtoBuf.IExtensible { + public partial class Sc10101 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -370,8 +497,36 @@ namespace BLHX.Server.Common.Proto.p10 { } + [global::ProtoBuf.ProtoContract(Name = @"sc_10701")] + public partial class Sc10701 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"url", IsRequired = true)] + public string Url { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"version")] + public global::System.Collections.Generic.List Versions { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(3, Name = @"addr_list")] + public global::System.Collections.Generic.List AddrLists { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(4, Name = @"timestamp", IsRequired = true)] + public uint Timestamp { get; set; } + + [global::ProtoBuf.ProtoMember(5, Name = @"monday_0oclock_timestamp", IsRequired = true)] + public uint Monday0oclockTimestamp { get; set; } + + [global::ProtoBuf.ProtoMember(6, Name = @"cdn_list")] + public global::System.Collections.Generic.List CdnLists { get; set; } = new global::System.Collections.Generic.List(); + + } + [global::ProtoBuf.ProtoContract(Name = @"sc_10801")] - public partial class Sc10801 : global::ProtoBuf.IExtensible { + public partial class Sc10801 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -390,7 +545,8 @@ namespace BLHX.Server.Common.Proto.p10 { [global::ProtoBuf.ProtoMember(5, Name = @"proxy_ip")] [global::System.ComponentModel.DefaultValue("")] - public string ProxyIp { + public string ProxyIp + { get => __pbn__ProxyIp ?? ""; set => __pbn__ProxyIp = value; } @@ -399,7 +555,8 @@ namespace BLHX.Server.Common.Proto.p10 { private string __pbn__ProxyIp; [global::ProtoBuf.ProtoMember(6, Name = @"proxy_port")] - public uint ProxyPort { + public uint ProxyPort + { get => __pbn__ProxyPort.GetValueOrDefault(); set => __pbn__ProxyPort = value; } @@ -416,10 +573,50 @@ namespace BLHX.Server.Common.Proto.p10 { [global::ProtoBuf.ProtoMember(9, Name = @"monday_0oclock_timestamp", IsRequired = true)] public uint Monday0oclockTimestamp { get; set; } + [global::ProtoBuf.ProtoMember(10, Name = @"cdn_list")] + public global::System.Collections.Generic.List CdnLists { get; set; } = new global::System.Collections.Generic.List(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_10803")] + public partial class Sc10803 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"gateway_ip", IsRequired = true)] + public string GatewayIp { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"gateway_port", IsRequired = true)] + public uint GatewayPort { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"proxy_ip")] + [global::System.ComponentModel.DefaultValue("")] + public string ProxyIp + { + get => __pbn__ProxyIp ?? ""; + set => __pbn__ProxyIp = value; + } + public bool ShouldSerializeProxyIp() => __pbn__ProxyIp != null; + public void ResetProxyIp() => __pbn__ProxyIp = null; + private string __pbn__ProxyIp; + + [global::ProtoBuf.ProtoMember(4, Name = @"proxy_port")] + public uint ProxyPort + { + get => __pbn__ProxyPort.GetValueOrDefault(); + set => __pbn__ProxyPort = value; + } + public bool ShouldSerializeProxyPort() => __pbn__ProxyPort != null; + public void ResetProxyPort() => __pbn__ProxyPort = null; + private uint? __pbn__ProxyPort; + } [global::ProtoBuf.ProtoContract(Name = @"sc_10995")] - public partial class Sc10995 : global::ProtoBuf.IExtensible { + public partial class Sc10995 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -430,7 +627,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"sc_10997")] - public partial class Sc10997 : global::ProtoBuf.IExtensible { + public partial class Sc10997 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -459,7 +657,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"sc_10998")] - public partial class Sc10998 : global::ProtoBuf.IExtensible { + public partial class Sc10998 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -473,7 +672,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"sc_10999")] - public partial class Sc10999 : global::ProtoBuf.IExtensible { + public partial class Sc10999 : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -484,7 +684,8 @@ namespace BLHX.Server.Common.Proto.p10 { } [global::ProtoBuf.ProtoContract(Name = @"serverinfo")] - public partial class Serverinfo : global::ProtoBuf.IExtensible { + public partial class Serverinfo : global::ProtoBuf.IExtensible + { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); @@ -505,7 +706,8 @@ namespace BLHX.Server.Common.Proto.p10 { public string Name { get; set; } [global::ProtoBuf.ProtoMember(6, Name = @"tag_state")] - public uint TagState { + public uint TagState + { get => __pbn__TagState.GetValueOrDefault(); set => __pbn__TagState = value; } @@ -514,7 +716,8 @@ namespace BLHX.Server.Common.Proto.p10 { private uint? __pbn__TagState; [global::ProtoBuf.ProtoMember(7, Name = @"sort")] - public uint Sort { + public uint Sort + { get => __pbn__Sort.GetValueOrDefault(); set => __pbn__Sort = value; } @@ -524,7 +727,8 @@ namespace BLHX.Server.Common.Proto.p10 { [global::ProtoBuf.ProtoMember(8, Name = @"proxy_ip")] [global::System.ComponentModel.DefaultValue("")] - public string ProxyIp { + public string ProxyIp + { get => __pbn__ProxyIp ?? ""; set => __pbn__ProxyIp = value; } @@ -533,7 +737,8 @@ namespace BLHX.Server.Common.Proto.p10 { private string __pbn__ProxyIp; [global::ProtoBuf.ProtoMember(9, Name = @"proxy_port")] - public uint ProxyPort { + public uint ProxyPort + { get => __pbn__ProxyPort.GetValueOrDefault(); set => __pbn__ProxyPort = value; } @@ -545,5 +750,5 @@ namespace BLHX.Server.Common.Proto.p10 { } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p11_pb.cs b/BLHX.Server.Common/Proto/p11_pb.cs index db09c20..dc40a81 100644 --- a/BLHX.Server.Common/Proto/p11_pb.cs +++ b/BLHX.Server.Common/Proto/p11_pb.cs @@ -5,7 +5,9 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +using BLHX.Server.Common.Proto.p12; + namespace BLHX.Server.Common.Proto.p11 { @@ -89,6 +91,20 @@ namespace BLHX.Server.Common.Proto.p11 [global::ProtoBuf.ProtoMember(15, Name = @"buff_list")] public global::System.Collections.Generic.List BuffLists { get; set; } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(16, Name = @"str_data1")] + [global::System.ComponentModel.DefaultValue("")] + public string StrData1 + { + get => __pbn__StrData1 ?? ""; + set => __pbn__StrData1 = value; + } + public bool ShouldSerializeStrData1() => __pbn__StrData1 != null; + public void ResetStrData1() => __pbn__StrData1 = null; + private string __pbn__StrData1; + + [global::ProtoBuf.ProtoMember(17, Name = @"data4_list")] + public global::System.Collections.Generic.List Data4Lists { get; set; } = new global::System.Collections.Generic.List(); + } [global::ProtoBuf.ProtoContract(Name = @"benefitbuff")] @@ -301,6 +317,42 @@ namespace BLHX.Server.Common.Proto.p11 } + [global::ProtoBuf.ProtoContract(Name = @"cs_11029")] + public partial class Cs11029 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"track_typ", IsRequired = true)] + public uint TrackTyp { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"int_arg1", IsRequired = true)] + public uint IntArg1 { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"int_arg2", IsRequired = true)] + public uint IntArg2 { get; set; } + + [global::ProtoBuf.ProtoMember(4, Name = @"int_arg3", IsRequired = true)] + public uint IntArg3 { get; set; } + + [global::ProtoBuf.ProtoMember(5, Name = @"str_arg1", IsRequired = true)] + public string StrArg1 { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_11030")] + public partial class Cs11030 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"livingarea_cover_id", IsRequired = true)] + public uint LivingareaCoverId { get; set; } + + } + [global::ProtoBuf.ProtoContract(Name = @"cs_11100")] public partial class Cs11100 : global::ProtoBuf.IExtensible { @@ -450,6 +502,24 @@ namespace BLHX.Server.Common.Proto.p11 } + [global::ProtoBuf.ProtoContract(Name = @"cs_11212")] + public partial class Cs11212 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"track_typ", IsRequired = true)] + public uint TrackTyp { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"ship_tid", IsRequired = true)] + public uint ShipTid { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"from", IsRequired = true)] + public uint From { get; set; } + + } + [global::ProtoBuf.ProtoContract(Name = @"cs_11401")] public partial class Cs11401 : global::ProtoBuf.IExtensible { @@ -699,24 +769,6 @@ namespace BLHX.Server.Common.Proto.p11 } - [global::ProtoBuf.ProtoContract(Name = @"groupinfo")] - public partial class Groupinfo : global::ProtoBuf.IExtensible - { - private global::ProtoBuf.IExtension __pbn__extensionData; - global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) - => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - - [global::ProtoBuf.ProtoMember(1, Name = @"id", IsRequired = true)] - public uint Id { get; set; } - - [global::ProtoBuf.ProtoMember(2, Name = @"ship_list")] - 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(); - - } - [global::ProtoBuf.ProtoContract(Name = @"ins_message")] public partial class InsMessage : global::ProtoBuf.IExtensible { @@ -869,6 +921,21 @@ namespace BLHX.Server.Common.Proto.p11 } + [global::ProtoBuf.ProtoContract(Name = @"livingarea_cover")] + public partial class LivingareaCover : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"id", IsRequired = true)] + public uint Id { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"covers")] + public global::System.Collections.Generic.List Covers { get; set; } = new global::System.Collections.Generic.List(); + + } + [global::ProtoBuf.ProtoContract(Name = @"noticeinfo")] public partial class Noticeinfo : global::ProtoBuf.IExtensible { @@ -897,6 +964,18 @@ namespace BLHX.Server.Common.Proto.p11 [global::ProtoBuf.ProtoMember(7, Name = @"content", IsRequired = true)] public string Content { get; set; } + [global::ProtoBuf.ProtoMember(8, Name = @"tag_type", IsRequired = true)] + public uint TagType { get; set; } + + [global::ProtoBuf.ProtoMember(9, Name = @"icon", IsRequired = true)] + public uint Icon { get; set; } + + [global::ProtoBuf.ProtoMember(10, Name = @"track", IsRequired = true)] + public string Track { get; set; } + + [global::ProtoBuf.ProtoMember(11, Name = @"priority", IsRequired = true)] + public uint Priority { get; set; } + } [global::ProtoBuf.ProtoContract(Name = @"resource")] @@ -1107,6 +1186,18 @@ namespace BLHX.Server.Common.Proto.p11 [global::ProtoBuf.ProtoMember(46, Name = @"child_display", IsRequired = true)] public uint ChildDisplay { get; set; } + [global::ProtoBuf.ProtoMember(47, Name = @"cover", IsRequired = true)] + public LivingareaCover Cover { get; set; } + + [global::ProtoBuf.ProtoMember(48, Name = @"mail_storeroom_lv", IsRequired = true)] + public uint MailStoreroomLv { get; set; } + + [global::ProtoBuf.ProtoMember(49, Name = @"battle_ui_list")] + public global::System.Collections.Generic.List BattleUiLists { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(50, Name = @"battle_ui", IsRequired = true)] + public uint BattleUi { get; set; } + } [global::ProtoBuf.ProtoContract(Name = @"sc_11004")] @@ -1271,6 +1362,18 @@ namespace BLHX.Server.Common.Proto.p11 } + [global::ProtoBuf.ProtoContract(Name = @"sc_11031")] + public partial class Sc11031 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } + + } + [global::ProtoBuf.ProtoContract(Name = @"sc_11101")] public partial class Sc11101 : global::ProtoBuf.IExtensible { @@ -1416,7 +1519,7 @@ namespace BLHX.Server.Common.Proto.p11 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"notice_list")] - public global::System.Collections.Generic.List NoticeLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List NoticeLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -1857,5 +1960,5 @@ namespace BLHX.Server.Common.Proto.p11 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p12_pb.cs b/BLHX.Server.Common/Proto/p12_pb.cs index edeb169..89efbf5 100644 --- a/BLHX.Server.Common/Proto/p12_pb.cs +++ b/BLHX.Server.Common/Proto/p12_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p12 { @@ -776,7 +776,7 @@ namespace BLHX.Server.Common.Proto.p12 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"group_list")] - public global::System.Collections.Generic.List GroupLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List GroupLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -812,7 +812,7 @@ namespace BLHX.Server.Common.Proto.p12 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"group", IsRequired = true)] - public Groupinfo Group { get; set; } + public global::BLHX.Server.Common.Proto.p12.Groupinfo Group { get; set; } } @@ -896,5 +896,5 @@ namespace BLHX.Server.Common.Proto.p12 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p13_pb.cs b/BLHX.Server.Common/Proto/p13_pb.cs index 3fbaf56..d935952 100644 --- a/BLHX.Server.Common/Proto/p13_pb.cs +++ b/BLHX.Server.Common/Proto/p13_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p13 { @@ -1145,5 +1145,5 @@ namespace BLHX.Server.Common.Proto.p13 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p14_pb.cs b/BLHX.Server.Common/Proto/p14_pb.cs index fddd1c0..4bde134 100644 --- a/BLHX.Server.Common/Proto/p14_pb.cs +++ b/BLHX.Server.Common/Proto/p14_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p14 { @@ -428,5 +428,5 @@ namespace BLHX.Server.Common.Proto.p14 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p15_pb.cs b/BLHX.Server.Common/Proto/p15_pb.cs index 1e5ab26..2e89f3c 100644 --- a/BLHX.Server.Common/Proto/p15_pb.cs +++ b/BLHX.Server.Common/Proto/p15_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p15 { @@ -233,5 +233,5 @@ namespace BLHX.Server.Common.Proto.p15 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p16_pb.cs b/BLHX.Server.Common/Proto/p16_pb.cs index c268721..d74ab11 100644 --- a/BLHX.Server.Common/Proto/p16_pb.cs +++ b/BLHX.Server.Common/Proto/p16_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p16 { @@ -314,5 +314,5 @@ namespace BLHX.Server.Common.Proto.p16 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p17_pb.cs b/BLHX.Server.Common/Proto/p17_pb.cs index b661772..c2a65de 100644 --- a/BLHX.Server.Common/Proto/p17_pb.cs +++ b/BLHX.Server.Common/Proto/p17_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p17 { @@ -507,6 +507,9 @@ namespace BLHX.Server.Common.Proto.p17 [global::ProtoBuf.ProtoMember(2, Name = @"ship_discuss")] public ShipDiscussInfo ShipDiscuss { get; set; } + [global::ProtoBuf.ProtoMember(3, Name = @"need_level", IsRequired = true)] + public uint NeedLevel { get; set; } + } [global::ProtoBuf.ProtoContract(Name = @"sc_17106")] @@ -571,7 +574,7 @@ namespace BLHX.Server.Common.Proto.p17 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"list")] - public global::System.Collections.Generic.List Lists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Lists { get; set; } = new global::System.Collections.Generic.List(); } @@ -824,5 +827,5 @@ namespace BLHX.Server.Common.Proto.p17 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p18_pb.cs b/BLHX.Server.Common/Proto/p18_pb.cs index 95e811a..57d7037 100644 --- a/BLHX.Server.Common/Proto/p18_pb.cs +++ b/BLHX.Server.Common/Proto/p18_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p18 { @@ -406,5 +406,5 @@ namespace BLHX.Server.Common.Proto.p18 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p19_pb.cs b/BLHX.Server.Common/Proto/p19_pb.cs index 0c673df..3a47b3c 100644 --- a/BLHX.Server.Common/Proto/p19_pb.cs +++ b/BLHX.Server.Common/Proto/p19_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p19 { @@ -1068,5 +1068,5 @@ namespace BLHX.Server.Common.Proto.p19 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p20_pb.cs b/BLHX.Server.Common/Proto/p20_pb.cs index 57588da..0214485 100644 --- a/BLHX.Server.Common/Proto/p20_pb.cs +++ b/BLHX.Server.Common/Proto/p20_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p20 { @@ -24,6 +24,24 @@ namespace BLHX.Server.Common.Proto.p20 } + [global::ProtoBuf.ProtoContract(Name = @"act_task_init_list")] + public partial class ActTaskInitList : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"act_id", IsRequired = true)] + public uint ActId { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"tasks")] + public global::System.Collections.Generic.List Tasks { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(3, Name = @"finish_ids")] + public global::System.Collections.Generic.List FinishIds { get; set; } = new global::System.Collections.Generic.List(); + + } + [global::ProtoBuf.ProtoContract(Name = @"act_task_list")] public partial class ActTaskList : global::ProtoBuf.IExtensible { @@ -156,6 +174,24 @@ namespace BLHX.Server.Common.Proto.p20 } + [global::ProtoBuf.ProtoContract(Name = @"cs_20207")] + public partial class Cs20207 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"act_id", IsRequired = true)] + public uint ActId { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"task_id", IsRequired = true)] + public uint TaskId { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"item_cost", IsRequired = true)] + public uint ItemCost { get; set; } + + } + [global::ProtoBuf.ProtoContract(Name = @"sc_20001")] public partial class Sc20001 : global::ProtoBuf.IExtensible { @@ -308,7 +344,7 @@ namespace BLHX.Server.Common.Proto.p20 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"task")] - public global::System.Collections.Generic.List Tasks { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Tasks { get; set; } = new global::System.Collections.Generic.List(); } @@ -359,7 +395,7 @@ namespace BLHX.Server.Common.Proto.p20 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"next")] - public WeeklyTask Next { get; set; } + public global::BLHX.Server.Common.Proto.guild.WeeklyTask Next { get; set; } } @@ -377,7 +413,7 @@ namespace BLHX.Server.Common.Proto.p20 public uint Pt { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"next")] - public global::System.Collections.Generic.List Nexts { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Nexts { get; set; } = new global::System.Collections.Generic.List(); } @@ -404,7 +440,7 @@ namespace BLHX.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(); } @@ -459,6 +495,21 @@ namespace BLHX.Server.Common.Proto.p20 } + [global::ProtoBuf.ProtoContract(Name = @"sc_20208")] + public partial class Sc20208 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + 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(); + + } + [global::ProtoBuf.ProtoContract(Name = @"task_add")] public partial class TaskAdd : global::ProtoBuf.IExtensible { @@ -528,7 +579,7 @@ namespace BLHX.Server.Common.Proto.p20 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"task")] - public global::System.Collections.Generic.List Tasks { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Tasks { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(2, Name = @"pt", IsRequired = true)] public uint Pt { get; set; } @@ -555,5 +606,5 @@ namespace BLHX.Server.Common.Proto.p20 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p22_pb.cs b/BLHX.Server.Common/Proto/p22_pb.cs index 94cf135..a3fea58 100644 --- a/BLHX.Server.Common/Proto/p22_pb.cs +++ b/BLHX.Server.Common/Proto/p22_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p22 { @@ -336,5 +336,5 @@ namespace BLHX.Server.Common.Proto.p22 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p24_pb.cs b/BLHX.Server.Common/Proto/p24_pb.cs index b19a81a..2bb4388 100644 --- a/BLHX.Server.Common/Proto/p24_pb.cs +++ b/BLHX.Server.Common/Proto/p24_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p24 { @@ -68,7 +68,7 @@ namespace BLHX.Server.Common.Proto.p24 public uint ActivityId { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"group_list")] - public global::System.Collections.Generic.List GroupLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List GroupLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"mode", IsRequired = true)] public uint Mode { get; set; } @@ -232,6 +232,9 @@ namespace BLHX.Server.Common.Proto.p24 [global::ProtoBuf.ProtoMember(3, Name = @"awards")] public global::System.Collections.Generic.List Awards { get; set; } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(4, Name = @"pass_ids")] + public global::System.Collections.Generic.List PassIds { get; set; } = new global::System.Collections.Generic.List(); + } [global::ProtoBuf.ProtoContract(Name = @"sc_24023")] @@ -281,5 +284,5 @@ namespace BLHX.Server.Common.Proto.p24 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p25_pb.cs b/BLHX.Server.Common/Proto/p25_pb.cs index 1a5f27c..3618805 100644 --- a/BLHX.Server.Common/Proto/p25_pb.cs +++ b/BLHX.Server.Common/Proto/p25_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p25 { @@ -658,5 +658,5 @@ namespace BLHX.Server.Common.Proto.p25 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p26_pb.cs b/BLHX.Server.Common/Proto/p26_pb.cs index 4382a89..c2b696c 100644 --- a/BLHX.Server.Common/Proto/p26_pb.cs +++ b/BLHX.Server.Common/Proto/p26_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p26 { @@ -483,6 +483,39 @@ namespace BLHX.Server.Common.Proto.p26 } + [global::ProtoBuf.ProtoContract(Name = @"cs_26160")] + public partial class Cs26160 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"act_id", IsRequired = true)] + public uint ActId { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"int_value")] + public uint IntValue + { + get => __pbn__IntValue.GetValueOrDefault(); + set => __pbn__IntValue = value; + } + public bool ShouldSerializeIntValue() => __pbn__IntValue != null; + public void ResetIntValue() => __pbn__IntValue = null; + private uint? __pbn__IntValue; + + [global::ProtoBuf.ProtoMember(3, Name = @"str_value")] + [global::System.ComponentModel.DefaultValue("")] + public string StrValue + { + get => __pbn__StrValue ?? ""; + set => __pbn__StrValue = value; + } + public bool ShouldSerializeStrValue() => __pbn__StrValue != null; + public void ResetStrValue() => __pbn__StrValue = null; + private string __pbn__StrValue; + + } + [global::ProtoBuf.ProtoContract(Name = @"friendscore")] public partial class Friendscore : global::ProtoBuf.IExtensible { @@ -502,6 +535,9 @@ namespace BLHX.Server.Common.Proto.p26 [global::ProtoBuf.ProtoMember(4, Name = @"display", IsRequired = true)] public global::BLHX.Server.Common.Proto.common.Displayinfo Display { get; set; } + [global::ProtoBuf.ProtoMember(5, Name = @"time_data", IsRequired = true)] + public uint TimeData { get; set; } + } [global::ProtoBuf.ProtoContract(Name = @"gameroom")] @@ -570,7 +606,7 @@ namespace BLHX.Server.Common.Proto.p26 public uint Key { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"value_list")] - public global::System.Collections.Generic.List ValueLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ValueLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -588,7 +624,7 @@ namespace BLHX.Server.Common.Proto.p26 public global::System.Collections.Generic.List Datas { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"date1_key_value_list")] - public global::System.Collections.Generic.List Date1KeyValueLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Date1KeyValueLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -633,7 +669,7 @@ namespace BLHX.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(); } @@ -1119,7 +1155,7 @@ namespace BLHX.Server.Common.Proto.p26 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"goods")] - public global::System.Collections.Generic.List Goods { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Goods { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(2, Name = @"next_flash_time", IsRequired = true)] public uint NextFlashTime { get; set; } @@ -1209,6 +1245,18 @@ namespace BLHX.Server.Common.Proto.p26 } + [global::ProtoBuf.ProtoContract(Name = @"sc_26161")] + public partial class Sc26161 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } + + } + [global::ProtoBuf.ProtoContract(Name = @"select_info")] public partial class SelectInfo : global::ProtoBuf.IExtensible { @@ -1226,5 +1274,5 @@ namespace BLHX.Server.Common.Proto.p26 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p27_pb.cs b/BLHX.Server.Common/Proto/p27_pb.cs index 149f11d..f915ded 100644 --- a/BLHX.Server.Common/Proto/p27_pb.cs +++ b/BLHX.Server.Common/Proto/p27_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p27 { @@ -1031,5 +1031,5 @@ namespace BLHX.Server.Common.Proto.p27 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p28_pb.cs b/BLHX.Server.Common/Proto/p28_pb.cs new file mode 100644 index 0000000..6d9e5a9 --- /dev/null +++ b/BLHX.Server.Common/Proto/p28_pb.cs @@ -0,0 +1,453 @@ +// +// This file was generated by a tool; you should avoid making direct changes. +// Consider using 'partial classes' to extend these types +// Input: p28_pb.proto +// + +#region Designer generated code +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +namespace BLHX.Server.Common.Proto.p28 +{ + + [global::ProtoBuf.ProtoContract(Name = @"apartment_furniture")] + public partial class ApartmentFurniture : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"furniture_id", IsRequired = true)] + public uint FurnitureId { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"slot_id", IsRequired = true)] + public uint SlotId { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"apartment_gift")] + public partial class ApartmentGift : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"gift_id", IsRequired = true)] + public uint GiftId { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"number", IsRequired = true)] + public uint Number { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"used_number", IsRequired = true)] + public uint UsedNumber { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"apartment_gift_shop")] + public partial class ApartmentGiftShop : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"gift_id", IsRequired = true)] + public uint GiftId { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"count", IsRequired = true)] + public uint Count { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"apartment_give_gift")] + public partial class ApartmentGiveGift : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"gift_id", IsRequired = true)] + public uint GiftId { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"number", IsRequired = true)] + public uint Number { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"apartment_room")] + public partial class ApartmentRoom : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"id", IsRequired = true)] + public uint Id { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"furnitures")] + public global::System.Collections.Generic.List Furnitures { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(3, Name = @"collections")] + public global::System.Collections.Generic.List Collections { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(4, Name = @"ships")] + public global::System.Collections.Generic.List Ships { get; set; } = new global::System.Collections.Generic.List(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"apartment_ship")] + public partial class ApartmentShip : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"ship_group", IsRequired = true)] + public uint ShipGroup { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"favor_lv", IsRequired = true)] + public uint FavorLv { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"favor_exp", IsRequired = true)] + public uint FavorExp { get; set; } + + [global::ProtoBuf.ProtoMember(4, Name = @"regular_trigger")] + public global::System.Collections.Generic.List RegularTriggers { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(5, Name = @"daily_favor", IsRequired = true)] + public uint DailyFavor { get; set; } + + [global::ProtoBuf.ProtoMember(6, Name = @"dialogues")] + public global::System.Collections.Generic.List Dialogues { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(7, Name = @"skins")] + public global::System.Collections.Generic.List Skins { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(8, Name = @"cur_skin", IsRequired = true)] + public uint CurSkin { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_28001")] + public partial class Cs28001 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"room_id", IsRequired = true)] + public uint RoomId { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_28003")] + public partial class Cs28003 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"ship_group", IsRequired = true)] + public uint ShipGroup { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"trigger_id", IsRequired = true)] + public uint TriggerId { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_28005")] + public partial class Cs28005 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"ship_group", IsRequired = true)] + public uint ShipGroup { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_28007")] + public partial class Cs28007 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"room_id", IsRequired = true)] + public uint RoomId { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"furnitures")] + public global::System.Collections.Generic.List Furnitures { get; set; } = new global::System.Collections.Generic.List(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_28009")] + public partial class Cs28009 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"ship_group", IsRequired = true)] + public uint ShipGroup { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"gifts")] + public global::System.Collections.Generic.List Gifts { get; set; } = new global::System.Collections.Generic.List(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_28011")] + public partial class Cs28011 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"room_id", IsRequired = true)] + public uint RoomId { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"collection_id", IsRequired = true)] + public uint CollectionId { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"ship_group", IsRequired = true)] + public uint ShipGroup { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_28013")] + public partial class Cs28013 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"ship_group", IsRequired = true)] + public uint ShipGroup { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"skin", IsRequired = true)] + public uint Skin { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_28015")] + public partial class Cs28015 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"dialog_id", IsRequired = true)] + public uint DialogId { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_28017")] + public partial class Cs28017 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"type", IsRequired = true)] + public uint Type { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_28019")] + public partial class Cs28019 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"room_id", IsRequired = true)] + public uint RoomId { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"ship_group", IsRequired = true)] + public uint ShipGroup { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_28090")] + public partial class Cs28090 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"track_typ", IsRequired = true)] + public uint TrackTyp { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"int_args")] + public global::System.Collections.Generic.List IntArgs { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(3, Name = @"str_args")] + public global::System.Collections.Generic.List StrArgs { get; set; } = new global::System.Collections.Generic.List(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_28000")] + public partial class Sc28000 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"gifts")] + public global::System.Collections.Generic.List Gifts { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(2, Name = @"ships")] + public global::System.Collections.Generic.List Ships { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(3, Name = @"gift_daily")] + public global::System.Collections.Generic.List GiftDailies { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(4, Name = @"gift_permanent")] + public global::System.Collections.Generic.List GiftPermanents { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(5, Name = @"furniture_daily")] + public global::System.Collections.Generic.List FurnitureDailies { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(6, Name = @"furniture_permanent")] + public global::System.Collections.Generic.List FurniturePermanents { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(7, Name = @"daily_vigor_max", IsRequired = true)] + public uint DailyVigorMax { get; set; } + + [global::ProtoBuf.ProtoMember(8, Name = @"rooms")] + public global::System.Collections.Generic.List Rooms { get; set; } = new global::System.Collections.Generic.List(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_28002")] + public partial class Sc28002 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"room", IsRequired = true)] + public ApartmentRoom Room { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_28004")] + public partial class Sc28004 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_28006")] + public partial class Sc28006 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + 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(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_28008")] + public partial class Sc28008 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_28010")] + public partial class Sc28010 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_28012")] + public partial class Sc28012 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_28014")] + public partial class Sc28014 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_28016")] + public partial class Sc28016 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + 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(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_28018")] + public partial class Sc28018 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_28020")] + public partial class Sc28020 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } + + } + +} + +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#endregion diff --git a/BLHX.Server.Common/Proto/p30_pb.cs b/BLHX.Server.Common/Proto/p30_pb.cs index 0c3d8be..1c9a0b2 100644 --- a/BLHX.Server.Common/Proto/p30_pb.cs +++ b/BLHX.Server.Common/Proto/p30_pb.cs @@ -5,28 +5,10 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p30 { - [global::ProtoBuf.ProtoContract(Name = @"attachment")] - public partial class Attachment : global::ProtoBuf.IExtensible - { - private global::ProtoBuf.IExtension __pbn__extensionData; - global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) - => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - - [global::ProtoBuf.ProtoMember(1, Name = @"type", IsRequired = true)] - public uint Type { get; set; } - - [global::ProtoBuf.ProtoMember(2, Name = @"id", IsRequired = true)] - public uint Id { get; set; } - - [global::ProtoBuf.ProtoMember(3, Name = @"number", IsRequired = true)] - public uint Number { get; set; } - - } - [global::ProtoBuf.ProtoContract(Name = @"cs_30002")] public partial class Cs30002 : global::ProtoBuf.IExtensible { @@ -37,15 +19,11 @@ namespace BLHX.Server.Common.Proto.p30 [global::ProtoBuf.ProtoMember(1, Name = @"type", IsRequired = true)] public uint Type { get; set; } - [global::ProtoBuf.ProtoMember(2, Name = @"split_id")] - public uint SplitId - { - get => __pbn__SplitId.GetValueOrDefault(); - set => __pbn__SplitId = value; - } - public bool ShouldSerializeSplitId() => __pbn__SplitId != null; - public void ResetSplitId() => __pbn__SplitId = null; - private uint? __pbn__SplitId; + [global::ProtoBuf.ProtoMember(2, Name = @"index_begin", IsRequired = true)] + public uint IndexBegin { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"index_end", IsRequired = true)] + public uint IndexEnd { get; set; } } @@ -56,8 +34,11 @@ namespace BLHX.Server.Common.Proto.p30 global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1, Name = @"id")] - public global::System.Collections.Generic.List Ids { get; set; } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(1, Name = @"index_begin", IsRequired = true)] + public uint IndexBegin { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"index_end", IsRequired = true)] + public uint IndexEnd { get; set; } } @@ -68,8 +49,11 @@ namespace BLHX.Server.Common.Proto.p30 global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1, Name = @"id", IsRequired = true)] - public uint Id { get; set; } + [global::ProtoBuf.ProtoMember(1, Name = @"cmd", IsRequired = true)] + public uint Cmd { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"match_list")] + public global::System.Collections.Generic.List MatchLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -80,8 +64,8 @@ namespace BLHX.Server.Common.Proto.p30 global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1, Name = @"id", IsRequired = true)] - public uint Id { get; set; } + [global::ProtoBuf.ProtoMember(1, Name = @"mail_id", IsRequired = true)] + public uint MailId { get; set; } } @@ -92,34 +76,111 @@ namespace BLHX.Server.Common.Proto.p30 global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1, Name = @"id", IsRequired = true)] - public uint Id { get; set; } - - [global::ProtoBuf.ProtoMember(2, Name = @"flag", IsRequired = true)] - public uint Flag { get; set; } + [global::ProtoBuf.ProtoMember(1, Name = @"arg", IsRequired = true)] + public uint Arg { get; set; } } - [global::ProtoBuf.ProtoContract(Name = @"mail_detail")] - public partial class MailDetail : global::ProtoBuf.IExtensible + [global::ProtoBuf.ProtoContract(Name = @"cs_30012")] + public partial class Cs30012 : global::ProtoBuf.IExtensible { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1, Name = @"id", IsRequired = true)] - public uint Id { get; set; } + [global::ProtoBuf.ProtoMember(1, Name = @"oil", IsRequired = true)] + public uint Oil { get; set; } - [global::ProtoBuf.ProtoMember(2, Name = @"content", IsRequired = true)] - public string Content { get; set; } - - [global::ProtoBuf.ProtoMember(3, Name = @"attachment_list")] - public global::System.Collections.Generic.List AttachmentLists { get; set; } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(2, Name = @"gold", IsRequired = true)] + public uint Gold { get; set; } } - [global::ProtoBuf.ProtoContract(Name = @"mail_sigle")] - public partial class MailSigle : global::ProtoBuf.IExtensible + [global::ProtoBuf.ProtoContract(Name = @"cs_30014")] + public partial class Cs30014 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"id_list")] + public global::System.Collections.Generic.List IdLists { get; set; } = new global::System.Collections.Generic.List(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_30016")] + public partial class Cs30016 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"item_id", IsRequired = true)] + public uint ItemId { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"groupid", IsRequired = true)] + public uint Groupid { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_30018")] + public partial class Cs30018 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"item_id", IsRequired = true)] + public uint ItemId { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"year")] + public uint Year + { + get => __pbn__Year.GetValueOrDefault(); + set => __pbn__Year = value; + } + public bool ShouldSerializeYear() => __pbn__Year != null; + public void ResetYear() => __pbn__Year = null; + private uint? __pbn__Year; + + [global::ProtoBuf.ProtoMember(3, Name = @"groupid")] + public uint Groupid + { + get => __pbn__Groupid.GetValueOrDefault(); + set => __pbn__Groupid = value; + } + public bool ShouldSerializeGroupid() => __pbn__Groupid != null; + public void ResetGroupid() => __pbn__Groupid = null; + private uint? __pbn__Groupid; + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_30102")] + public partial class Cs30102 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"type", IsRequired = true)] + public uint Type { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"cs_30104")] + public partial class Cs30104 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"reward_id", IsRequired = true)] + public uint RewardId { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"mail_info")] + public partial class MailInfo : global::ProtoBuf.IExtensible { private global::ProtoBuf.IExtension __pbn__extensionData; global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) @@ -134,20 +195,77 @@ namespace BLHX.Server.Common.Proto.p30 [global::ProtoBuf.ProtoMember(3, Name = @"title", IsRequired = true)] public string Title { get; set; } - [global::ProtoBuf.ProtoMember(4, Name = @"attach_flag", IsRequired = true)] + [global::ProtoBuf.ProtoMember(4, Name = @"content", IsRequired = true)] + public string Content { get; set; } + + [global::ProtoBuf.ProtoMember(5, Name = @"attachment_list")] + public global::System.Collections.Generic.List AttachmentLists { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(6, Name = @"attach_flag", IsRequired = true)] public uint AttachFlag { get; set; } - [global::ProtoBuf.ProtoMember(5, Name = @"read_flag", IsRequired = true)] + [global::ProtoBuf.ProtoMember(7, Name = @"read_flag", IsRequired = true)] public uint ReadFlag { get; set; } - [global::ProtoBuf.ProtoMember(6, Name = @"attachment_list")] - public global::System.Collections.Generic.List AttachmentLists { get; set; } = new global::System.Collections.Generic.List(); - - [global::ProtoBuf.ProtoMember(7, Name = @"imp_flag", IsRequired = true)] + [global::ProtoBuf.ProtoMember(8, Name = @"imp_flag", IsRequired = true)] public uint ImpFlag { get; set; } } + [global::ProtoBuf.ProtoContract(Name = @"mail_simple_info")] + public partial class MailSimpleInfo : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"id", IsRequired = true)] + public uint Id { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"date", IsRequired = true)] + public uint Date { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"title", IsRequired = true)] + public string Title { get; set; } + + [global::ProtoBuf.ProtoMember(4, Name = @"content", IsRequired = true)] + public string Content { get; set; } + + [global::ProtoBuf.ProtoMember(5, Name = @"attachment_list")] + public global::System.Collections.Generic.List AttachmentLists { get; set; } = new global::System.Collections.Generic.List(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"mail_title")] + public partial class MailTitle : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"id", IsRequired = true)] + public uint Id { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"title", IsRequired = true)] + public string Title { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"match_expression")] + public partial class MatchExpression : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"type", IsRequired = true)] + public uint Type { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"arg_list")] + public global::System.Collections.Generic.List ArgLists { get; set; } = new global::System.Collections.Generic.List(); + + } + [global::ProtoBuf.ProtoContract(Name = @"sc_30001")] public partial class Sc30001 : global::ProtoBuf.IExtensible { @@ -158,7 +276,7 @@ namespace BLHX.Server.Common.Proto.p30 [global::ProtoBuf.ProtoMember(1, Name = @"unread_number", IsRequired = true)] public uint UnreadNumber { get; set; } - [global::ProtoBuf.ProtoMember(3, Name = @"total_number", IsRequired = true)] + [global::ProtoBuf.ProtoMember(2, Name = @"total_number", IsRequired = true)] public uint TotalNumber { get; set; } } @@ -171,7 +289,7 @@ namespace BLHX.Server.Common.Proto.p30 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"mail_list")] - public global::System.Collections.Generic.List MailLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List MailLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -182,8 +300,8 @@ namespace BLHX.Server.Common.Proto.p30 global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1, Name = @"attachment_list")] - public global::System.Collections.Generic.List AttachmentLists { get; set; } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(1, Name = @"mail_list")] + public global::System.Collections.Generic.List MailLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -194,8 +312,17 @@ namespace BLHX.Server.Common.Proto.p30 global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1, Name = @"id_list")] - public global::System.Collections.Generic.List IdLists { get; set; } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"mail_id_list")] + public global::System.Collections.Generic.List MailIdLists { 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(); + + [global::ProtoBuf.ProtoMember(4, Name = @"unread_number", IsRequired = true)] + public uint UnreadNumber { get; set; } } @@ -206,8 +333,8 @@ namespace BLHX.Server.Common.Proto.p30 global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - [global::ProtoBuf.ProtoMember(1, Name = @"detail_info", IsRequired = true)] - public MailDetail DetailInfo { get; set; } + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } } @@ -223,7 +350,136 @@ namespace BLHX.Server.Common.Proto.p30 } + [global::ProtoBuf.ProtoContract(Name = @"sc_30013")] + public partial class Sc30013 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + public uint Result { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_30015")] + public partial class Sc30015 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(2, Name = @"mail_title_list")] + public global::System.Collections.Generic.List MailTitleLists { get; set; } = new global::System.Collections.Generic.List(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_30017")] + public partial class Sc30017 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"years")] + public global::System.Collections.Generic.List Years { get; set; } = new global::System.Collections.Generic.List(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_30019")] + public partial class Sc30019 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"ret", IsRequired = true)] + public uint Ret { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"drop_list")] + public global::System.Collections.Generic.List DropLists { get; set; } = new global::System.Collections.Generic.List(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_30101")] + public partial class Sc30101 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"number", IsRequired = true)] + public uint Number { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"max_timestamp", IsRequired = true)] + public uint MaxTimestamp { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_30103")] + public partial class Sc30103 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"time_reward_list")] + public global::System.Collections.Generic.List TimeRewardLists { get; set; } = new global::System.Collections.Generic.List(); + + } + + [global::ProtoBuf.ProtoContract(Name = @"sc_30105")] + public partial class Sc30105 : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"result", IsRequired = true)] + 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(); + + [global::ProtoBuf.ProtoMember(3, Name = @"number", IsRequired = true)] + public uint Number { get; set; } + + [global::ProtoBuf.ProtoMember(4, Name = @"max_timestamp", IsRequired = true)] + public uint MaxTimestamp { get; set; } + + } + + [global::ProtoBuf.ProtoContract(Name = @"time_reward_info")] + public partial class TimeRewardInfo : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"id", IsRequired = true)] + public uint Id { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"timestamp", IsRequired = true)] + public uint Timestamp { get; set; } + + [global::ProtoBuf.ProtoMember(3, Name = @"title", IsRequired = true)] + public string Title { get; set; } + + [global::ProtoBuf.ProtoMember(4, Name = @"text", IsRequired = true)] + public string Text { get; set; } + + [global::ProtoBuf.ProtoMember(5, Name = @"attachment_list")] + public global::System.Collections.Generic.List AttachmentLists { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(6, Name = @"attach_flag", IsRequired = true)] + public uint AttachFlag { get; set; } + + [global::ProtoBuf.ProtoMember(7, Name = @"send_time", IsRequired = true)] + public uint SendTime { get; set; } + + } + } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p33_pb.cs b/BLHX.Server.Common/Proto/p33_pb.cs index 73806c2..9877e61 100644 --- a/BLHX.Server.Common/Proto/p33_pb.cs +++ b/BLHX.Server.Common/Proto/p33_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p33 { @@ -17,7 +17,7 @@ namespace BLHX.Server.Common.Proto.p33 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"ai_pos", IsRequired = true)] - public Chaptercellpos AiPos { get; set; } + public global::BLHX.Server.Common.Proto.p13.Chaptercellpos AiPos { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"strategy_id")] public uint StrategyId @@ -30,13 +30,13 @@ namespace BLHX.Server.Common.Proto.p33 private uint? __pbn__StrategyId; [global::ProtoBuf.ProtoMember(3, Name = @"target_pos")] - public Chaptercellpos TargetPos { get; set; } + public global::BLHX.Server.Common.Proto.p13.Chaptercellpos TargetPos { get; set; } [global::ProtoBuf.ProtoMember(4, Name = @"move_path")] - public global::System.Collections.Generic.List MovePaths { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List MovePaths { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(6, Name = @"ship_update")] - public global::System.Collections.Generic.List ShipUpdates { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ShipUpdates { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(7, Name = @"type", IsRequired = true)] public uint Type { get; set; } @@ -96,7 +96,7 @@ namespace BLHX.Server.Common.Proto.p33 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"pos", IsRequired = true)] - public Chaptercellpos Pos { get; set; } + public global::BLHX.Server.Common.Proto.p13.Chaptercellpos Pos { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"discovered")] public uint Discovered @@ -193,7 +193,7 @@ namespace BLHX.Server.Common.Proto.p33 public uint EnterMapId { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"elite_fleet_list")] - public global::System.Collections.Generic.List EliteFleetLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List EliteFleetLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"camp", IsRequired = true)] public uint Camp { get; set; } @@ -234,7 +234,7 @@ namespace BLHX.Server.Common.Proto.p33 private uint? __pbn__ActArg2; [global::ProtoBuf.ProtoMember(5, Name = @"pos_list")] - public global::System.Collections.Generic.List PosLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List PosLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -393,7 +393,7 @@ namespace BLHX.Server.Common.Proto.p33 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"elite_fleet_list")] - public global::System.Collections.Generic.List EliteFleetLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List EliteFleetLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -516,19 +516,19 @@ namespace BLHX.Server.Common.Proto.p33 public uint Id { 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(); [global::ProtoBuf.ProtoMember(3, Name = @"pos", IsRequired = true)] - public Chaptercellpos Pos { get; set; } + public global::BLHX.Server.Common.Proto.p13.Chaptercellpos Pos { get; set; } [global::ProtoBuf.ProtoMember(4, Name = @"loss_flag", IsRequired = true)] public uint LossFlag { get; set; } [global::ProtoBuf.ProtoMember(5, Name = @"box_strategy_list")] - public global::System.Collections.Generic.List BoxStrategyLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List BoxStrategyLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(6, Name = @"ship_strategy_list")] - public global::System.Collections.Generic.List ShipStrategyLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ShipStrategyLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(7, Name = @"strategy_ids")] public global::System.Collections.Generic.List StrategyIds { get; set; } = new global::System.Collections.Generic.List(); @@ -537,7 +537,7 @@ namespace BLHX.Server.Common.Proto.p33 public uint Bullet { get; set; } [global::ProtoBuf.ProtoMember(9, Name = @"start_pos", IsRequired = true)] - public Chaptercellpos StartPos { get; set; } + public global::BLHX.Server.Common.Proto.p13.Chaptercellpos StartPos { get; set; } [global::ProtoBuf.ProtoMember(10, Name = @"attach_list")] public global::System.Collections.Generic.List AttachLists { get; set; } = new global::System.Collections.Generic.List(); @@ -585,13 +585,13 @@ namespace BLHX.Server.Common.Proto.p33 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"pos", IsRequired = true)] - public Chaptercellpos Pos { get; set; } + public global::BLHX.Server.Common.Proto.p13.Chaptercellpos Pos { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"type", IsRequired = true)] public uint Type { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"dir", IsRequired = true)] - public Chaptercellpos Dir { get; set; } + public global::BLHX.Server.Common.Proto.p13.Chaptercellpos Dir { get; set; } [global::ProtoBuf.ProtoMember(4, Name = @"distance", IsRequired = true)] public uint Distance { get; set; } @@ -609,7 +609,7 @@ namespace BLHX.Server.Common.Proto.p33 public uint MapId { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"vision_list")] - public global::System.Collections.Generic.List VisionLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List VisionLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -624,7 +624,7 @@ namespace BLHX.Server.Common.Proto.p33 public Worldmapid Id { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"cell_list")] - public global::System.Collections.Generic.List CellLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List CellLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"state_flag")] public global::System.Collections.Generic.List StateFlags { get; set; } = new global::System.Collections.Generic.List(); @@ -651,7 +651,7 @@ namespace BLHX.Server.Common.Proto.p33 public global::System.Collections.Generic.List TaskLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(3, Name = @"goods_list")] - public global::System.Collections.Generic.List GoodsLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List GoodsLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"next_refresh_time", IsRequired = true)] public uint NextRefreshTime { get; set; } @@ -687,7 +687,7 @@ namespace BLHX.Server.Common.Proto.p33 public Countinfo CountInfo { get; set; } [global::ProtoBuf.ProtoMember(8, Name = @"out_shop_buy_list")] - public global::System.Collections.Generic.List OutShopBuyLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List OutShopBuyLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(9, Name = @"clean_chapter")] public global::System.Collections.Generic.List CleanChapters { get; set; } = new global::System.Collections.Generic.List(); @@ -744,7 +744,7 @@ namespace BLHX.Server.Common.Proto.p33 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"move_path")] - public global::System.Collections.Generic.List MovePaths { get; set; } = new global::System.Collections.Generic.List(); + 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(); @@ -760,10 +760,10 @@ namespace BLHX.Server.Common.Proto.p33 private uint? __pbn__EnterMapId; [global::ProtoBuf.ProtoMember(5, Name = @"ship_update")] - public global::System.Collections.Generic.List ShipUpdates { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List ShipUpdates { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(6, Name = @"ai_act_list")] - public global::System.Collections.Generic.List AiActLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AiActLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(7, Name = @"id")] public Worldmapid Id { get; set; } @@ -1060,7 +1060,7 @@ namespace BLHX.Server.Common.Proto.p33 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"group_list")] - public global::System.Collections.Generic.List GroupLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List GroupLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -1289,7 +1289,7 @@ namespace BLHX.Server.Common.Proto.p33 private uint? __pbn__Time; [global::ProtoBuf.ProtoMember(3, Name = @"group_list")] - public global::System.Collections.Generic.List GroupLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List GroupLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(4, Name = @"round")] public uint Round @@ -1321,7 +1321,7 @@ namespace BLHX.Server.Common.Proto.p33 public global::System.Collections.Generic.List ItemLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(9, Name = @"goods_list")] - public global::System.Collections.Generic.List GoodsLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List GoodsLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(11, Name = @"action_power", IsRequired = true)] public uint ActionPower { get; set; } @@ -1439,7 +1439,7 @@ namespace BLHX.Server.Common.Proto.p33 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"pos", IsRequired = true)] - public Chaptercellpos Pos { get; set; } + public global::BLHX.Server.Common.Proto.p13.Chaptercellpos Pos { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"item_list")] public global::System.Collections.Generic.List ItemLists { get; set; } = new global::System.Collections.Generic.List(); @@ -1493,5 +1493,5 @@ namespace BLHX.Server.Common.Proto.p33 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p34_pb.cs b/BLHX.Server.Common/Proto/p34_pb.cs index b6ba773..7f9879a 100644 --- a/BLHX.Server.Common/Proto/p34_pb.cs +++ b/BLHX.Server.Common/Proto/p34_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p34 { @@ -264,10 +264,10 @@ namespace BLHX.Server.Common.Proto.p34 public uint FightCountUpdateTime { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"self_boss")] - public WorldbossInfo SelfBoss { get; set; } + public global::BLHX.Server.Common.Proto.p33.WorldbossInfo SelfBoss { get; set; } [global::ProtoBuf.ProtoMember(4, Name = @"other_boss")] - public global::System.Collections.Generic.List OtherBosses { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List OtherBosses { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(5, Name = @"summon_pt", IsRequired = true)] public uint SummonPt { get; set; } @@ -312,7 +312,7 @@ namespace BLHX.Server.Common.Proto.p34 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"boss_list")] - public global::System.Collections.Generic.List BossLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List BossLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -324,7 +324,7 @@ namespace BLHX.Server.Common.Proto.p34 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"rank_list")] - public global::System.Collections.Generic.List RankLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List RankLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -336,7 +336,7 @@ namespace BLHX.Server.Common.Proto.p34 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"boss_info", IsRequired = true)] - public WorldbossInfo BossInfo { get; set; } + public global::BLHX.Server.Common.Proto.p33.WorldbossInfo BossInfo { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"user_info", IsRequired = true)] public global::BLHX.Server.Common.Proto.common.Usersimpleinfo UserInfo { get; set; } @@ -450,7 +450,7 @@ namespace BLHX.Server.Common.Proto.p34 public uint Result { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"boss")] - public WorldbossInfo Boss { get; set; } + public global::BLHX.Server.Common.Proto.p33.WorldbossInfo Boss { get; set; } } @@ -576,5 +576,5 @@ namespace BLHX.Server.Common.Proto.p34 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p40_pb.cs b/BLHX.Server.Common/Proto/p40_pb.cs index 31647c0..b27de3d 100644 --- a/BLHX.Server.Common/Proto/p40_pb.cs +++ b/BLHX.Server.Common/Proto/p40_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p40 { @@ -122,6 +122,15 @@ namespace BLHX.Server.Common.Proto.p40 [global::ProtoBuf.ProtoMember(15, Name = @"otherstatistics")] public global::System.Collections.Generic.List Otherstatistics { get; set; } = new global::System.Collections.Generic.List(); + [global::ProtoBuf.ProtoMember(16, Name = @"auto_before", IsRequired = true)] + public uint AutoBefore { get; set; } + + [global::ProtoBuf.ProtoMember(17, Name = @"auto_switch_time", IsRequired = true)] + public uint AutoSwitchTime { get; set; } + + [global::ProtoBuf.ProtoMember(18, Name = @"auto_after", IsRequired = true)] + public uint AutoAfter { get; set; } + } [global::ProtoBuf.ProtoContract(Name = @"cs_40005")] @@ -392,5 +401,5 @@ namespace BLHX.Server.Common.Proto.p40 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p50_pb.cs b/BLHX.Server.Common/Proto/p50_pb.cs index c6e2c9f..506c888 100644 --- a/BLHX.Server.Common/Proto/p50_pb.cs +++ b/BLHX.Server.Common/Proto/p50_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p50 { @@ -593,5 +593,5 @@ namespace BLHX.Server.Common.Proto.p50 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p60_pb.cs b/BLHX.Server.Common/Proto/p60_pb.cs index ca36cff..a18d817 100644 --- a/BLHX.Server.Common/Proto/p60_pb.cs +++ b/BLHX.Server.Common/Proto/p60_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p60 { @@ -308,7 +308,7 @@ namespace BLHX.Server.Common.Proto.p60 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"player", IsRequired = true)] - public PlayerInfo Player { get; set; } + public global::BLHX.Server.Common.Proto.p50.PlayerInfo Player { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"content", IsRequired = true)] public string Content { get; set; } @@ -393,36 +393,6 @@ namespace BLHX.Server.Common.Proto.p60 } - [global::ProtoBuf.ProtoContract(Name = @"user_guild_info")] - public partial class UserGuildInfo : global::ProtoBuf.IExtensible - { - private global::ProtoBuf.IExtension __pbn__extensionData; - global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) - => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); - - [global::ProtoBuf.ProtoMember(1, Name = @"donate_count", IsRequired = true)] - public uint DonateCount { get; set; } - - [global::ProtoBuf.ProtoMember(2, Name = @"donate_tasks")] - public global::System.Collections.Generic.List DonateTasks { get; set; } = new global::System.Collections.Generic.List(); - - [global::ProtoBuf.ProtoMember(3, Name = @"benefit_time", IsRequired = true)] - public uint BenefitTime { get; set; } - - [global::ProtoBuf.ProtoMember(4, Name = @"tech_id")] - public global::System.Collections.Generic.List TechIds { get; set; } = new global::System.Collections.Generic.List(); - - [global::ProtoBuf.ProtoMember(5, Name = @"weekly_task_flag", IsRequired = true)] - public uint WeeklyTaskFlag { get; set; } - - [global::ProtoBuf.ProtoMember(6, Name = @"extra_donate", IsRequired = true)] - public uint ExtraDonate { get; set; } - - [global::ProtoBuf.ProtoMember(7, Name = @"extra_operation", IsRequired = true)] - public uint ExtraOperation { get; set; } - - } - [global::ProtoBuf.ProtoContract(Name = @"guild_shop_info")] public partial class GuildShopInfo : global::ProtoBuf.IExtensible { @@ -449,7 +419,7 @@ namespace BLHX.Server.Common.Proto.p60 public GuildBaseInfo Base { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"leader", IsRequired = true)] - public PlayerInfo Leader { get; set; } + public global::BLHX.Server.Common.Proto.p50.PlayerInfo Leader { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"tech_seat", IsRequired = true)] public uint TechSeat { get; set; } @@ -537,7 +507,7 @@ namespace BLHX.Server.Common.Proto.p60 public uint Timestamp { get; set; } [global::ProtoBuf.ProtoMember(2, Name = @"player", IsRequired = true)] - public PlayerInfo Player { get; set; } + public global::BLHX.Server.Common.Proto.p50.PlayerInfo Player { get; set; } [global::ProtoBuf.ProtoMember(3, Name = @"content", IsRequired = true)] public string Content { get; set; } @@ -600,7 +570,7 @@ namespace BLHX.Server.Common.Proto.p60 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(2, Name = @"request_list")] - public global::System.Collections.Generic.List RequestLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List RequestLists { get; set; } = new global::System.Collections.Generic.List(); } @@ -859,7 +829,37 @@ namespace BLHX.Server.Common.Proto.p60 } + [global::ProtoBuf.ProtoContract(Name = @"user_guild_info")] + public partial class UserGuildInfo : global::ProtoBuf.IExtensible + { + private global::ProtoBuf.IExtension __pbn__extensionData; + global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing) + => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); + + [global::ProtoBuf.ProtoMember(1, Name = @"donate_count", IsRequired = true)] + public uint DonateCount { get; set; } + + [global::ProtoBuf.ProtoMember(2, Name = @"donate_tasks")] + public global::System.Collections.Generic.List DonateTasks { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(3, Name = @"benefit_time", IsRequired = true)] + public uint BenefitTime { get; set; } + + [global::ProtoBuf.ProtoMember(4, Name = @"tech_id")] + public global::System.Collections.Generic.List TechIds { get; set; } = new global::System.Collections.Generic.List(); + + [global::ProtoBuf.ProtoMember(5, Name = @"weekly_task_flag", IsRequired = true)] + public uint WeeklyTaskFlag { get; set; } + + [global::ProtoBuf.ProtoMember(6, Name = @"extra_donate", IsRequired = true)] + public uint ExtraDonate { get; set; } + + [global::ProtoBuf.ProtoMember(7, Name = @"extra_operation", IsRequired = true)] + public uint ExtraOperation { get; set; } + + } + } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p61_pb.cs b/BLHX.Server.Common/Proto/p61_pb.cs index 7f98b4c..4133960 100644 --- a/BLHX.Server.Common/Proto/p61_pb.cs +++ b/BLHX.Server.Common/Proto/p61_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p61 { @@ -275,7 +275,7 @@ namespace BLHX.Server.Common.Proto.p61 public global::System.Collections.Generic.List Perfs { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(6, Name = @"formation_time")] - public global::System.Collections.Generic.List FormationTimes { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List FormationTimes { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(7, Name = @"completed_events")] public global::System.Collections.Generic.List CompletedEvents { get; set; } = new global::System.Collections.Generic.List(); @@ -317,10 +317,10 @@ namespace BLHX.Server.Common.Proto.p61 public global::System.Collections.Generic.List Shipinevents { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(6, Name = @"attr_acc_list")] - public global::System.Collections.Generic.List AttrAccLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AttrAccLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(7, Name = @"attr_count_list")] - public global::System.Collections.Generic.List AttrCountLists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List AttrCountLists { get; set; } = new global::System.Collections.Generic.List(); [global::ProtoBuf.ProtoMember(8, Name = @"eventnodes")] public global::System.Collections.Generic.List Eventnodes { get; set; } = new global::System.Collections.Generic.List(); @@ -698,7 +698,7 @@ namespace BLHX.Server.Common.Proto.p61 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"list")] - public global::System.Collections.Generic.List Lists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Lists { get; set; } = new global::System.Collections.Generic.List(); } @@ -746,7 +746,7 @@ namespace BLHX.Server.Common.Proto.p61 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"list")] - public global::System.Collections.Generic.List Lists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Lists { get; set; } = new global::System.Collections.Generic.List(); } @@ -836,5 +836,5 @@ namespace BLHX.Server.Common.Proto.p61 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p62_pb.cs b/BLHX.Server.Common/Proto/p62_pb.cs index d01a171..07dd99d 100644 --- a/BLHX.Server.Common/Proto/p62_pb.cs +++ b/BLHX.Server.Common/Proto/p62_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p62 { @@ -389,7 +389,7 @@ namespace BLHX.Server.Common.Proto.p62 => global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing); [global::ProtoBuf.ProtoMember(1, Name = @"list")] - public global::System.Collections.Generic.List Lists { get; set; } = new global::System.Collections.Generic.List(); + public global::System.Collections.Generic.List Lists { get; set; } = new global::System.Collections.Generic.List(); } @@ -419,5 +419,5 @@ namespace BLHX.Server.Common.Proto.p62 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p63_pb.cs b/BLHX.Server.Common/Proto/p63_pb.cs index d631e8a..5b71b35 100644 --- a/BLHX.Server.Common/Proto/p63_pb.cs +++ b/BLHX.Server.Common/Proto/p63_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p63 { @@ -1067,5 +1067,5 @@ namespace BLHX.Server.Common.Proto.p63 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p64_pb.cs b/BLHX.Server.Common/Proto/p64_pb.cs index 335e3ef..402ea32 100644 --- a/BLHX.Server.Common/Proto/p64_pb.cs +++ b/BLHX.Server.Common/Proto/p64_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p64 { @@ -200,5 +200,5 @@ namespace BLHX.Server.Common.Proto.p64 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Common/Proto/p70_pb.cs b/BLHX.Server.Common/Proto/p70_pb.cs index 59caef4..3269d51 100644 --- a/BLHX.Server.Common/Proto/p70_pb.cs +++ b/BLHX.Server.Common/Proto/p70_pb.cs @@ -5,7 +5,7 @@ // #region Designer generated code -#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning disable CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 namespace BLHX.Server.Common.Proto.p70 { @@ -101,5 +101,5 @@ namespace BLHX.Server.Common.Proto.p70 } -#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 +#pragma warning restore CS0612, CS0618, CS1591, CS3021, CS8981, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192 #endregion diff --git a/BLHX.Server.Game/Handlers/P10.cs b/BLHX.Server.Game/Handlers/P10.cs index f1cec70..8078c66 100644 --- a/BLHX.Server.Game/Handlers/P10.cs +++ b/BLHX.Server.Game/Handlers/P10.cs @@ -17,18 +17,19 @@ namespace BLHX.Server.Game.Handlers { ProxyIp = Config.Instance.Address, ProxyPort = Config.Instance.Port, Versions = [ - "$azhash$7$1$532$312a453ef34efc48", - "$cvhash$477$8487e9251175425e", - "$l2dhash$526$4bf900d597d9b176", - "$pichash$15$0d6f59289972cc8a", - "$bgmhash$13$76fdc897426a138d", - "$paintinghash$99$19becda4b1a9955a", - "$mangahash$31$e79f94a955fca957", - "$cipherhash$24$3cefad85368b3296", + "$azhash$8$2$95$10cebc67d98f59cb", + "$cvhash$530$38388f9a50dc9310", + "$l2dhash$603$8546436aa5a3a01e", + "$pichash$22$e147d036aaf79d0d", + "$bgmhash$22$e147d036aaf79d0d", + "$paintinghash$180$bf5094d856ef7d33", + "$mangahash$52$c65215a4f27efa25", + "$cipherhash$36$ea9de9ee37d80caf", + "$dormhash$16$aafdaa42b89be89e", "dTag-1" ], Timestamp = (uint)DateTimeOffset.Now.ToUnixTimeSeconds(), - Monday0oclockTimestamp = Connection.Monday0oclockTimestamp + Monday0oclockTimestamp = Connection.Monday0oclockTimestamp, }); connection.EndProtocol(); }