diff --git a/xiaofang/Assets/ProtoBuf/Proto/Join.cs b/xiaofang/Assets/ProtoBuf/Proto/Join.cs index e04d90be..3d9d6eb9 100644 --- a/xiaofang/Assets/ProtoBuf/Proto/Join.cs +++ b/xiaofang/Assets/ProtoBuf/Proto/Join.cs @@ -22,41 +22,42 @@ public static partial class JoinReflection { static JoinReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cgpqb2luLnByb3RvGgptb3ZlLnByb3RvGgpoYWxsLnByb3RvIssDChBVc2Vy", - "Sm9pblJlc3BvbnNlEg4KBnVzZXJJZBgBIAEoAxIQCghuaWNrTmFtZRgCIAEo", - "CRIQCghyb2xlTmFtZRgDIAEoCRIOCgZyb29tSWQYBCABKAkSDgoGb25saW5l", - "GAUgASgIEhMKC21lc3NhZ2VUeXBlGAYgASgFEg8KB0lzUmVhZHkYECABKAgS", - "CwoDY21kGAcgASgJEgwKBElzQWkYCCABKAgSJwoMdGFza1Jlc3BvbnNlGAsg", - "ASgLMhEuVGFza0luZm9SZXNwb25zZRIrCg5vYmplY3RSZXNwb25zZRgMIAEo", - "CzITLk9iamVjdEluZm9SZXNwb25zZRIlCgtucGNSZXNwb25zZRgNIAEoCzIQ", - "Lk5wY0luZm9SZXNwb25zZRIuCg12b2ljZVJlc3BvbnNlGA4gASgLMhcuVm9p", - "Y2VUcmFuc3BvcnRSZXNwb25zZRIrCg5wbGF5ZXJSZXNwb25zZRgPIAEoCzIT", - "LlBsYXllckpvaW5SZXNwb25zZRInCgxmaXJlUmVzcG9uc2UYESADKAsyES5G", - "aXJlSW5mb1Jlc3BvbnNlEgkKAXgYEiABKAISCQoBeRgTIAEoAhIJCgF6GBQg", - "ASgCIjwKFlZvaWNlVHJhbnNwb3J0UmVzcG9uc2USDQoFYXBwSWQYASABKAkS", - "EwoLY2hhbm5lbE5hbWUYAiABKAkiNwoQUm9vbVVzZXJSZXNwb25zZRIjCgh1", - "c2VyTGlzdBgBIAMoCzIRLlVzZXJKb2luUmVzcG9uc2UitgIKEFRhc2tJbmZv", - "UmVzcG9uc2USDgoGVGFza0lkGAEgASgJEg4KBlN0YXR1cxgCIAEoCRIOCgZS", - "b29tSWQYAyABKAkSCQoBWBgEIAEoAhIJCgFZGAUgASgCEgkKAVoYBiABKAIS", - "DAoEVHlwZRgHIAEoCRIRCglUaW1lTGltaXQYCCABKAMSDAoERGVzYxgJIAEo", - "CRIPCgdUcmlnZ2VyGAogASgJEhEKCU5leHRUYXNrcxgLIAEoCRISCgpUYXJn", - "ZXRUeXBlGAwgASgJEg4KBlJld2FyZBgNIAEoCRIMCgROb3RlGA4gASgJEhIK", - "CkNyZWF0ZVRpbWUYDyABKAkSEgoKVXBkYXRlVGltZRgQIAEoCRIQCghUb1Vz", - "ZXJJZBgRIAEoCRISCgpCYXNlVGFza0lkGBIgASgJIq8DChJPYmplY3RJbmZv", - "UmVzcG9uc2USDgoGUm9vbUlkGAEgASgJEgoKAklkGAIgASgJEhAKCE9iamVj", - "dElkGAMgASgJEgwKBE5vdGUYBCABKAkSDAoEVHlwZRgFIAEoCRIMCgROYW1l", - "GAYgASgJEhYKDk5hbWVTaG93T2Zmc2V0GAcgASgDEhIKClNob3dSYWRpdXMY", - "CCABKAMSDAoESWNvbhgJIAEoCRIMCgRSb2xlGAogASgJEhIKCkl0ZW1EZXBl", - "bmQYCyABKAkSEAoIVGFrZVRpbWUYDCABKAMSEwoLTmVlZFBsYXllcnMYDSAB", - "KAkSEgoKVGFza1N0YXR1cxgOIAEoCRISCgpTZWxlY3RMaXN0GA8gASgJEg0K", - "BU9uT2ZmGBAgASgDEg4KBlN0YXR1cxgRIAEoCRIRCglSZXNDaGFuZ2UYEiAB", - "KAkSFwoPUGFyYWxsZWxDb250cm9sGBMgASgDEhIKCkV4dHJhVmFsdWUYFCAB", - "KAkSDwoHVXNlcklkcxgVIAEoCRISCgpDcmVhdGVUaW1lGBYgASgJEhIKClVw", - "ZGF0ZVRpbWUYFyABKAlCB1oFLi87cGJiBnByb3RvMw==")); + "Cgpqb2luLnByb3RvGgptb3ZlLnByb3RvGgpoYWxsLnByb3RvGgpwcm9wLnBy", + "b3RvIvUDChBVc2VySm9pblJlc3BvbnNlEg4KBnVzZXJJZBgBIAEoAxIQCghu", + "aWNrTmFtZRgCIAEoCRIQCghyb2xlTmFtZRgDIAEoCRIOCgZyb29tSWQYBCAB", + "KAkSDgoGb25saW5lGAUgASgIEhMKC21lc3NhZ2VUeXBlGAYgASgFEg8KB0lz", + "UmVhZHkYECABKAgSCwoDY21kGAcgASgJEgwKBElzQWkYCCABKAgSJwoMdGFz", + "a1Jlc3BvbnNlGAsgASgLMhEuVGFza0luZm9SZXNwb25zZRIrCg5vYmplY3RS", + "ZXNwb25zZRgMIAEoCzITLk9iamVjdEluZm9SZXNwb25zZRIlCgtucGNSZXNw", + "b25zZRgNIAEoCzIQLk5wY0luZm9SZXNwb25zZRIuCg12b2ljZVJlc3BvbnNl", + "GA4gASgLMhcuVm9pY2VUcmFuc3BvcnRSZXNwb25zZRIrCg5wbGF5ZXJSZXNw", + "b25zZRgPIAEoCzITLlBsYXllckpvaW5SZXNwb25zZRInCgxmaXJlUmVzcG9u", + "c2UYESADKAsyES5GaXJlSW5mb1Jlc3BvbnNlEgkKAXgYEiABKAISCQoBeRgT", + "IAEoAhIJCgF6GBQgASgCEigKDHByb3BSZXNwb25zZRgVIAMoCzISLlByb3BN", + "b2RlbFJlc3BvbnNlIjwKFlZvaWNlVHJhbnNwb3J0UmVzcG9uc2USDQoFYXBw", + "SWQYASABKAkSEwoLY2hhbm5lbE5hbWUYAiABKAkiNwoQUm9vbVVzZXJSZXNw", + "b25zZRIjCgh1c2VyTGlzdBgBIAMoCzIRLlVzZXJKb2luUmVzcG9uc2UitgIK", + "EFRhc2tJbmZvUmVzcG9uc2USDgoGVGFza0lkGAEgASgJEg4KBlN0YXR1cxgC", + "IAEoCRIOCgZSb29tSWQYAyABKAkSCQoBWBgEIAEoAhIJCgFZGAUgASgCEgkK", + "AVoYBiABKAISDAoEVHlwZRgHIAEoCRIRCglUaW1lTGltaXQYCCABKAMSDAoE", + "RGVzYxgJIAEoCRIPCgdUcmlnZ2VyGAogASgJEhEKCU5leHRUYXNrcxgLIAEo", + "CRISCgpUYXJnZXRUeXBlGAwgASgJEg4KBlJld2FyZBgNIAEoCRIMCgROb3Rl", + "GA4gASgJEhIKCkNyZWF0ZVRpbWUYDyABKAkSEgoKVXBkYXRlVGltZRgQIAEo", + "CRIQCghUb1VzZXJJZBgRIAEoCRISCgpCYXNlVGFza0lkGBIgASgJIq8DChJP", + "YmplY3RJbmZvUmVzcG9uc2USDgoGUm9vbUlkGAEgASgJEgoKAklkGAIgASgJ", + "EhAKCE9iamVjdElkGAMgASgJEgwKBE5vdGUYBCABKAkSDAoEVHlwZRgFIAEo", + "CRIMCgROYW1lGAYgASgJEhYKDk5hbWVTaG93T2Zmc2V0GAcgASgDEhIKClNo", + "b3dSYWRpdXMYCCABKAMSDAoESWNvbhgJIAEoCRIMCgRSb2xlGAogASgJEhIK", + "Ckl0ZW1EZXBlbmQYCyABKAkSEAoIVGFrZVRpbWUYDCABKAMSEwoLTmVlZFBs", + "YXllcnMYDSABKAkSEgoKVGFza1N0YXR1cxgOIAEoCRISCgpTZWxlY3RMaXN0", + "GA8gASgJEg0KBU9uT2ZmGBAgASgDEg4KBlN0YXR1cxgRIAEoCRIRCglSZXND", + "aGFuZ2UYEiABKAkSFwoPUGFyYWxsZWxDb250cm9sGBMgASgDEhIKCkV4dHJh", + "VmFsdWUYFCABKAkSDwoHVXNlcklkcxgVIAEoCRISCgpDcmVhdGVUaW1lGBYg", + "ASgJEhIKClVwZGF0ZVRpbWUYFyABKAlCB1oFLi87cGJiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::MoveReflection.Descriptor, global::HallReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::MoveReflection.Descriptor, global::HallReflection.Descriptor, global::PropReflection.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", "IsReady", "Cmd", "IsAi", "TaskResponse", "ObjectResponse", "NpcResponse", "VoiceResponse", "PlayerResponse", "FireResponse", "X", "Y", "Z" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::UserJoinResponse), global::UserJoinResponse.Parser, new[]{ "UserId", "NickName", "RoleName", "RoomId", "Online", "MessageType", "IsReady", "Cmd", "IsAi", "TaskResponse", "ObjectResponse", "NpcResponse", "VoiceResponse", "PlayerResponse", "FireResponse", "X", "Y", "Z", "PropResponse" }, 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), @@ -120,6 +121,7 @@ public sealed partial class UserJoinResponse : pb::IMessage x_ = other.x_; y_ = other.y_; z_ = other.z_; + propResponse_ = other.propResponse_.Clone(); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -208,7 +210,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 房间开始 12 玩家准备 + ///事件状态 1 用户上线 2用户下线 3 用户加入房间 4 事故发生 5 火势 6 任务 7 对象操作 8 NPC 属性更新 9 语音信息 10 用户信息更新 11 房间开始 12 玩家准备 13 房间道具 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -398,6 +400,20 @@ public sealed partial class UserJoinResponse : pb::IMessage } } + /// Field number for the "propResponse" field. + public const int PropResponseFieldNumber = 21; + private static readonly pb::FieldCodec _repeated_propResponse_codec + = pb::FieldCodec.ForMessage(170, global::PropModelResponse.Parser); + private readonly pbc::RepeatedField propResponse_ = new pbc::RepeatedField(); + /// + /// 道具信息 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField PropResponse { + get { return propResponse_; } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -431,6 +447,7 @@ public sealed partial class UserJoinResponse : pb::IMessage if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(X, other.X)) return false; if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Y, other.Y)) return false; if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false; + if(!propResponse_.Equals(other.propResponse_)) return false; return Equals(_unknownFields, other._unknownFields); } @@ -456,6 +473,7 @@ public sealed partial class UserJoinResponse : pb::IMessage if (X != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(X); if (Y != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Y); if (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z); + hash ^= propResponse_.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -543,6 +561,7 @@ public sealed partial class UserJoinResponse : pb::IMessage output.WriteRawTag(165, 1); output.WriteFloat(Z); } + propResponse_.WriteTo(output, _repeated_propResponse_codec); if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -622,6 +641,7 @@ public sealed partial class UserJoinResponse : pb::IMessage output.WriteRawTag(165, 1); output.WriteFloat(Z); } + propResponse_.WriteTo(ref output, _repeated_propResponse_codec); if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -684,6 +704,7 @@ public sealed partial class UserJoinResponse : pb::IMessage if (Z != 0F) { size += 2 + 4; } + size += propResponse_.CalculateSize(_repeated_propResponse_codec); if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -763,6 +784,7 @@ public sealed partial class UserJoinResponse : pb::IMessage if (other.Z != 0F) { Z = other.Z; } + propResponse_.Add(other.propResponse_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -869,6 +891,10 @@ public sealed partial class UserJoinResponse : pb::IMessage Z = input.ReadFloat(); break; } + case 170: { + propResponse_.AddEntriesFrom(input, _repeated_propResponse_codec); + break; + } } } #endif @@ -975,6 +1001,10 @@ public sealed partial class UserJoinResponse : pb::IMessage Z = input.ReadFloat(); break; } + case 170: { + propResponse_.AddEntriesFrom(ref input, _repeated_propResponse_codec); + break; + } } } } diff --git a/xiaofang/Assets/ProtoBuf/Proto/Prop.cs b/xiaofang/Assets/ProtoBuf/Proto/Prop.cs index e29cd556..3c6a8c39 100644 --- a/xiaofang/Assets/ProtoBuf/Proto/Prop.cs +++ b/xiaofang/Assets/ProtoBuf/Proto/Prop.cs @@ -39,7 +39,8 @@ public static partial class PropReflection { "GBQgASgFEhEKCUF0dHJpYnV0ZRgVIAEoCSI8Cg5QdXRGaXJlUmVxdWVzdBIa", "CgRkYXRhGAEgAygLMgwuUHV0RmlyZURhdGESDgoGcm9vbUlkGAIgASgJIi4K", "C1B1dEZpcmVEYXRhEg4KBnByb3BJZBgBIAEoCRIPCgd1c2VkTnVtGAIgASgF", - "QgdaBS4vO3BiYgZwcm90bzM=")); + "IjcKEVJvb21Qcm9wc1Jlc3BvbnNlEiIKBnJlc3VsdBgBIAMoCzISLlByb3BN", + "b2RlbFJlc3BvbnNlQgdaBS4vO3BiYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { @@ -48,7 +49,8 @@ public static partial class PropReflection { new pbr::GeneratedClrTypeInfo(typeof(global::PropModelRequest), global::PropModelRequest.Parser, new[]{ "Id" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::PropModelResponse), global::PropModelResponse.Parser, new[]{ "Id", "Category", "Note", "Name", "Weight", "Scene", "Icon", "ResPath", "ConsumableType", "Durations", "IsPickup", "Num", "Calculation", "LossTime", "PropServerId", "Used", "UserId", "RoomId", "TotalNum", "RestNum", "Attribute" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::PutFireRequest), global::PutFireRequest.Parser, new[]{ "Data", "RoomId" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::PutFireData), global::PutFireData.Parser, new[]{ "PropId", "UsedNum" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::PutFireData), global::PutFireData.Parser, new[]{ "PropId", "UsedNum" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::RoomPropsResponse), global::RoomPropsResponse.Parser, new[]{ "Result" }, null, null, null, null) })); } #endregion @@ -2567,6 +2569,196 @@ public sealed partial class PutFireData : pb::IMessage } +[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] +public sealed partial class RoomPropsResponse : pb::IMessage +#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage +#endif +{ + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new RoomPropsResponse()); + 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::PropReflection.Descriptor.MessageTypes[6]; } + } + + [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 RoomPropsResponse() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public RoomPropsResponse(RoomPropsResponse other) : this() { + result_ = other.result_.Clone(); + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public RoomPropsResponse Clone() { + return new RoomPropsResponse(this); + } + + /// Field number for the "result" field. + public const int ResultFieldNumber = 1; + private static readonly pb::FieldCodec _repeated_result_codec + = pb::FieldCodec.ForMessage(10, global::PropModelResponse.Parser); + private readonly pbc::RepeatedField result_ = new pbc::RepeatedField(); + /// + /// 道具列表 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField Result { + get { return result_; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as RoomPropsResponse); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(RoomPropsResponse other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if(!result_.Equals(other.result_)) 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 ^= result_.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 + result_.WriteTo(output, _repeated_result_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) { + result_.WriteTo(ref output, _repeated_result_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 += result_.CalculateSize(_repeated_result_codec); + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(RoomPropsResponse other) { + if (other == null) { + return; + } + result_.Add(other.result_); + _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: { + result_.AddEntriesFrom(input, _repeated_result_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: { + result_.AddEntriesFrom(ref input, _repeated_result_codec); + break; + } + } + } + } + #endif + +} + #endregion diff --git a/xiaofang/Assets/Res/gsj/scripts/Personnelpreparation.cs b/xiaofang/Assets/Res/gsj/scripts/Personnelpreparation.cs index a711eedc..d22c01f4 100644 --- a/xiaofang/Assets/Res/gsj/scripts/Personnelpreparation.cs +++ b/xiaofang/Assets/Res/gsj/scripts/Personnelpreparation.cs @@ -14,7 +14,7 @@ public class Personnelpreparation : MonoBehaviour // һ¼״̬仯ʱ public UnityEvent onStatusChanged; public PlayerStatisticsResponse playerStatisticsResponse; - public getPlayerList userInfo; + //public getPlayerList userInfo; // Start is called before the first frame update void Start() { diff --git a/xiaofang/Assets/Script/loginScripts/LoginPanel.cs b/xiaofang/Assets/Script/loginScripts/LoginPanel.cs index 906f390d..bcdae806 100644 --- a/xiaofang/Assets/Script/loginScripts/LoginPanel.cs +++ b/xiaofang/Assets/Script/loginScripts/LoginPanel.cs @@ -39,6 +39,7 @@ public class LoginPanel : Base //¼߼ public async void Login() { + // ¼ body auth_login loginBody = new auth_login {