mirror of
https://github.com/EggLinks/DanhengServer-OpenSource.git
synced 2026-01-02 20:26:03 +08:00
Merge
This commit is contained in:
@@ -25,12 +25,12 @@ namespace EggLink.DanhengServer.Proto {
|
||||
byte[] descriptorData = global::System.Convert.FromBase64String(
|
||||
string.Concat(
|
||||
"ChZHZXRTYXZlUmFpZENzUmVxLnByb3RvIjgKEEdldFNhdmVSYWlkQ3NSZXES",
|
||||
"EwoLd29ybGRfbGV2ZWwYDyABKA0SDwoHcmFpZF9pZBgKIAEoDUIeqgIbRWdn",
|
||||
"DwoHcmFpZF9pZBgKIAEoDRITCgt3b3JsZF9sZXZlbBgLIAEoDUIeqgIbRWdn",
|
||||
"TGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM="));
|
||||
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
|
||||
new pbr::FileDescriptor[] { },
|
||||
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
|
||||
new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetSaveRaidCsReq), global::EggLink.DanhengServer.Proto.GetSaveRaidCsReq.Parser, new[]{ "WorldLevel", "RaidId" }, null, null, null, null)
|
||||
new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetSaveRaidCsReq), global::EggLink.DanhengServer.Proto.GetSaveRaidCsReq.Parser, new[]{ "RaidId", "WorldLevel" }, null, null, null, null)
|
||||
}));
|
||||
}
|
||||
#endregion
|
||||
@@ -72,8 +72,8 @@ namespace EggLink.DanhengServer.Proto {
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
public GetSaveRaidCsReq(GetSaveRaidCsReq other) : this() {
|
||||
worldLevel_ = other.worldLevel_;
|
||||
raidId_ = other.raidId_;
|
||||
worldLevel_ = other.worldLevel_;
|
||||
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
|
||||
}
|
||||
|
||||
@@ -83,18 +83,6 @@ namespace EggLink.DanhengServer.Proto {
|
||||
return new GetSaveRaidCsReq(this);
|
||||
}
|
||||
|
||||
/// <summary>Field number for the "world_level" field.</summary>
|
||||
public const int WorldLevelFieldNumber = 15;
|
||||
private uint worldLevel_;
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
public uint WorldLevel {
|
||||
get { return worldLevel_; }
|
||||
set {
|
||||
worldLevel_ = value;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Field number for the "raid_id" field.</summary>
|
||||
public const int RaidIdFieldNumber = 10;
|
||||
private uint raidId_;
|
||||
@@ -107,6 +95,18 @@ namespace EggLink.DanhengServer.Proto {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Field number for the "world_level" field.</summary>
|
||||
public const int WorldLevelFieldNumber = 11;
|
||||
private uint worldLevel_;
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
public uint WorldLevel {
|
||||
get { return worldLevel_; }
|
||||
set {
|
||||
worldLevel_ = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
public override bool Equals(object other) {
|
||||
@@ -122,8 +122,8 @@ namespace EggLink.DanhengServer.Proto {
|
||||
if (ReferenceEquals(other, this)) {
|
||||
return true;
|
||||
}
|
||||
if (WorldLevel != other.WorldLevel) return false;
|
||||
if (RaidId != other.RaidId) return false;
|
||||
if (WorldLevel != other.WorldLevel) return false;
|
||||
return Equals(_unknownFields, other._unknownFields);
|
||||
}
|
||||
|
||||
@@ -131,8 +131,8 @@ namespace EggLink.DanhengServer.Proto {
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
public override int GetHashCode() {
|
||||
int hash = 1;
|
||||
if (WorldLevel != 0) hash ^= WorldLevel.GetHashCode();
|
||||
if (RaidId != 0) hash ^= RaidId.GetHashCode();
|
||||
if (WorldLevel != 0) hash ^= WorldLevel.GetHashCode();
|
||||
if (_unknownFields != null) {
|
||||
hash ^= _unknownFields.GetHashCode();
|
||||
}
|
||||
@@ -156,7 +156,7 @@ namespace EggLink.DanhengServer.Proto {
|
||||
output.WriteUInt32(RaidId);
|
||||
}
|
||||
if (WorldLevel != 0) {
|
||||
output.WriteRawTag(120);
|
||||
output.WriteRawTag(88);
|
||||
output.WriteUInt32(WorldLevel);
|
||||
}
|
||||
if (_unknownFields != null) {
|
||||
@@ -174,7 +174,7 @@ namespace EggLink.DanhengServer.Proto {
|
||||
output.WriteUInt32(RaidId);
|
||||
}
|
||||
if (WorldLevel != 0) {
|
||||
output.WriteRawTag(120);
|
||||
output.WriteRawTag(88);
|
||||
output.WriteUInt32(WorldLevel);
|
||||
}
|
||||
if (_unknownFields != null) {
|
||||
@@ -187,12 +187,12 @@ namespace EggLink.DanhengServer.Proto {
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
public int CalculateSize() {
|
||||
int size = 0;
|
||||
if (WorldLevel != 0) {
|
||||
size += 1 + pb::CodedOutputStream.ComputeUInt32Size(WorldLevel);
|
||||
}
|
||||
if (RaidId != 0) {
|
||||
size += 1 + pb::CodedOutputStream.ComputeUInt32Size(RaidId);
|
||||
}
|
||||
if (WorldLevel != 0) {
|
||||
size += 1 + pb::CodedOutputStream.ComputeUInt32Size(WorldLevel);
|
||||
}
|
||||
if (_unknownFields != null) {
|
||||
size += _unknownFields.CalculateSize();
|
||||
}
|
||||
@@ -205,12 +205,12 @@ namespace EggLink.DanhengServer.Proto {
|
||||
if (other == null) {
|
||||
return;
|
||||
}
|
||||
if (other.WorldLevel != 0) {
|
||||
WorldLevel = other.WorldLevel;
|
||||
}
|
||||
if (other.RaidId != 0) {
|
||||
RaidId = other.RaidId;
|
||||
}
|
||||
if (other.WorldLevel != 0) {
|
||||
WorldLevel = other.WorldLevel;
|
||||
}
|
||||
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
|
||||
}
|
||||
|
||||
@@ -230,7 +230,7 @@ namespace EggLink.DanhengServer.Proto {
|
||||
RaidId = input.ReadUInt32();
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
case 88: {
|
||||
WorldLevel = input.ReadUInt32();
|
||||
break;
|
||||
}
|
||||
@@ -253,7 +253,7 @@ namespace EggLink.DanhengServer.Proto {
|
||||
RaidId = input.ReadUInt32();
|
||||
break;
|
||||
}
|
||||
case 120: {
|
||||
case 88: {
|
||||
WorldLevel = input.ReadUInt32();
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user