From 1d61624f4485aaed9dc67a3857fd5a7bbbdb1a92 Mon Sep 17 00:00:00 2001 From: Acheron <2368447395@qq.com> Date: Sun, 6 Oct 2024 23:15:02 +0800 Subject: [PATCH] Fixed dialogue reversal --- Proto/RevcMsgScNotify.cs | 95 ++++++++++------------------------------ 1 file changed, 24 insertions(+), 71 deletions(-) diff --git a/Proto/RevcMsgScNotify.cs b/Proto/RevcMsgScNotify.cs index d0f5fcfd..c160e264 100644 --- a/Proto/RevcMsgScNotify.cs +++ b/Proto/RevcMsgScNotify.cs @@ -24,17 +24,16 @@ namespace EggLink.DanhengServer.Proto { static RevcMsgScNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChVSZXZjTXNnU2NOb3RpZnkucHJvdG8aDkNoYXRUeXBlLnByb3RvGhFMRkNL", - "UFBETElKSS5wcm90bxoNTXNnVHlwZS5wcm90byLCAQoPUmV2Y01zZ1NjTm90", - "aWZ5EhQKDG1lc3NhZ2VfdGV4dBgCIAEoCRIcCgljaGF0X3R5cGUYCyABKA4y", - "CS5DaGF0VHlwZRISCgp0YXJnZXRfdWlkGAogASgNEhIKCnNvdXJjZV91aWQY", - "BSABKA0SHgoMbWVzc2FnZV90eXBlGAMgASgOMgguTXNnVHlwZRIQCghleHRy", - "YV9pZBgEIAEoDRIhCgtCTkFCTkNDTUlMTRgBIAEoCzIMLkxGQ0tQUERMSUpJ", - "Qh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); + "ChVSZXZjTXNnU2NOb3RpZnkucHJvdG8aDU1zZ1R5cGUucHJvdG8aDkNoYXRU", + "eXBlLnByb3RvIp8BCg9SZXZjTXNnU2NOb3RpZnkSFAoMbWVzc2FnZV90ZXh0", + "GAIgASgJEhwKCWNoYXRfdHlwZRgLIAEoDjIJLkNoYXRUeXBlEhIKCnRhcmdl", + "dF91aWQYBSABKA0SEgoKc291cmNlX3VpZBgKIAEoDRIeCgxtZXNzYWdlX3R5", + "cGUYAyABKA4yCC5Nc2dUeXBlEhAKCGV4dHJhX2lkGAQgASgNQh6qAhtFZ2dM", + "aW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.ChatTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.LFCKPPDLIJIReflection.Descriptor, global::EggLink.DanhengServer.Proto.MsgTypeReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MsgTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.ChatTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RevcMsgScNotify), global::EggLink.DanhengServer.Proto.RevcMsgScNotify.Parser, new[]{ "MessageText", "ChatType", "TargetUid", "SourceUid", "MessageType", "ExtraId", "BNABNCCMILM" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.RevcMsgScNotify), global::EggLink.DanhengServer.Proto.RevcMsgScNotify.Parser, new[]{ "MessageText", "ChatType", "TargetUid", "SourceUid", "MessageType", "ExtraId" }, null, null, null, null) })); } #endregion @@ -82,7 +81,6 @@ namespace EggLink.DanhengServer.Proto { sourceUid_ = other.sourceUid_; messageType_ = other.messageType_; extraId_ = other.extraId_; - bNABNCCMILM_ = other.bNABNCCMILM_ != null ? other.bNABNCCMILM_.Clone() : null; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -120,7 +118,7 @@ namespace EggLink.DanhengServer.Proto { public const int TargetUidFieldNumber = 10; private uint targetUid_; /// - /// 5 + /// or 5 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -135,7 +133,7 @@ namespace EggLink.DanhengServer.Proto { public const int SourceUidFieldNumber = 5; private uint sourceUid_; /// - /// 10 + /// or 10 /// [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -170,18 +168,6 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "BNABNCCMILM" field. - public const int BNABNCCMILMFieldNumber = 1; - private global::EggLink.DanhengServer.Proto.LFCKPPDLIJI bNABNCCMILM_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::EggLink.DanhengServer.Proto.LFCKPPDLIJI BNABNCCMILM { - get { return bNABNCCMILM_; } - set { - bNABNCCMILM_ = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -203,7 +189,6 @@ namespace EggLink.DanhengServer.Proto { if (SourceUid != other.SourceUid) return false; if (MessageType != other.MessageType) return false; if (ExtraId != other.ExtraId) return false; - if (!object.Equals(BNABNCCMILM, other.BNABNCCMILM)) return false; return Equals(_unknownFields, other._unknownFields); } @@ -217,7 +202,6 @@ namespace EggLink.DanhengServer.Proto { if (SourceUid != 0) hash ^= SourceUid.GetHashCode(); if (MessageType != global::EggLink.DanhengServer.Proto.MsgType.None) hash ^= MessageType.GetHashCode(); if (ExtraId != 0) hash ^= ExtraId.GetHashCode(); - if (bNABNCCMILM_ != null) hash ^= BNABNCCMILM.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -236,10 +220,6 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (bNABNCCMILM_ != null) { - output.WriteRawTag(10); - output.WriteMessage(BNABNCCMILM); - } if (MessageText.Length != 0) { output.WriteRawTag(18); output.WriteString(MessageText); @@ -252,14 +232,14 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(32); output.WriteUInt32(ExtraId); } - if (SourceUid != 0) { - output.WriteRawTag(40); - output.WriteUInt32(SourceUid); - } if (TargetUid != 0) { - output.WriteRawTag(80); + output.WriteRawTag(40); output.WriteUInt32(TargetUid); } + if (SourceUid != 0) { + output.WriteRawTag(80); + output.WriteUInt32(SourceUid); + } if (ChatType != global::EggLink.DanhengServer.Proto.ChatType.None) { output.WriteRawTag(88); output.WriteEnum((int) ChatType); @@ -274,10 +254,6 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (bNABNCCMILM_ != null) { - output.WriteRawTag(10); - output.WriteMessage(BNABNCCMILM); - } if (MessageText.Length != 0) { output.WriteRawTag(18); output.WriteString(MessageText); @@ -290,14 +266,14 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(32); output.WriteUInt32(ExtraId); } - if (SourceUid != 0) { - output.WriteRawTag(40); - output.WriteUInt32(SourceUid); - } if (TargetUid != 0) { - output.WriteRawTag(80); + output.WriteRawTag(40); output.WriteUInt32(TargetUid); } + if (SourceUid != 0) { + output.WriteRawTag(80); + output.WriteUInt32(SourceUid); + } if (ChatType != global::EggLink.DanhengServer.Proto.ChatType.None) { output.WriteRawTag(88); output.WriteEnum((int) ChatType); @@ -330,9 +306,6 @@ namespace EggLink.DanhengServer.Proto { if (ExtraId != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ExtraId); } - if (bNABNCCMILM_ != null) { - size += 1 + pb::CodedOutputStream.ComputeMessageSize(BNABNCCMILM); - } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -363,12 +336,6 @@ namespace EggLink.DanhengServer.Proto { if (other.ExtraId != 0) { ExtraId = other.ExtraId; } - if (other.bNABNCCMILM_ != null) { - if (bNABNCCMILM_ == null) { - BNABNCCMILM = new global::EggLink.DanhengServer.Proto.LFCKPPDLIJI(); - } - BNABNCCMILM.MergeFrom(other.BNABNCCMILM); - } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -384,13 +351,6 @@ namespace EggLink.DanhengServer.Proto { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; - case 10: { - if (bNABNCCMILM_ == null) { - BNABNCCMILM = new global::EggLink.DanhengServer.Proto.LFCKPPDLIJI(); - } - input.ReadMessage(BNABNCCMILM); - break; - } case 18: { MessageText = input.ReadString(); break; @@ -404,11 +364,11 @@ namespace EggLink.DanhengServer.Proto { break; } case 40: { - SourceUid = input.ReadUInt32(); + TargetUid = input.ReadUInt32(); break; } case 80: { - TargetUid = input.ReadUInt32(); + SourceUid = input.ReadUInt32(); break; } case 88: { @@ -430,13 +390,6 @@ namespace EggLink.DanhengServer.Proto { default: _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; - case 10: { - if (bNABNCCMILM_ == null) { - BNABNCCMILM = new global::EggLink.DanhengServer.Proto.LFCKPPDLIJI(); - } - input.ReadMessage(BNABNCCMILM); - break; - } case 18: { MessageText = input.ReadString(); break; @@ -450,11 +403,11 @@ namespace EggLink.DanhengServer.Proto { break; } case 40: { - SourceUid = input.ReadUInt32(); + TargetUid = input.ReadUInt32(); break; } case 80: { - TargetUid = input.ReadUInt32(); + SourceUid = input.ReadUInt32(); break; } case 88: {