From 8a1991e9480e1974a82eb35914de1a6a3bc917cc Mon Sep 17 00:00:00 2001 From: huyulong <1838407198@qq.com> Date: Mon, 30 Dec 2024 12:12:16 +0800 Subject: [PATCH] =?UTF-8?q?proto=E6=96=87=E4=BB=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaofang/Assets/ProtoBuf/Proto/Hall.cs | 248 ++++++++++++++++++++--- xiaofang/Assets/ProtoBuf/Proto/Join.cs | 101 ++++++--- xiaofang/Assets/ProtoBuf/Proto/Object.cs | 2 +- xiaofang/Assets/ProtoBuf/Proto/Select.cs | 6 +- 4 files changed, 295 insertions(+), 62 deletions(-) diff --git a/xiaofang/Assets/ProtoBuf/Proto/Hall.cs b/xiaofang/Assets/ProtoBuf/Proto/Hall.cs index 56e2cd8f..c8e4d0ab 100644 --- a/xiaofang/Assets/ProtoBuf/Proto/Hall.cs +++ b/xiaofang/Assets/ProtoBuf/Proto/Hall.cs @@ -41,24 +41,25 @@ public static partial class HallReflection { "b25kGBEgASgFEhYKDk1vdmVTcGVlZFRoaXJkGBIgASgFEhAKCEJlYXJMb2Fk", "GBMgASgFEhIKClByb3RlY3Rpb24YFCABKAUSDgoGSGVhbHRoGBUgASgFEhIK", "ClJvbGVTdGF0dXMYFiABKAUSDgoGVXNlcklkGBcgASgDEg8KB2lzUmVhZHkY", - "GCABKAgiKQoTUHJvcFRlbXBsYXRlUmVxdWVzdBISCgp0ZW1wbGF0ZUlkGAEg", - "ASgDIksKFFByb3BUZW1wbGF0ZVJlc3BvbnNlEhIKClRlbXBsYXRlSWQYASAB", - "KAMSCwoDTnVtGAIgASgDEhIKCk1hdGVyaWFsSWQYAyABKAMiOwoPUHBjUHJv", - "cFJlc3BvbnNlEigKCXJlc3BvbnNlcxgBIAMoCzIVLlByb3BUZW1wbGF0ZVJl", - "c3BvbnNlIloKE1JwY1Jvb21JbmZvUmVzcG9uc2USCgoCSWQYASABKAMSEgoK", - "VGVtcGxhdGVJZBgCIAEoAxIOCgZTdGF0dXMYAyABKAMSEwoLUmVzZXJ2ZURh", - "dGUYBCABKAkiOQoTVXNlclRlbXBsYXRlUmVxdWVzdBISCgp0ZW1wbGF0ZUlk", - "GAEgASgDEg4KBlJvb21JZBgCIAEoCSI4CgxVc2VyVGVtcGxhdGUSKAoJcmVz", - "cG9uc2VzGAEgAygLMhUuVXNlclRlbXBsYXRlUmVzcG9uc2Ui/wEKFFVzZXJU", - "ZW1wbGF0ZVJlc3BvbnNlEg4KBlJvb21JZBgBIAEoAxIOCgZVc2VySWQYAiAB", - "KAMSDgoGU3RhdHVzGAMgASgFEhIKClRlbXBsYXRlSWQYBCABKAMSDgoGUm9s", - "ZUlkGAUgASgDEhMKC0JpcnRoQXJlYUlkGAYgASgDEhQKDENoYXJnZUFyZWFJ", - "ZBgHIAEoAxIJCgFYGAggASgCEgkKAVkYCSABKAISCQoBWhgKIAEoAhIWCg5N", - "b3ZlU3BlZWRGaXJzdBgLIAEoAxIXCg9Nb3ZlU3BlZWRTZWNvbmQYDCABKAMS", - "FgoOTW92ZVNwZWVkVGhpcmQYDSABKAMiYgoPVXNlckluZm9SZXF1ZXN0Eg4K", - "BlVzZXJJZBgBIAEoAxIOCgZTdGF0dXMYAiABKAUSDgoGUm9vbUlkGAMgASgJ", - "EgkKAXgYBCABKAISCQoBeRgFIAEoAhIJCgF6GAYgASgCIhIKEFVzZXJJbmZv", - "UmVzcG9uc2VCB1oFLi87cGJiBnByb3RvMw==")); + "GCABKAgiPQoYUGxheWVyU3RhdGlzdGljc1Jlc3BvbnNlEiEKBGRhdGEYASAD", + "KAsyEy5QbGF5ZXJKb2luUmVzcG9uc2UiKQoTUHJvcFRlbXBsYXRlUmVxdWVz", + "dBISCgp0ZW1wbGF0ZUlkGAEgASgDIksKFFByb3BUZW1wbGF0ZVJlc3BvbnNl", + "EhIKClRlbXBsYXRlSWQYASABKAMSCwoDTnVtGAIgASgDEhIKCk1hdGVyaWFs", + "SWQYAyABKAMiOwoPUHBjUHJvcFJlc3BvbnNlEigKCXJlc3BvbnNlcxgBIAMo", + "CzIVLlByb3BUZW1wbGF0ZVJlc3BvbnNlIloKE1JwY1Jvb21JbmZvUmVzcG9u", + "c2USCgoCSWQYASABKAMSEgoKVGVtcGxhdGVJZBgCIAEoAxIOCgZTdGF0dXMY", + "AyABKAMSEwoLUmVzZXJ2ZURhdGUYBCABKAkiOQoTVXNlclRlbXBsYXRlUmVx", + "dWVzdBISCgp0ZW1wbGF0ZUlkGAEgASgDEg4KBlJvb21JZBgCIAEoCSI4CgxV", + "c2VyVGVtcGxhdGUSKAoJcmVzcG9uc2VzGAEgAygLMhUuVXNlclRlbXBsYXRl", + "UmVzcG9uc2Ui/wEKFFVzZXJUZW1wbGF0ZVJlc3BvbnNlEg4KBlJvb21JZBgB", + "IAEoAxIOCgZVc2VySWQYAiABKAMSDgoGU3RhdHVzGAMgASgFEhIKClRlbXBs", + "YXRlSWQYBCABKAMSDgoGUm9sZUlkGAUgASgDEhMKC0JpcnRoQXJlYUlkGAYg", + "ASgDEhQKDENoYXJnZUFyZWFJZBgHIAEoAxIJCgFYGAggASgCEgkKAVkYCSAB", + "KAISCQoBWhgKIAEoAhIWCg5Nb3ZlU3BlZWRGaXJzdBgLIAEoAxIXCg9Nb3Zl", + "U3BlZWRTZWNvbmQYDCABKAMSFgoOTW92ZVNwZWVkVGhpcmQYDSABKAMiYgoP", + "VXNlckluZm9SZXF1ZXN0Eg4KBlVzZXJJZBgBIAEoAxIOCgZTdGF0dXMYAiAB", + "KAUSDgoGUm9vbUlkGAMgASgJEgkKAXgYBCABKAISCQoBeRgFIAEoAhIJCgF6", + "GAYgASgCIhIKEFVzZXJJbmZvUmVzcG9uc2VCB1oFLi87cGJiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { @@ -70,6 +71,7 @@ public static partial class HallReflection { new pbr::GeneratedClrTypeInfo(typeof(global::PlayerReadyRequest), global::PlayerReadyRequest.Parser, new[]{ "RoomId", "IsReady" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::JoinRoomResponse), global::JoinRoomResponse.Parser, new[]{ "Message", "Code", "Data" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::PlayerJoinResponse), global::PlayerJoinResponse.Parser, new[]{ "UserName", "RoomId", "Status", "RoleName", "IsLeadingNPC", "Online", "RoleId", "GroupLeader", "ActionMode", "Group", "X", "Y", "Z", "OverseeCond", "SendFrameCount", "MoveSpeedFirst", "MoveSpeedSecond", "MoveSpeedThird", "BearLoad", "Protection", "Health", "RoleStatus", "UserId", "IsReady" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::PlayerStatisticsResponse), global::PlayerStatisticsResponse.Parser, new[]{ "Data" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::PropTemplateRequest), global::PropTemplateRequest.Parser, new[]{ "TemplateId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::PropTemplateResponse), global::PropTemplateResponse.Parser, new[]{ "TemplateId", "Num", "MaterialId" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::PpcPropResponse), global::PpcPropResponse.Parser, new[]{ "Responses" }, null, null, null, null), @@ -1832,7 +1834,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessage - /// 用户名 + /// 用户名a /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -2881,6 +2883,196 @@ public sealed partial class PlayerJoinResponse : pb::IMessage +#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage +#endif +{ + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PlayerStatisticsResponse()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public static pbr::MessageDescriptor Descriptor { + get { return global::HallReflection.Descriptor.MessageTypes[8]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public PlayerStatisticsResponse() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public PlayerStatisticsResponse(PlayerStatisticsResponse other) : this() { + data_ = other.data_.Clone(); + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public PlayerStatisticsResponse Clone() { + return new PlayerStatisticsResponse(this); + } + + /// Field number for the "data" field. + public const int DataFieldNumber = 1; + private static readonly pb::FieldCodec _repeated_data_codec + = pb::FieldCodec.ForMessage(10, global::PlayerJoinResponse.Parser); + private readonly pbc::RepeatedField data_ = new pbc::RepeatedField(); + /// + /// 玩家信息 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField Data { + get { return data_; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as PlayerStatisticsResponse); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(PlayerStatisticsResponse other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if(!data_.Equals(other.data_)) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + hash ^= data_.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + data_.WriteTo(output, _repeated_data_codec); + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + data_.WriteTo(ref output, _repeated_data_codec); + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + size += data_.CalculateSize(_repeated_data_codec); + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(PlayerStatisticsResponse other) { + if (other == null) { + return; + } + data_.Add(other.data_); + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 10: { + data_.AddEntriesFrom(input, _repeated_data_codec); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + if ((tag & 7) == 4) { + // Abort on any end group tag. + return; + } + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 10: { + data_.AddEntriesFrom(ref input, _repeated_data_codec); + break; + } + } + } + } + #endif + +} + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class PropTemplateRequest : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -2896,7 +3088,7 @@ public sealed partial class PropTemplateRequest : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::HallReflection.Descriptor.MessageTypes[10]; } + get { return global::HallReflection.Descriptor.MessageTypes[11]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -3562,7 +3754,7 @@ public sealed partial class RpcRoomInfoResponse : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::HallReflection.Descriptor.MessageTypes[13]; } + get { return global::HallReflection.Descriptor.MessageTypes[14]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -4293,7 +4485,7 @@ public sealed partial class UserTemplateResponse : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::HallReflection.Descriptor.MessageTypes[15]; } + get { return global::HallReflection.Descriptor.MessageTypes[16]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -5318,7 +5510,7 @@ public sealed partial class UserInfoResponse : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::HallReflection.Descriptor.MessageTypes[16]; } + get { return global::HallReflection.Descriptor.MessageTypes[17]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] diff --git a/xiaofang/Assets/ProtoBuf/Proto/Join.cs b/xiaofang/Assets/ProtoBuf/Proto/Join.cs index 6b6d3823..4454e2ff 100644 --- a/xiaofang/Assets/ProtoBuf/Proto/Join.cs +++ b/xiaofang/Assets/ProtoBuf/Proto/Join.cs @@ -22,40 +22,41 @@ public static partial class JoinReflection { static JoinReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cgpqb2luLnByb3RvGgptb3ZlLnByb3RvGgpoYWxsLnByb3RvIqMDChBVc2Vy", + "Cgpqb2luLnByb3RvGgptb3ZlLnByb3RvGgpoYWxsLnByb3RvIrQDChBVc2Vy", "Sm9pblJlc3BvbnNlEg4KBnVzZXJJZBgBIAEoAxIQCghuaWNrTmFtZRgCIAEo", "CRIQCghyb2xlTmFtZRgDIAEoCRIOCgZyb29tSWQYBCABKAkSDgoGb25saW5l", - "GAUgASgIEhMKC21lc3NhZ2VUeXBlGAYgASgFEgsKA2NtZBgHIAEoCRIYChBp", - "bmNpZGVudFBvc2l0aW9uGAggASgJEhIKCmZpcmVSYWRpdXMYCSABKAISEQoJ", - "ZmlyZVZhbHVlGAogASgFEicKDHRhc2tSZXNwb25zZRgLIAEoCzIRLlRhc2tJ", - "bmZvUmVzcG9uc2USKwoOb2JqZWN0UmVzcG9uc2UYDCABKAsyEy5PYmplY3RJ", - "bmZvUmVzcG9uc2USJQoLbnBjUmVzcG9uc2UYDSABKAsyEC5OcGNJbmZvUmVz", - "cG9uc2USLgoNdm9pY2VSZXNwb25zZRgOIAEoCzIXLlZvaWNlVHJhbnNwb3J0", - "UmVzcG9uc2USKwoOcGxheWVyUmVzcG9uc2UYDyABKAsyEy5QbGF5ZXJKb2lu", - "UmVzcG9uc2UiPAoWVm9pY2VUcmFuc3BvcnRSZXNwb25zZRINCgVhcHBJZBgB", - "IAEoCRITCgtjaGFubmVsTmFtZRgCIAEoCSI3ChBSb29tVXNlclJlc3BvbnNl", - "EiMKCHVzZXJMaXN0GAEgAygLMhEuVXNlckpvaW5SZXNwb25zZSK2AgoQVGFz", - "a0luZm9SZXNwb25zZRIOCgZUYXNrSWQYASABKAkSDgoGU3RhdHVzGAIgASgJ", - "Eg4KBlJvb21JZBgDIAEoCRIJCgFYGAQgASgCEgkKAVkYBSABKAISCQoBWhgG", - "IAEoAhIMCgRUeXBlGAcgASgJEhEKCVRpbWVMaW1pdBgIIAEoAxIMCgREZXNj", - "GAkgASgJEg8KB1RyaWdnZXIYCiABKAkSEQoJTmV4dFRhc2tzGAsgASgJEhIK", - "ClRhcmdldFR5cGUYDCABKAkSDgoGUmV3YXJkGA0gASgJEgwKBE5vdGUYDiAB", - "KAkSEgoKQ3JlYXRlVGltZRgPIAEoCRISCgpVcGRhdGVUaW1lGBAgASgJEhAK", - "CFRvVXNlcklkGBEgASgJEhIKCkJhc2VUYXNrSWQYEiABKAkirwMKEk9iamVj", - "dEluZm9SZXNwb25zZRIOCgZSb29tSWQYASABKAkSCgoCSWQYAiABKAkSEAoI", - "T2JqZWN0SWQYAyABKAkSDAoETm90ZRgEIAEoCRIMCgRUeXBlGAUgASgJEgwK", - "BE5hbWUYBiABKAkSFgoOTmFtZVNob3dPZmZzZXQYByABKAMSEgoKU2hvd1Jh", - "ZGl1cxgIIAEoAxIMCgRJY29uGAkgASgJEgwKBFJvbGUYCiABKAkSEgoKSXRl", - "bURlcGVuZBgLIAEoCRIQCghUYWtlVGltZRgMIAEoAxITCgtOZWVkUGxheWVy", - "cxgNIAEoCRISCgpUYXNrU3RhdHVzGA4gASgJEhIKClNlbGVjdExpc3QYDyAB", - "KAkSDQoFT25PZmYYECABKAMSDgoGU3RhdHVzGBEgASgJEhEKCVJlc0NoYW5n", - "ZRgSIAEoCRIXCg9QYXJhbGxlbENvbnRyb2wYEyABKAMSEgoKRXh0cmFWYWx1", - "ZRgUIAEoCRIPCgdVc2VySWRzGBUgASgJEhIKCkNyZWF0ZVRpbWUYFiABKAkS", - "EgoKVXBkYXRlVGltZRgXIAEoCUIHWgUuLztwYmIGcHJvdG8z")); + "GAUgASgIEhMKC21lc3NhZ2VUeXBlGAYgASgFEg8KB0lzUmVhZHkYECABKAgS", + "CwoDY21kGAcgASgJEhgKEGluY2lkZW50UG9zaXRpb24YCCABKAkSEgoKZmly", + "ZVJhZGl1cxgJIAEoAhIRCglmaXJlVmFsdWUYCiABKAUSJwoMdGFza1Jlc3Bv", + "bnNlGAsgASgLMhEuVGFza0luZm9SZXNwb25zZRIrCg5vYmplY3RSZXNwb25z", + "ZRgMIAEoCzITLk9iamVjdEluZm9SZXNwb25zZRIlCgtucGNSZXNwb25zZRgN", + "IAEoCzIQLk5wY0luZm9SZXNwb25zZRIuCg12b2ljZVJlc3BvbnNlGA4gASgL", + "MhcuVm9pY2VUcmFuc3BvcnRSZXNwb25zZRIrCg5wbGF5ZXJSZXNwb25zZRgP", + "IAEoCzITLlBsYXllckpvaW5SZXNwb25zZSI8ChZWb2ljZVRyYW5zcG9ydFJl", + "c3BvbnNlEg0KBWFwcElkGAEgASgJEhMKC2NoYW5uZWxOYW1lGAIgASgJIjcK", + "EFJvb21Vc2VyUmVzcG9uc2USIwoIdXNlckxpc3QYASADKAsyES5Vc2VySm9p", + "blJlc3BvbnNlIrYCChBUYXNrSW5mb1Jlc3BvbnNlEg4KBlRhc2tJZBgBIAEo", + "CRIOCgZTdGF0dXMYAiABKAkSDgoGUm9vbUlkGAMgASgJEgkKAVgYBCABKAIS", + "CQoBWRgFIAEoAhIJCgFaGAYgASgCEgwKBFR5cGUYByABKAkSEQoJVGltZUxp", + "bWl0GAggASgDEgwKBERlc2MYCSABKAkSDwoHVHJpZ2dlchgKIAEoCRIRCglO", + "ZXh0VGFza3MYCyABKAkSEgoKVGFyZ2V0VHlwZRgMIAEoCRIOCgZSZXdhcmQY", + "DSABKAkSDAoETm90ZRgOIAEoCRISCgpDcmVhdGVUaW1lGA8gASgJEhIKClVw", + "ZGF0ZVRpbWUYECABKAkSEAoIVG9Vc2VySWQYESABKAkSEgoKQmFzZVRhc2tJ", + "ZBgSIAEoCSKvAwoST2JqZWN0SW5mb1Jlc3BvbnNlEg4KBlJvb21JZBgBIAEo", + "CRIKCgJJZBgCIAEoCRIQCghPYmplY3RJZBgDIAEoCRIMCgROb3RlGAQgASgJ", + "EgwKBFR5cGUYBSABKAkSDAoETmFtZRgGIAEoCRIWCg5OYW1lU2hvd09mZnNl", + "dBgHIAEoAxISCgpTaG93UmFkaXVzGAggASgDEgwKBEljb24YCSABKAkSDAoE", + "Um9sZRgKIAEoCRISCgpJdGVtRGVwZW5kGAsgASgJEhAKCFRha2VUaW1lGAwg", + "ASgDEhMKC05lZWRQbGF5ZXJzGA0gASgJEhIKClRhc2tTdGF0dXMYDiABKAkS", + "EgoKU2VsZWN0TGlzdBgPIAEoCRINCgVPbk9mZhgQIAEoAxIOCgZTdGF0dXMY", + "ESABKAkSEQoJUmVzQ2hhbmdlGBIgASgJEhcKD1BhcmFsbGVsQ29udHJvbBgT", + "IAEoAxISCgpFeHRyYVZhbHVlGBQgASgJEg8KB1VzZXJJZHMYFSABKAkSEgoK", + "Q3JlYXRlVGltZRgWIAEoCRISCgpVcGRhdGVUaW1lGBcgASgJQgdaBS4vO3Bi", + "YgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::MoveReflection.Descriptor, global::HallReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::UserJoinResponse), global::UserJoinResponse.Parser, new[]{ "UserId", "NickName", "RoleName", "RoomId", "Online", "MessageType", "Cmd", "IncidentPosition", "FireRadius", "FireValue", "TaskResponse", "ObjectResponse", "NpcResponse", "VoiceResponse", "PlayerResponse" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::UserJoinResponse), global::UserJoinResponse.Parser, new[]{ "UserId", "NickName", "RoleName", "RoomId", "Online", "MessageType", "IsReady", "Cmd", "IncidentPosition", "FireRadius", "FireValue", "TaskResponse", "ObjectResponse", "NpcResponse", "VoiceResponse", "PlayerResponse" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::VoiceTransportResponse), global::VoiceTransportResponse.Parser, new[]{ "AppId", "ChannelName" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::RoomUserResponse), global::RoomUserResponse.Parser, new[]{ "UserList" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::TaskInfoResponse), global::TaskInfoResponse.Parser, new[]{ "TaskId", "Status", "RoomId", "X", "Y", "Z", "Type", "TimeLimit", "Desc", "Trigger", "NextTasks", "TargetType", "Reward", "Note", "CreateTime", "UpdateTime", "ToUserId", "BaseTaskId" }, null, null, null, null), @@ -107,6 +108,7 @@ public sealed partial class UserJoinResponse : pb::IMessage roomId_ = other.roomId_; online_ = other.online_; messageType_ = other.messageType_; + isReady_ = other.isReady_; cmd_ = other.cmd_; incidentPosition_ = other.incidentPosition_; fireRadius_ = other.fireRadius_; @@ -204,7 +206,7 @@ public sealed partial class UserJoinResponse : pb::IMessage public const int MessageTypeFieldNumber = 6; private int messageType_; /// - ///事件状态 1 用户上线 2用户下线 3 用户加入房间 4 事故发生 5 火势 6 任务 7 对象操作 8 NPC 属性更新 9 语音信息 10 用户信息更新 11 房间开始 + ///事件状态 1 用户上线 2用户下线 3 用户加入房间 4 事故发生 5 火势 6 任务 7 对象操作 8 NPC 属性更新 9 语音信息 10 用户信息更新 11 房间开始 12 玩家准备 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -215,6 +217,21 @@ public sealed partial class UserJoinResponse : pb::IMessage } } + /// Field number for the "IsReady" field. + public const int IsReadyFieldNumber = 16; + private bool isReady_; + /// + /// 是否准备 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool IsReady { + get { return isReady_; } + set { + isReady_ = value; + } + } + /// Field number for the "cmd" field. public const int CmdFieldNumber = 7; private string cmd_ = ""; @@ -371,6 +388,7 @@ public sealed partial class UserJoinResponse : pb::IMessage if (RoomId != other.RoomId) return false; if (Online != other.Online) return false; if (MessageType != other.MessageType) return false; + if (IsReady != other.IsReady) return false; if (Cmd != other.Cmd) return false; if (IncidentPosition != other.IncidentPosition) return false; if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(FireRadius, other.FireRadius)) return false; @@ -393,6 +411,7 @@ public sealed partial class UserJoinResponse : pb::IMessage if (RoomId.Length != 0) hash ^= RoomId.GetHashCode(); if (Online != false) hash ^= Online.GetHashCode(); if (MessageType != 0) hash ^= MessageType.GetHashCode(); + if (IsReady != false) hash ^= IsReady.GetHashCode(); if (Cmd.Length != 0) hash ^= Cmd.GetHashCode(); if (IncidentPosition.Length != 0) hash ^= IncidentPosition.GetHashCode(); if (FireRadius != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(FireRadius); @@ -480,6 +499,10 @@ public sealed partial class UserJoinResponse : pb::IMessage output.WriteRawTag(122); output.WriteMessage(PlayerResponse); } + if (IsReady != false) { + output.WriteRawTag(128, 1); + output.WriteBool(IsReady); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -550,6 +573,10 @@ public sealed partial class UserJoinResponse : pb::IMessage output.WriteRawTag(122); output.WriteMessage(PlayerResponse); } + if (IsReady != false) { + output.WriteRawTag(128, 1); + output.WriteBool(IsReady); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -578,6 +605,9 @@ public sealed partial class UserJoinResponse : pb::IMessage if (MessageType != 0) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(MessageType); } + if (IsReady != false) { + size += 2 + 1; + } if (Cmd.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(Cmd); } @@ -635,6 +665,9 @@ public sealed partial class UserJoinResponse : pb::IMessage if (other.MessageType != 0) { MessageType = other.MessageType; } + if (other.IsReady != false) { + IsReady = other.IsReady; + } if (other.Cmd.Length != 0) { Cmd = other.Cmd; } @@ -771,6 +804,10 @@ public sealed partial class UserJoinResponse : pb::IMessage input.ReadMessage(PlayerResponse); break; } + case 128: { + IsReady = input.ReadBool(); + break; + } } } #endif @@ -865,6 +902,10 @@ public sealed partial class UserJoinResponse : pb::IMessage input.ReadMessage(PlayerResponse); break; } + case 128: { + IsReady = input.ReadBool(); + break; + } } } } diff --git a/xiaofang/Assets/ProtoBuf/Proto/Object.cs b/xiaofang/Assets/ProtoBuf/Proto/Object.cs index e9b905a3..5afb187f 100644 --- a/xiaofang/Assets/ProtoBuf/Proto/Object.cs +++ b/xiaofang/Assets/ProtoBuf/Proto/Object.cs @@ -147,7 +147,7 @@ public sealed partial class RequestObject : pb::IMessage public const int UserIdsFieldNumber = 4; private string userIds_ = ""; /// - /// 用户ID "1,2,3" 多个用户用逗号分隔 + /// 用户ID "1,2,3" 多个用户用逗号分隔 例如消火栓，需要多人配合时传入多个用户ID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] diff --git a/xiaofang/Assets/ProtoBuf/Proto/Select.cs b/xiaofang/Assets/ProtoBuf/Proto/Select.cs index 06aa24ac..7bb3e1ae 100644 --- a/xiaofang/Assets/ProtoBuf/Proto/Select.cs +++ b/xiaofang/Assets/ProtoBuf/Proto/Select.cs @@ -193,7 +193,7 @@ public sealed partial class SelectRequest : pb::IMessage public const int InputNumFieldNumber = 6; private int inputNum_; /// - /// 输入的数字 + /// 输入的数字, 操作某个选项需要传入值的情况 例如上报未疏散的人数 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -236,7 +236,7 @@ public sealed partial class SelectRequest : pb::IMessage public const int OtherIdFieldNumber = 9; private string otherId_ = ""; /// - /// 其他ID 道具ID 交互对象ID 等 当触发属于消火栓增援任务时，需要传入消火栓的对象ID根据配置表获取 + /// 其他ID 道具ID 交互对象ID 等 例如当触发属于消火栓增援任务时，需要传入消火栓的对象ID根据配置表获取 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -251,7 +251,7 @@ public sealed partial class SelectRequest : pb::IMessage public const int OtherId2FieldNumber = 10; private string otherId2_ = ""; /// - /// 其他ID2 道具ID 交互对象ID 等 当触发属于消火栓增援任务时，需要传消火栓唯一ID + /// 其他ID2 道具ID 交互对象ID 等 例如当触发属于消火栓增援任务时，需要传消火栓唯一ID /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]