diff --git a/xiaofang/Assets/ProtoBuf/Proto/Fps.cs b/xiaofang/Assets/ProtoBuf/Proto/Fps.cs index 1e4d0bec..c6ff0b24 100644 --- a/xiaofang/Assets/ProtoBuf/Proto/Fps.cs +++ b/xiaofang/Assets/ProtoBuf/Proto/Fps.cs @@ -25,29 +25,28 @@ public static partial class FpsReflection { "CglmcHMucHJvdG8iNgoRQnJvYWRjYXN0RnJhbWVNc2cSIQoGZnJhbWVzGAEg", "AygLMhEuRnJhbWVEYXRhUmVxdWVzdCJPChBGcmFtZURhdGFSZXF1ZXN0EhQK", "B2ZyYW1lSUQYASABKA1IAIgBARIZCgVpbnB1dBgCIAMoCzIKLklucHV0RGF0", - "YUIKCghfZnJhbWVJRCLyAgoJSW5wdXREYXRhEgoKAmlkGAEgASgJEgsKA3NJ", - "ZBgCIAEoCRIJCgF4GAMgASgCEgkKAXkYBCABKAISEgoKcm9vbVNlYXRJZBgF", - "IAEoBRIJCgF6GAYgASgCEg4KBnJvb21JZBgIIAEoCRIOCgZ2aXNpb24YCSAB", - "KAISEQoJZGlyZWN0aW9uGAogASgCEg4KBmFjdGlvbhgLIAEoBRIeCgpmaXJl", - "UGFyYW1zGAwgAygLMgouRmlyZVBhcmFtEh4KCnByb3BQYXJhbXMYDSADKAsy", - "Ci5Qcm9wUGFyYW0SHAoJbnBjUGFyYW1zGA4gAygLMgkuTnBjUGFyYW0SDQoF", - "c3BlZWQYDyABKAISDwoHbmV0d29yaxgQIAEoAhITCgt1c2VQb3dlckJveBgR", - "IAEoCBIeCgp0YXNrUGFyYW1zGBIgAygLMgouVGFza1BhcmFtEiEKC09ubGlu", - "ZVBhcmFtGBMgAygLMgwuT25saW5lUGFyYW0iDwoNRW1wdHlSZXNwb25zZSIo", - "CglGaXJlUGFyYW0SDQoFcG9pbnQYASABKAkSDAoEaGFsZhgCIAEoAiJYCglQ", - "cm9wUGFyYW0SDgoGcHJvcElkGAEgASgJEgsKA251bRgCIAEoBRIPCgdzZWNv", - "bmRzGAMgASgFEg0KBXBvaW50GAQgASgJEg4KBnN0YXR1cxgFIAEoBSI4CghO", - "cGNQYXJhbRINCgVucGNJZBgBIAEoCRINCgVwb2ludBgCIAEoCRIOCgZzdGF0", - "dXMYAyABKAUiMAoLT25saW5lUGFyYW0SDgoGcm9sZUlkGAEgASgJEhEKCW9u", - "bGluZU51bRgCIAEoBSJBCglUYXNrUGFyYW0SDgoGdGFza0lkGAEgASgJEhAK", - "CHRhc2tOYW1lGAIgASgJEhIKCnRhc2tTdGF0dXMYAyABKAVCB1oFLi87cGJi", - "BnByb3RvMw==")); + "YUIKCghfZnJhbWVJRCLRAgoJSW5wdXREYXRhEgoKAmlkGAEgASgJEgkKAXgY", + "AyABKAISCQoBeRgEIAEoAhIJCgF6GAYgASgCEg4KBnJvb21JZBgIIAEoCRIO", + "CgZ2aXNpb24YCSABKAISEQoJZGlyZWN0aW9uGAogASgCEg4KBmFjdGlvbhgL", + "IAEoBRIeCgpmaXJlUGFyYW1zGAwgAygLMgouRmlyZVBhcmFtEh4KCnByb3BQ", + "YXJhbXMYDSADKAsyCi5Qcm9wUGFyYW0SHAoJbnBjUGFyYW1zGA4gAygLMgku", + "TnBjUGFyYW0SDQoFc3BlZWQYDyABKAISDwoHbmV0d29yaxgQIAEoAhITCgt1", + "c2VQb3dlckJveBgRIAEoCBIeCgp0YXNrUGFyYW1zGBIgAygLMgouVGFza1Bh", + "cmFtEiEKC09ubGluZVBhcmFtGBMgAygLMgwuT25saW5lUGFyYW0iDwoNRW1w", + "dHlSZXNwb25zZSIoCglGaXJlUGFyYW0SDQoFcG9pbnQYASABKAkSDAoEaGFs", + "ZhgCIAEoAiJYCglQcm9wUGFyYW0SDgoGcHJvcElkGAEgASgJEgsKA251bRgC", + "IAEoBRIPCgdzZWNvbmRzGAMgASgFEg0KBXBvaW50GAQgASgJEg4KBnN0YXR1", + "cxgFIAEoBSI4CghOcGNQYXJhbRINCgVucGNJZBgBIAEoCRINCgVwb2ludBgC", + "IAEoCRIOCgZzdGF0dXMYAyABKAUiMAoLT25saW5lUGFyYW0SDgoGcm9sZUlk", + "GAEgASgJEhEKCW9ubGluZU51bRgCIAEoBSJBCglUYXNrUGFyYW0SDgoGdGFz", + "a0lkGAEgASgJEhAKCHRhc2tOYW1lGAIgASgJEhIKCnRhc2tTdGF0dXMYAyAB", + "KAVCB1oFLi87cGJiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::BroadcastFrameMsg), global::BroadcastFrameMsg.Parser, new[]{ "Frames" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::FrameDataRequest), global::FrameDataRequest.Parser, new[]{ "FrameID", "Input" }, new[]{ "FrameID" }, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::InputData), global::InputData.Parser, new[]{ "Id", "SId", "X", "Y", "RoomSeatId", "Z", "RoomId", "Vision", "Direction", "Action", "FireParams", "PropParams", "NpcParams", "Speed", "Network", "UsePowerBox", "TaskParams", "OnlineParam" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::InputData), global::InputData.Parser, new[]{ "Id", "X", "Y", "Z", "RoomId", "Vision", "Direction", "Action", "FireParams", "PropParams", "NpcParams", "Speed", "Network", "UsePowerBox", "TaskParams", "OnlineParam" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::EmptyResponse), global::EmptyResponse.Parser, null, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::FireParam), global::FireParam.Parser, new[]{ "Point", "Half" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::PropParam), global::PropParam.Parser, new[]{ "PropId", "Num", "Seconds", "Point", "Status" }, null, null, null, null), @@ -542,10 +541,8 @@ public sealed partial class InputData : pb::IMessage [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public InputData(InputData other) : this() { id_ = other.id_; - sId_ = other.sId_; x_ = other.x_; y_ = other.y_; - roomSeatId_ = other.roomSeatId_; z_ = other.z_; roomId_ = other.roomId_; vision_ = other.vision_; @@ -583,21 +580,6 @@ public sealed partial class InputData : pb::IMessage } } - /// Field number for the "sId" field. - public const int SIdFieldNumber = 2; - private string sId_ = ""; - /// - ///操作id - /// - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public string SId { - get { return sId_; } - set { - sId_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - /// Field number for the "x" field. public const int XFieldNumber = 3; private float x_; @@ -628,21 +610,6 @@ public sealed partial class InputData : pb::IMessage } } - /// Field number for the "roomSeatId" field. - public const int RoomSeatIdFieldNumber = 5; - private int roomSeatId_; - /// - ///操作者的位置索引id(1~N) - /// - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public int RoomSeatId { - get { return roomSeatId_; } - set { - roomSeatId_ = value; - } - } - /// Field number for the "z" field. public const int ZFieldNumber = 6; private float z_; @@ -707,7 +674,7 @@ public sealed partial class InputData : pb::IMessage public const int ActionFieldNumber = 11; private int action_; /// - ///动作 1 跑动 2 使用道具 3 救人 4 使用配电箱 + ///动作 1 跑动 2 使用道具 3 救人 4 使用配电箱 5 站立 6 使用消防栓 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -825,7 +792,7 @@ public sealed partial class InputData : pb::IMessage = pb::FieldCodec.ForMessage(154, global::OnlineParam.Parser); private readonly pbc::RepeatedField onlineParam_ = new pbc::RepeatedField(); /// - /// 配电箱id列表 + /// 角色在线状态 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -849,10 +816,8 @@ public sealed partial class InputData : pb::IMessage return true; } if (Id != other.Id) return false; - if (SId != other.SId) return false; if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(X, other.X)) return false; if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Y, other.Y)) return false; - if (RoomSeatId != other.RoomSeatId) return false; if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false; if (RoomId != other.RoomId) return false; if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Vision, other.Vision)) return false; @@ -874,10 +839,8 @@ public sealed partial class InputData : pb::IMessage public override int GetHashCode() { int hash = 1; if (Id.Length != 0) hash ^= Id.GetHashCode(); - if (SId.Length != 0) hash ^= SId.GetHashCode(); if (X != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(X); if (Y != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Y); - if (RoomSeatId != 0) hash ^= RoomSeatId.GetHashCode(); if (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z); if (RoomId.Length != 0) hash ^= RoomId.GetHashCode(); if (Vision != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Vision); @@ -913,10 +876,6 @@ public sealed partial class InputData : pb::IMessage output.WriteRawTag(10); output.WriteString(Id); } - if (SId.Length != 0) { - output.WriteRawTag(18); - output.WriteString(SId); - } if (X != 0F) { output.WriteRawTag(29); output.WriteFloat(X); @@ -925,10 +884,6 @@ public sealed partial class InputData : pb::IMessage output.WriteRawTag(37); output.WriteFloat(Y); } - if (RoomSeatId != 0) { - output.WriteRawTag(40); - output.WriteInt32(RoomSeatId); - } if (Z != 0F) { output.WriteRawTag(53); output.WriteFloat(Z); @@ -980,10 +935,6 @@ public sealed partial class InputData : pb::IMessage output.WriteRawTag(10); output.WriteString(Id); } - if (SId.Length != 0) { - output.WriteRawTag(18); - output.WriteString(SId); - } if (X != 0F) { output.WriteRawTag(29); output.WriteFloat(X); @@ -992,10 +943,6 @@ public sealed partial class InputData : pb::IMessage output.WriteRawTag(37); output.WriteFloat(Y); } - if (RoomSeatId != 0) { - output.WriteRawTag(40); - output.WriteInt32(RoomSeatId); - } if (Z != 0F) { output.WriteRawTag(53); output.WriteFloat(Z); @@ -1046,18 +993,12 @@ public sealed partial class InputData : pb::IMessage if (Id.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(Id); } - if (SId.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(SId); - } if (X != 0F) { size += 1 + 4; } if (Y != 0F) { size += 1 + 4; } - if (RoomSeatId != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(RoomSeatId); - } if (Z != 0F) { size += 1 + 4; } @@ -1102,18 +1043,12 @@ public sealed partial class InputData : pb::IMessage if (other.Id.Length != 0) { Id = other.Id; } - if (other.SId.Length != 0) { - SId = other.SId; - } if (other.X != 0F) { X = other.X; } if (other.Y != 0F) { Y = other.Y; } - if (other.RoomSeatId != 0) { - RoomSeatId = other.RoomSeatId; - } if (other.Z != 0F) { Z = other.Z; } @@ -1166,10 +1101,6 @@ public sealed partial class InputData : pb::IMessage Id = input.ReadString(); break; } - case 18: { - SId = input.ReadString(); - break; - } case 29: { X = input.ReadFloat(); break; @@ -1178,10 +1109,6 @@ public sealed partial class InputData : pb::IMessage Y = input.ReadFloat(); break; } - case 40: { - RoomSeatId = input.ReadInt32(); - break; - } case 53: { Z = input.ReadFloat(); break; @@ -1257,10 +1184,6 @@ public sealed partial class InputData : pb::IMessage Id = input.ReadString(); break; } - case 18: { - SId = input.ReadString(); - break; - } case 29: { X = input.ReadFloat(); break; @@ -1269,10 +1192,6 @@ public sealed partial class InputData : pb::IMessage Y = input.ReadFloat(); break; } - case 40: { - RoomSeatId = input.ReadInt32(); - break; - } case 53: { Z = input.ReadFloat(); break; diff --git a/xiaofang/Assets/ProtoBuf/Proto/Hall.cs b/xiaofang/Assets/ProtoBuf/Proto/Hall.cs index c11dd1ec..66c63875 100644 --- a/xiaofang/Assets/ProtoBuf/Proto/Hall.cs +++ b/xiaofang/Assets/ProtoBuf/Proto/Hall.cs @@ -30,7 +30,7 @@ public static partial class HallReflection { "IiEKD0pvaW5Sb29tUmVxdWVzdBIOCgZyb29tSWQYASABKAkiNQoSUGxheWVy", "UmVhZHlSZXF1ZXN0Eg4KBnJvb21JZBgBIAEoCRIPCgdpc1JlYWR5GAIgASgI", "IlQKEEpvaW5Sb29tUmVzcG9uc2USDwoHbWVzc2FnZRgBIAEoCRIMCgRjb2Rl", - "GAIgASgFEiEKBGRhdGEYAyABKAsyEy5QbGF5ZXJKb2luUmVzcG9uc2Ui7QMK", + "GAIgASgFEiEKBGRhdGEYAyABKAsyEy5QbGF5ZXJKb2luUmVzcG9uc2Ui+wMK", "ElBsYXllckpvaW5SZXNwb25zZRIQCghVc2VyTmFtZRgBIAEoCRIOCgZSb29t", "SWQYAiABKAkSDgoGU3RhdHVzGAMgASgFEhAKCFJvbGVOYW1lGAQgASgJEhQK", "DElzTGVhZGluZ05QQxgFIAEoBRIOCgZPbmxpbmUYBiABKAgSDgoGUm9sZUlk", @@ -41,29 +41,29 @@ public static partial class HallReflection { "b25kGBEgASgFEhYKDk1vdmVTcGVlZFRoaXJkGBIgASgFEhAKCEJlYXJMb2Fk", "GBMgASgFEhIKClByb3RlY3Rpb24YFCABKAUSDgoGSGVhbHRoGBUgASgFEhIK", "ClJvbGVTdGF0dXMYFiABKAUSDgoGVXNlcklkGBcgASgDEg8KB2lzUmVhZHkY", - "GCABKAgSIwoIZmlyZUluZm8YGSADKAsyES5GaXJlSW5mb1Jlc3BvbnNlImUK", - "EEZpcmVJbmZvUmVzcG9uc2USCQoBeBgBIAEoAhIJCgF5GAIgASgCEgkKAXoY", - "AyABKAISEQoJaGFsZldpZHRoGAQgASgCEhEKCWZpcmVQb3dlchgFIAEoCRIK", - "CgJJZBgGIAEoCSI9ChhQbGF5ZXJTdGF0aXN0aWNzUmVzcG9uc2USIQoEZGF0", - "YRgBIAMoCzITLlBsYXllckpvaW5SZXNwb25zZSIpChNQcm9wVGVtcGxhdGVS", - "ZXF1ZXN0EhIKCnRlbXBsYXRlSWQYASABKAMiSwoUUHJvcFRlbXBsYXRlUmVz", - "cG9uc2USEgoKVGVtcGxhdGVJZBgBIAEoAxILCgNOdW0YAiABKAMSEgoKTWF0", - "ZXJpYWxJZBgDIAEoAyI7Cg9QcGNQcm9wUmVzcG9uc2USKAoJcmVzcG9uc2Vz", - "GAEgAygLMhUuUHJvcFRlbXBsYXRlUmVzcG9uc2UiWgoTUnBjUm9vbUluZm9S", - "ZXNwb25zZRIKCgJJZBgBIAEoAxISCgpUZW1wbGF0ZUlkGAIgASgDEg4KBlN0", - "YXR1cxgDIAEoAxITCgtSZXNlcnZlRGF0ZRgEIAEoCSI5ChNVc2VyVGVtcGxh", - "dGVSZXF1ZXN0EhIKCnRlbXBsYXRlSWQYASABKAMSDgoGUm9vbUlkGAIgASgJ", - "IjgKDFVzZXJUZW1wbGF0ZRIoCglyZXNwb25zZXMYASADKAsyFS5Vc2VyVGVt", - "cGxhdGVSZXNwb25zZSL/AQoUVXNlclRlbXBsYXRlUmVzcG9uc2USDgoGUm9v", - "bUlkGAEgASgDEg4KBlVzZXJJZBgCIAEoAxIOCgZTdGF0dXMYAyABKAUSEgoK", - "VGVtcGxhdGVJZBgEIAEoAxIOCgZSb2xlSWQYBSABKAMSEwoLQmlydGhBcmVh", - "SWQYBiABKAMSFAoMQ2hhcmdlQXJlYUlkGAcgASgDEgkKAVgYCCABKAISCQoB", - "WRgJIAEoAhIJCgFaGAogASgCEhYKDk1vdmVTcGVlZEZpcnN0GAsgASgDEhcK", - "D01vdmVTcGVlZFNlY29uZBgMIAEoAxIWCg5Nb3ZlU3BlZWRUaGlyZBgNIAEo", - "AyJiCg9Vc2VySW5mb1JlcXVlc3QSDgoGVXNlcklkGAEgASgDEg4KBlN0YXR1", - "cxgCIAEoBRIOCgZSb29tSWQYAyABKAkSCQoBeBgEIAEoAhIJCgF5GAUgASgC", - "EgkKAXoYBiABKAIiEgoQVXNlckluZm9SZXNwb25zZUIHWgUuLztwYmIGcHJv", - "dG8z")); + "GCABKAgSIwoIZmlyZUluZm8YGSADKAsyES5GaXJlSW5mb1Jlc3BvbnNlEgwK", + "BGlzQWkYGiABKAgiZQoQRmlyZUluZm9SZXNwb25zZRIJCgF4GAEgASgCEgkK", + "AXkYAiABKAISCQoBehgDIAEoAhIRCgloYWxmV2lkdGgYBCABKAISEQoJZmly", + "ZVBvd2VyGAUgASgJEgoKAklkGAYgASgJIj0KGFBsYXllclN0YXRpc3RpY3NS", + "ZXNwb25zZRIhCgRkYXRhGAEgAygLMhMuUGxheWVySm9pblJlc3BvbnNlIikK", + "E1Byb3BUZW1wbGF0ZVJlcXVlc3QSEgoKdGVtcGxhdGVJZBgBIAEoAyJLChRQ", + "cm9wVGVtcGxhdGVSZXNwb25zZRISCgpUZW1wbGF0ZUlkGAEgASgDEgsKA051", + "bRgCIAEoAxISCgpNYXRlcmlhbElkGAMgASgDIjsKD1BwY1Byb3BSZXNwb25z", + "ZRIoCglyZXNwb25zZXMYASADKAsyFS5Qcm9wVGVtcGxhdGVSZXNwb25zZSJa", + "ChNScGNSb29tSW5mb1Jlc3BvbnNlEgoKAklkGAEgASgDEhIKClRlbXBsYXRl", + "SWQYAiABKAMSDgoGU3RhdHVzGAMgASgDEhMKC1Jlc2VydmVEYXRlGAQgASgJ", + "IjkKE1VzZXJUZW1wbGF0ZVJlcXVlc3QSEgoKdGVtcGxhdGVJZBgBIAEoAxIO", + "CgZSb29tSWQYAiABKAkiOAoMVXNlclRlbXBsYXRlEigKCXJlc3BvbnNlcxgB", + "IAMoCzIVLlVzZXJUZW1wbGF0ZVJlc3BvbnNlIv8BChRVc2VyVGVtcGxhdGVS", + "ZXNwb25zZRIOCgZSb29tSWQYASABKAMSDgoGVXNlcklkGAIgASgDEg4KBlN0", + "YXR1cxgDIAEoBRISCgpUZW1wbGF0ZUlkGAQgASgDEg4KBlJvbGVJZBgFIAEo", + "AxITCgtCaXJ0aEFyZWFJZBgGIAEoAxIUCgxDaGFyZ2VBcmVhSWQYByABKAMS", + "CQoBWBgIIAEoAhIJCgFZGAkgASgCEgkKAVoYCiABKAISFgoOTW92ZVNwZWVk", + "Rmlyc3QYCyABKAMSFwoPTW92ZVNwZWVkU2Vjb25kGAwgASgDEhYKDk1vdmVT", + "cGVlZFRoaXJkGA0gASgDImIKD1VzZXJJbmZvUmVxdWVzdBIOCgZVc2VySWQY", + "ASABKAMSDgoGU3RhdHVzGAIgASgFEg4KBlJvb21JZBgDIAEoCRIJCgF4GAQg", + "ASgCEgkKAXkYBSABKAISCQoBehgGIAEoAiISChBVc2VySW5mb1Jlc3BvbnNl", + "QgdaBS4vO3BiYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { @@ -74,7 +74,7 @@ public static partial class HallReflection { new pbr::GeneratedClrTypeInfo(typeof(global::JoinRoomRequest), global::JoinRoomRequest.Parser, new[]{ "RoomId" }, null, null, null, null), 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", "FireInfo" }, 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", "FireInfo", "IsAi" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::FireInfoResponse), global::FireInfoResponse.Parser, new[]{ "X", "Y", "Z", "HalfWidth", "FirePower", "Id" }, 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), @@ -1827,6 +1827,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessageField number for the "isAi" field. + public const int IsAiFieldNumber = 26; + private bool isAi_; + /// + /// 是否是ai + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool IsAi { + get { return isAi_; } + set { + isAi_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -2250,6 +2266,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessage z_ = other.z_; propResponse_ = other.propResponse_.Clone(); isAllReady_ = other.isAllReady_; + playerReadyList_ = other.playerReadyList_.Clone(); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -431,6 +433,20 @@ public sealed partial class UserJoinResponse : pb::IMessage } } + /// Field number for the "playerReadyList" field. + public const int PlayerReadyListFieldNumber = 23; + private static readonly pb::FieldCodec _repeated_playerReadyList_codec + = pb::FieldCodec.ForMessage(186, global::PlayerJoinResponse.Parser); + private readonly pbc::RepeatedField playerReadyList_ = new pbc::RepeatedField(); + /// + /// 准备玩家列表 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField PlayerReadyList { + get { return playerReadyList_; } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -466,6 +482,7 @@ public sealed partial class UserJoinResponse : pb::IMessage if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false; if(!propResponse_.Equals(other.propResponse_)) return false; if (IsAllReady != other.IsAllReady) return false; + if(!playerReadyList_.Equals(other.playerReadyList_)) return false; return Equals(_unknownFields, other._unknownFields); } @@ -493,6 +510,7 @@ public sealed partial class UserJoinResponse : pb::IMessage if (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z); hash ^= propResponse_.GetHashCode(); if (IsAllReady != false) hash ^= IsAllReady.GetHashCode(); + hash ^= playerReadyList_.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -585,6 +603,7 @@ public sealed partial class UserJoinResponse : pb::IMessage output.WriteRawTag(176, 1); output.WriteBool(IsAllReady); } + playerReadyList_.WriteTo(output, _repeated_playerReadyList_codec); if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -669,6 +688,7 @@ public sealed partial class UserJoinResponse : pb::IMessage output.WriteRawTag(176, 1); output.WriteBool(IsAllReady); } + playerReadyList_.WriteTo(ref output, _repeated_playerReadyList_codec); if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -735,6 +755,7 @@ public sealed partial class UserJoinResponse : pb::IMessage if (IsAllReady != false) { size += 2 + 1; } + size += playerReadyList_.CalculateSize(_repeated_playerReadyList_codec); if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -818,6 +839,7 @@ public sealed partial class UserJoinResponse : pb::IMessage if (other.IsAllReady != false) { IsAllReady = other.IsAllReady; } + playerReadyList_.Add(other.playerReadyList_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -932,6 +954,10 @@ public sealed partial class UserJoinResponse : pb::IMessage IsAllReady = input.ReadBool(); break; } + case 186: { + playerReadyList_.AddEntriesFrom(input, _repeated_playerReadyList_codec); + break; + } } } #endif @@ -1046,6 +1072,10 @@ public sealed partial class UserJoinResponse : pb::IMessage IsAllReady = input.ReadBool(); break; } + case 186: { + playerReadyList_.AddEntriesFrom(ref input, _repeated_playerReadyList_codec); + break; + } } } } diff --git a/xiaofang/Assets/ProtoBuf/Proto/Room.cs b/xiaofang/Assets/ProtoBuf/Proto/Room.cs index 77409708..c12bfcb5 100644 --- a/xiaofang/Assets/ProtoBuf/Proto/Room.cs +++ b/xiaofang/Assets/ProtoBuf/Proto/Room.cs @@ -22,7 +22,7 @@ public static partial class RoomReflection { static RoomReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cgpyb29tLnByb3RvIqAEChRSb29tVGVtcGxhdGVSZXNwb25zZRIKCgJJZBgB", + "Cgpyb29tLnByb3RvIsMEChRSb29tVGVtcGxhdGVSZXNwb25zZRIKCgJJZBgB", "IAEoAxIUCgxUZW1wbGF0ZU5hbWUYAiABKAkSEQoJQ29tcGFueUlkGAMgASgJ", "Eg8KB1NjZW5lSWQYBCABKAkSEQoJU3ViamVjdElkGAUgASgJEg4KBlN0YXR1", "cxgGIAEoCRISCgpJc1RlbXBsYXRlGAcgASgJEhAKCENyZWF0ZUJ5GAggASgJ", @@ -34,45 +34,53 @@ public static partial class RoomReflection { "IAMoCzIOLk9iamVjdE9ybURhdGESFAoMR2FtZVBvc2l0aW9uGBYgASgJEhYK", "DkluaXRGaXJlUmFkaXVzGBcgASgCEhQKDEluaXRGaXJlVGltZRgYIAEoBRIV", "Cg1BZGRGaXJlUmFkaXVzGBkgASgCEhQKDEFkZEZpcmVWYWx1ZRgaIAEoAhIT", - "CgtNYXhGaXJld2FsbBgbIAEoBSLVAwoLVGFza09ybURhdGESCgoCSWQYASAB", - "KAMSEAoIVGFza05hbWUYAiABKAkSEAoIR2FtZU5hbWUYAyABKAkSEAoIR2Ft", - "ZVR5cGUYBCABKAUSEAoIR2FtZURlc2MYBSABKAkSFgoOR2FtZVBsYXlTY3Jp", - "cHQYBiABKAkSEwoLR2FtZVRyaWdnZXIYByABKAkSGAoQR2FtZVRyaWdnZXJM", - "b2dpYxgIIAEoCRIXCg9HYW1lT3ZlcnNlZUNvbmQYCSABKAkSFQoNR2FtZVRp", - "bWVMaW1pdBgKIAEoCRIQCghHYW1lUm9sZRgLIAEoCRITCgtHYW1lU2VsZWN0", - "cxgMIAEoCRIWCg5HYW1lVGFyZ2V0VHlwZRgNIAEoCRIYChBHYW1lVGFyZ2V0", - "c0ZpcnN0GA4gASgJEhkKEUdhbWVUYXJnZXRzU2Vjb25kGA8gASgJEh4KFkdh", - "bWVUYXJnZXRzU2Vjb25kTG9naWMYECABKAkSFgoOR2FtZUV4dHJhVmFsdWUY", - "ESABKAkSEAoIR2FtZVNvcnQYEiABKAkSEgoKR2FtZUlzU2hvdxgTIAEoCRIV", - "Cg1HYW1lRXhjbHVzaXZlGBQgASgJEhIKCkdhbWVSZXdhcmQYFSABKAkingMK", - "DVNlbGVjdE9ybURhdGESCgoCSWQYASABKAMSDAoETm90ZRgCIAEoCRINCgVH", - "cm91cBgDIAEoCRIQCghTaG93VGV4dBgEIAEoCRIMCgRJY29uGAUgASgJEhUK", - "DVByZWNvbmRpdGlvbnMYBiABKAkSEQoJRXhjbHVzaXZlGAcgASgJEhAKCFRh", - "c2tUaW1lGAggASgDEhEKCVRpbWVMaW1pdBgJIAEoAxISCgpOZXh0U2VsZWN0", - "GAogASgJEhAKCFRhc2tMaW5rGAsgASgJEhcKD1Rhc2tMaW5rRGV0YWlscxgM", - "IAEoCRIQCghDYWxsTW9kZRgNIAEoCRIVCg1DYWxsUmVjaXBpZW50GA4gASgJ", - "EhUKDUNvcnJlY3RPcHRpb24YDyABKAkSDgoGUmV3YXJkGBAgASgJEg4KBlJl", - "c3VsdBgRIAEoCRINCgVSb3V0ZRgSIAEoCRIUCgxUaW1pbmdDaGFuZ2UYEyAB", - "KAkSEQoJQXBwbGllZFVJGBQgASgJEhEKCVVJRGV0YWlscxgVIAEoCRILCgNT", - "ZXEYFiABKAkiqgMKDU9iamVjdE9ybURhdGESCgoCSWQYASABKAkSEAoIT2Jq", - "ZWN0SWQYAiABKAkSDAoETm90ZRgDIAEoCRIMCgRUeXBlGAQgASgJEgwKBE5h", - "bWUYBSABKAkSFgoOTmFtZVNob3dPZmZzZXQYBiABKAMSEgoKU2hvd1JhZGl1", - "cxgHIAEoAxIMCgRJY29uGAggASgJEgwKBFJvbGUYCSABKAkSEgoKSXRlbURl", - "cGVuZBgKIAEoCRIQCghUYWtlVGltZRgLIAEoAxITCgtOZWVkUGxheWVycxgM", - "IAEoCRISCgpUYXNrU3RhdHVzGA0gASgJEhIKClNlbGVjdExpc3QYDiABKAkS", - "DQoFT25PZmYYDyABKAMSDgoGU3RhdHVzGBAgASgJEhEKCVJlc0NoYW5nZRgR", - "IAEoCRIXCg9QYXJhbGxlbENvbnRyb2wYEiABKAMSEgoKRXh0cmFWYWx1ZRgT", - "IAEoCRIPCgdVc2VySWRzGBQgASgJEhIKCkNyZWF0ZVRpbWUYFSABKAkSEgoK", - "VXBkYXRlVGltZRgWIAEoCRIOCgZSb29tSWQYFyABKAkiQwoQRmlyZVBvaW50", - "UmVxdWVzdBIJCgFYGAEgASgCEgkKAVkYAiABKAISCQoBWhgDIAEoAhIOCgZS", - "b29tSWQYBCABKAlCB1oFLi87cGJiBnByb3RvMw==")); + "CgtNYXhGaXJld2FsbBgbIAEoBRIhCgthcmVhT3JtRGF0YRgcIAMoCzIMLkFy", + "ZWFPcm1EYXRhItUDCgtUYXNrT3JtRGF0YRIKCgJJZBgBIAEoAxIQCghUYXNr", + "TmFtZRgCIAEoCRIQCghHYW1lTmFtZRgDIAEoCRIQCghHYW1lVHlwZRgEIAEo", + "BRIQCghHYW1lRGVzYxgFIAEoCRIWCg5HYW1lUGxheVNjcmlwdBgGIAEoCRIT", + "CgtHYW1lVHJpZ2dlchgHIAEoCRIYChBHYW1lVHJpZ2dlckxvZ2ljGAggASgJ", + "EhcKD0dhbWVPdmVyc2VlQ29uZBgJIAEoCRIVCg1HYW1lVGltZUxpbWl0GAog", + "ASgJEhAKCEdhbWVSb2xlGAsgASgJEhMKC0dhbWVTZWxlY3RzGAwgASgJEhYK", + "DkdhbWVUYXJnZXRUeXBlGA0gASgJEhgKEEdhbWVUYXJnZXRzRmlyc3QYDiAB", + "KAkSGQoRR2FtZVRhcmdldHNTZWNvbmQYDyABKAkSHgoWR2FtZVRhcmdldHNT", + "ZWNvbmRMb2dpYxgQIAEoCRIWCg5HYW1lRXh0cmFWYWx1ZRgRIAEoCRIQCghH", + "YW1lU29ydBgSIAEoCRISCgpHYW1lSXNTaG93GBMgASgJEhUKDUdhbWVFeGNs", + "dXNpdmUYFCABKAkSEgoKR2FtZVJld2FyZBgVIAEoCSKeAwoNU2VsZWN0T3Jt", + "RGF0YRIKCgJJZBgBIAEoAxIMCgROb3RlGAIgASgJEg0KBUdyb3VwGAMgASgJ", + "EhAKCFNob3dUZXh0GAQgASgJEgwKBEljb24YBSABKAkSFQoNUHJlY29uZGl0", + "aW9ucxgGIAEoCRIRCglFeGNsdXNpdmUYByABKAkSEAoIVGFza1RpbWUYCCAB", + "KAMSEQoJVGltZUxpbWl0GAkgASgDEhIKCk5leHRTZWxlY3QYCiABKAkSEAoI", + "VGFza0xpbmsYCyABKAkSFwoPVGFza0xpbmtEZXRhaWxzGAwgASgJEhAKCENh", + "bGxNb2RlGA0gASgJEhUKDUNhbGxSZWNpcGllbnQYDiABKAkSFQoNQ29ycmVj", + "dE9wdGlvbhgPIAEoCRIOCgZSZXdhcmQYECABKAkSDgoGUmVzdWx0GBEgASgJ", + "Eg0KBVJvdXRlGBIgASgJEhQKDFRpbWluZ0NoYW5nZRgTIAEoCRIRCglBcHBs", + "aWVkVUkYFCABKAkSEQoJVUlEZXRhaWxzGBUgASgJEgsKA1NlcRgWIAEoCSKq", + "AwoNT2JqZWN0T3JtRGF0YRIKCgJJZBgBIAEoCRIQCghPYmplY3RJZBgCIAEo", + "CRIMCgROb3RlGAMgASgJEgwKBFR5cGUYBCABKAkSDAoETmFtZRgFIAEoCRIW", + "Cg5OYW1lU2hvd09mZnNldBgGIAEoAxISCgpTaG93UmFkaXVzGAcgASgDEgwK", + "BEljb24YCCABKAkSDAoEUm9sZRgJIAEoCRISCgpJdGVtRGVwZW5kGAogASgJ", + "EhAKCFRha2VUaW1lGAsgASgDEhMKC05lZWRQbGF5ZXJzGAwgASgJEhIKClRh", + "c2tTdGF0dXMYDSABKAkSEgoKU2VsZWN0TGlzdBgOIAEoCRINCgVPbk9mZhgP", + "IAEoAxIOCgZTdGF0dXMYECABKAkSEQoJUmVzQ2hhbmdlGBEgASgJEhcKD1Bh", + "cmFsbGVsQ29udHJvbBgSIAEoAxISCgpFeHRyYVZhbHVlGBMgASgJEg8KB1Vz", + "ZXJJZHMYFCABKAkSEgoKQ3JlYXRlVGltZRgVIAEoCRISCgpVcGRhdGVUaW1l", + "GBYgASgJEg4KBlJvb21JZBgXIAEoCSKFAgoLQXJlYU9ybURhdGESCgoCSWQY", + "ASABKAMSEAoIR2FtZU5vdGUYAiABKAkSEAoIR2FtZU5hbWUYAyABKAkSEQoJ", + "R2FtZVNjZW5lGAQgASgJEhEKCUdhbWVSYW5nZRgFIAEoCRIXCg9HYW1lQ2Vu", + "dHJlUG9pbnQYBiABKAkSFAoMR2FtZU5wY1JhdGlvGAcgASgJEhMKC0dhbWVP", + "dmVyc2VlGAggASgJEhQKDEdhbWVFbmRQb2ludBgJIAEoCRIVCg1HYW1lUm9s", + "ZUxpbWl0GAogASgJEhEKCUdhbWVMZXZlbBgLIAEoCRIcChRHYW1lUGxheWVy", + "U3Bhd25Qb2ludBgMIAEoCSJDChBGaXJlUG9pbnRSZXF1ZXN0EgkKAVgYASAB", + "KAISCQoBWRgCIAEoAhIJCgFaGAMgASgCEg4KBlJvb21JZBgEIAEoCUIHWgUu", + "LztwYmIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::RoomTemplateResponse), global::RoomTemplateResponse.Parser, new[]{ "Id", "TemplateName", "CompanyId", "SceneId", "SubjectId", "Status", "IsTemplate", "CreateBy", "CreateTime", "UpdateBy", "UpdateTime", "Remark", "Mode", "DisasterLocation", "Firewall", "TaskOrmData", "SelectOrmData", "ObjectOrmData", "GamePosition", "InitFireRadius", "InitFireTime", "AddFireRadius", "AddFireValue", "MaxFirewall" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::RoomTemplateResponse), global::RoomTemplateResponse.Parser, new[]{ "Id", "TemplateName", "CompanyId", "SceneId", "SubjectId", "Status", "IsTemplate", "CreateBy", "CreateTime", "UpdateBy", "UpdateTime", "Remark", "Mode", "DisasterLocation", "Firewall", "TaskOrmData", "SelectOrmData", "ObjectOrmData", "GamePosition", "InitFireRadius", "InitFireTime", "AddFireRadius", "AddFireValue", "MaxFirewall", "AreaOrmData" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::TaskOrmData), global::TaskOrmData.Parser, new[]{ "Id", "TaskName", "GameName", "GameType", "GameDesc", "GamePlayScript", "GameTrigger", "GameTriggerLogic", "GameOverseeCond", "GameTimeLimit", "GameRole", "GameSelects", "GameTargetType", "GameTargetsFirst", "GameTargetsSecond", "GameTargetsSecondLogic", "GameExtraValue", "GameSort", "GameIsShow", "GameExclusive", "GameReward" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::SelectOrmData), global::SelectOrmData.Parser, new[]{ "Id", "Note", "Group", "ShowText", "Icon", "Preconditions", "Exclusive", "TaskTime", "TimeLimit", "NextSelect", "TaskLink", "TaskLinkDetails", "CallMode", "CallRecipient", "CorrectOption", "Reward", "Result", "Route", "TimingChange", "AppliedUI", "UIDetails", "Seq" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::ObjectOrmData), global::ObjectOrmData.Parser, new[]{ "Id", "ObjectId", "Note", "Type", "Name", "NameShowOffset", "ShowRadius", "Icon", "Role", "ItemDepend", "TakeTime", "NeedPlayers", "TaskStatus", "SelectList", "OnOff", "Status", "ResChange", "ParallelControl", "ExtraValue", "UserIds", "CreateTime", "UpdateTime", "RoomId" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AreaOrmData), global::AreaOrmData.Parser, new[]{ "Id", "GameNote", "GameName", "GameScene", "GameRange", "GameCentrePoint", "GameNpcRatio", "GameOversee", "GameEndPoint", "GameRoleLimit", "GameLevel", "GamePlayerSpawnPoint" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::FirePointRequest), global::FirePointRequest.Parser, new[]{ "X", "Y", "Z", "RoomId" }, null, null, null, null) })); } @@ -139,6 +147,7 @@ public sealed partial class RoomTemplateResponse : pb::IMessageField number for the "areaOrmData" field. + public const int AreaOrmDataFieldNumber = 28; + private static readonly pb::FieldCodec _repeated_areaOrmData_codec + = pb::FieldCodec.ForMessage(226, global::AreaOrmData.Parser); + private readonly pbc::RepeatedField areaOrmData_ = new pbc::RepeatedField(); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField AreaOrmData { + get { return areaOrmData_; } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -472,6 +492,7 @@ public sealed partial class RoomTemplateResponse : pb::IMessage } +[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] +public sealed partial class AreaOrmData : pb::IMessage +#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage +#endif +{ + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new AreaOrmData()); + 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::RoomReflection.Descriptor.MessageTypes[4]; } + } + + [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 AreaOrmData() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public AreaOrmData(AreaOrmData other) : this() { + id_ = other.id_; + gameNote_ = other.gameNote_; + gameName_ = other.gameName_; + gameScene_ = other.gameScene_; + gameRange_ = other.gameRange_; + gameCentrePoint_ = other.gameCentrePoint_; + gameNpcRatio_ = other.gameNpcRatio_; + gameOversee_ = other.gameOversee_; + gameEndPoint_ = other.gameEndPoint_; + gameRoleLimit_ = other.gameRoleLimit_; + gameLevel_ = other.gameLevel_; + gamePlayerSpawnPoint_ = other.gamePlayerSpawnPoint_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public AreaOrmData Clone() { + return new AreaOrmData(this); + } + + /// Field number for the "Id" field. + public const int IdFieldNumber = 1; + private long id_; + /// + /// ID + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public long Id { + get { return id_; } + set { + id_ = value; + } + } + + /// Field number for the "GameNote" field. + public const int GameNoteFieldNumber = 2; + private string gameNote_ = ""; + /// + /// 状态 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string GameNote { + get { return gameNote_; } + set { + gameNote_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "GameName" field. + public const int GameNameFieldNumber = 3; + private string gameName_ = ""; + /// + /// 对象名称 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string GameName { + get { return gameName_; } + set { + gameName_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "GameScene" field. + public const int GameSceneFieldNumber = 4; + private string gameScene_ = ""; + /// + /// 场景名称 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string GameScene { + get { return gameScene_; } + set { + gameScene_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "GameRange" field. + public const int GameRangeFieldNumber = 5; + private string gameRange_ = ""; + /// + /// 范围 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string GameRange { + get { return gameRange_; } + set { + gameRange_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "GameCentrePoint" field. + public const int GameCentrePointFieldNumber = 6; + private string gameCentrePoint_ = ""; + /// + /// 中心点 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string GameCentrePoint { + get { return gameCentrePoint_; } + set { + gameCentrePoint_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "GameNpcRatio" field. + public const int GameNpcRatioFieldNumber = 7; + private string gameNpcRatio_ = ""; + /// + /// NPC比例 0-1 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string GameNpcRatio { + get { return gameNpcRatio_; } + set { + gameNpcRatio_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "GameOversee" field. + public const int GameOverseeFieldNumber = 8; + private string gameOversee_ = ""; + /// + /// 监视者 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string GameOversee { + get { return gameOversee_; } + set { + gameOversee_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "GameEndPoint" field. + public const int GameEndPointFieldNumber = 9; + private string gameEndPoint_ = ""; + /// + /// 结束点 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string GameEndPoint { + get { return gameEndPoint_; } + set { + gameEndPoint_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "GameRoleLimit" field. + public const int GameRoleLimitFieldNumber = 10; + private string gameRoleLimit_ = ""; + /// + /// 角色限制 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string GameRoleLimit { + get { return gameRoleLimit_; } + set { + gameRoleLimit_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "GameLevel" field. + public const int GameLevelFieldNumber = 11; + private string gameLevel_ = ""; + /// + /// 等级限制 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string GameLevel { + get { return gameLevel_; } + set { + gameLevel_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// Field number for the "GamePlayerSpawnPoint" field. + public const int GamePlayerSpawnPointFieldNumber = 12; + private string gamePlayerSpawnPoint_ = ""; + /// + /// 玩家出生点 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public string GamePlayerSpawnPoint { + get { return gamePlayerSpawnPoint_; } + set { + gamePlayerSpawnPoint_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as AreaOrmData); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(AreaOrmData other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Id != other.Id) return false; + if (GameNote != other.GameNote) return false; + if (GameName != other.GameName) return false; + if (GameScene != other.GameScene) return false; + if (GameRange != other.GameRange) return false; + if (GameCentrePoint != other.GameCentrePoint) return false; + if (GameNpcRatio != other.GameNpcRatio) return false; + if (GameOversee != other.GameOversee) return false; + if (GameEndPoint != other.GameEndPoint) return false; + if (GameRoleLimit != other.GameRoleLimit) return false; + if (GameLevel != other.GameLevel) return false; + if (GamePlayerSpawnPoint != other.GamePlayerSpawnPoint) 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; + if (Id != 0L) hash ^= Id.GetHashCode(); + if (GameNote.Length != 0) hash ^= GameNote.GetHashCode(); + if (GameName.Length != 0) hash ^= GameName.GetHashCode(); + if (GameScene.Length != 0) hash ^= GameScene.GetHashCode(); + if (GameRange.Length != 0) hash ^= GameRange.GetHashCode(); + if (GameCentrePoint.Length != 0) hash ^= GameCentrePoint.GetHashCode(); + if (GameNpcRatio.Length != 0) hash ^= GameNpcRatio.GetHashCode(); + if (GameOversee.Length != 0) hash ^= GameOversee.GetHashCode(); + if (GameEndPoint.Length != 0) hash ^= GameEndPoint.GetHashCode(); + if (GameRoleLimit.Length != 0) hash ^= GameRoleLimit.GetHashCode(); + if (GameLevel.Length != 0) hash ^= GameLevel.GetHashCode(); + if (GamePlayerSpawnPoint.Length != 0) hash ^= GamePlayerSpawnPoint.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 + if (Id != 0L) { + output.WriteRawTag(8); + output.WriteInt64(Id); + } + if (GameNote.Length != 0) { + output.WriteRawTag(18); + output.WriteString(GameNote); + } + if (GameName.Length != 0) { + output.WriteRawTag(26); + output.WriteString(GameName); + } + if (GameScene.Length != 0) { + output.WriteRawTag(34); + output.WriteString(GameScene); + } + if (GameRange.Length != 0) { + output.WriteRawTag(42); + output.WriteString(GameRange); + } + if (GameCentrePoint.Length != 0) { + output.WriteRawTag(50); + output.WriteString(GameCentrePoint); + } + if (GameNpcRatio.Length != 0) { + output.WriteRawTag(58); + output.WriteString(GameNpcRatio); + } + if (GameOversee.Length != 0) { + output.WriteRawTag(66); + output.WriteString(GameOversee); + } + if (GameEndPoint.Length != 0) { + output.WriteRawTag(74); + output.WriteString(GameEndPoint); + } + if (GameRoleLimit.Length != 0) { + output.WriteRawTag(82); + output.WriteString(GameRoleLimit); + } + if (GameLevel.Length != 0) { + output.WriteRawTag(90); + output.WriteString(GameLevel); + } + if (GamePlayerSpawnPoint.Length != 0) { + output.WriteRawTag(98); + output.WriteString(GamePlayerSpawnPoint); + } + 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) { + if (Id != 0L) { + output.WriteRawTag(8); + output.WriteInt64(Id); + } + if (GameNote.Length != 0) { + output.WriteRawTag(18); + output.WriteString(GameNote); + } + if (GameName.Length != 0) { + output.WriteRawTag(26); + output.WriteString(GameName); + } + if (GameScene.Length != 0) { + output.WriteRawTag(34); + output.WriteString(GameScene); + } + if (GameRange.Length != 0) { + output.WriteRawTag(42); + output.WriteString(GameRange); + } + if (GameCentrePoint.Length != 0) { + output.WriteRawTag(50); + output.WriteString(GameCentrePoint); + } + if (GameNpcRatio.Length != 0) { + output.WriteRawTag(58); + output.WriteString(GameNpcRatio); + } + if (GameOversee.Length != 0) { + output.WriteRawTag(66); + output.WriteString(GameOversee); + } + if (GameEndPoint.Length != 0) { + output.WriteRawTag(74); + output.WriteString(GameEndPoint); + } + if (GameRoleLimit.Length != 0) { + output.WriteRawTag(82); + output.WriteString(GameRoleLimit); + } + if (GameLevel.Length != 0) { + output.WriteRawTag(90); + output.WriteString(GameLevel); + } + if (GamePlayerSpawnPoint.Length != 0) { + output.WriteRawTag(98); + output.WriteString(GamePlayerSpawnPoint); + } + 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; + if (Id != 0L) { + size += 1 + pb::CodedOutputStream.ComputeInt64Size(Id); + } + if (GameNote.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(GameNote); + } + if (GameName.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(GameName); + } + if (GameScene.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(GameScene); + } + if (GameRange.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(GameRange); + } + if (GameCentrePoint.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(GameCentrePoint); + } + if (GameNpcRatio.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(GameNpcRatio); + } + if (GameOversee.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(GameOversee); + } + if (GameEndPoint.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(GameEndPoint); + } + if (GameRoleLimit.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(GameRoleLimit); + } + if (GameLevel.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(GameLevel); + } + if (GamePlayerSpawnPoint.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(GamePlayerSpawnPoint); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(AreaOrmData other) { + if (other == null) { + return; + } + if (other.Id != 0L) { + Id = other.Id; + } + if (other.GameNote.Length != 0) { + GameNote = other.GameNote; + } + if (other.GameName.Length != 0) { + GameName = other.GameName; + } + if (other.GameScene.Length != 0) { + GameScene = other.GameScene; + } + if (other.GameRange.Length != 0) { + GameRange = other.GameRange; + } + if (other.GameCentrePoint.Length != 0) { + GameCentrePoint = other.GameCentrePoint; + } + if (other.GameNpcRatio.Length != 0) { + GameNpcRatio = other.GameNpcRatio; + } + if (other.GameOversee.Length != 0) { + GameOversee = other.GameOversee; + } + if (other.GameEndPoint.Length != 0) { + GameEndPoint = other.GameEndPoint; + } + if (other.GameRoleLimit.Length != 0) { + GameRoleLimit = other.GameRoleLimit; + } + if (other.GameLevel.Length != 0) { + GameLevel = other.GameLevel; + } + if (other.GamePlayerSpawnPoint.Length != 0) { + GamePlayerSpawnPoint = other.GamePlayerSpawnPoint; + } + _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 8: { + Id = input.ReadInt64(); + break; + } + case 18: { + GameNote = input.ReadString(); + break; + } + case 26: { + GameName = input.ReadString(); + break; + } + case 34: { + GameScene = input.ReadString(); + break; + } + case 42: { + GameRange = input.ReadString(); + break; + } + case 50: { + GameCentrePoint = input.ReadString(); + break; + } + case 58: { + GameNpcRatio = input.ReadString(); + break; + } + case 66: { + GameOversee = input.ReadString(); + break; + } + case 74: { + GameEndPoint = input.ReadString(); + break; + } + case 82: { + GameRoleLimit = input.ReadString(); + break; + } + case 90: { + GameLevel = input.ReadString(); + break; + } + case 98: { + GamePlayerSpawnPoint = input.ReadString(); + 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 8: { + Id = input.ReadInt64(); + break; + } + case 18: { + GameNote = input.ReadString(); + break; + } + case 26: { + GameName = input.ReadString(); + break; + } + case 34: { + GameScene = input.ReadString(); + break; + } + case 42: { + GameRange = input.ReadString(); + break; + } + case 50: { + GameCentrePoint = input.ReadString(); + break; + } + case 58: { + GameNpcRatio = input.ReadString(); + break; + } + case 66: { + GameOversee = input.ReadString(); + break; + } + case 74: { + GameEndPoint = input.ReadString(); + break; + } + case 82: { + GameRoleLimit = input.ReadString(); + break; + } + case 90: { + GameLevel = input.ReadString(); + break; + } + case 98: { + GamePlayerSpawnPoint = input.ReadString(); + break; + } + } + } + } + #endif + +} + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class FirePointRequest : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -4105,7 +4780,7 @@ public sealed partial class FirePointRequest : pb::IMessage [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::RoomReflection.Descriptor.MessageTypes[4]; } + get { return global::RoomReflection.Descriptor.MessageTypes[5]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] diff --git a/xiaofang/Assets/ProtoBuf/test.cs b/xiaofang/Assets/ProtoBuf/test.cs index df259883..535731fa 100644 --- a/xiaofang/Assets/ProtoBuf/test.cs +++ b/xiaofang/Assets/ProtoBuf/test.cs @@ -115,16 +115,10 @@ public class test : MonoBehaviour } //֡洢 - public void UpFps(string id,string sid,float x,float y,int roomseatid,float z,string roomid) + public void UpFps(InputData inputData) { InputData data = new InputData(); - data.Id = id; - data.SId = sid; - data.X = x; - data.Y = y; - data.RoomSeatId = roomseatid; - data.Z = z; - data.RoomId = roomid; + data = inputData; WSMessage msg = new WSMessage(); msg.Module = "fps"; msg.ServiceName = "UpFps"; @@ -661,7 +655,8 @@ string HandleButtoncallId=11;// //BroadcastFrameMsg.FramesFieldNumber wEBScriptListener.SendMessageByte(sendData); - }//23.ҵλ 2024.12.30 + } + //23.ҵλ 2024.12.30 public void PlayerSituation(string roomId) { JoinRoomRequest data = new JoinRoomRequest(); @@ -790,7 +785,7 @@ string HandleButtoncallId=11;// byte[] joinByte = joinRoomResponse.Data.ToByteArray(); PlayerJoinResponse playerJoinResponse = ProtoBufffer.DeSerialize(joinByte); Debug.Log("ң" + playerJoinResponse.UserName + "뷿:" + playerJoinResponse.RoomId.ToString()); - GameObject.Find("player").transform.position = new Vector3((float)playerJoinResponse.X, (float)playerJoinResponse.Y, (float)playerJoinResponse.Z); + GameObject.Find("player").transform.position = new Vector3((float)playerJoinResponse.X, (float)playerJoinResponse.Y, (float)playerJoinResponse.Z); Debug.Log(playerJoinResponse.IsReady);//Ƿ׼ж Debug.Log("λ"); @@ -904,6 +899,14 @@ string HandleButtoncallId=11;// } if (userJoinResponse.MessageType == 11)//俪ʼ { + foreach(var item in userJoinResponse.PlayerReadyList) + { + if(!test111.instance.PLayerList.ContainsKey(item.UserId.ToString())) + { + test111.instance.PLayerList.Add(item.UserId.ToString(), item); + + } + } Debug.LogWarning("俪ʼ"); test111.instance.Oppanel(); } @@ -921,9 +924,15 @@ string HandleButtoncallId=11;// break; //֡ - case "fps.UpFps": - InputData inputData = ProtoBufffer.DeSerialize(bytes); - Debug.Log("Id" + inputData.Id + ",sId :" + inputData.SId + "X:" + inputData.X.ToString() + "Y:" + inputData.Y.ToString() + "roomSeatId :" + inputData.RoomSeatId + "z:" + inputData.Z.ToString() + "roomId:" + inputData.RoomId); + case "fps.BroadcastFrameData": + BroadcastFrameMsg broadcastFrameMsg = ProtoBufffer.DeSerialize(bytes); + foreach(var i in broadcastFrameMsg.Frames) + { + foreach(var j in i.Input) + { + Debug.Log(j); + } + } break; //ʰȡ߼ @@ -1215,7 +1224,7 @@ string RoleId=2;// Debug.LogError(playerStatisticsResponse.Data.Count); foreach (var item in playerStatisticsResponse.Data) { - Debug.Log(item.RoleId); + Debug.Log(item.RoleId); Debug.Log(item.IsReady); } Personnelpreparation.instance.playerStatisticsResponse = playerStatisticsResponse; diff --git a/xiaofang/Assets/Res/gsj/gameRoomList.cs b/xiaofang/Assets/Res/gsj/gameRoomList.cs index 805f010b..cc8bd809 100644 --- a/xiaofang/Assets/Res/gsj/gameRoomList.cs +++ b/xiaofang/Assets/Res/gsj/gameRoomList.cs @@ -84,7 +84,7 @@ public class GameRoomListPlayer public string UserId { get; set; } // ûID public int RoleId { get; set; } // ɫID public string RoleName { get; set; } // ɫ - //public int BirthAreaId { get; set; } // ID + public int BirthAreaId { get; set; } // ID public string BirthAreaName { get; set; } // public int ChargeAreaId { get; set; } // ID public string ChargeAreaName { get; set; } // diff --git a/xiaofang/Assets/Res/gsj/scripts/Godvisual.cs b/xiaofang/Assets/Res/gsj/scripts/Godvisual.cs index b7c39267..fed9104b 100644 --- a/xiaofang/Assets/Res/gsj/scripts/Godvisual.cs +++ b/xiaofang/Assets/Res/gsj/scripts/Godvisual.cs @@ -118,6 +118,7 @@ public class Godvisual : MonoBehaviour // ȷλúת׼ȷ transform.position = endPosition; transform.rotation = endRotation; + } // ȡǰɫĬӽǣɫΪ 0 diff --git a/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs b/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs index 0cfb6525..61221cbd 100644 --- a/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs +++ b/xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs @@ -23,7 +23,7 @@ public class ReadRoom : MonoBehaviour public loginData playerdetail; public test test; public string ID; - + public GameRoomListData GameRoomListData; // Start is called before the first frame update void Start() { @@ -78,7 +78,7 @@ public class ReadRoom : MonoBehaviour Debug.LogError(room.PlayerList[i].UserId); if ((GlobalData.ServerData.data.userId == room.PlayerList[i].UserId) && (formattedDate == room.ReserveDate)) { - + GameRoomListData = room; //ְҵID //Player.CSZS.SetPlayerID(room.PlayerList[i].RoleId); Debug.Log("ֱӽ뷿"); diff --git a/xiaofang/Assets/Res/gsj/test111.cs b/xiaofang/Assets/Res/gsj/test111.cs index 73b08d83..1132e99e 100644 --- a/xiaofang/Assets/Res/gsj/test111.cs +++ b/xiaofang/Assets/Res/gsj/test111.cs @@ -10,9 +10,11 @@ public class test111 : MonoBehaviour public Camera camera; public Canvas canvas2; public Camera camera1; - + public gameRoomList gameRoomListInstance; // gameRoomList űʵ + public Dictionary PLayerList; void Start() { + gameRoomListInstance = FindObjectOfType(); instance = this; @@ -41,6 +43,19 @@ public class test111 : MonoBehaviour camera1.gameObject.SetActive(false); } } + public async void adHead() + { + var response = ReadRoom.instance.GameRoomListData; + if (response != null ) + { + foreach (var player in response.PlayerList) + { + //player.BirthAreaId + } + + + } + } // Update is called once per frame void Update() { diff --git a/xiaofang/Assets/Script/DirllInterface/getPlayerList.cs b/xiaofang/Assets/Script/DirllInterface/getPlayerList.cs index 39ac3b57..d1cb99be 100644 --- a/xiaofang/Assets/Script/DirllInterface/getPlayerList.cs +++ b/xiaofang/Assets/Script/DirllInterface/getPlayerList.cs @@ -21,7 +21,7 @@ public class getPlayerList : MonoBehaviour {"clientId", "e5cd7e4891bf95d1d19206ce24a7b32e" } }; } - // + // public async Task GetPlayerList() { @@ -33,7 +33,6 @@ public class getPlayerList : MonoBehaviour PlayerListResponse playerListResponse = JsonConvert.DeserializeObject(response); Debug.Log(playerListResponse.data[0].UserId); Debug.Log(playerListResponse.data[0].UserName); - return playerListResponse; } }