From 63133cf5403a9d7fbe3811d20c3d24f26a752449 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 22 Oct 2020 16:06:35 +0800
Subject: [PATCH] 无尽模式，添加法阵展示和结算界面滑动列表
---
Assets/Scripts/Net/NetExtends/Game.cs | 843 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 648 insertions(+), 195 deletions(-)
diff --git a/Assets/Scripts/Net/NetExtends/Game.cs b/Assets/Scripts/Net/NetExtends/Game.cs
index 3dea287..139bdde 100644
--- a/Assets/Scripts/Net/NetExtends/Game.cs
+++ b/Assets/Scripts/Net/NetExtends/Game.cs
@@ -94,48 +94,52 @@
"KAgimAEKEFRha2VBcmVuYUJveF9TMkMSEQoJZXJyb3Jjb2RlGAEgASgFEgsK",
"A3BvcxgCIAEoBRINCgVib3hpZBgDIAEoBRIpCghjdXJpdGVtcxgEIAMoCzIX",
"LnByb3RvYnVmLlJld2FyZEl0ZW1Nc2cSKgoJYm94cmV3YXJkGAUgAygLMhcu",
- "cHJvdG9idWYuUmV3YXJkSXRlbU1zZyI+ChBGYW1pbHlTZWFyY2hfQzJTEgwK",
- "BG5hbWUYASABKAkSDQoFc3RhcnQYAiABKAUSDQoFbGltaXQYAyABKAUiZwoQ",
- "RmFtaWx5U2VhcmNoX1MyQxIRCgllcnJvcmNvZGUYASABKAUSMQoKZmFtaWx5",
- "bGlzdBgCIAMoCzIdLnByb3RvYnVmLkZhbWlseVNlYXJjaEl0ZW1Nc2cSDQoF",
- "dG90YWwYAyABKAUiOgoWRmFtaWx5UGxheWVyT25saW5lX1MyQxIQCgh1c2Vy",
- "bmFtZRgBIAEoBRIOCgZvbmxpbmUYAiABKAgiYgoQRmFtaWx5Q3JlYXRlX0My",
- "UxIMCgRuYW1lGAEgASgJEgwKBGRlc2MYAiABKAkSDQoFaWNvbnMYAyADKAUS",
- "EAoIZnJlZUpvaW4YBCABKAUSEQoJbmVlZFNjb3JlGAUgASgFIh0KDkZhbWls",
- "eUpvaW5fQzJTEgsKA3VpZBgBIAEoCSIwCg5GYW1pbHlKb2luX1MyQxIRCgll",
- "cnJvcmNvZGUYASABKAUSCwoDdWlkGAIgASgJIjEKEUZhbWlseUdldENoYXRf",
- "QzJTEg0KBXN0YXJ0GAEgASgFEg0KBWxpbWl0GAIgASgFInUKEUZhbWlseUdl",
- "dENoYXRfUzJDEhEKCWVycm9yY29kZRgBIAEoBRIpCghtZXNzYWdlcxgCIAMo",
- "CzIXLnByb3RvYnVmLkZhbWlseUNoYXRNc2cSDQoFdG90YWwYAyABKAUSEwoL",
- "b25saW5lQ291bnQYBCABKAUiTAoTRmFtaWx5U3RhcnRDaGF0X0MyUxIkCghj",
- "aGF0VHlwZRgBIAEoDjISLnByb3RvYnVmLkNoYXRUeXBlEg8KB2NvbnRlbnQY",
- "AiABKAkiUgoTRmFtaWx5U3RhcnRDaGF0X1MyQxIRCgllcnJvcmNvZGUYASAB",
- "KAUSKAoHbWVzc2FnZRgCIAEoCzIXLnByb3RvYnVmLkZhbWlseUNoYXRNc2ci",
- "KgoVRmFtaWx5U3RhcnREb25hdGVfQzJTEhEKCW1lc3NhZ2VJZBgBIAEoBSJU",
- "ChVGYW1pbHlTdGFydERvbmF0ZV9TMkMSEQoJZXJyb3Jjb2RlGAEgASgFEigK",
- "B21lc3NhZ2UYAiABKAsyFy5wcm90b2J1Zi5GYW1pbHlDaGF0TXNnIhAKDkZh",
- "bWlseVF1aXRfQzJTIiMKDkZhbWlseVF1aXRfUzJDEhEKCWVycm9yY29kZRgB",
- "IAEoBSIoChNGYW1pbHlBZ3JlZUpvaW5fQzJTEhEKCW1lc3NhZ2VJZBgBIAEo",
- "BSJWChNGYW1pbHlBZ3JlZUpvaW5fUzJDEhEKCWVycm9yY29kZRgBIAEoBRIs",
- "CgluZXdNZW1iZXIYAiABKAsyGS5wcm90b2J1Zi5GYW1pbHlNZW1iZXJNc2ci",
- "JgoSRmFtaWx5S2lja1VzZXJfQzJTEhAKCHVzZXJuYW1lGAEgASgJIicKEkZh",
- "bWlseUtpY2tVc2VyX1MyQxIRCgllcnJvcmNvZGUYASABKAUiKQoVRmFtaWx5",
- "VHJhbnNMZWFkZXJfQzJTEhAKCHVzZXJuYW1lGAEgASgJIioKFUZhbWlseVRy",
- "YW5zTGVhZGVyX1MyQxIRCgllcnJvcmNvZGUYASABKAUiGQoXRmFtaWx5R2V0",
- "RG9uYXRlU2hvcF9DMlMiZwoXRmFtaWx5R2V0RG9uYXRlU2hvcF9TMkMSEQoJ",
- "ZXJyb3Jjb2RlGAEgASgFEiUKBWl0ZW1zGAIgAygLMhYucHJvdG9idWYuU3Rv",
- "cmVJdGVtTXNnEhIKCmV4cGlyZVRpbWUYAyABKAUiLwoXRmFtaWx5QnV5RG9u",
- "YXRlU2hvcF9DMlMSFAoMZG9uYXRlc2hvcElkGAEgASgFIn8KF0ZhbWlseUJ1",
- "eURvbmF0ZVNob3BfUzJDEhEKCWVycm9yY29kZRgBIAEoBRIUCgxkb25hdGVz",
- "aG9wSWQYAiABKAUSKQoIY3VyaXRlbXMYAyADKAsyFy5wcm90b2J1Zi5SZXdh",
- "cmRJdGVtTXNnEhAKCGJ1eUNvdW50GAQgASgFIhgKFkZhbWlseUdldFNjb3Jl",
- "U2hvcF9DMlMiZgoWRmFtaWx5R2V0U2NvcmVTaG9wX1MyQxIRCgllcnJvcmNv",
- "ZGUYASABKAUSJQoFaXRlbXMYAiADKAsyFi5wcm90b2J1Zi5TdG9yZUl0ZW1N",
- "c2cSEgoKZXhwaXJlVGltZRgDIAEoBSItChZGYW1pbHlCdXlTY29yZVNob3Bf",
- "QzJTEhMKC3Njb3Jlc2hvcElkGAEgASgFIoEBChZGYW1pbHlCdXlTY29yZVNo",
- "b3BfUzJDEhEKCWVycm9yY29kZRgBIAEoBRITCgtzY29yZXNob3BJZBgCIAEo",
- "BRIYChBzY29yZXNob3BFeHBpcmVkGAMgASgFEhMKC2ZhbWlseVNjb3JlGAQg",
- "ASgFEhAKCGJ1eUNvdW50GAUgASgFYgZwcm90bzM="));
+ "cHJvdG9idWYuUmV3YXJkSXRlbU1zZyI1Cg5GYW1pbHlJbmZvX1MyQxIjCgZm",
+ "YW1pbHkYASABKAsyEy5wcm90b2J1Zi5GYW1pbHlNc2ciLwoQRmFtaWx5U2Vh",
+ "cmNoX0MyUxIMCgRuYW1lGAEgASgJEg0KBWxpbWl0GAIgASgFIlgKEEZhbWls",
+ "eVNlYXJjaF9TMkMSEQoJZXJyb3Jjb2RlGAEgASgFEjEKCmZhbWlseWxpc3QY",
+ "AiADKAsyHS5wcm90b2J1Zi5GYW1pbHlTZWFyY2hJdGVtTXNnIjoKFkZhbWls",
+ "eVBsYXllck9ubGluZV9TMkMSEAoIdXNlcm5hbWUYASABKAUSDgoGb25saW5l",
+ "GAIgASgIImIKEEZhbWlseUNyZWF0ZV9DMlMSDAoEbmFtZRgBIAEoCRIMCgRk",
+ "ZXNjGAIgASgJEg0KBWljb25zGAMgAygFEhAKCGZyZWVKb2luGAQgASgFEhEK",
+ "CW5lZWRTY29yZRgFIAEoBSJKChBGYW1pbHlDcmVhdGVfUzJDEhEKCWVycm9y",
+ "Y29kZRgBIAEoBRIjCgZmYW1pbHkYAiABKAsyEy5wcm90b2J1Zi5GYW1pbHlN",
+ "c2ciHQoORmFtaWx5RmluZF9DMlMSCwoDdWlkGAEgASgJIkgKDkZhbWlseUZp",
+ "bmRfUzJDEhEKCWVycm9yY29kZRgBIAEoBRIjCgZmYW1pbHkYAiABKAsyEy5w",
+ "cm90b2J1Zi5GYW1pbHlNc2ciHQoORmFtaWx5Sm9pbl9DMlMSCwoDdWlkGAEg",
+ "ASgJIjAKDkZhbWlseUpvaW5fUzJDEhEKCWVycm9yY29kZRgBIAEoBRILCgN1",
+ "aWQYAiABKAkiIgoRRmFtaWx5R2V0Q2hhdF9DMlMSDQoFbGltaXQYASABKAUi",
+ "ZgoRRmFtaWx5R2V0Q2hhdF9TMkMSEQoJZXJyb3Jjb2RlGAEgASgFEikKCG1l",
+ "c3NhZ2VzGAIgAygLMhcucHJvdG9idWYuRmFtaWx5Q2hhdE1zZxITCgtvbmxp",
+ "bmVDb3VudBgEIAEoBSJMChNGYW1pbHlTdGFydENoYXRfQzJTEiQKCGNoYXRU",
+ "eXBlGAEgASgOMhIucHJvdG9idWYuQ2hhdFR5cGUSDwoHY29udGVudBgCIAEo",
+ "CSJSChNGYW1pbHlTdGFydENoYXRfUzJDEhEKCWVycm9yY29kZRgBIAEoBRIo",
+ "CgdtZXNzYWdlGAIgASgLMhcucHJvdG9idWYuRmFtaWx5Q2hhdE1zZyIqChVG",
+ "YW1pbHlTdGFydERvbmF0ZV9DMlMSEQoJbWVzc2FnZUlkGAEgASgFIlQKFUZh",
+ "bWlseVN0YXJ0RG9uYXRlX1MyQxIRCgllcnJvcmNvZGUYASABKAUSKAoHbWVz",
+ "c2FnZRgCIAEoCzIXLnByb3RvYnVmLkZhbWlseUNoYXRNc2ciEAoORmFtaWx5",
+ "UXVpdF9DMlMiIwoORmFtaWx5UXVpdF9TMkMSEQoJZXJyb3Jjb2RlGAEgASgF",
+ "IigKE0ZhbWlseUFncmVlSm9pbl9DMlMSEQoJbWVzc2FnZUlkGAEgASgFIlYK",
+ "E0ZhbWlseUFncmVlSm9pbl9TMkMSEQoJZXJyb3Jjb2RlGAEgASgFEiwKCW5l",
+ "d01lbWJlchgCIAEoCzIZLnByb3RvYnVmLkZhbWlseU1lbWJlck1zZyImChJG",
+ "YW1pbHlLaWNrVXNlcl9DMlMSEAoIdXNlcm5hbWUYASABKAkiJwoSRmFtaWx5",
+ "S2lja1VzZXJfUzJDEhEKCWVycm9yY29kZRgBIAEoBSIpChVGYW1pbHlUcmFu",
+ "c0xlYWRlcl9DMlMSEAoIdXNlcm5hbWUYASABKAkiKgoVRmFtaWx5VHJhbnNM",
+ "ZWFkZXJfUzJDEhEKCWVycm9yY29kZRgBIAEoBSIZChdGYW1pbHlHZXREb25h",
+ "dGVTaG9wX0MyUyJnChdGYW1pbHlHZXREb25hdGVTaG9wX1MyQxIRCgllcnJv",
+ "cmNvZGUYASABKAUSJQoFaXRlbXMYAiADKAsyFi5wcm90b2J1Zi5TdG9yZUl0",
+ "ZW1Nc2cSEgoKZXhwaXJlVGltZRgDIAEoBSIvChdGYW1pbHlCdXlEb25hdGVT",
+ "aG9wX0MyUxIUCgxkb25hdGVzaG9wSWQYASABKAUifwoXRmFtaWx5QnV5RG9u",
+ "YXRlU2hvcF9TMkMSEQoJZXJyb3Jjb2RlGAEgASgFEhQKDGRvbmF0ZXNob3BJ",
+ "ZBgCIAEoBRIpCghjdXJpdGVtcxgDIAMoCzIXLnByb3RvYnVmLlJld2FyZEl0",
+ "ZW1Nc2cSEAoIYnV5Q291bnQYBCABKAUiGAoWRmFtaWx5R2V0U2NvcmVTaG9w",
+ "X0MyUyJmChZGYW1pbHlHZXRTY29yZVNob3BfUzJDEhEKCWVycm9yY29kZRgB",
+ "IAEoBRIlCgVpdGVtcxgCIAMoCzIWLnByb3RvYnVmLlN0b3JlSXRlbU1zZxIS",
+ "CgpleHBpcmVUaW1lGAMgASgFIi0KFkZhbWlseUJ1eVNjb3JlU2hvcF9DMlMS",
+ "EwoLc2NvcmVzaG9wSWQYASABKAUigQEKFkZhbWlseUJ1eVNjb3JlU2hvcF9T",
+ "MkMSEQoJZXJyb3Jjb2RlGAEgASgFEhMKC3Njb3Jlc2hvcElkGAIgASgFEhgK",
+ "EHNjb3Jlc2hvcEV4cGlyZWQYAyABKAUSEwoLZmFtaWx5U2NvcmUYBCABKAUS",
+ "EAoIYnV5Q291bnQYBSABKAViBnByb3RvMw=="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { global::Protobuf.CommonReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
@@ -188,14 +192,18 @@
new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.UnLockArenaBox_S2C), global::Protobuf.UnLockArenaBox_S2C.Parser, new[]{ "Errorcode", "Areabox" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.TakeArenaBox_C2S), global::Protobuf.TakeArenaBox_C2S.Parser, new[]{ "Pos", "Free" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.TakeArenaBox_S2C), global::Protobuf.TakeArenaBox_S2C.Parser, new[]{ "Errorcode", "Pos", "Boxid", "Curitems", "Boxreward" }, null, null, null),
- new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilySearch_C2S), global::Protobuf.FamilySearch_C2S.Parser, new[]{ "Name", "Start", "Limit" }, null, null, null),
- new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilySearch_S2C), global::Protobuf.FamilySearch_S2C.Parser, new[]{ "Errorcode", "Familylist", "Total" }, null, null, null),
+ new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyInfo_S2C), global::Protobuf.FamilyInfo_S2C.Parser, new[]{ "Family" }, null, null, null),
+ new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilySearch_C2S), global::Protobuf.FamilySearch_C2S.Parser, new[]{ "Name", "Limit" }, null, null, null),
+ new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilySearch_S2C), global::Protobuf.FamilySearch_S2C.Parser, new[]{ "Errorcode", "Familylist" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyPlayerOnline_S2C), global::Protobuf.FamilyPlayerOnline_S2C.Parser, new[]{ "Username", "Online" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyCreate_C2S), global::Protobuf.FamilyCreate_C2S.Parser, new[]{ "Name", "Desc", "Icons", "FreeJoin", "NeedScore" }, null, null, null),
+ new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyCreate_S2C), global::Protobuf.FamilyCreate_S2C.Parser, new[]{ "Errorcode", "Family" }, null, null, null),
+ new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyFind_C2S), global::Protobuf.FamilyFind_C2S.Parser, new[]{ "Uid" }, null, null, null),
+ new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyFind_S2C), global::Protobuf.FamilyFind_S2C.Parser, new[]{ "Errorcode", "Family" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyJoin_C2S), global::Protobuf.FamilyJoin_C2S.Parser, new[]{ "Uid" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyJoin_S2C), global::Protobuf.FamilyJoin_S2C.Parser, new[]{ "Errorcode", "Uid" }, null, null, null),
- new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyGetChat_C2S), global::Protobuf.FamilyGetChat_C2S.Parser, new[]{ "Start", "Limit" }, null, null, null),
- new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyGetChat_S2C), global::Protobuf.FamilyGetChat_S2C.Parser, new[]{ "Errorcode", "Messages", "Total", "OnlineCount" }, null, null, null),
+ new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyGetChat_C2S), global::Protobuf.FamilyGetChat_C2S.Parser, new[]{ "Limit" }, null, null, null),
+ new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyGetChat_S2C), global::Protobuf.FamilyGetChat_S2C.Parser, new[]{ "Errorcode", "Messages", "OnlineCount" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyStartChat_C2S), global::Protobuf.FamilyStartChat_C2S.Parser, new[]{ "ChatType", "Content" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyStartChat_S2C), global::Protobuf.FamilyStartChat_S2C.Parser, new[]{ "Errorcode", "Message" }, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyStartDonate_C2S), global::Protobuf.FamilyStartDonate_C2S.Parser, new[]{ "MessageId" }, null, null, null),
@@ -7858,6 +7866,136 @@
}
/// <summary>
+ /// 玩家上线后，如果收到这个信息，表示加入工会了，
+ /// 服务器自动下发，不用请求
+ /// </summary>
+ public sealed partial class FamilyInfo_S2C : pb::IMessage<FamilyInfo_S2C> {
+ private static readonly pb::MessageParser<FamilyInfo_S2C> _parser = new pb::MessageParser<FamilyInfo_S2C>(() => new FamilyInfo_S2C());
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public static pb::MessageParser<FamilyInfo_S2C> Parser { get { return _parser; } }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public static pbr::MessageDescriptor Descriptor {
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[49]; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ pbr::MessageDescriptor pb::IMessage.Descriptor {
+ get { return Descriptor; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public FamilyInfo_S2C() {
+ OnConstruction();
+ }
+
+ partial void OnConstruction();
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public FamilyInfo_S2C(FamilyInfo_S2C other) : this() {
+ Family = other.family_ != null ? other.Family.Clone() : null;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public FamilyInfo_S2C Clone() {
+ return new FamilyInfo_S2C(this);
+ }
+
+ /// <summary>Field number for the "family" field.</summary>
+ public const int FamilyFieldNumber = 1;
+ private global::Protobuf.FamilyMsg family_;
+ /// <summary>
+ /// 工会信息
+ /// </summary>
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public global::Protobuf.FamilyMsg Family {
+ get { return family_; }
+ set {
+ family_ = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override bool Equals(object other) {
+ return Equals(other as FamilyInfo_S2C);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public bool Equals(FamilyInfo_S2C other) {
+ if (ReferenceEquals(other, null)) {
+ return false;
+ }
+ if (ReferenceEquals(other, this)) {
+ return true;
+ }
+ if (!object.Equals(Family, other.Family)) return false;
+ return true;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override int GetHashCode() {
+ int hash = 1;
+ if (family_ != null) hash ^= Family.GetHashCode();
+ return hash;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override string ToString() {
+ return pb::JsonFormatter.ToDiagnosticString(this);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void WriteTo(pb::CodedOutputStream output) {
+ if (family_ != null) {
+ output.WriteRawTag(10);
+ output.WriteMessage(Family);
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public int CalculateSize() {
+ int size = 0;
+ if (family_ != null) {
+ size += 1 + pb::CodedOutputStream.ComputeMessageSize(Family);
+ }
+ return size;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void MergeFrom(FamilyInfo_S2C other) {
+ if (other == null) {
+ return;
+ }
+ if (other.family_ != null) {
+ if (family_ == null) {
+ family_ = new global::Protobuf.FamilyMsg();
+ }
+ Family.MergeFrom(other.Family);
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void MergeFrom(pb::CodedInputStream input) {
+ uint tag;
+ while ((tag = input.ReadTag()) != 0) {
+ switch(tag) {
+ default:
+ input.SkipLastField();
+ break;
+ case 10: {
+ if (family_ == null) {
+ family_ = new global::Protobuf.FamilyMsg();
+ }
+ input.ReadMessage(family_);
+ break;
+ }
+ }
+ }
+ }
+
+ }
+
+ /// <summary>
/// 查找工会，支持模糊查询
/// </summary>
public sealed partial class FamilySearch_C2S : pb::IMessage<FamilySearch_C2S> {
@@ -7867,7 +8005,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[49]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[50]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -7885,7 +8023,6 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public FamilySearch_C2S(FamilySearch_C2S other) : this() {
name_ = other.name_;
- start_ = other.start_;
limit_ = other.limit_;
}
@@ -7905,23 +8042,13 @@
}
}
- /// <summary>Field number for the "start" field.</summary>
- public const int StartFieldNumber = 2;
- private int start_;
+ /// <summary>Field number for the "limit" field.</summary>
+ public const int LimitFieldNumber = 2;
+ private int limit_;
/// <summary>
/// 起始分页0
+ /// int32 start = 2;
/// </summary>
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
- public int Start {
- get { return start_; }
- set {
- start_ = value;
- }
- }
-
- /// <summary>Field number for the "limit" field.</summary>
- public const int LimitFieldNumber = 3;
- private int limit_;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public int Limit {
get { return limit_; }
@@ -7944,7 +8071,6 @@
return true;
}
if (Name != other.Name) return false;
- if (Start != other.Start) return false;
if (Limit != other.Limit) return false;
return true;
}
@@ -7953,7 +8079,6 @@
public override int GetHashCode() {
int hash = 1;
if (Name.Length != 0) hash ^= Name.GetHashCode();
- if (Start != 0) hash ^= Start.GetHashCode();
if (Limit != 0) hash ^= Limit.GetHashCode();
return hash;
}
@@ -7969,12 +8094,8 @@
output.WriteRawTag(10);
output.WriteString(Name);
}
- if (Start != 0) {
- output.WriteRawTag(16);
- output.WriteInt32(Start);
- }
if (Limit != 0) {
- output.WriteRawTag(24);
+ output.WriteRawTag(16);
output.WriteInt32(Limit);
}
}
@@ -7984,9 +8105,6 @@
int size = 0;
if (Name.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
- }
- if (Start != 0) {
- size += 1 + pb::CodedOutputStream.ComputeInt32Size(Start);
}
if (Limit != 0) {
size += 1 + pb::CodedOutputStream.ComputeInt32Size(Limit);
@@ -8001,9 +8119,6 @@
}
if (other.Name.Length != 0) {
Name = other.Name;
- }
- if (other.Start != 0) {
- Start = other.Start;
}
if (other.Limit != 0) {
Limit = other.Limit;
@@ -8023,10 +8138,6 @@
break;
}
case 16: {
- Start = input.ReadInt32();
- break;
- }
- case 24: {
Limit = input.ReadInt32();
break;
}
@@ -8043,7 +8154,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[50]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[51]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -8062,7 +8173,6 @@
public FamilySearch_S2C(FamilySearch_S2C other) : this() {
errorcode_ = other.errorcode_;
familylist_ = other.familylist_.Clone();
- total_ = other.total_;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -8094,17 +8204,6 @@
get { return familylist_; }
}
- /// <summary>Field number for the "total" field.</summary>
- public const int TotalFieldNumber = 3;
- private int total_;
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
- public int Total {
- get { return total_; }
- set {
- total_ = value;
- }
- }
-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
return Equals(other as FamilySearch_S2C);
@@ -8120,7 +8219,6 @@
}
if (Errorcode != other.Errorcode) return false;
if(!familylist_.Equals(other.familylist_)) return false;
- if (Total != other.Total) return false;
return true;
}
@@ -8129,7 +8227,6 @@
int hash = 1;
if (Errorcode != 0) hash ^= Errorcode.GetHashCode();
hash ^= familylist_.GetHashCode();
- if (Total != 0) hash ^= Total.GetHashCode();
return hash;
}
@@ -8145,10 +8242,6 @@
output.WriteInt32(Errorcode);
}
familylist_.WriteTo(output, _repeated_familylist_codec);
- if (Total != 0) {
- output.WriteRawTag(24);
- output.WriteInt32(Total);
- }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -8158,9 +8251,6 @@
size += 1 + pb::CodedOutputStream.ComputeInt32Size(Errorcode);
}
size += familylist_.CalculateSize(_repeated_familylist_codec);
- if (Total != 0) {
- size += 1 + pb::CodedOutputStream.ComputeInt32Size(Total);
- }
return size;
}
@@ -8173,9 +8263,6 @@
Errorcode = other.Errorcode;
}
familylist_.Add(other.familylist_);
- if (other.Total != 0) {
- Total = other.Total;
- }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -8194,10 +8281,6 @@
familylist_.AddEntriesFrom(input, _repeated_familylist_codec);
break;
}
- case 24: {
- Total = input.ReadInt32();
- break;
- }
}
}
}
@@ -8214,7 +8297,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[51]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[52]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -8365,7 +8448,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[52]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[53]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -8596,6 +8679,430 @@
}
/// <summary>
+ /// </summary>
+ public sealed partial class FamilyCreate_S2C : pb::IMessage<FamilyCreate_S2C> {
+ private static readonly pb::MessageParser<FamilyCreate_S2C> _parser = new pb::MessageParser<FamilyCreate_S2C>(() => new FamilyCreate_S2C());
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public static pb::MessageParser<FamilyCreate_S2C> Parser { get { return _parser; } }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public static pbr::MessageDescriptor Descriptor {
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[54]; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ pbr::MessageDescriptor pb::IMessage.Descriptor {
+ get { return Descriptor; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public FamilyCreate_S2C() {
+ OnConstruction();
+ }
+
+ partial void OnConstruction();
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public FamilyCreate_S2C(FamilyCreate_S2C other) : this() {
+ errorcode_ = other.errorcode_;
+ Family = other.family_ != null ? other.Family.Clone() : null;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public FamilyCreate_S2C Clone() {
+ return new FamilyCreate_S2C(this);
+ }
+
+ /// <summary>Field number for the "errorcode" field.</summary>
+ public const int ErrorcodeFieldNumber = 1;
+ private int errorcode_;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public int Errorcode {
+ get { return errorcode_; }
+ set {
+ errorcode_ = value;
+ }
+ }
+
+ /// <summary>Field number for the "family" field.</summary>
+ public const int FamilyFieldNumber = 2;
+ private global::Protobuf.FamilyMsg family_;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public global::Protobuf.FamilyMsg Family {
+ get { return family_; }
+ set {
+ family_ = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override bool Equals(object other) {
+ return Equals(other as FamilyCreate_S2C);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public bool Equals(FamilyCreate_S2C other) {
+ if (ReferenceEquals(other, null)) {
+ return false;
+ }
+ if (ReferenceEquals(other, this)) {
+ return true;
+ }
+ if (Errorcode != other.Errorcode) return false;
+ if (!object.Equals(Family, other.Family)) return false;
+ return true;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override int GetHashCode() {
+ int hash = 1;
+ if (Errorcode != 0) hash ^= Errorcode.GetHashCode();
+ if (family_ != null) hash ^= Family.GetHashCode();
+ return hash;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override string ToString() {
+ return pb::JsonFormatter.ToDiagnosticString(this);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void WriteTo(pb::CodedOutputStream output) {
+ if (Errorcode != 0) {
+ output.WriteRawTag(8);
+ output.WriteInt32(Errorcode);
+ }
+ if (family_ != null) {
+ output.WriteRawTag(18);
+ output.WriteMessage(Family);
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public int CalculateSize() {
+ int size = 0;
+ if (Errorcode != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeInt32Size(Errorcode);
+ }
+ if (family_ != null) {
+ size += 1 + pb::CodedOutputStream.ComputeMessageSize(Family);
+ }
+ return size;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void MergeFrom(FamilyCreate_S2C other) {
+ if (other == null) {
+ return;
+ }
+ if (other.Errorcode != 0) {
+ Errorcode = other.Errorcode;
+ }
+ if (other.family_ != null) {
+ if (family_ == null) {
+ family_ = new global::Protobuf.FamilyMsg();
+ }
+ Family.MergeFrom(other.Family);
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void MergeFrom(pb::CodedInputStream input) {
+ uint tag;
+ while ((tag = input.ReadTag()) != 0) {
+ switch(tag) {
+ default:
+ input.SkipLastField();
+ break;
+ case 8: {
+ Errorcode = input.ReadInt32();
+ break;
+ }
+ case 18: {
+ if (family_ == null) {
+ family_ = new global::Protobuf.FamilyMsg();
+ }
+ input.ReadMessage(family_);
+ break;
+ }
+ }
+ }
+ }
+
+ }
+
+ /// <summary>
+ /// 查询公会
+ /// </summary>
+ public sealed partial class FamilyFind_C2S : pb::IMessage<FamilyFind_C2S> {
+ private static readonly pb::MessageParser<FamilyFind_C2S> _parser = new pb::MessageParser<FamilyFind_C2S>(() => new FamilyFind_C2S());
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public static pb::MessageParser<FamilyFind_C2S> Parser { get { return _parser; } }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public static pbr::MessageDescriptor Descriptor {
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[55]; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ pbr::MessageDescriptor pb::IMessage.Descriptor {
+ get { return Descriptor; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public FamilyFind_C2S() {
+ OnConstruction();
+ }
+
+ partial void OnConstruction();
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public FamilyFind_C2S(FamilyFind_C2S other) : this() {
+ uid_ = other.uid_;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public FamilyFind_C2S Clone() {
+ return new FamilyFind_C2S(this);
+ }
+
+ /// <summary>Field number for the "uid" field.</summary>
+ public const int UidFieldNumber = 1;
+ private string uid_ = "";
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public string Uid {
+ get { return uid_; }
+ set {
+ uid_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override bool Equals(object other) {
+ return Equals(other as FamilyFind_C2S);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public bool Equals(FamilyFind_C2S other) {
+ if (ReferenceEquals(other, null)) {
+ return false;
+ }
+ if (ReferenceEquals(other, this)) {
+ return true;
+ }
+ if (Uid != other.Uid) return false;
+ return true;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override int GetHashCode() {
+ int hash = 1;
+ if (Uid.Length != 0) hash ^= Uid.GetHashCode();
+ return hash;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override string ToString() {
+ return pb::JsonFormatter.ToDiagnosticString(this);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void WriteTo(pb::CodedOutputStream output) {
+ if (Uid.Length != 0) {
+ output.WriteRawTag(10);
+ output.WriteString(Uid);
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public int CalculateSize() {
+ int size = 0;
+ if (Uid.Length != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeStringSize(Uid);
+ }
+ return size;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void MergeFrom(FamilyFind_C2S other) {
+ if (other == null) {
+ return;
+ }
+ if (other.Uid.Length != 0) {
+ Uid = other.Uid;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void MergeFrom(pb::CodedInputStream input) {
+ uint tag;
+ while ((tag = input.ReadTag()) != 0) {
+ switch(tag) {
+ default:
+ input.SkipLastField();
+ break;
+ case 10: {
+ Uid = input.ReadString();
+ break;
+ }
+ }
+ }
+ }
+
+ }
+
+ public sealed partial class FamilyFind_S2C : pb::IMessage<FamilyFind_S2C> {
+ private static readonly pb::MessageParser<FamilyFind_S2C> _parser = new pb::MessageParser<FamilyFind_S2C>(() => new FamilyFind_S2C());
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public static pb::MessageParser<FamilyFind_S2C> Parser { get { return _parser; } }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public static pbr::MessageDescriptor Descriptor {
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[56]; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ pbr::MessageDescriptor pb::IMessage.Descriptor {
+ get { return Descriptor; }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public FamilyFind_S2C() {
+ OnConstruction();
+ }
+
+ partial void OnConstruction();
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public FamilyFind_S2C(FamilyFind_S2C other) : this() {
+ errorcode_ = other.errorcode_;
+ Family = other.family_ != null ? other.Family.Clone() : null;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public FamilyFind_S2C Clone() {
+ return new FamilyFind_S2C(this);
+ }
+
+ /// <summary>Field number for the "errorcode" field.</summary>
+ public const int ErrorcodeFieldNumber = 1;
+ private int errorcode_;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public int Errorcode {
+ get { return errorcode_; }
+ set {
+ errorcode_ = value;
+ }
+ }
+
+ /// <summary>Field number for the "family" field.</summary>
+ public const int FamilyFieldNumber = 2;
+ private global::Protobuf.FamilyMsg family_;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public global::Protobuf.FamilyMsg Family {
+ get { return family_; }
+ set {
+ family_ = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override bool Equals(object other) {
+ return Equals(other as FamilyFind_S2C);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public bool Equals(FamilyFind_S2C other) {
+ if (ReferenceEquals(other, null)) {
+ return false;
+ }
+ if (ReferenceEquals(other, this)) {
+ return true;
+ }
+ if (Errorcode != other.Errorcode) return false;
+ if (!object.Equals(Family, other.Family)) return false;
+ return true;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override int GetHashCode() {
+ int hash = 1;
+ if (Errorcode != 0) hash ^= Errorcode.GetHashCode();
+ if (family_ != null) hash ^= Family.GetHashCode();
+ return hash;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public override string ToString() {
+ return pb::JsonFormatter.ToDiagnosticString(this);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void WriteTo(pb::CodedOutputStream output) {
+ if (Errorcode != 0) {
+ output.WriteRawTag(8);
+ output.WriteInt32(Errorcode);
+ }
+ if (family_ != null) {
+ output.WriteRawTag(18);
+ output.WriteMessage(Family);
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public int CalculateSize() {
+ int size = 0;
+ if (Errorcode != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeInt32Size(Errorcode);
+ }
+ if (family_ != null) {
+ size += 1 + pb::CodedOutputStream.ComputeMessageSize(Family);
+ }
+ return size;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void MergeFrom(FamilyFind_S2C other) {
+ if (other == null) {
+ return;
+ }
+ if (other.Errorcode != 0) {
+ Errorcode = other.Errorcode;
+ }
+ if (other.family_ != null) {
+ if (family_ == null) {
+ family_ = new global::Protobuf.FamilyMsg();
+ }
+ Family.MergeFrom(other.Family);
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public void MergeFrom(pb::CodedInputStream input) {
+ uint tag;
+ while ((tag = input.ReadTag()) != 0) {
+ switch(tag) {
+ default:
+ input.SkipLastField();
+ break;
+ case 8: {
+ Errorcode = input.ReadInt32();
+ break;
+ }
+ case 18: {
+ if (family_ == null) {
+ family_ = new global::Protobuf.FamilyMsg();
+ }
+ input.ReadMessage(family_);
+ break;
+ }
+ }
+ }
+ }
+
+ }
+
+ /// <summary>
/// 申请加入公会
/// </summary>
public sealed partial class FamilyJoin_C2S : pb::IMessage<FamilyJoin_C2S> {
@@ -8605,7 +9112,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[53]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[57]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -8722,7 +9229,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[54]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[58]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -8870,7 +9377,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[55]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[59]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -8887,7 +9394,6 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public FamilyGetChat_C2S(FamilyGetChat_C2S other) : this() {
- start_ = other.start_;
limit_ = other.limit_;
}
@@ -8896,23 +9402,13 @@
return new FamilyGetChat_C2S(this);
}
- /// <summary>Field number for the "start" field.</summary>
- public const int StartFieldNumber = 1;
- private int start_;
+ /// <summary>Field number for the "limit" field.</summary>
+ public const int LimitFieldNumber = 1;
+ private int limit_;
/// <summary>
/// 0是最后一页,1倒数第二页
+ /// int32 start = 1;
/// </summary>
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
- public int Start {
- get { return start_; }
- set {
- start_ = value;
- }
- }
-
- /// <summary>Field number for the "limit" field.</summary>
- public const int LimitFieldNumber = 2;
- private int limit_;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public int Limit {
get { return limit_; }
@@ -8934,7 +9430,6 @@
if (ReferenceEquals(other, this)) {
return true;
}
- if (Start != other.Start) return false;
if (Limit != other.Limit) return false;
return true;
}
@@ -8942,7 +9437,6 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override int GetHashCode() {
int hash = 1;
- if (Start != 0) hash ^= Start.GetHashCode();
if (Limit != 0) hash ^= Limit.GetHashCode();
return hash;
}
@@ -8954,12 +9448,8 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public void WriteTo(pb::CodedOutputStream output) {
- if (Start != 0) {
- output.WriteRawTag(8);
- output.WriteInt32(Start);
- }
if (Limit != 0) {
- output.WriteRawTag(16);
+ output.WriteRawTag(8);
output.WriteInt32(Limit);
}
}
@@ -8967,9 +9457,6 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public int CalculateSize() {
int size = 0;
- if (Start != 0) {
- size += 1 + pb::CodedOutputStream.ComputeInt32Size(Start);
- }
if (Limit != 0) {
size += 1 + pb::CodedOutputStream.ComputeInt32Size(Limit);
}
@@ -8980,9 +9467,6 @@
public void MergeFrom(FamilyGetChat_C2S other) {
if (other == null) {
return;
- }
- if (other.Start != 0) {
- Start = other.Start;
}
if (other.Limit != 0) {
Limit = other.Limit;
@@ -8998,10 +9482,6 @@
input.SkipLastField();
break;
case 8: {
- Start = input.ReadInt32();
- break;
- }
- case 16: {
Limit = input.ReadInt32();
break;
}
@@ -9018,7 +9498,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[56]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[60]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -9037,7 +9517,6 @@
public FamilyGetChat_S2C(FamilyGetChat_S2C other) : this() {
errorcode_ = other.errorcode_;
messages_ = other.messages_.Clone();
- total_ = other.total_;
onlineCount_ = other.onlineCount_;
}
@@ -9067,21 +9546,11 @@
get { return messages_; }
}
- /// <summary>Field number for the "total" field.</summary>
- public const int TotalFieldNumber = 3;
- private int total_;
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
- public int Total {
- get { return total_; }
- set {
- total_ = value;
- }
- }
-
/// <summary>Field number for the "onlineCount" field.</summary>
public const int OnlineCountFieldNumber = 4;
private int onlineCount_;
/// <summary>
+ /// int32 total=3;
/// 公会在线玩家数
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -9107,7 +9576,6 @@
}
if (Errorcode != other.Errorcode) return false;
if(!messages_.Equals(other.messages_)) return false;
- if (Total != other.Total) return false;
if (OnlineCount != other.OnlineCount) return false;
return true;
}
@@ -9117,7 +9585,6 @@
int hash = 1;
if (Errorcode != 0) hash ^= Errorcode.GetHashCode();
hash ^= messages_.GetHashCode();
- if (Total != 0) hash ^= Total.GetHashCode();
if (OnlineCount != 0) hash ^= OnlineCount.GetHashCode();
return hash;
}
@@ -9134,10 +9601,6 @@
output.WriteInt32(Errorcode);
}
messages_.WriteTo(output, _repeated_messages_codec);
- if (Total != 0) {
- output.WriteRawTag(24);
- output.WriteInt32(Total);
- }
if (OnlineCount != 0) {
output.WriteRawTag(32);
output.WriteInt32(OnlineCount);
@@ -9151,9 +9614,6 @@
size += 1 + pb::CodedOutputStream.ComputeInt32Size(Errorcode);
}
size += messages_.CalculateSize(_repeated_messages_codec);
- if (Total != 0) {
- size += 1 + pb::CodedOutputStream.ComputeInt32Size(Total);
- }
if (OnlineCount != 0) {
size += 1 + pb::CodedOutputStream.ComputeInt32Size(OnlineCount);
}
@@ -9169,9 +9629,6 @@
Errorcode = other.Errorcode;
}
messages_.Add(other.messages_);
- if (other.Total != 0) {
- Total = other.Total;
- }
if (other.OnlineCount != 0) {
OnlineCount = other.OnlineCount;
}
@@ -9191,10 +9648,6 @@
}
case 18: {
messages_.AddEntriesFrom(input, _repeated_messages_codec);
- break;
- }
- case 24: {
- Total = input.ReadInt32();
break;
}
case 32: {
@@ -9217,7 +9670,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[57]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[61]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -9356,7 +9809,7 @@
}
/// <summary>
- /// 这个消息也会群发给其他玩家
+ /// 这个消息也会群发给其他玩家,用于广播
/// </summary>
public sealed partial class FamilyStartChat_S2C : pb::IMessage<FamilyStartChat_S2C> {
private static readonly pb::MessageParser<FamilyStartChat_S2C> _parser = new pb::MessageParser<FamilyStartChat_S2C>(() => new FamilyStartChat_S2C());
@@ -9365,7 +9818,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[58]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[62]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -9519,7 +9972,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[59]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[63]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -9639,7 +10092,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[60]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[64]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -9794,7 +10247,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[61]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[65]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -9883,7 +10336,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[62]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[66]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -10004,7 +10457,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[63]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[67]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -10121,7 +10574,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[64]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[68]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -10275,7 +10728,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[65]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[69]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -10392,7 +10845,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[66]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[70]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -10512,7 +10965,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[67]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[71]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -10629,7 +11082,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[68]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[72]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -10750,7 +11203,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[69]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[73]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -10839,7 +11292,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[70]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[74]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -11010,7 +11463,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[71]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[75]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -11127,7 +11580,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[72]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[76]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -11329,7 +11782,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[73]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[77]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -11418,7 +11871,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[74]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[78]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -11589,7 +12042,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[75]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[79]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -11706,7 +12159,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public static pbr::MessageDescriptor Descriptor {
- get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[76]; }
+ get { return global::Protobuf.GameReflection.Descriptor.MessageTypes[80]; }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
--
Gitblit v1.9.1