From d7db442a4655baa0c0f282aa415fd12da4edc40a Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 27 Oct 2020 09:46:31 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle
---
Assets/Scripts/Net/NetExtends/Game.cs | 122 +++++++++++++++++++++++++++++++++++-----
1 files changed, 107 insertions(+), 15 deletions(-)
diff --git a/Assets/Scripts/Net/NetExtends/Game.cs b/Assets/Scripts/Net/NetExtends/Game.cs
index 139bdde..c6f26ea 100644
--- a/Assets/Scripts/Net/NetExtends/Game.cs
+++ b/Assets/Scripts/Net/NetExtends/Game.cs
@@ -108,12 +108,13 @@
"bmRfUzJDEhEKCWVycm9yY29kZRgBIAEoBRIjCgZmYW1pbHkYAiABKAsyEy5w",
"cm90b2J1Zi5GYW1pbHlNc2ciHQoORmFtaWx5Sm9pbl9DMlMSCwoDdWlkGAEg",
"ASgJIjAKDkZhbWlseUpvaW5fUzJDEhEKCWVycm9yY29kZRgBIAEoBRILCgN1",
- "aWQYAiABKAkiIgoRRmFtaWx5R2V0Q2hhdF9DMlMSDQoFbGltaXQYASABKAUi",
- "ZgoRRmFtaWx5R2V0Q2hhdF9TMkMSEQoJZXJyb3Jjb2RlGAEgASgFEikKCG1l",
- "c3NhZ2VzGAIgAygLMhcucHJvdG9idWYuRmFtaWx5Q2hhdE1zZxITCgtvbmxp",
- "bmVDb3VudBgEIAEoBSJMChNGYW1pbHlTdGFydENoYXRfQzJTEiQKCGNoYXRU",
- "eXBlGAEgASgOMhIucHJvdG9idWYuQ2hhdFR5cGUSDwoHY29udGVudBgCIAEo",
- "CSJSChNGYW1pbHlTdGFydENoYXRfUzJDEhEKCWVycm9yY29kZRgBIAEoBRIo",
+ "aWQYAiABKAkiMQoRRmFtaWx5R2V0Q2hhdF9DMlMSDQoFc3RhcnQYASABKAUS",
+ "DQoFbGltaXQYAiABKAUidQoRRmFtaWx5R2V0Q2hhdF9TMkMSEQoJZXJyb3Jj",
+ "b2RlGAEgASgFEikKCG1lc3NhZ2VzGAIgAygLMhcucHJvdG9idWYuRmFtaWx5",
+ "Q2hhdE1zZxINCgV0b3RhbBgDIAEoBRITCgtvbmxpbmVDb3VudBgEIAEoBSJb",
+ "ChNGYW1pbHlTdGFydENoYXRfQzJTEiQKCGNoYXRUeXBlGAEgASgOMhIucHJv",
+ "dG9idWYuQ2hhdFR5cGUSDwoHY29udGVudBgCIAEoCRINCgVnZW1JZBgDIAEo",
+ "BSJSChNGYW1pbHlTdGFydENoYXRfUzJDEhEKCWVycm9yY29kZRgBIAEoBRIo",
"CgdtZXNzYWdlGAIgASgLMhcucHJvdG9idWYuRmFtaWx5Q2hhdE1zZyIqChVG",
"YW1pbHlTdGFydERvbmF0ZV9DMlMSEQoJbWVzc2FnZUlkGAEgASgFIlQKFUZh",
"bWlseVN0YXJ0RG9uYXRlX1MyQxIRCgllcnJvcmNvZGUYASABKAUSKAoHbWVz",
@@ -202,9 +203,9 @@
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[]{ "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.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.FamilyStartChat_C2S), global::Protobuf.FamilyStartChat_C2S.Parser, new[]{ "ChatType", "Content", "GemId" }, 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),
new pbr::GeneratedClrTypeInfo(typeof(global::Protobuf.FamilyStartDonate_S2C), global::Protobuf.FamilyStartDonate_S2C.Parser, new[]{ "Errorcode", "Message" }, null, null, null),
@@ -8716,6 +8717,9 @@
/// <summary>Field number for the "errorcode" field.</summary>
public const int ErrorcodeFieldNumber = 1;
private int errorcode_;
+ /// <summary>
+ /// NotEnough_Level,Input_Invalid
+ /// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public int Errorcode {
get { return errorcode_; }
@@ -8987,6 +8991,9 @@
/// <summary>Field number for the "errorcode" field.</summary>
public const int ErrorcodeFieldNumber = 1;
private int errorcode_;
+ /// <summary>
+ /// NotEnough_Level,AlreadyIn_Family
+ /// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public int Errorcode {
get { return errorcode_; }
@@ -9258,6 +9265,9 @@
/// <summary>Field number for the "errorcode" field.</summary>
public const int ErrorcodeFieldNumber = 1;
private int errorcode_;
+ /// <summary>
+ /// NotEnough_Level,AlreadyIn_Family,NotExist_Family
+ /// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public int Errorcode {
get { return errorcode_; }
@@ -9394,6 +9404,7 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public FamilyGetChat_C2S(FamilyGetChat_C2S other) : this() {
+ start_ = other.start_;
limit_ = other.limit_;
}
@@ -9402,13 +9413,23 @@
return new FamilyGetChat_C2S(this);
}
- /// <summary>Field number for the "limit" field.</summary>
- public const int LimitFieldNumber = 1;
- private int limit_;
+ /// <summary>Field number for the "start" field.</summary>
+ public const int StartFieldNumber = 1;
+ private int start_;
/// <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_; }
@@ -9430,6 +9451,7 @@
if (ReferenceEquals(other, this)) {
return true;
}
+ if (Start != other.Start) return false;
if (Limit != other.Limit) return false;
return true;
}
@@ -9437,6 +9459,7 @@
[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;
}
@@ -9448,8 +9471,12 @@
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public void WriteTo(pb::CodedOutputStream output) {
- if (Limit != 0) {
+ if (Start != 0) {
output.WriteRawTag(8);
+ output.WriteInt32(Start);
+ }
+ if (Limit != 0) {
+ output.WriteRawTag(16);
output.WriteInt32(Limit);
}
}
@@ -9457,6 +9484,9 @@
[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);
}
@@ -9467,6 +9497,9 @@
public void MergeFrom(FamilyGetChat_C2S other) {
if (other == null) {
return;
+ }
+ if (other.Start != 0) {
+ Start = other.Start;
}
if (other.Limit != 0) {
Limit = other.Limit;
@@ -9482,6 +9515,10 @@
input.SkipLastField();
break;
case 8: {
+ Start = input.ReadInt32();
+ break;
+ }
+ case 16: {
Limit = input.ReadInt32();
break;
}
@@ -9517,6 +9554,7 @@
public FamilyGetChat_S2C(FamilyGetChat_S2C other) : this() {
errorcode_ = other.errorcode_;
messages_ = other.messages_.Clone();
+ total_ = other.total_;
onlineCount_ = other.onlineCount_;
}
@@ -9546,11 +9584,21 @@
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]
@@ -9576,6 +9624,7 @@
}
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;
}
@@ -9585,6 +9634,7 @@
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;
}
@@ -9601,6 +9651,10 @@
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);
@@ -9614,6 +9668,9 @@
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);
}
@@ -9629,6 +9686,9 @@
Errorcode = other.Errorcode;
}
messages_.Add(other.messages_);
+ if (other.Total != 0) {
+ Total = other.Total;
+ }
if (other.OnlineCount != 0) {
OnlineCount = other.OnlineCount;
}
@@ -9648,6 +9708,10 @@
}
case 18: {
messages_.AddEntriesFrom(input, _repeated_messages_codec);
+ break;
+ }
+ case 24: {
+ Total = input.ReadInt32();
break;
}
case 32: {
@@ -9689,6 +9753,7 @@
public FamilyStartChat_C2S(FamilyStartChat_C2S other) : this() {
chatType_ = other.chatType_;
content_ = other.content_;
+ gemId_ = other.gemId_;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -9718,6 +9783,17 @@
}
}
+ /// <summary>Field number for the "gemId" field.</summary>
+ public const int GemIdFieldNumber = 3;
+ private int gemId_;
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+ public int GemId {
+ get { return gemId_; }
+ set {
+ gemId_ = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
public override bool Equals(object other) {
return Equals(other as FamilyStartChat_C2S);
@@ -9733,6 +9809,7 @@
}
if (ChatType != other.ChatType) return false;
if (Content != other.Content) return false;
+ if (GemId != other.GemId) return false;
return true;
}
@@ -9741,6 +9818,7 @@
int hash = 1;
if (ChatType != 0) hash ^= ChatType.GetHashCode();
if (Content.Length != 0) hash ^= Content.GetHashCode();
+ if (GemId != 0) hash ^= GemId.GetHashCode();
return hash;
}
@@ -9759,6 +9837,10 @@
output.WriteRawTag(18);
output.WriteString(Content);
}
+ if (GemId != 0) {
+ output.WriteRawTag(24);
+ output.WriteInt32(GemId);
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -9769,6 +9851,9 @@
}
if (Content.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(Content);
+ }
+ if (GemId != 0) {
+ size += 1 + pb::CodedOutputStream.ComputeInt32Size(GemId);
}
return size;
}
@@ -9783,6 +9868,9 @@
}
if (other.Content.Length != 0) {
Content = other.Content;
+ }
+ if (other.GemId != 0) {
+ GemId = other.GemId;
}
}
@@ -9802,6 +9890,10 @@
Content = input.ReadString();
break;
}
+ case 24: {
+ GemId = input.ReadInt32();
+ break;
+ }
}
}
}
--
Gitblit v1.9.1