wulongxiao/_xiaofang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang

Browse Source
This commit is contained in:
lq 2025-01-03 19:16:20 +08:00
commit 7f4e874145
10 changed files with 891 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
xiaofang/Assets/ProtoBuf/Proto/Fps.cs
View File

@ -25,29 +25,28 @@ public static partial class FpsReflection {
"CglmcHMucHJvdG8iNgoRQnJvYWRjYXN0RnJhbWVNc2cSIQoGZnJhbWVzGAEg", "CglmcHMucHJvdG8iNgoRQnJvYWRjYXN0RnJhbWVNc2cSIQoGZnJhbWVzGAEg",
"AygLMhEuRnJhbWVEYXRhUmVxdWVzdCJPChBGcmFtZURhdGFSZXF1ZXN0EhQK", "AygLMhEuRnJhbWVEYXRhUmVxdWVzdCJPChBGcmFtZURhdGFSZXF1ZXN0EhQK",
"B2ZyYW1lSUQYASABKA1IAIgBARIZCgVpbnB1dBgCIAMoCzIKLklucHV0RGF0", "B2ZyYW1lSUQYASABKA1IAIgBARIZCgVpbnB1dBgCIAMoCzIKLklucHV0RGF0",
"YUIKCghfZnJhbWVJRCLyAgoJSW5wdXREYXRhEgoKAmlkGAEgASgJEgsKA3NJ", "YUIKCghfZnJhbWVJRCLRAgoJSW5wdXREYXRhEgoKAmlkGAEgASgJEgkKAXgY",
"ZBgCIAEoCRIJCgF4GAMgASgCEgkKAXkYBCABKAISEgoKcm9vbVNlYXRJZBgF", "AyABKAISCQoBeRgEIAEoAhIJCgF6GAYgASgCEg4KBnJvb21JZBgIIAEoCRIO",
"IAEoBRIJCgF6GAYgASgCEg4KBnJvb21JZBgIIAEoCRIOCgZ2aXNpb24YCSAB", "CgZ2aXNpb24YCSABKAISEQoJZGlyZWN0aW9uGAogASgCEg4KBmFjdGlvbhgL",
"KAISEQoJZGlyZWN0aW9uGAogASgCEg4KBmFjdGlvbhgLIAEoBRIeCgpmaXJl", "IAEoBRIeCgpmaXJlUGFyYW1zGAwgAygLMgouRmlyZVBhcmFtEh4KCnByb3BQ",
"UGFyYW1zGAwgAygLMgouRmlyZVBhcmFtEh4KCnByb3BQYXJhbXMYDSADKAsy", "YXJhbXMYDSADKAsyCi5Qcm9wUGFyYW0SHAoJbnBjUGFyYW1zGA4gAygLMgku",
"Ci5Qcm9wUGFyYW0SHAoJbnBjUGFyYW1zGA4gAygLMgkuTnBjUGFyYW0SDQoF", "TnBjUGFyYW0SDQoFc3BlZWQYDyABKAISDwoHbmV0d29yaxgQIAEoAhITCgt1",
"c3BlZWQYDyABKAISDwoHbmV0d29yaxgQIAEoAhITCgt1c2VQb3dlckJveBgR", "c2VQb3dlckJveBgRIAEoCBIeCgp0YXNrUGFyYW1zGBIgAygLMgouVGFza1Bh",
"IAEoCBIeCgp0YXNrUGFyYW1zGBIgAygLMgouVGFza1BhcmFtEiEKC09ubGlu", "cmFtEiEKC09ubGluZVBhcmFtGBMgAygLMgwuT25saW5lUGFyYW0iDwoNRW1w",
"ZVBhcmFtGBMgAygLMgwuT25saW5lUGFyYW0iDwoNRW1wdHlSZXNwb25zZSIo", "dHlSZXNwb25zZSIoCglGaXJlUGFyYW0SDQoFcG9pbnQYASABKAkSDAoEaGFs",
"CglGaXJlUGFyYW0SDQoFcG9pbnQYASABKAkSDAoEaGFsZhgCIAEoAiJYCglQ", "ZhgCIAEoAiJYCglQcm9wUGFyYW0SDgoGcHJvcElkGAEgASgJEgsKA251bRgC",
"cm9wUGFyYW0SDgoGcHJvcElkGAEgASgJEgsKA251bRgCIAEoBRIPCgdzZWNv", "IAEoBRIPCgdzZWNvbmRzGAMgASgFEg0KBXBvaW50GAQgASgJEg4KBnN0YXR1",
"bmRzGAMgASgFEg0KBXBvaW50GAQgASgJEg4KBnN0YXR1cxgFIAEoBSI4CghO", "cxgFIAEoBSI4CghOcGNQYXJhbRINCgVucGNJZBgBIAEoCRINCgVwb2ludBgC",
"cGNQYXJhbRINCgVucGNJZBgBIAEoCRINCgVwb2ludBgCIAEoCRIOCgZzdGF0", "IAEoCRIOCgZzdGF0dXMYAyABKAUiMAoLT25saW5lUGFyYW0SDgoGcm9sZUlk",
"dXMYAyABKAUiMAoLT25saW5lUGFyYW0SDgoGcm9sZUlkGAEgASgJEhEKCW9u", "GAEgASgJEhEKCW9ubGluZU51bRgCIAEoBSJBCglUYXNrUGFyYW0SDgoGdGFz",
"bGluZU51bRgCIAEoBSJBCglUYXNrUGFyYW0SDgoGdGFza0lkGAEgASgJEhAK", "a0lkGAEgASgJEhAKCHRhc2tOYW1lGAIgASgJEhIKCnRhc2tTdGF0dXMYAyAB",
"CHRhc2tOYW1lGAIgASgJEhIKCnRhc2tTdGF0dXMYAyABKAVCB1oFLi87cGJi", "KAVCB1oFLi87cGJiBnByb3RvMw=="));
"BnByb3RvMw=="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { 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::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::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::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::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), 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<InputData>
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public InputData(InputData other) : this() { public InputData(InputData other) : this() {
id_ = other.id_; id_ = other.id_;
sId_ = other.sId_;
x_ = other.x_; x_ = other.x_;
y_ = other.y_; y_ = other.y_;
roomSeatId_ = other.roomSeatId_;
z_ = other.z_; z_ = other.z_;
roomId_ = other.roomId_; roomId_ = other.roomId_;
vision_ = other.vision_; vision_ = other.vision_;
@ -583,21 +580,6 @@ public sealed partial class InputData : pb::IMessage<InputData>
} }
} }
/// <summary>Field number for the "sId" field.</summary>
public const int SIdFieldNumber = 2;
private string sId_ = "";
/// <summary>
///操作id
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string SId {
get { return sId_; }
set {
sId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
/// <summary>Field number for the "x" field.</summary> /// <summary>Field number for the "x" field.</summary>
public const int XFieldNumber = 3; public const int XFieldNumber = 3;
private float x_; private float x_;
@ -628,21 +610,6 @@ public sealed partial class InputData : pb::IMessage<InputData>
} }
} }
/// <summary>Field number for the "roomSeatId" field.</summary>
public const int RoomSeatIdFieldNumber = 5;
private int roomSeatId_;
/// <summary>
///操作者的位置索引id(1~N)
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public int RoomSeatId {
get { return roomSeatId_; }
set {
roomSeatId_ = value;
}
}
/// <summary>Field number for the "z" field.</summary> /// <summary>Field number for the "z" field.</summary>
public const int ZFieldNumber = 6; public const int ZFieldNumber = 6;
private float z_; private float z_;
@ -707,7 +674,7 @@ public sealed partial class InputData : pb::IMessage<InputData>
public const int ActionFieldNumber = 11; public const int ActionFieldNumber = 11;
private int action_; private int action_;
/// <summary> /// <summary>
///动作 1 跑动 2 使用道具 3 救人 4 使用配电箱 ///动作 1 跑动 2 使用道具 3 救人 4 使用配电箱 5 站立 6 使用消防栓
/// </summary> /// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
@ -825,7 +792,7 @@ public sealed partial class InputData : pb::IMessage<InputData>
= pb::FieldCodec.ForMessage(154, global::OnlineParam.Parser); = pb::FieldCodec.ForMessage(154, global::OnlineParam.Parser);
private readonly pbc::RepeatedField<global::OnlineParam> onlineParam_ = new pbc::RepeatedField<global::OnlineParam>(); private readonly pbc::RepeatedField<global::OnlineParam> onlineParam_ = new pbc::RepeatedField<global::OnlineParam>();
/// <summary> /// <summary>
/// 配电箱id列表 /// 角色在线状态
/// </summary> /// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
@ -849,10 +816,8 @@ public sealed partial class InputData : pb::IMessage<InputData>
return true; return true;
} }
if (Id != other.Id) return false; 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(X, other.X)) return false;
if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Y, other.Y)) 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 (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false;
if (RoomId != other.RoomId) return false; if (RoomId != other.RoomId) return false;
if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Vision, other.Vision)) return false; if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Vision, other.Vision)) return false;
@ -874,10 +839,8 @@ public sealed partial class InputData : pb::IMessage<InputData>
public override int GetHashCode() { public override int GetHashCode() {
int hash = 1; int hash = 1;
if (Id.Length != 0) hash ^= Id.GetHashCode(); if (Id.Length != 0) hash ^= Id.GetHashCode();
if (SId.Length != 0) hash ^= SId.GetHashCode();
if (X != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(X); if (X != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(X);
if (Y != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Y); 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 (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z);
if (RoomId.Length != 0) hash ^= RoomId.GetHashCode(); if (RoomId.Length != 0) hash ^= RoomId.GetHashCode();
if (Vision != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Vision); if (Vision != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Vision);
@ -913,10 +876,6 @@ public sealed partial class InputData : pb::IMessage<InputData>
output.WriteRawTag(10); output.WriteRawTag(10);
output.WriteString(Id); output.WriteString(Id);
} }
if (SId.Length != 0) {
output.WriteRawTag(18);
output.WriteString(SId);
}
if (X != 0F) { if (X != 0F) {
output.WriteRawTag(29); output.WriteRawTag(29);
output.WriteFloat(X); output.WriteFloat(X);
@ -925,10 +884,6 @@ public sealed partial class InputData : pb::IMessage<InputData>
output.WriteRawTag(37); output.WriteRawTag(37);
output.WriteFloat(Y); output.WriteFloat(Y);
} }
if (RoomSeatId != 0) {
output.WriteRawTag(40);
output.WriteInt32(RoomSeatId);
}
if (Z != 0F) { if (Z != 0F) {
output.WriteRawTag(53); output.WriteRawTag(53);
output.WriteFloat(Z); output.WriteFloat(Z);
@ -980,10 +935,6 @@ public sealed partial class InputData : pb::IMessage<InputData>
output.WriteRawTag(10); output.WriteRawTag(10);
output.WriteString(Id); output.WriteString(Id);
} }
if (SId.Length != 0) {
output.WriteRawTag(18);
output.WriteString(SId);
}
if (X != 0F) { if (X != 0F) {
output.WriteRawTag(29); output.WriteRawTag(29);
output.WriteFloat(X); output.WriteFloat(X);
@ -992,10 +943,6 @@ public sealed partial class InputData : pb::IMessage<InputData>
output.WriteRawTag(37); output.WriteRawTag(37);
output.WriteFloat(Y); output.WriteFloat(Y);
} }
if (RoomSeatId != 0) {
output.WriteRawTag(40);
output.WriteInt32(RoomSeatId);
}
if (Z != 0F) { if (Z != 0F) {
output.WriteRawTag(53); output.WriteRawTag(53);
output.WriteFloat(Z); output.WriteFloat(Z);
@ -1046,18 +993,12 @@ public sealed partial class InputData : pb::IMessage<InputData>
if (Id.Length != 0) { if (Id.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(Id); size += 1 + pb::CodedOutputStream.ComputeStringSize(Id);
} }
if (SId.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(SId);
}
if (X != 0F) { if (X != 0F) {
size += 1 + 4; size += 1 + 4;
} }
if (Y != 0F) { if (Y != 0F) {
size += 1 + 4; size += 1 + 4;
} }
if (RoomSeatId != 0) {
size += 1 + pb::CodedOutputStream.ComputeInt32Size(RoomSeatId);
}
if (Z != 0F) { if (Z != 0F) {
size += 1 + 4; size += 1 + 4;
} }
@ -1102,18 +1043,12 @@ public sealed partial class InputData : pb::IMessage<InputData>
if (other.Id.Length != 0) { if (other.Id.Length != 0) {
Id = other.Id; Id = other.Id;
} }
if (other.SId.Length != 0) {
SId = other.SId;
}
if (other.X != 0F) { if (other.X != 0F) {
X = other.X; X = other.X;
} }
if (other.Y != 0F) { if (other.Y != 0F) {
Y = other.Y; Y = other.Y;
} }
if (other.RoomSeatId != 0) {
RoomSeatId = other.RoomSeatId;
}
if (other.Z != 0F) { if (other.Z != 0F) {
Z = other.Z; Z = other.Z;
} }
@ -1166,10 +1101,6 @@ public sealed partial class InputData : pb::IMessage<InputData>
Id = input.ReadString(); Id = input.ReadString();
break; break;
} }
case 18: {
SId = input.ReadString();
break;
}
case 29: { case 29: {
X = input.ReadFloat(); X = input.ReadFloat();
break; break;
@ -1178,10 +1109,6 @@ public sealed partial class InputData : pb::IMessage<InputData>
Y = input.ReadFloat(); Y = input.ReadFloat();
break; break;
} }
case 40: {
RoomSeatId = input.ReadInt32();
break;
}
case 53: { case 53: {
Z = input.ReadFloat(); Z = input.ReadFloat();
break; break;
@ -1257,10 +1184,6 @@ public sealed partial class InputData : pb::IMessage<InputData>
Id = input.ReadString(); Id = input.ReadString();
break; break;
} }
case 18: {
SId = input.ReadString();
break;
}
case 29: { case 29: {
X = input.ReadFloat(); X = input.ReadFloat();
break; break;
@ -1269,10 +1192,6 @@ public sealed partial class InputData : pb::IMessage<InputData>
Y = input.ReadFloat(); Y = input.ReadFloat();
break; break;
} }
case 40: {
RoomSeatId = input.ReadInt32();
break;
}
case 53: { case 53: {
Z = input.ReadFloat(); Z = input.ReadFloat();
break; break;

90
xiaofang/Assets/ProtoBuf/Proto/Hall.cs
View File

@ -30,7 +30,7 @@ public static partial class HallReflection {
"IiEKD0pvaW5Sb29tUmVxdWVzdBIOCgZyb29tSWQYASABKAkiNQoSUGxheWVy", "IiEKD0pvaW5Sb29tUmVxdWVzdBIOCgZyb29tSWQYASABKAkiNQoSUGxheWVy",
"UmVhZHlSZXF1ZXN0Eg4KBnJvb21JZBgBIAEoCRIPCgdpc1JlYWR5GAIgASgI", "UmVhZHlSZXF1ZXN0Eg4KBnJvb21JZBgBIAEoCRIPCgdpc1JlYWR5GAIgASgI",
"IlQKEEpvaW5Sb29tUmVzcG9uc2USDwoHbWVzc2FnZRgBIAEoCRIMCgRjb2Rl", "IlQKEEpvaW5Sb29tUmVzcG9uc2USDwoHbWVzc2FnZRgBIAEoCRIMCgRjb2Rl",
"GAIgASgFEiEKBGRhdGEYAyABKAsyEy5QbGF5ZXJKb2luUmVzcG9uc2Ui7QMK", "GAIgASgFEiEKBGRhdGEYAyABKAsyEy5QbGF5ZXJKb2luUmVzcG9uc2Ui+wMK",
"ElBsYXllckpvaW5SZXNwb25zZRIQCghVc2VyTmFtZRgBIAEoCRIOCgZSb29t", "ElBsYXllckpvaW5SZXNwb25zZRIQCghVc2VyTmFtZRgBIAEoCRIOCgZSb29t",
"SWQYAiABKAkSDgoGU3RhdHVzGAMgASgFEhAKCFJvbGVOYW1lGAQgASgJEhQK", "SWQYAiABKAkSDgoGU3RhdHVzGAMgASgFEhAKCFJvbGVOYW1lGAQgASgJEhQK",
"DElzTGVhZGluZ05QQxgFIAEoBRIOCgZPbmxpbmUYBiABKAgSDgoGUm9sZUlk", "DElzTGVhZGluZ05QQxgFIAEoBRIOCgZPbmxpbmUYBiABKAgSDgoGUm9sZUlk",
@ -41,29 +41,29 @@ public static partial class HallReflection {
"b25kGBEgASgFEhYKDk1vdmVTcGVlZFRoaXJkGBIgASgFEhAKCEJlYXJMb2Fk", "b25kGBEgASgFEhYKDk1vdmVTcGVlZFRoaXJkGBIgASgFEhAKCEJlYXJMb2Fk",
"GBMgASgFEhIKClByb3RlY3Rpb24YFCABKAUSDgoGSGVhbHRoGBUgASgFEhIK", "GBMgASgFEhIKClByb3RlY3Rpb24YFCABKAUSDgoGSGVhbHRoGBUgASgFEhIK",
"ClJvbGVTdGF0dXMYFiABKAUSDgoGVXNlcklkGBcgASgDEg8KB2lzUmVhZHkY", "ClJvbGVTdGF0dXMYFiABKAUSDgoGVXNlcklkGBcgASgDEg8KB2lzUmVhZHkY",
"GCABKAgSIwoIZmlyZUluZm8YGSADKAsyES5GaXJlSW5mb1Jlc3BvbnNlImUK", "GCABKAgSIwoIZmlyZUluZm8YGSADKAsyES5GaXJlSW5mb1Jlc3BvbnNlEgwK",
"EEZpcmVJbmZvUmVzcG9uc2USCQoBeBgBIAEoAhIJCgF5GAIgASgCEgkKAXoY", "BGlzQWkYGiABKAgiZQoQRmlyZUluZm9SZXNwb25zZRIJCgF4GAEgASgCEgkK",
"AyABKAISEQoJaGFsZldpZHRoGAQgASgCEhEKCWZpcmVQb3dlchgFIAEoCRIK", "AXkYAiABKAISCQoBehgDIAEoAhIRCgloYWxmV2lkdGgYBCABKAISEQoJZmly",
"CgJJZBgGIAEoCSI9ChhQbGF5ZXJTdGF0aXN0aWNzUmVzcG9uc2USIQoEZGF0", "ZVBvd2VyGAUgASgJEgoKAklkGAYgASgJIj0KGFBsYXllclN0YXRpc3RpY3NS",
"YRgBIAMoCzITLlBsYXllckpvaW5SZXNwb25zZSIpChNQcm9wVGVtcGxhdGVS", "ZXNwb25zZRIhCgRkYXRhGAEgAygLMhMuUGxheWVySm9pblJlc3BvbnNlIikK",
"ZXF1ZXN0EhIKCnRlbXBsYXRlSWQYASABKAMiSwoUUHJvcFRlbXBsYXRlUmVz", "E1Byb3BUZW1wbGF0ZVJlcXVlc3QSEgoKdGVtcGxhdGVJZBgBIAEoAyJLChRQ",
"cG9uc2USEgoKVGVtcGxhdGVJZBgBIAEoAxILCgNOdW0YAiABKAMSEgoKTWF0", "cm9wVGVtcGxhdGVSZXNwb25zZRISCgpUZW1wbGF0ZUlkGAEgASgDEgsKA051",
"ZXJpYWxJZBgDIAEoAyI7Cg9QcGNQcm9wUmVzcG9uc2USKAoJcmVzcG9uc2Vz", "bRgCIAEoAxISCgpNYXRlcmlhbElkGAMgASgDIjsKD1BwY1Byb3BSZXNwb25z",
"GAEgAygLMhUuUHJvcFRlbXBsYXRlUmVzcG9uc2UiWgoTUnBjUm9vbUluZm9S", "ZRIoCglyZXNwb25zZXMYASADKAsyFS5Qcm9wVGVtcGxhdGVSZXNwb25zZSJa",
"ZXNwb25zZRIKCgJJZBgBIAEoAxISCgpUZW1wbGF0ZUlkGAIgASgDEg4KBlN0", "ChNScGNSb29tSW5mb1Jlc3BvbnNlEgoKAklkGAEgASgDEhIKClRlbXBsYXRl",
"YXR1cxgDIAEoAxITCgtSZXNlcnZlRGF0ZRgEIAEoCSI5ChNVc2VyVGVtcGxh", "SWQYAiABKAMSDgoGU3RhdHVzGAMgASgDEhMKC1Jlc2VydmVEYXRlGAQgASgJ",
"dGVSZXF1ZXN0EhIKCnRlbXBsYXRlSWQYASABKAMSDgoGUm9vbUlkGAIgASgJ", "IjkKE1VzZXJUZW1wbGF0ZVJlcXVlc3QSEgoKdGVtcGxhdGVJZBgBIAEoAxIO",
"IjgKDFVzZXJUZW1wbGF0ZRIoCglyZXNwb25zZXMYASADKAsyFS5Vc2VyVGVt", "CgZSb29tSWQYAiABKAkiOAoMVXNlclRlbXBsYXRlEigKCXJlc3BvbnNlcxgB",
"cGxhdGVSZXNwb25zZSL/AQoUVXNlclRlbXBsYXRlUmVzcG9uc2USDgoGUm9v", "IAMoCzIVLlVzZXJUZW1wbGF0ZVJlc3BvbnNlIv8BChRVc2VyVGVtcGxhdGVS",
"bUlkGAEgASgDEg4KBlVzZXJJZBgCIAEoAxIOCgZTdGF0dXMYAyABKAUSEgoK", "ZXNwb25zZRIOCgZSb29tSWQYASABKAMSDgoGVXNlcklkGAIgASgDEg4KBlN0",
"VGVtcGxhdGVJZBgEIAEoAxIOCgZSb2xlSWQYBSABKAMSEwoLQmlydGhBcmVh", "YXR1cxgDIAEoBRISCgpUZW1wbGF0ZUlkGAQgASgDEg4KBlJvbGVJZBgFIAEo",
"SWQYBiABKAMSFAoMQ2hhcmdlQXJlYUlkGAcgASgDEgkKAVgYCCABKAISCQoB", "AxITCgtCaXJ0aEFyZWFJZBgGIAEoAxIUCgxDaGFyZ2VBcmVhSWQYByABKAMS",
"WRgJIAEoAhIJCgFaGAogASgCEhYKDk1vdmVTcGVlZEZpcnN0GAsgASgDEhcK", "CQoBWBgIIAEoAhIJCgFZGAkgASgCEgkKAVoYCiABKAISFgoOTW92ZVNwZWVk",
"D01vdmVTcGVlZFNlY29uZBgMIAEoAxIWCg5Nb3ZlU3BlZWRUaGlyZBgNIAEo", "Rmlyc3QYCyABKAMSFwoPTW92ZVNwZWVkU2Vjb25kGAwgASgDEhYKDk1vdmVT",
"AyJiCg9Vc2VySW5mb1JlcXVlc3QSDgoGVXNlcklkGAEgASgDEg4KBlN0YXR1", "cGVlZFRoaXJkGA0gASgDImIKD1VzZXJJbmZvUmVxdWVzdBIOCgZVc2VySWQY",
"cxgCIAEoBRIOCgZSb29tSWQYAyABKAkSCQoBeBgEIAEoAhIJCgF5GAUgASgC", "ASABKAMSDgoGU3RhdHVzGAIgASgFEg4KBlJvb21JZBgDIAEoCRIJCgF4GAQg",
"EgkKAXoYBiABKAIiEgoQVXNlckluZm9SZXNwb25zZUIHWgUuLztwYmIGcHJv", "ASgCEgkKAXkYBSABKAISCQoBehgGIAEoAiISChBVc2VySW5mb1Jlc3BvbnNl",
"dG8z")); "QgdaBS4vO3BiYgZwcm90bzM="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { 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::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::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::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::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::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::PropTemplateRequest), global::PropTemplateRequest.Parser, new[]{ "TemplateId" }, null, null, null, null),
@ -1827,6 +1827,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
userId_ = other.userId_; userId_ = other.userId_;
isReady_ = other.isReady_; isReady_ = other.isReady_;
fireInfo_ = other.fireInfo_.Clone(); fireInfo_ = other.fireInfo_.Clone();
isAi_ = other.isAi_;
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
} }
@ -2210,6 +2211,21 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
get { return fireInfo_; } get { return fireInfo_; }
} }
/// <summary>Field number for the "isAi" field.</summary>
public const int IsAiFieldNumber = 26;
private bool isAi_;
/// <summary>
/// 是否是ai
/// </summary>
[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.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public override bool Equals(object other) { public override bool Equals(object other) {
@ -2250,6 +2266,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
if (UserId != other.UserId) return false; if (UserId != other.UserId) return false;
if (IsReady != other.IsReady) return false; if (IsReady != other.IsReady) return false;
if(!fireInfo_.Equals(other.fireInfo_)) return false; if(!fireInfo_.Equals(other.fireInfo_)) return false;
if (IsAi != other.IsAi) return false;
return Equals(_unknownFields, other._unknownFields); return Equals(_unknownFields, other._unknownFields);
} }
@ -2282,6 +2299,7 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
if (UserId != 0L) hash ^= UserId.GetHashCode(); if (UserId != 0L) hash ^= UserId.GetHashCode();
if (IsReady != false) hash ^= IsReady.GetHashCode(); if (IsReady != false) hash ^= IsReady.GetHashCode();
hash ^= fireInfo_.GetHashCode(); hash ^= fireInfo_.GetHashCode();
if (IsAi != false) hash ^= IsAi.GetHashCode();
if (_unknownFields != null) { if (_unknownFields != null) {
hash ^= _unknownFields.GetHashCode(); hash ^= _unknownFields.GetHashCode();
} }
@ -2397,6 +2415,10 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
output.WriteBool(IsReady); output.WriteBool(IsReady);
} }
fireInfo_.WriteTo(output, _repeated_fireInfo_codec); fireInfo_.WriteTo(output, _repeated_fireInfo_codec);
if (IsAi != false) {
output.WriteRawTag(208, 1);
output.WriteBool(IsAi);
}
if (_unknownFields != null) { if (_unknownFields != null) {
_unknownFields.WriteTo(output); _unknownFields.WriteTo(output);
} }
@ -2504,6 +2526,10 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
output.WriteBool(IsReady); output.WriteBool(IsReady);
} }
fireInfo_.WriteTo(ref output, _repeated_fireInfo_codec); fireInfo_.WriteTo(ref output, _repeated_fireInfo_codec);
if (IsAi != false) {
output.WriteRawTag(208, 1);
output.WriteBool(IsAi);
}
if (_unknownFields != null) { if (_unknownFields != null) {
_unknownFields.WriteTo(ref output); _unknownFields.WriteTo(ref output);
} }
@ -2587,6 +2613,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
size += 2 + 1; size += 2 + 1;
} }
size += fireInfo_.CalculateSize(_repeated_fireInfo_codec); size += fireInfo_.CalculateSize(_repeated_fireInfo_codec);
if (IsAi != false) {
size += 2 + 1;
}
if (_unknownFields != null) { if (_unknownFields != null) {
size += _unknownFields.CalculateSize(); size += _unknownFields.CalculateSize();
} }
@ -2672,6 +2701,9 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
IsReady = other.IsReady; IsReady = other.IsReady;
} }
fireInfo_.Add(other.fireInfo_); fireInfo_.Add(other.fireInfo_);
if (other.IsAi != false) {
IsAi = other.IsAi;
}
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
} }
@ -2791,6 +2823,10 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
fireInfo_.AddEntriesFrom(input, _repeated_fireInfo_codec); fireInfo_.AddEntriesFrom(input, _repeated_fireInfo_codec);
break; break;
} }
case 208: {
IsAi = input.ReadBool();
break;
}
} }
} }
#endif #endif
@ -2910,6 +2946,10 @@ public sealed partial class PlayerJoinResponse : pb::IMessage<PlayerJoinResponse
fireInfo_.AddEntriesFrom(ref input, _repeated_fireInfo_codec); fireInfo_.AddEntriesFrom(ref input, _repeated_fireInfo_codec);
break; break;
} }
case 208: {
IsAi = input.ReadBool();
break;
}
} }
} }
} }

76
xiaofang/Assets/ProtoBuf/Proto/Join.cs
View File

@ -23,7 +23,7 @@ public static partial class JoinReflection {
byte[] descriptorData = global::System.Convert.FromBase64String( byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat( string.Concat(
"Cgpqb2luLnByb3RvGgptb3ZlLnByb3RvGgpoYWxsLnByb3RvGgpwcm9wLnBy", "Cgpqb2luLnByb3RvGgptb3ZlLnByb3RvGgpoYWxsLnByb3RvGgpwcm9wLnBy",
"b3RvIokEChBVc2VySm9pblJlc3BvbnNlEg4KBnVzZXJJZBgBIAEoAxIQCghu", "b3RvIrcEChBVc2VySm9pblJlc3BvbnNlEg4KBnVzZXJJZBgBIAEoAxIQCghu",
"aWNrTmFtZRgCIAEoCRIQCghyb2xlTmFtZRgDIAEoCRIOCgZyb29tSWQYBCAB", "aWNrTmFtZRgCIAEoCRIQCghyb2xlTmFtZRgDIAEoCRIOCgZyb29tSWQYBCAB",
"KAkSDgoGb25saW5lGAUgASgIEhMKC21lc3NhZ2VUeXBlGAYgASgFEg8KB0lz", "KAkSDgoGb25saW5lGAUgASgIEhMKC21lc3NhZ2VUeXBlGAYgASgFEg8KB0lz",
"UmVhZHkYECABKAgSCwoDY21kGAcgASgJEgwKBElzQWkYCCABKAgSJwoMdGFz", "UmVhZHkYECABKAgSCwoDY21kGAcgASgJEgwKBElzQWkYCCABKAgSJwoMdGFz",
@ -34,31 +34,32 @@ public static partial class JoinReflection {
"b25zZRgPIAEoCzITLlBsYXllckpvaW5SZXNwb25zZRInCgxmaXJlUmVzcG9u", "b25zZRgPIAEoCzITLlBsYXllckpvaW5SZXNwb25zZRInCgxmaXJlUmVzcG9u",
"c2UYESADKAsyES5GaXJlSW5mb1Jlc3BvbnNlEgkKAXgYEiABKAISCQoBeRgT", "c2UYESADKAsyES5GaXJlSW5mb1Jlc3BvbnNlEgkKAXgYEiABKAISCQoBeRgT",
"IAEoAhIJCgF6GBQgASgCEigKDHByb3BSZXNwb25zZRgVIAMoCzISLlByb3BN", "IAEoAhIJCgF6GBQgASgCEigKDHByb3BSZXNwb25zZRgVIAMoCzISLlByb3BN",
"b2RlbFJlc3BvbnNlEhIKCklzQWxsUmVhZHkYFiABKAgiPAoWVm9pY2VUcmFu", "b2RlbFJlc3BvbnNlEhIKCklzQWxsUmVhZHkYFiABKAgSLAoPcGxheWVyUmVh",
"c3BvcnRSZXNwb25zZRINCgVhcHBJZBgBIAEoCRITCgtjaGFubmVsTmFtZRgC", "ZHlMaXN0GBcgAygLMhMuUGxheWVySm9pblJlc3BvbnNlIjwKFlZvaWNlVHJh",
"IAEoCSI3ChBSb29tVXNlclJlc3BvbnNlEiMKCHVzZXJMaXN0GAEgAygLMhEu", "bnNwb3J0UmVzcG9uc2USDQoFYXBwSWQYASABKAkSEwoLY2hhbm5lbE5hbWUY",
"VXNlckpvaW5SZXNwb25zZSK2AgoQVGFza0luZm9SZXNwb25zZRIOCgZUYXNr", "AiABKAkiNwoQUm9vbVVzZXJSZXNwb25zZRIjCgh1c2VyTGlzdBgBIAMoCzIR",
"SWQYASABKAkSDgoGU3RhdHVzGAIgASgJEg4KBlJvb21JZBgDIAEoCRIJCgFY", "LlVzZXJKb2luUmVzcG9uc2UitgIKEFRhc2tJbmZvUmVzcG9uc2USDgoGVGFz",
"GAQgASgCEgkKAVkYBSABKAISCQoBWhgGIAEoAhIMCgRUeXBlGAcgASgJEhEK", "a0lkGAEgASgJEg4KBlN0YXR1cxgCIAEoCRIOCgZSb29tSWQYAyABKAkSCQoB",
"CVRpbWVMaW1pdBgIIAEoAxIMCgREZXNjGAkgASgJEg8KB1RyaWdnZXIYCiAB", "WBgEIAEoAhIJCgFZGAUgASgCEgkKAVoYBiABKAISDAoEVHlwZRgHIAEoCRIR",
"KAkSEQoJTmV4dFRhc2tzGAsgASgJEhIKClRhcmdldFR5cGUYDCABKAkSDgoG", "CglUaW1lTGltaXQYCCABKAMSDAoERGVzYxgJIAEoCRIPCgdUcmlnZ2VyGAog",
"UmV3YXJkGA0gASgJEgwKBE5vdGUYDiABKAkSEgoKQ3JlYXRlVGltZRgPIAEo", "ASgJEhEKCU5leHRUYXNrcxgLIAEoCRISCgpUYXJnZXRUeXBlGAwgASgJEg4K",
"CRISCgpVcGRhdGVUaW1lGBAgASgJEhAKCFRvVXNlcklkGBEgASgJEhIKCkJh", "BlJld2FyZBgNIAEoCRIMCgROb3RlGA4gASgJEhIKCkNyZWF0ZVRpbWUYDyAB",
"c2VUYXNrSWQYEiABKAkirwMKEk9iamVjdEluZm9SZXNwb25zZRIOCgZSb29t", "KAkSEgoKVXBkYXRlVGltZRgQIAEoCRIQCghUb1VzZXJJZBgRIAEoCRISCgpC",
"SWQYASABKAkSCgoCSWQYAiABKAkSEAoIT2JqZWN0SWQYAyABKAkSDAoETm90", "YXNlVGFza0lkGBIgASgJIq8DChJPYmplY3RJbmZvUmVzcG9uc2USDgoGUm9v",
"ZRgEIAEoCRIMCgRUeXBlGAUgASgJEgwKBE5hbWUYBiABKAkSFgoOTmFtZVNo", "bUlkGAEgASgJEgoKAklkGAIgASgJEhAKCE9iamVjdElkGAMgASgJEgwKBE5v",
"b3dPZmZzZXQYByABKAMSEgoKU2hvd1JhZGl1cxgIIAEoAxIMCgRJY29uGAkg", "dGUYBCABKAkSDAoEVHlwZRgFIAEoCRIMCgROYW1lGAYgASgJEhYKDk5hbWVT",
"ASgJEgwKBFJvbGUYCiABKAkSEgoKSXRlbURlcGVuZBgLIAEoCRIQCghUYWtl", "aG93T2Zmc2V0GAcgASgDEhIKClNob3dSYWRpdXMYCCABKAMSDAoESWNvbhgJ",
"VGltZRgMIAEoAxITCgtOZWVkUGxheWVycxgNIAEoCRISCgpUYXNrU3RhdHVz", "IAEoCRIMCgRSb2xlGAogASgJEhIKCkl0ZW1EZXBlbmQYCyABKAkSEAoIVGFr",
"GA4gASgJEhIKClNlbGVjdExpc3QYDyABKAkSDQoFT25PZmYYECABKAMSDgoG", "ZVRpbWUYDCABKAMSEwoLTmVlZFBsYXllcnMYDSABKAkSEgoKVGFza1N0YXR1",
"U3RhdHVzGBEgASgJEhEKCVJlc0NoYW5nZRgSIAEoCRIXCg9QYXJhbGxlbENv", "cxgOIAEoCRISCgpTZWxlY3RMaXN0GA8gASgJEg0KBU9uT2ZmGBAgASgDEg4K",
"bnRyb2wYEyABKAMSEgoKRXh0cmFWYWx1ZRgUIAEoCRIPCgdVc2VySWRzGBUg", "BlN0YXR1cxgRIAEoCRIRCglSZXNDaGFuZ2UYEiABKAkSFwoPUGFyYWxsZWxD",
"ASgJEhIKCkNyZWF0ZVRpbWUYFiABKAkSEgoKVXBkYXRlVGltZRgXIAEoCUIH", "b250cm9sGBMgASgDEhIKCkV4dHJhVmFsdWUYFCABKAkSDwoHVXNlcklkcxgV",
"WgUuLztwYmIGcHJvdG8z")); "IAEoCRISCgpDcmVhdGVUaW1lGBYgASgJEhIKClVwZGF0ZVRpbWUYFyABKAlC",
"B1oFLi87cGJiBnByb3RvMw=="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { global::MoveReflection.Descriptor, global::HallReflection.Descriptor, global::PropReflection.Descriptor, }, new pbr::FileDescriptor[] { global::MoveReflection.Descriptor, global::HallReflection.Descriptor, global::PropReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { 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", "PropResponse", "IsAllReady" }, 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", "IsAllReady", "PlayerReadyList" }, 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::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::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), 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),
@ -124,6 +125,7 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
z_ = other.z_; z_ = other.z_;
propResponse_ = other.propResponse_.Clone(); propResponse_ = other.propResponse_.Clone();
isAllReady_ = other.isAllReady_; isAllReady_ = other.isAllReady_;
playerReadyList_ = other.playerReadyList_.Clone();
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
} }
@ -431,6 +433,20 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
} }
} }
/// <summary>Field number for the "playerReadyList" field.</summary>
public const int PlayerReadyListFieldNumber = 23;
private static readonly pb::FieldCodec<global::PlayerJoinResponse> _repeated_playerReadyList_codec
= pb::FieldCodec.ForMessage(186, global::PlayerJoinResponse.Parser);
private readonly pbc::RepeatedField<global::PlayerJoinResponse> playerReadyList_ = new pbc::RepeatedField<global::PlayerJoinResponse>();
/// <summary>
/// 准备玩家列表
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public pbc::RepeatedField<global::PlayerJoinResponse> PlayerReadyList {
get { return playerReadyList_; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public override bool Equals(object other) { public override bool Equals(object other) {
@ -466,6 +482,7 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false; if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Z, other.Z)) return false;
if(!propResponse_.Equals(other.propResponse_)) return false; if(!propResponse_.Equals(other.propResponse_)) return false;
if (IsAllReady != other.IsAllReady) return false; if (IsAllReady != other.IsAllReady) return false;
if(!playerReadyList_.Equals(other.playerReadyList_)) return false;
return Equals(_unknownFields, other._unknownFields); return Equals(_unknownFields, other._unknownFields);
} }
@ -493,6 +510,7 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
if (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z); if (Z != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Z);
hash ^= propResponse_.GetHashCode(); hash ^= propResponse_.GetHashCode();
if (IsAllReady != false) hash ^= IsAllReady.GetHashCode(); if (IsAllReady != false) hash ^= IsAllReady.GetHashCode();
hash ^= playerReadyList_.GetHashCode();
if (_unknownFields != null) { if (_unknownFields != null) {
hash ^= _unknownFields.GetHashCode(); hash ^= _unknownFields.GetHashCode();
} }
@ -585,6 +603,7 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
output.WriteRawTag(176, 1); output.WriteRawTag(176, 1);
output.WriteBool(IsAllReady); output.WriteBool(IsAllReady);
} }
playerReadyList_.WriteTo(output, _repeated_playerReadyList_codec);
if (_unknownFields != null) { if (_unknownFields != null) {
_unknownFields.WriteTo(output); _unknownFields.WriteTo(output);
} }
@ -669,6 +688,7 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
output.WriteRawTag(176, 1); output.WriteRawTag(176, 1);
output.WriteBool(IsAllReady); output.WriteBool(IsAllReady);
} }
playerReadyList_.WriteTo(ref output, _repeated_playerReadyList_codec);
if (_unknownFields != null) { if (_unknownFields != null) {
_unknownFields.WriteTo(ref output); _unknownFields.WriteTo(ref output);
} }
@ -735,6 +755,7 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
if (IsAllReady != false) { if (IsAllReady != false) {
size += 2 + 1; size += 2 + 1;
} }
size += playerReadyList_.CalculateSize(_repeated_playerReadyList_codec);
if (_unknownFields != null) { if (_unknownFields != null) {
size += _unknownFields.CalculateSize(); size += _unknownFields.CalculateSize();
} }
@ -818,6 +839,7 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
if (other.IsAllReady != false) { if (other.IsAllReady != false) {
IsAllReady = other.IsAllReady; IsAllReady = other.IsAllReady;
} }
playerReadyList_.Add(other.playerReadyList_);
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
} }
@ -932,6 +954,10 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
IsAllReady = input.ReadBool(); IsAllReady = input.ReadBool();
break; break;
} }
case 186: {
playerReadyList_.AddEntriesFrom(input, _repeated_playerReadyList_codec);
break;
}
} }
} }
#endif #endif
@ -1046,6 +1072,10 @@ public sealed partial class UserJoinResponse : pb::IMessage<UserJoinResponse>
IsAllReady = input.ReadBool(); IsAllReady = input.ReadBool();
break; break;
} }
case 186: {
playerReadyList_.AddEntriesFrom(ref input, _repeated_playerReadyList_codec);
break;
}
} }
} }
} }

745
xiaofang/Assets/ProtoBuf/Proto/Room.cs
View File

@ -22,7 +22,7 @@ public static partial class RoomReflection {
static RoomReflection() { static RoomReflection() {
byte[] descriptorData = global::System.Convert.FromBase64String( byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat( string.Concat(
"Cgpyb29tLnByb3RvIqAEChRSb29tVGVtcGxhdGVSZXNwb25zZRIKCgJJZBgB", "Cgpyb29tLnByb3RvIsMEChRSb29tVGVtcGxhdGVSZXNwb25zZRIKCgJJZBgB",
"IAEoAxIUCgxUZW1wbGF0ZU5hbWUYAiABKAkSEQoJQ29tcGFueUlkGAMgASgJ", "IAEoAxIUCgxUZW1wbGF0ZU5hbWUYAiABKAkSEQoJQ29tcGFueUlkGAMgASgJ",
"Eg8KB1NjZW5lSWQYBCABKAkSEQoJU3ViamVjdElkGAUgASgJEg4KBlN0YXR1", "Eg8KB1NjZW5lSWQYBCABKAkSEQoJU3ViamVjdElkGAUgASgJEg4KBlN0YXR1",
"cxgGIAEoCRISCgpJc1RlbXBsYXRlGAcgASgJEhAKCENyZWF0ZUJ5GAggASgJ", "cxgGIAEoCRISCgpJc1RlbXBsYXRlGAcgASgJEhAKCENyZWF0ZUJ5GAggASgJ",
@ -34,45 +34,53 @@ public static partial class RoomReflection {
"IAMoCzIOLk9iamVjdE9ybURhdGESFAoMR2FtZVBvc2l0aW9uGBYgASgJEhYK", "IAMoCzIOLk9iamVjdE9ybURhdGESFAoMR2FtZVBvc2l0aW9uGBYgASgJEhYK",
"DkluaXRGaXJlUmFkaXVzGBcgASgCEhQKDEluaXRGaXJlVGltZRgYIAEoBRIV", "DkluaXRGaXJlUmFkaXVzGBcgASgCEhQKDEluaXRGaXJlVGltZRgYIAEoBRIV",
"Cg1BZGRGaXJlUmFkaXVzGBkgASgCEhQKDEFkZEZpcmVWYWx1ZRgaIAEoAhIT", "Cg1BZGRGaXJlUmFkaXVzGBkgASgCEhQKDEFkZEZpcmVWYWx1ZRgaIAEoAhIT",
"CgtNYXhGaXJld2FsbBgbIAEoBSLVAwoLVGFza09ybURhdGESCgoCSWQYASAB", "CgtNYXhGaXJld2FsbBgbIAEoBRIhCgthcmVhT3JtRGF0YRgcIAMoCzIMLkFy",
"KAMSEAoIVGFza05hbWUYAiABKAkSEAoIR2FtZU5hbWUYAyABKAkSEAoIR2Ft", "ZWFPcm1EYXRhItUDCgtUYXNrT3JtRGF0YRIKCgJJZBgBIAEoAxIQCghUYXNr",
"ZVR5cGUYBCABKAUSEAoIR2FtZURlc2MYBSABKAkSFgoOR2FtZVBsYXlTY3Jp", "TmFtZRgCIAEoCRIQCghHYW1lTmFtZRgDIAEoCRIQCghHYW1lVHlwZRgEIAEo",
"cHQYBiABKAkSEwoLR2FtZVRyaWdnZXIYByABKAkSGAoQR2FtZVRyaWdnZXJM", "BRIQCghHYW1lRGVzYxgFIAEoCRIWCg5HYW1lUGxheVNjcmlwdBgGIAEoCRIT",
"b2dpYxgIIAEoCRIXCg9HYW1lT3ZlcnNlZUNvbmQYCSABKAkSFQoNR2FtZVRp", "CgtHYW1lVHJpZ2dlchgHIAEoCRIYChBHYW1lVHJpZ2dlckxvZ2ljGAggASgJ",
"bWVMaW1pdBgKIAEoCRIQCghHYW1lUm9sZRgLIAEoCRITCgtHYW1lU2VsZWN0", "EhcKD0dhbWVPdmVyc2VlQ29uZBgJIAEoCRIVCg1HYW1lVGltZUxpbWl0GAog",
"cxgMIAEoCRIWCg5HYW1lVGFyZ2V0VHlwZRgNIAEoCRIYChBHYW1lVGFyZ2V0", "ASgJEhAKCEdhbWVSb2xlGAsgASgJEhMKC0dhbWVTZWxlY3RzGAwgASgJEhYK",
"c0ZpcnN0GA4gASgJEhkKEUdhbWVUYXJnZXRzU2Vjb25kGA8gASgJEh4KFkdh", "DkdhbWVUYXJnZXRUeXBlGA0gASgJEhgKEEdhbWVUYXJnZXRzRmlyc3QYDiAB",
"bWVUYXJnZXRzU2Vjb25kTG9naWMYECABKAkSFgoOR2FtZUV4dHJhVmFsdWUY", "KAkSGQoRR2FtZVRhcmdldHNTZWNvbmQYDyABKAkSHgoWR2FtZVRhcmdldHNT",
"ESABKAkSEAoIR2FtZVNvcnQYEiABKAkSEgoKR2FtZUlzU2hvdxgTIAEoCRIV", "ZWNvbmRMb2dpYxgQIAEoCRIWCg5HYW1lRXh0cmFWYWx1ZRgRIAEoCRIQCghH",
"Cg1HYW1lRXhjbHVzaXZlGBQgASgJEhIKCkdhbWVSZXdhcmQYFSABKAkingMK", "YW1lU29ydBgSIAEoCRISCgpHYW1lSXNTaG93GBMgASgJEhUKDUdhbWVFeGNs",
"DVNlbGVjdE9ybURhdGESCgoCSWQYASABKAMSDAoETm90ZRgCIAEoCRINCgVH", "dXNpdmUYFCABKAkSEgoKR2FtZVJld2FyZBgVIAEoCSKeAwoNU2VsZWN0T3Jt",
"cm91cBgDIAEoCRIQCghTaG93VGV4dBgEIAEoCRIMCgRJY29uGAUgASgJEhUK", "RGF0YRIKCgJJZBgBIAEoAxIMCgROb3RlGAIgASgJEg0KBUdyb3VwGAMgASgJ",
"DVByZWNvbmRpdGlvbnMYBiABKAkSEQoJRXhjbHVzaXZlGAcgASgJEhAKCFRh", "EhAKCFNob3dUZXh0GAQgASgJEgwKBEljb24YBSABKAkSFQoNUHJlY29uZGl0",
"c2tUaW1lGAggASgDEhEKCVRpbWVMaW1pdBgJIAEoAxISCgpOZXh0U2VsZWN0", "aW9ucxgGIAEoCRIRCglFeGNsdXNpdmUYByABKAkSEAoIVGFza1RpbWUYCCAB",
"GAogASgJEhAKCFRhc2tMaW5rGAsgASgJEhcKD1Rhc2tMaW5rRGV0YWlscxgM", "KAMSEQoJVGltZUxpbWl0GAkgASgDEhIKCk5leHRTZWxlY3QYCiABKAkSEAoI",
"IAEoCRIQCghDYWxsTW9kZRgNIAEoCRIVCg1DYWxsUmVjaXBpZW50GA4gASgJ", "VGFza0xpbmsYCyABKAkSFwoPVGFza0xpbmtEZXRhaWxzGAwgASgJEhAKCENh",
"EhUKDUNvcnJlY3RPcHRpb24YDyABKAkSDgoGUmV3YXJkGBAgASgJEg4KBlJl", "bGxNb2RlGA0gASgJEhUKDUNhbGxSZWNpcGllbnQYDiABKAkSFQoNQ29ycmVj",
"c3VsdBgRIAEoCRINCgVSb3V0ZRgSIAEoCRIUCgxUaW1pbmdDaGFuZ2UYEyAB", "dE9wdGlvbhgPIAEoCRIOCgZSZXdhcmQYECABKAkSDgoGUmVzdWx0GBEgASgJ",
"KAkSEQoJQXBwbGllZFVJGBQgASgJEhEKCVVJRGV0YWlscxgVIAEoCRILCgNT", "Eg0KBVJvdXRlGBIgASgJEhQKDFRpbWluZ0NoYW5nZRgTIAEoCRIRCglBcHBs",
"ZXEYFiABKAkiqgMKDU9iamVjdE9ybURhdGESCgoCSWQYASABKAkSEAoIT2Jq", "aWVkVUkYFCABKAkSEQoJVUlEZXRhaWxzGBUgASgJEgsKA1NlcRgWIAEoCSKq",
"ZWN0SWQYAiABKAkSDAoETm90ZRgDIAEoCRIMCgRUeXBlGAQgASgJEgwKBE5h", "AwoNT2JqZWN0T3JtRGF0YRIKCgJJZBgBIAEoCRIQCghPYmplY3RJZBgCIAEo",
"bWUYBSABKAkSFgoOTmFtZVNob3dPZmZzZXQYBiABKAMSEgoKU2hvd1JhZGl1", "CRIMCgROb3RlGAMgASgJEgwKBFR5cGUYBCABKAkSDAoETmFtZRgFIAEoCRIW",
"cxgHIAEoAxIMCgRJY29uGAggASgJEgwKBFJvbGUYCSABKAkSEgoKSXRlbURl", "Cg5OYW1lU2hvd09mZnNldBgGIAEoAxISCgpTaG93UmFkaXVzGAcgASgDEgwK",
"cGVuZBgKIAEoCRIQCghUYWtlVGltZRgLIAEoAxITCgtOZWVkUGxheWVycxgM", "BEljb24YCCABKAkSDAoEUm9sZRgJIAEoCRISCgpJdGVtRGVwZW5kGAogASgJ",
"IAEoCRISCgpUYXNrU3RhdHVzGA0gASgJEhIKClNlbGVjdExpc3QYDiABKAkS", "EhAKCFRha2VUaW1lGAsgASgDEhMKC05lZWRQbGF5ZXJzGAwgASgJEhIKClRh",
"DQoFT25PZmYYDyABKAMSDgoGU3RhdHVzGBAgASgJEhEKCVJlc0NoYW5nZRgR", "c2tTdGF0dXMYDSABKAkSEgoKU2VsZWN0TGlzdBgOIAEoCRINCgVPbk9mZhgP",
"IAEoCRIXCg9QYXJhbGxlbENvbnRyb2wYEiABKAMSEgoKRXh0cmFWYWx1ZRgT", "IAEoAxIOCgZTdGF0dXMYECABKAkSEQoJUmVzQ2hhbmdlGBEgASgJEhcKD1Bh",
"IAEoCRIPCgdVc2VySWRzGBQgASgJEhIKCkNyZWF0ZVRpbWUYFSABKAkSEgoK", "cmFsbGVsQ29udHJvbBgSIAEoAxISCgpFeHRyYVZhbHVlGBMgASgJEg8KB1Vz",
"VXBkYXRlVGltZRgWIAEoCRIOCgZSb29tSWQYFyABKAkiQwoQRmlyZVBvaW50", "ZXJJZHMYFCABKAkSEgoKQ3JlYXRlVGltZRgVIAEoCRISCgpVcGRhdGVUaW1l",
"UmVxdWVzdBIJCgFYGAEgASgCEgkKAVkYAiABKAISCQoBWhgDIAEoAhIOCgZS", "GBYgASgJEg4KBlJvb21JZBgXIAEoCSKFAgoLQXJlYU9ybURhdGESCgoCSWQY",
"b29tSWQYBCABKAlCB1oFLi87cGJiBnByb3RvMw==")); "ASABKAMSEAoIR2FtZU5vdGUYAiABKAkSEAoIR2FtZU5hbWUYAyABKAkSEQoJ",
"R2FtZVNjZW5lGAQgASgJEhEKCUdhbWVSYW5nZRgFIAEoCRIXCg9HYW1lQ2Vu",
"dHJlUG9pbnQYBiABKAkSFAoMR2FtZU5wY1JhdGlvGAcgASgJEhMKC0dhbWVP",
"dmVyc2VlGAggASgJEhQKDEdhbWVFbmRQb2ludBgJIAEoCRIVCg1HYW1lUm9s",
"ZUxpbWl0GAogASgJEhEKCUdhbWVMZXZlbBgLIAEoCRIcChRHYW1lUGxheWVy",
"U3Bhd25Qb2ludBgMIAEoCSJDChBGaXJlUG9pbnRSZXF1ZXN0EgkKAVgYASAB",
"KAISCQoBWRgCIAEoAhIJCgFaGAMgASgCEg4KBlJvb21JZBgEIAEoCUIHWgUu",
"LztwYmIGcHJvdG8z"));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { 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::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::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::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) 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::IMessage<RoomTemplateResp
addFireRadius_ = other.addFireRadius_; addFireRadius_ = other.addFireRadius_;
addFireValue_ = other.addFireValue_; addFireValue_ = other.addFireValue_;
maxFirewall_ = other.maxFirewall_; maxFirewall_ = other.maxFirewall_;
areaOrmData_ = other.areaOrmData_.Clone();
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
} }
@ -433,6 +442,17 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
} }
} }
/// <summary>Field number for the "areaOrmData" field.</summary>
public const int AreaOrmDataFieldNumber = 28;
private static readonly pb::FieldCodec<global::AreaOrmData> _repeated_areaOrmData_codec
= pb::FieldCodec.ForMessage(226, global::AreaOrmData.Parser);
private readonly pbc::RepeatedField<global::AreaOrmData> areaOrmData_ = new pbc::RepeatedField<global::AreaOrmData>();
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public pbc::RepeatedField<global::AreaOrmData> AreaOrmData {
get { return areaOrmData_; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public override bool Equals(object other) { public override bool Equals(object other) {
@ -472,6 +492,7 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(AddFireRadius, other.AddFireRadius)) return false; if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(AddFireRadius, other.AddFireRadius)) return false;
if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(AddFireValue, other.AddFireValue)) return false; if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(AddFireValue, other.AddFireValue)) return false;
if (MaxFirewall != other.MaxFirewall) return false; if (MaxFirewall != other.MaxFirewall) return false;
if(!areaOrmData_.Equals(other.areaOrmData_)) return false;
return Equals(_unknownFields, other._unknownFields); return Equals(_unknownFields, other._unknownFields);
} }
@ -503,6 +524,7 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
if (AddFireRadius != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(AddFireRadius); if (AddFireRadius != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(AddFireRadius);
if (AddFireValue != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(AddFireValue); if (AddFireValue != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(AddFireValue);
if (MaxFirewall != 0) hash ^= MaxFirewall.GetHashCode(); if (MaxFirewall != 0) hash ^= MaxFirewall.GetHashCode();
hash ^= areaOrmData_.GetHashCode();
if (_unknownFields != null) { if (_unknownFields != null) {
hash ^= _unknownFields.GetHashCode(); hash ^= _unknownFields.GetHashCode();
} }
@ -608,6 +630,7 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
output.WriteRawTag(216, 1); output.WriteRawTag(216, 1);
output.WriteInt32(MaxFirewall); output.WriteInt32(MaxFirewall);
} }
areaOrmData_.WriteTo(output, _repeated_areaOrmData_codec);
if (_unknownFields != null) { if (_unknownFields != null) {
_unknownFields.WriteTo(output); _unknownFields.WriteTo(output);
} }
@ -705,6 +728,7 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
output.WriteRawTag(216, 1); output.WriteRawTag(216, 1);
output.WriteInt32(MaxFirewall); output.WriteInt32(MaxFirewall);
} }
areaOrmData_.WriteTo(ref output, _repeated_areaOrmData_codec);
if (_unknownFields != null) { if (_unknownFields != null) {
_unknownFields.WriteTo(ref output); _unknownFields.WriteTo(ref output);
} }
@ -781,6 +805,7 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
if (MaxFirewall != 0) { if (MaxFirewall != 0) {
size += 2 + pb::CodedOutputStream.ComputeInt32Size(MaxFirewall); size += 2 + pb::CodedOutputStream.ComputeInt32Size(MaxFirewall);
} }
size += areaOrmData_.CalculateSize(_repeated_areaOrmData_codec);
if (_unknownFields != null) { if (_unknownFields != null) {
size += _unknownFields.CalculateSize(); size += _unknownFields.CalculateSize();
} }
@ -859,6 +884,7 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
if (other.MaxFirewall != 0) { if (other.MaxFirewall != 0) {
MaxFirewall = other.MaxFirewall; MaxFirewall = other.MaxFirewall;
} }
areaOrmData_.Add(other.areaOrmData_);
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
} }
@ -974,6 +1000,10 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
MaxFirewall = input.ReadInt32(); MaxFirewall = input.ReadInt32();
break; break;
} }
case 226: {
areaOrmData_.AddEntriesFrom(input, _repeated_areaOrmData_codec);
break;
}
} }
} }
#endif #endif
@ -1089,6 +1119,10 @@ public sealed partial class RoomTemplateResponse : pb::IMessage<RoomTemplateResp
MaxFirewall = input.ReadInt32(); MaxFirewall = input.ReadInt32();
break; break;
} }
case 226: {
areaOrmData_.AddEntriesFrom(ref input, _repeated_areaOrmData_codec);
break;
}
} }
} }
} }
@ -4090,6 +4124,647 @@ public sealed partial class ObjectOrmData : pb::IMessage<ObjectOrmData>
} }
[global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
public sealed partial class AreaOrmData : pb::IMessage<AreaOrmData>
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
, pb::IBufferMessage
#endif
{
private static readonly pb::MessageParser<AreaOrmData> _parser = new pb::MessageParser<AreaOrmData>(() => new AreaOrmData());
private pb::UnknownFieldSet _unknownFields;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public static pb::MessageParser<AreaOrmData> 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);
}
/// <summary>Field number for the "Id" field.</summary>
public const int IdFieldNumber = 1;
private long id_;
/// <summary>
/// ID
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public long Id {
get { return id_; }
set {
id_ = value;
}
}
/// <summary>Field number for the "GameNote" field.</summary>
public const int GameNoteFieldNumber = 2;
private string gameNote_ = "";
/// <summary>
/// 状态
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string GameNote {
get { return gameNote_; }
set {
gameNote_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
/// <summary>Field number for the "GameName" field.</summary>
public const int GameNameFieldNumber = 3;
private string gameName_ = "";
/// <summary>
/// 对象名称
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string GameName {
get { return gameName_; }
set {
gameName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
/// <summary>Field number for the "GameScene" field.</summary>
public const int GameSceneFieldNumber = 4;
private string gameScene_ = "";
/// <summary>
/// 场景名称
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string GameScene {
get { return gameScene_; }
set {
gameScene_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
/// <summary>Field number for the "GameRange" field.</summary>
public const int GameRangeFieldNumber = 5;
private string gameRange_ = "";
/// <summary>
/// 范围
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string GameRange {
get { return gameRange_; }
set {
gameRange_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
/// <summary>Field number for the "GameCentrePoint" field.</summary>
public const int GameCentrePointFieldNumber = 6;
private string gameCentrePoint_ = "";
/// <summary>
/// 中心点
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string GameCentrePoint {
get { return gameCentrePoint_; }
set {
gameCentrePoint_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
/// <summary>Field number for the "GameNpcRatio" field.</summary>
public const int GameNpcRatioFieldNumber = 7;
private string gameNpcRatio_ = "";
/// <summary>
/// NPC比例 0-1
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string GameNpcRatio {
get { return gameNpcRatio_; }
set {
gameNpcRatio_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
/// <summary>Field number for the "GameOversee" field.</summary>
public const int GameOverseeFieldNumber = 8;
private string gameOversee_ = "";
/// <summary>
/// 监视者
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string GameOversee {
get { return gameOversee_; }
set {
gameOversee_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
/// <summary>Field number for the "GameEndPoint" field.</summary>
public const int GameEndPointFieldNumber = 9;
private string gameEndPoint_ = "";
/// <summary>
/// 结束点
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string GameEndPoint {
get { return gameEndPoint_; }
set {
gameEndPoint_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
/// <summary>Field number for the "GameRoleLimit" field.</summary>
public const int GameRoleLimitFieldNumber = 10;
private string gameRoleLimit_ = "";
/// <summary>
/// 角色限制
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string GameRoleLimit {
get { return gameRoleLimit_; }
set {
gameRoleLimit_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
/// <summary>Field number for the "GameLevel" field.</summary>
public const int GameLevelFieldNumber = 11;
private string gameLevel_ = "";
/// <summary>
/// 等级限制
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string GameLevel {
get { return gameLevel_; }
set {
gameLevel_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
/// <summary>Field number for the "GamePlayerSpawnPoint" field.</summary>
public const int GamePlayerSpawnPointFieldNumber = 12;
private string gamePlayerSpawnPoint_ = "";
/// <summary>
/// 玩家出生点
/// </summary>
[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}")] [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
public sealed partial class FirePointRequest : pb::IMessage<FirePointRequest> public sealed partial class FirePointRequest : pb::IMessage<FirePointRequest>
#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
@ -4105,7 +4780,7 @@ public sealed partial class FirePointRequest : pb::IMessage<FirePointRequest>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public static pbr::MessageDescriptor Descriptor { public static pbr::MessageDescriptor Descriptor {
get { return global::RoomReflection.Descriptor.MessageTypes[4]; } get { return global::RoomReflection.Descriptor.MessageTypes[5]; }
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]

33
xiaofang/Assets/ProtoBuf/test.cs
View File

@ -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(); InputData data = new InputData();
data.Id = id; data = inputData;
data.SId = sid;
data.X = x;
data.Y = y;
data.RoomSeatId = roomseatid;
data.Z = z;
data.RoomId = roomid;
WSMessage msg = new WSMessage(); WSMessage msg = new WSMessage();
msg.Module = "fps"; msg.Module = "fps";
msg.ServiceName = "UpFps"; msg.ServiceName = "UpFps";
@ -661,7 +655,8 @@ string HandleButtoncallId=11;//
//BroadcastFrameMsg.FramesFieldNumber //BroadcastFrameMsg.FramesFieldNumber
wEBScriptListener.SendMessageByte(sendData); wEBScriptListener.SendMessageByte(sendData);
}//23.玩家到位情况 2024.12.30 }
//23.Íæ¼Òµ½Î»Çé¿ö 2024.12.30
public void PlayerSituation(string roomId) public void PlayerSituation(string roomId)
{ {
JoinRoomRequest data = new JoinRoomRequest(); JoinRoomRequest data = new JoinRoomRequest();
@ -904,6 +899,14 @@ string HandleButtoncallId=11;//
} }
if (userJoinResponse.MessageType == 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("房间开始"); Debug.LogWarning("房间开始");
test111.instance.Oppanel(); test111.instance.Oppanel();
} }
@ -921,9 +924,15 @@ string HandleButtoncallId=11;//
break; break;
//帧数据 //帧数据
case "fps.UpFps": case "fps.BroadcastFrameData":
InputData inputData = ProtoBufffer.DeSerialize<InputData>(bytes); BroadcastFrameMsg broadcastFrameMsg = ProtoBufffer.DeSerialize<BroadcastFrameMsg>(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); foreach(var i in broadcastFrameMsg.Frames)
{
foreach(var j in i.Input)
{
Debug.Log(j);
}
}
break; break;
//拾取道具监听返回 //拾取道具监听返回

2
xiaofang/Assets/Res/gsj/gameRoomList.cs
View File

@ -84,7 +84,7 @@ public class GameRoomListPlayer
public string UserId { get; set; } // 用户ID public string UserId { get; set; } // 用户ID
public int RoleId { get; set; } // 角色ID public int RoleId { get; set; } // 角色ID
public string RoleName { get; set; } // 角色名称 public string RoleName { get; set; } // 角色名称
//public int BirthAreaId { get; set; } // 出生地ID public int BirthAreaId { get; set; } // 出生地ID
public string BirthAreaName { get; set; } // 出生地名称 public string BirthAreaName { get; set; } // 出生地名称
public int ChargeAreaId { get; set; } // 负责区域ID public int ChargeAreaId { get; set; } // 负责区域ID
public string ChargeAreaName { get; set; } // 负责区域名称 public string ChargeAreaName { get; set; } // 负责区域名称

1
xiaofang/Assets/Res/gsj/scripts/Godvisual.cs
View File

@ -118,6 +118,7 @@ public class Godvisual : MonoBehaviour
// 确保最终位置和旋转准确 // 确保最终位置和旋转准确
transform.position = endPosition; transform.position = endPosition;
transform.rotation = endRotation; transform.rotation = endRotation;
} }
// 获取当前角色的默认视角（假设角色索引为 0） // 获取当前角色的默认视角（假设角色索引为 0）

4
xiaofang/Assets/Res/gsj/scripts/ReadRoom.cs
View File

@ -23,7 +23,7 @@ public class ReadRoom : MonoBehaviour
public loginData playerdetail; public loginData playerdetail;
public test test; public test test;
public string ID; public string ID;
public GameRoomListData GameRoomListData;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
@ -78,7 +78,7 @@ public class ReadRoom : MonoBehaviour
Debug.LogError(room.PlayerList[i].UserId); Debug.LogError(room.PlayerList[i].UserId);
if ((GlobalData.ServerData.data.userId == room.PlayerList[i].UserId) && (formattedDate == room.ReserveDate)) if ((GlobalData.ServerData.data.userId == room.PlayerList[i].UserId) && (formattedDate == room.ReserveDate))
{ {
GameRoomListData = room;
//传人物职业ID //传人物职业ID
//Player.CSZS.SetPlayerID(room.PlayerList[i].RoleId); //Player.CSZS.SetPlayerID(room.PlayerList[i].RoleId);
Debug.Log("可以直接进入房间"); Debug.Log("可以直接进入房间");

17
xiaofang/Assets/Res/gsj/test111.cs
View File

@ -10,9 +10,11 @@ public class test111 : MonoBehaviour
public Camera camera; public Camera camera;
public Canvas canvas2; public Canvas canvas2;
public Camera camera1; public Camera camera1;
public gameRoomList gameRoomListInstance; // 引用 gameRoomList 脚本实例
public Dictionary<string,PlayerJoinResponse> PLayerList;
void Start() void Start()
{ {
gameRoomListInstance = FindObjectOfType<gameRoomList>();
instance = this; instance = this;
@ -41,6 +43,19 @@ public class test111 : MonoBehaviour
camera1.gameObject.SetActive(false); 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 // Update is called once per frame
void Update() void Update()
{ {

1
xiaofang/Assets/Script/DirllInterface/getPlayerList.cs
View File

@ -33,7 +33,6 @@ public class getPlayerList : MonoBehaviour
PlayerListResponse playerListResponse = JsonConvert.DeserializeObject<PlayerListResponse>(response); PlayerListResponse playerListResponse = JsonConvert.DeserializeObject<PlayerListResponse>(response);
Debug.Log(playerListResponse.data[0].UserId); Debug.Log(playerListResponse.data[0].UserId);
Debug.Log(playerListResponse.data[0].UserName); Debug.Log(playerListResponse.data[0].UserName);
return playerListResponse; return playerListResponse;
} }
} }