mirror of
https://github.com/EggLinks/DanhengServer-OpenSource.git
synced 2026-01-02 20:26:03 +08:00
Merge
This commit is contained in:
@@ -26,13 +26,13 @@ namespace EggLink.DanhengServer.Proto {
|
||||
string.Concat(
|
||||
"CitTdGFydEFldGhlckRpdmlkZUNoYWxsZW5nZUJhdHRsZVNjUnNwLnByb3Rv",
|
||||
"GhxBZXRoZXJEaXZpZGVCYXR0bGVJbmZvLnByb3RvImYKJVN0YXJ0QWV0aGVy",
|
||||
"RGl2aWRlQ2hhbGxlbmdlQmF0dGxlU2NSc3ASDwoHcmV0Y29kZRgOIAEoDRIs",
|
||||
"CgtiYXR0bGVfaW5mbxgCIAEoCzIXLkFldGhlckRpdmlkZUJhdHRsZUluZm9C",
|
||||
"RGl2aWRlQ2hhbGxlbmdlQmF0dGxlU2NSc3ASLAoLYmF0dGxlX2luZm8YCyAB",
|
||||
"KAsyFy5BZXRoZXJEaXZpZGVCYXR0bGVJbmZvEg8KB3JldGNvZGUYDCABKA1C",
|
||||
"HqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z"));
|
||||
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
|
||||
new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AetherDivideBattleInfoReflection.Descriptor, },
|
||||
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
|
||||
new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.StartAetherDivideChallengeBattleScRsp), global::EggLink.DanhengServer.Proto.StartAetherDivideChallengeBattleScRsp.Parser, new[]{ "Retcode", "BattleInfo" }, null, null, null, null)
|
||||
new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.StartAetherDivideChallengeBattleScRsp), global::EggLink.DanhengServer.Proto.StartAetherDivideChallengeBattleScRsp.Parser, new[]{ "BattleInfo", "Retcode" }, null, null, null, null)
|
||||
}));
|
||||
}
|
||||
#endregion
|
||||
@@ -74,8 +74,8 @@ namespace EggLink.DanhengServer.Proto {
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
public StartAetherDivideChallengeBattleScRsp(StartAetherDivideChallengeBattleScRsp other) : this() {
|
||||
retcode_ = other.retcode_;
|
||||
battleInfo_ = other.battleInfo_ != null ? other.battleInfo_.Clone() : null;
|
||||
retcode_ = other.retcode_;
|
||||
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
|
||||
}
|
||||
|
||||
@@ -85,20 +85,8 @@ namespace EggLink.DanhengServer.Proto {
|
||||
return new StartAetherDivideChallengeBattleScRsp(this);
|
||||
}
|
||||
|
||||
/// <summary>Field number for the "retcode" field.</summary>
|
||||
public const int RetcodeFieldNumber = 14;
|
||||
private uint retcode_;
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
public uint Retcode {
|
||||
get { return retcode_; }
|
||||
set {
|
||||
retcode_ = value;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Field number for the "battle_info" field.</summary>
|
||||
public const int BattleInfoFieldNumber = 2;
|
||||
public const int BattleInfoFieldNumber = 11;
|
||||
private global::EggLink.DanhengServer.Proto.AetherDivideBattleInfo battleInfo_;
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
@@ -109,6 +97,18 @@ namespace EggLink.DanhengServer.Proto {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Field number for the "retcode" field.</summary>
|
||||
public const int RetcodeFieldNumber = 12;
|
||||
private uint retcode_;
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
public uint Retcode {
|
||||
get { return retcode_; }
|
||||
set {
|
||||
retcode_ = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
public override bool Equals(object other) {
|
||||
@@ -124,8 +124,8 @@ namespace EggLink.DanhengServer.Proto {
|
||||
if (ReferenceEquals(other, this)) {
|
||||
return true;
|
||||
}
|
||||
if (Retcode != other.Retcode) return false;
|
||||
if (!object.Equals(BattleInfo, other.BattleInfo)) return false;
|
||||
if (Retcode != other.Retcode) return false;
|
||||
return Equals(_unknownFields, other._unknownFields);
|
||||
}
|
||||
|
||||
@@ -133,8 +133,8 @@ namespace EggLink.DanhengServer.Proto {
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
public override int GetHashCode() {
|
||||
int hash = 1;
|
||||
if (Retcode != 0) hash ^= Retcode.GetHashCode();
|
||||
if (battleInfo_ != null) hash ^= BattleInfo.GetHashCode();
|
||||
if (Retcode != 0) hash ^= Retcode.GetHashCode();
|
||||
if (_unknownFields != null) {
|
||||
hash ^= _unknownFields.GetHashCode();
|
||||
}
|
||||
@@ -154,11 +154,11 @@ namespace EggLink.DanhengServer.Proto {
|
||||
output.WriteRawMessage(this);
|
||||
#else
|
||||
if (battleInfo_ != null) {
|
||||
output.WriteRawTag(18);
|
||||
output.WriteRawTag(90);
|
||||
output.WriteMessage(BattleInfo);
|
||||
}
|
||||
if (Retcode != 0) {
|
||||
output.WriteRawTag(112);
|
||||
output.WriteRawTag(96);
|
||||
output.WriteUInt32(Retcode);
|
||||
}
|
||||
if (_unknownFields != null) {
|
||||
@@ -172,11 +172,11 @@ namespace EggLink.DanhengServer.Proto {
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
|
||||
if (battleInfo_ != null) {
|
||||
output.WriteRawTag(18);
|
||||
output.WriteRawTag(90);
|
||||
output.WriteMessage(BattleInfo);
|
||||
}
|
||||
if (Retcode != 0) {
|
||||
output.WriteRawTag(112);
|
||||
output.WriteRawTag(96);
|
||||
output.WriteUInt32(Retcode);
|
||||
}
|
||||
if (_unknownFields != null) {
|
||||
@@ -189,12 +189,12 @@ namespace EggLink.DanhengServer.Proto {
|
||||
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
|
||||
public int CalculateSize() {
|
||||
int size = 0;
|
||||
if (Retcode != 0) {
|
||||
size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Retcode);
|
||||
}
|
||||
if (battleInfo_ != null) {
|
||||
size += 1 + pb::CodedOutputStream.ComputeMessageSize(BattleInfo);
|
||||
}
|
||||
if (Retcode != 0) {
|
||||
size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Retcode);
|
||||
}
|
||||
if (_unknownFields != null) {
|
||||
size += _unknownFields.CalculateSize();
|
||||
}
|
||||
@@ -207,15 +207,15 @@ namespace EggLink.DanhengServer.Proto {
|
||||
if (other == null) {
|
||||
return;
|
||||
}
|
||||
if (other.Retcode != 0) {
|
||||
Retcode = other.Retcode;
|
||||
}
|
||||
if (other.battleInfo_ != null) {
|
||||
if (battleInfo_ == null) {
|
||||
BattleInfo = new global::EggLink.DanhengServer.Proto.AetherDivideBattleInfo();
|
||||
}
|
||||
BattleInfo.MergeFrom(other.BattleInfo);
|
||||
}
|
||||
if (other.Retcode != 0) {
|
||||
Retcode = other.Retcode;
|
||||
}
|
||||
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
|
||||
}
|
||||
|
||||
@@ -231,14 +231,14 @@ namespace EggLink.DanhengServer.Proto {
|
||||
default:
|
||||
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
|
||||
break;
|
||||
case 18: {
|
||||
case 90: {
|
||||
if (battleInfo_ == null) {
|
||||
BattleInfo = new global::EggLink.DanhengServer.Proto.AetherDivideBattleInfo();
|
||||
}
|
||||
input.ReadMessage(BattleInfo);
|
||||
break;
|
||||
}
|
||||
case 112: {
|
||||
case 96: {
|
||||
Retcode = input.ReadUInt32();
|
||||
break;
|
||||
}
|
||||
@@ -257,14 +257,14 @@ namespace EggLink.DanhengServer.Proto {
|
||||
default:
|
||||
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
|
||||
break;
|
||||
case 18: {
|
||||
case 90: {
|
||||
if (battleInfo_ == null) {
|
||||
BattleInfo = new global::EggLink.DanhengServer.Proto.AetherDivideBattleInfo();
|
||||
}
|
||||
input.ReadMessage(BattleInfo);
|
||||
break;
|
||||
}
|
||||
case 112: {
|
||||
case 96: {
|
||||
Retcode = input.ReadUInt32();
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user