From b4c32fb1233dbe42513e0332934b5dff614cd2f3 Mon Sep 17 00:00:00 2001 From: WatchAndyTW Date: Sun, 26 May 2024 14:45:26 +0800 Subject: [PATCH] Update: RotaterData proto deobfuscation --- Common/Proto/DeployRotaterCsReq.cs | 58 +++++++++--------- Common/Proto/DeployRotaterScRsp.cs | 61 ++++++++++--------- Common/Proto/RemoveRotaterCsReq.cs | 58 +++++++++--------- Common/Proto/RemoveRotaterScRsp.cs | 61 ++++++++++--------- .../Recv/Player/HandlerDeployRotaterCsReq.cs | 2 +- .../Send/Player/PacketDeployRotaterScRsp.cs | 2 +- 6 files changed, 122 insertions(+), 120 deletions(-) diff --git a/Common/Proto/DeployRotaterCsReq.cs b/Common/Proto/DeployRotaterCsReq.cs index 3b4cf422..00072ce0 100644 --- a/Common/Proto/DeployRotaterCsReq.cs +++ b/Common/Proto/DeployRotaterCsReq.cs @@ -25,13 +25,13 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChhEZXBsb3lSb3RhdGVyQ3NSZXEucHJvdG8aEVJvdGF0ZXJEYXRhLnByb3Rv", - "IjcKEkRlcGxveVJvdGF0ZXJDc1JlcRIhCgtOSUtHSURQTU9MTRgLIAEoCzIM", - "LlJvdGF0ZXJEYXRhQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9i", - "BnByb3RvMw==")); + "IjgKEkRlcGxveVJvdGF0ZXJDc1JlcRIiCgxyb3RhdGVyX2RhdGEYCyABKAsy", + "DC5Sb3RhdGVyRGF0YUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3Rv", + "YgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RotaterDataReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.DeployRotaterCsReq), global::EggLink.DanhengServer.Proto.DeployRotaterCsReq.Parser, new[]{ "NIKGIDPMOLM" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.DeployRotaterCsReq), global::EggLink.DanhengServer.Proto.DeployRotaterCsReq.Parser, new[]{ "RotaterData" }, null, null, null, null) })); } #endregion @@ -73,7 +73,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public DeployRotaterCsReq(DeployRotaterCsReq other) : this() { - nIKGIDPMOLM_ = other.nIKGIDPMOLM_ != null ? other.nIKGIDPMOLM_.Clone() : null; + rotaterData_ = other.rotaterData_ != null ? other.rotaterData_.Clone() : null; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -83,15 +83,15 @@ namespace EggLink.DanhengServer.Proto { return new DeployRotaterCsReq(this); } - /// Field number for the "NIKGIDPMOLM" field. - public const int NIKGIDPMOLMFieldNumber = 11; - private global::EggLink.DanhengServer.Proto.RotaterData nIKGIDPMOLM_; + /// Field number for the "rotater_data" field. + public const int RotaterDataFieldNumber = 11; + private global::EggLink.DanhengServer.Proto.RotaterData rotaterData_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::EggLink.DanhengServer.Proto.RotaterData NIKGIDPMOLM { - get { return nIKGIDPMOLM_; } + public global::EggLink.DanhengServer.Proto.RotaterData RotaterData { + get { return rotaterData_; } set { - nIKGIDPMOLM_ = value; + rotaterData_ = value; } } @@ -110,7 +110,7 @@ namespace EggLink.DanhengServer.Proto { if (ReferenceEquals(other, this)) { return true; } - if (!object.Equals(NIKGIDPMOLM, other.NIKGIDPMOLM)) return false; + if (!object.Equals(RotaterData, other.RotaterData)) return false; return Equals(_unknownFields, other._unknownFields); } @@ -118,7 +118,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - if (nIKGIDPMOLM_ != null) hash ^= NIKGIDPMOLM.GetHashCode(); + if (rotaterData_ != null) hash ^= RotaterData.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -137,9 +137,9 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (nIKGIDPMOLM_ != null) { + if (rotaterData_ != null) { output.WriteRawTag(90); - output.WriteMessage(NIKGIDPMOLM); + output.WriteMessage(RotaterData); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -151,9 +151,9 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (nIKGIDPMOLM_ != null) { + if (rotaterData_ != null) { output.WriteRawTag(90); - output.WriteMessage(NIKGIDPMOLM); + output.WriteMessage(RotaterData); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -165,8 +165,8 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - if (nIKGIDPMOLM_ != null) { - size += 1 + pb::CodedOutputStream.ComputeMessageSize(NIKGIDPMOLM); + if (rotaterData_ != null) { + size += 1 + pb::CodedOutputStream.ComputeMessageSize(RotaterData); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -180,11 +180,11 @@ namespace EggLink.DanhengServer.Proto { if (other == null) { return; } - if (other.nIKGIDPMOLM_ != null) { - if (nIKGIDPMOLM_ == null) { - NIKGIDPMOLM = new global::EggLink.DanhengServer.Proto.RotaterData(); + if (other.rotaterData_ != null) { + if (rotaterData_ == null) { + RotaterData = new global::EggLink.DanhengServer.Proto.RotaterData(); } - NIKGIDPMOLM.MergeFrom(other.NIKGIDPMOLM); + RotaterData.MergeFrom(other.RotaterData); } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -202,10 +202,10 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 90: { - if (nIKGIDPMOLM_ == null) { - NIKGIDPMOLM = new global::EggLink.DanhengServer.Proto.RotaterData(); + if (rotaterData_ == null) { + RotaterData = new global::EggLink.DanhengServer.Proto.RotaterData(); } - input.ReadMessage(NIKGIDPMOLM); + input.ReadMessage(RotaterData); break; } } @@ -224,10 +224,10 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 90: { - if (nIKGIDPMOLM_ == null) { - NIKGIDPMOLM = new global::EggLink.DanhengServer.Proto.RotaterData(); + if (rotaterData_ == null) { + RotaterData = new global::EggLink.DanhengServer.Proto.RotaterData(); } - input.ReadMessage(NIKGIDPMOLM); + input.ReadMessage(RotaterData); break; } } diff --git a/Common/Proto/DeployRotaterScRsp.cs b/Common/Proto/DeployRotaterScRsp.cs index 11c55b8f..54f89ec5 100644 --- a/Common/Proto/DeployRotaterScRsp.cs +++ b/Common/Proto/DeployRotaterScRsp.cs @@ -25,14 +25,15 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChhEZXBsb3lSb3RhdGVyU2NSc3AucHJvdG8aF1JvdGF0b3JFbmVyZ3lJbmZv", - "LnByb3RvGhFSb3RhdGVyRGF0YS5wcm90byJxChJEZXBsb3lSb3RhdGVyU2NS", - "c3ASJwoLZW5lcmd5X2luZm8YBiABKAsyEi5Sb3RhdG9yRW5lcmd5SW5mbxIh", - "CgtOSUtHSURQTU9MTRgHIAEoCzIMLlJvdGF0ZXJEYXRhEg8KB3JldGNvZGUY", - "BSABKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); + "LnByb3RvGhFSb3RhdGVyRGF0YS5wcm90byJyChJEZXBsb3lSb3RhdGVyU2NS", + "c3ASJwoLZW5lcmd5X2luZm8YBiABKAsyEi5Sb3RhdG9yRW5lcmd5SW5mbxIi", + "Cgxyb3RhdGVyX2RhdGEYByABKAsyDC5Sb3RhdGVyRGF0YRIPCgdyZXRjb2Rl", + "GAUgASgNQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3Rv", + "Mw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RotatorEnergyInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RotaterDataReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.DeployRotaterScRsp), global::EggLink.DanhengServer.Proto.DeployRotaterScRsp.Parser, new[]{ "EnergyInfo", "NIKGIDPMOLM", "Retcode" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.DeployRotaterScRsp), global::EggLink.DanhengServer.Proto.DeployRotaterScRsp.Parser, new[]{ "EnergyInfo", "RotaterData", "Retcode" }, null, null, null, null) })); } #endregion @@ -75,7 +76,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public DeployRotaterScRsp(DeployRotaterScRsp other) : this() { energyInfo_ = other.energyInfo_ != null ? other.energyInfo_.Clone() : null; - nIKGIDPMOLM_ = other.nIKGIDPMOLM_ != null ? other.nIKGIDPMOLM_.Clone() : null; + rotaterData_ = other.rotaterData_ != null ? other.rotaterData_.Clone() : null; retcode_ = other.retcode_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -98,15 +99,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "NIKGIDPMOLM" field. - public const int NIKGIDPMOLMFieldNumber = 7; - private global::EggLink.DanhengServer.Proto.RotaterData nIKGIDPMOLM_; + /// Field number for the "rotater_data" field. + public const int RotaterDataFieldNumber = 7; + private global::EggLink.DanhengServer.Proto.RotaterData rotaterData_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::EggLink.DanhengServer.Proto.RotaterData NIKGIDPMOLM { - get { return nIKGIDPMOLM_; } + public global::EggLink.DanhengServer.Proto.RotaterData RotaterData { + get { return rotaterData_; } set { - nIKGIDPMOLM_ = value; + rotaterData_ = value; } } @@ -138,7 +139,7 @@ namespace EggLink.DanhengServer.Proto { return true; } if (!object.Equals(EnergyInfo, other.EnergyInfo)) return false; - if (!object.Equals(NIKGIDPMOLM, other.NIKGIDPMOLM)) return false; + if (!object.Equals(RotaterData, other.RotaterData)) return false; if (Retcode != other.Retcode) return false; return Equals(_unknownFields, other._unknownFields); } @@ -148,7 +149,7 @@ namespace EggLink.DanhengServer.Proto { public override int GetHashCode() { int hash = 1; if (energyInfo_ != null) hash ^= EnergyInfo.GetHashCode(); - if (nIKGIDPMOLM_ != null) hash ^= NIKGIDPMOLM.GetHashCode(); + if (rotaterData_ != null) hash ^= RotaterData.GetHashCode(); if (Retcode != 0) hash ^= Retcode.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -176,9 +177,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(50); output.WriteMessage(EnergyInfo); } - if (nIKGIDPMOLM_ != null) { + if (rotaterData_ != null) { output.WriteRawTag(58); - output.WriteMessage(NIKGIDPMOLM); + output.WriteMessage(RotaterData); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -198,9 +199,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(50); output.WriteMessage(EnergyInfo); } - if (nIKGIDPMOLM_ != null) { + if (rotaterData_ != null) { output.WriteRawTag(58); - output.WriteMessage(NIKGIDPMOLM); + output.WriteMessage(RotaterData); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -215,8 +216,8 @@ namespace EggLink.DanhengServer.Proto { if (energyInfo_ != null) { size += 1 + pb::CodedOutputStream.ComputeMessageSize(EnergyInfo); } - if (nIKGIDPMOLM_ != null) { - size += 1 + pb::CodedOutputStream.ComputeMessageSize(NIKGIDPMOLM); + if (rotaterData_ != null) { + size += 1 + pb::CodedOutputStream.ComputeMessageSize(RotaterData); } if (Retcode != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Retcode); @@ -239,11 +240,11 @@ namespace EggLink.DanhengServer.Proto { } EnergyInfo.MergeFrom(other.EnergyInfo); } - if (other.nIKGIDPMOLM_ != null) { - if (nIKGIDPMOLM_ == null) { - NIKGIDPMOLM = new global::EggLink.DanhengServer.Proto.RotaterData(); + if (other.rotaterData_ != null) { + if (rotaterData_ == null) { + RotaterData = new global::EggLink.DanhengServer.Proto.RotaterData(); } - NIKGIDPMOLM.MergeFrom(other.NIKGIDPMOLM); + RotaterData.MergeFrom(other.RotaterData); } if (other.Retcode != 0) { Retcode = other.Retcode; @@ -275,10 +276,10 @@ namespace EggLink.DanhengServer.Proto { break; } case 58: { - if (nIKGIDPMOLM_ == null) { - NIKGIDPMOLM = new global::EggLink.DanhengServer.Proto.RotaterData(); + if (rotaterData_ == null) { + RotaterData = new global::EggLink.DanhengServer.Proto.RotaterData(); } - input.ReadMessage(NIKGIDPMOLM); + input.ReadMessage(RotaterData); break; } } @@ -308,10 +309,10 @@ namespace EggLink.DanhengServer.Proto { break; } case 58: { - if (nIKGIDPMOLM_ == null) { - NIKGIDPMOLM = new global::EggLink.DanhengServer.Proto.RotaterData(); + if (rotaterData_ == null) { + RotaterData = new global::EggLink.DanhengServer.Proto.RotaterData(); } - input.ReadMessage(NIKGIDPMOLM); + input.ReadMessage(RotaterData); break; } } diff --git a/Common/Proto/RemoveRotaterCsReq.cs b/Common/Proto/RemoveRotaterCsReq.cs index 9c356ef3..8dc6d17a 100644 --- a/Common/Proto/RemoveRotaterCsReq.cs +++ b/Common/Proto/RemoveRotaterCsReq.cs @@ -25,13 +25,13 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChhSZW1vdmVSb3RhdGVyQ3NSZXEucHJvdG8aEVJvdGF0ZXJEYXRhLnByb3Rv", - "IjcKElJlbW92ZVJvdGF0ZXJDc1JlcRIhCgtOSUtHSURQTU9MTRgHIAEoCzIM", - "LlJvdGF0ZXJEYXRhQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9i", - "BnByb3RvMw==")); + "IjgKElJlbW92ZVJvdGF0ZXJDc1JlcRIiCgxyb3RhdGVyX2RhdGEYByABKAsy", + "DC5Sb3RhdGVyRGF0YUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3Rv", + "YgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RotaterDataReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RemoveRotaterCsReq), global::EggLink.DanhengServer.Proto.RemoveRotaterCsReq.Parser, new[]{ "NIKGIDPMOLM" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RemoveRotaterCsReq), global::EggLink.DanhengServer.Proto.RemoveRotaterCsReq.Parser, new[]{ "RotaterData" }, null, null, null, null) })); } #endregion @@ -73,7 +73,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public RemoveRotaterCsReq(RemoveRotaterCsReq other) : this() { - nIKGIDPMOLM_ = other.nIKGIDPMOLM_ != null ? other.nIKGIDPMOLM_.Clone() : null; + rotaterData_ = other.rotaterData_ != null ? other.rotaterData_.Clone() : null; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -83,15 +83,15 @@ namespace EggLink.DanhengServer.Proto { return new RemoveRotaterCsReq(this); } - /// Field number for the "NIKGIDPMOLM" field. - public const int NIKGIDPMOLMFieldNumber = 7; - private global::EggLink.DanhengServer.Proto.RotaterData nIKGIDPMOLM_; + /// Field number for the "rotater_data" field. + public const int RotaterDataFieldNumber = 7; + private global::EggLink.DanhengServer.Proto.RotaterData rotaterData_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::EggLink.DanhengServer.Proto.RotaterData NIKGIDPMOLM { - get { return nIKGIDPMOLM_; } + public global::EggLink.DanhengServer.Proto.RotaterData RotaterData { + get { return rotaterData_; } set { - nIKGIDPMOLM_ = value; + rotaterData_ = value; } } @@ -110,7 +110,7 @@ namespace EggLink.DanhengServer.Proto { if (ReferenceEquals(other, this)) { return true; } - if (!object.Equals(NIKGIDPMOLM, other.NIKGIDPMOLM)) return false; + if (!object.Equals(RotaterData, other.RotaterData)) return false; return Equals(_unknownFields, other._unknownFields); } @@ -118,7 +118,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - if (nIKGIDPMOLM_ != null) hash ^= NIKGIDPMOLM.GetHashCode(); + if (rotaterData_ != null) hash ^= RotaterData.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -137,9 +137,9 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (nIKGIDPMOLM_ != null) { + if (rotaterData_ != null) { output.WriteRawTag(58); - output.WriteMessage(NIKGIDPMOLM); + output.WriteMessage(RotaterData); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -151,9 +151,9 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (nIKGIDPMOLM_ != null) { + if (rotaterData_ != null) { output.WriteRawTag(58); - output.WriteMessage(NIKGIDPMOLM); + output.WriteMessage(RotaterData); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -165,8 +165,8 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - if (nIKGIDPMOLM_ != null) { - size += 1 + pb::CodedOutputStream.ComputeMessageSize(NIKGIDPMOLM); + if (rotaterData_ != null) { + size += 1 + pb::CodedOutputStream.ComputeMessageSize(RotaterData); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -180,11 +180,11 @@ namespace EggLink.DanhengServer.Proto { if (other == null) { return; } - if (other.nIKGIDPMOLM_ != null) { - if (nIKGIDPMOLM_ == null) { - NIKGIDPMOLM = new global::EggLink.DanhengServer.Proto.RotaterData(); + if (other.rotaterData_ != null) { + if (rotaterData_ == null) { + RotaterData = new global::EggLink.DanhengServer.Proto.RotaterData(); } - NIKGIDPMOLM.MergeFrom(other.NIKGIDPMOLM); + RotaterData.MergeFrom(other.RotaterData); } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -202,10 +202,10 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 58: { - if (nIKGIDPMOLM_ == null) { - NIKGIDPMOLM = new global::EggLink.DanhengServer.Proto.RotaterData(); + if (rotaterData_ == null) { + RotaterData = new global::EggLink.DanhengServer.Proto.RotaterData(); } - input.ReadMessage(NIKGIDPMOLM); + input.ReadMessage(RotaterData); break; } } @@ -224,10 +224,10 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 58: { - if (nIKGIDPMOLM_ == null) { - NIKGIDPMOLM = new global::EggLink.DanhengServer.Proto.RotaterData(); + if (rotaterData_ == null) { + RotaterData = new global::EggLink.DanhengServer.Proto.RotaterData(); } - input.ReadMessage(NIKGIDPMOLM); + input.ReadMessage(RotaterData); break; } } diff --git a/Common/Proto/RemoveRotaterScRsp.cs b/Common/Proto/RemoveRotaterScRsp.cs index f00a0f3c..93e2a581 100644 --- a/Common/Proto/RemoveRotaterScRsp.cs +++ b/Common/Proto/RemoveRotaterScRsp.cs @@ -25,14 +25,15 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChhSZW1vdmVSb3RhdGVyU2NSc3AucHJvdG8aF1JvdGF0b3JFbmVyZ3lJbmZv", - "LnByb3RvGhFSb3RhdGVyRGF0YS5wcm90byJxChJSZW1vdmVSb3RhdGVyU2NS", - "c3ASJwoLZW5lcmd5X2luZm8YBiABKAsyEi5Sb3RhdG9yRW5lcmd5SW5mbxIh", - "CgtOSUtHSURQTU9MTRgCIAEoCzIMLlJvdGF0ZXJEYXRhEg8KB3JldGNvZGUY", - "CCABKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); + "LnByb3RvGhFSb3RhdGVyRGF0YS5wcm90byJyChJSZW1vdmVSb3RhdGVyU2NS", + "c3ASJwoLZW5lcmd5X2luZm8YBiABKAsyEi5Sb3RhdG9yRW5lcmd5SW5mbxIi", + "Cgxyb3RhdGVyX2RhdGEYAiABKAsyDC5Sb3RhdGVyRGF0YRIPCgdyZXRjb2Rl", + "GAggASgNQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3Rv", + "Mw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.RotatorEnergyInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.RotaterDataReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RemoveRotaterScRsp), global::EggLink.DanhengServer.Proto.RemoveRotaterScRsp.Parser, new[]{ "EnergyInfo", "NIKGIDPMOLM", "Retcode" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RemoveRotaterScRsp), global::EggLink.DanhengServer.Proto.RemoveRotaterScRsp.Parser, new[]{ "EnergyInfo", "RotaterData", "Retcode" }, null, null, null, null) })); } #endregion @@ -75,7 +76,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public RemoveRotaterScRsp(RemoveRotaterScRsp other) : this() { energyInfo_ = other.energyInfo_ != null ? other.energyInfo_.Clone() : null; - nIKGIDPMOLM_ = other.nIKGIDPMOLM_ != null ? other.nIKGIDPMOLM_.Clone() : null; + rotaterData_ = other.rotaterData_ != null ? other.rotaterData_.Clone() : null; retcode_ = other.retcode_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -98,15 +99,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "NIKGIDPMOLM" field. - public const int NIKGIDPMOLMFieldNumber = 2; - private global::EggLink.DanhengServer.Proto.RotaterData nIKGIDPMOLM_; + /// Field number for the "rotater_data" field. + public const int RotaterDataFieldNumber = 2; + private global::EggLink.DanhengServer.Proto.RotaterData rotaterData_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::EggLink.DanhengServer.Proto.RotaterData NIKGIDPMOLM { - get { return nIKGIDPMOLM_; } + public global::EggLink.DanhengServer.Proto.RotaterData RotaterData { + get { return rotaterData_; } set { - nIKGIDPMOLM_ = value; + rotaterData_ = value; } } @@ -138,7 +139,7 @@ namespace EggLink.DanhengServer.Proto { return true; } if (!object.Equals(EnergyInfo, other.EnergyInfo)) return false; - if (!object.Equals(NIKGIDPMOLM, other.NIKGIDPMOLM)) return false; + if (!object.Equals(RotaterData, other.RotaterData)) return false; if (Retcode != other.Retcode) return false; return Equals(_unknownFields, other._unknownFields); } @@ -148,7 +149,7 @@ namespace EggLink.DanhengServer.Proto { public override int GetHashCode() { int hash = 1; if (energyInfo_ != null) hash ^= EnergyInfo.GetHashCode(); - if (nIKGIDPMOLM_ != null) hash ^= NIKGIDPMOLM.GetHashCode(); + if (rotaterData_ != null) hash ^= RotaterData.GetHashCode(); if (Retcode != 0) hash ^= Retcode.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -168,9 +169,9 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (nIKGIDPMOLM_ != null) { + if (rotaterData_ != null) { output.WriteRawTag(18); - output.WriteMessage(NIKGIDPMOLM); + output.WriteMessage(RotaterData); } if (energyInfo_ != null) { output.WriteRawTag(50); @@ -190,9 +191,9 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (nIKGIDPMOLM_ != null) { + if (rotaterData_ != null) { output.WriteRawTag(18); - output.WriteMessage(NIKGIDPMOLM); + output.WriteMessage(RotaterData); } if (energyInfo_ != null) { output.WriteRawTag(50); @@ -215,8 +216,8 @@ namespace EggLink.DanhengServer.Proto { if (energyInfo_ != null) { size += 1 + pb::CodedOutputStream.ComputeMessageSize(EnergyInfo); } - if (nIKGIDPMOLM_ != null) { - size += 1 + pb::CodedOutputStream.ComputeMessageSize(NIKGIDPMOLM); + if (rotaterData_ != null) { + size += 1 + pb::CodedOutputStream.ComputeMessageSize(RotaterData); } if (Retcode != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Retcode); @@ -239,11 +240,11 @@ namespace EggLink.DanhengServer.Proto { } EnergyInfo.MergeFrom(other.EnergyInfo); } - if (other.nIKGIDPMOLM_ != null) { - if (nIKGIDPMOLM_ == null) { - NIKGIDPMOLM = new global::EggLink.DanhengServer.Proto.RotaterData(); + if (other.rotaterData_ != null) { + if (rotaterData_ == null) { + RotaterData = new global::EggLink.DanhengServer.Proto.RotaterData(); } - NIKGIDPMOLM.MergeFrom(other.NIKGIDPMOLM); + RotaterData.MergeFrom(other.RotaterData); } if (other.Retcode != 0) { Retcode = other.Retcode; @@ -264,10 +265,10 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 18: { - if (nIKGIDPMOLM_ == null) { - NIKGIDPMOLM = new global::EggLink.DanhengServer.Proto.RotaterData(); + if (rotaterData_ == null) { + RotaterData = new global::EggLink.DanhengServer.Proto.RotaterData(); } - input.ReadMessage(NIKGIDPMOLM); + input.ReadMessage(RotaterData); break; } case 50: { @@ -297,10 +298,10 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 18: { - if (nIKGIDPMOLM_ == null) { - NIKGIDPMOLM = new global::EggLink.DanhengServer.Proto.RotaterData(); + if (rotaterData_ == null) { + RotaterData = new global::EggLink.DanhengServer.Proto.RotaterData(); } - input.ReadMessage(NIKGIDPMOLM); + input.ReadMessage(RotaterData); break; } case 50: { diff --git a/GameServer/Server/Packet/Recv/Player/HandlerDeployRotaterCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerDeployRotaterCsReq.cs index 9a8b1f69..a441ab4d 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerDeployRotaterCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerDeployRotaterCsReq.cs @@ -16,7 +16,7 @@ namespace EggLink.DanhengServer.Server.Packet.Recv.Player var req = DeployRotaterCsReq.Parser.ParseFrom(data); connection.Player!.ChargerNum--; - connection.SendPacket(new PacketDeployRotaterScRsp(req.NIKGIDPMOLM, connection.Player!.ChargerNum, 5)); + connection.SendPacket(new PacketDeployRotaterScRsp(req.RotaterData, connection.Player!.ChargerNum, 5)); } } } diff --git a/GameServer/Server/Packet/Send/Player/PacketDeployRotaterScRsp.cs b/GameServer/Server/Packet/Send/Player/PacketDeployRotaterScRsp.cs index d9201bd4..0ce0e951 100644 --- a/GameServer/Server/Packet/Send/Player/PacketDeployRotaterScRsp.cs +++ b/GameServer/Server/Packet/Send/Player/PacketDeployRotaterScRsp.cs @@ -18,7 +18,7 @@ namespace EggLink.DanhengServer.Server.Packet.Send.Player MaxNum = (uint)maxNum, CurNum = (uint)curNum, }, - NIKGIDPMOLM = rotaterData + RotaterData = rotaterData }; SetData(proto);