From 062ac4dbac7d8a5d40f2ba39cc95babad6140201 Mon Sep 17 00:00:00 2001 From: liuying <146726580+Firefly5201314@users.noreply.github.com> Date: Tue, 21 Jan 2025 23:52:22 +0800 Subject: [PATCH] fix: summon unit (#7) --- Proto/SceneSummonUnitInfo.cs | 169 +++++++++++++++++------------------ 1 file changed, 83 insertions(+), 86 deletions(-) diff --git a/Proto/SceneSummonUnitInfo.cs b/Proto/SceneSummonUnitInfo.cs index 9c78ddda..2e9d0837 100644 --- a/Proto/SceneSummonUnitInfo.cs +++ b/Proto/SceneSummonUnitInfo.cs @@ -25,24 +25,21 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChlTY2VuZVN1bW1vblVuaXRJbmZvLnByb3RvIqoBChNTY2VuZVN1bW1vblVu", - "aXRJbmZvEhQKDGxpZmVfdGltZV9tcxgPIAEoBRIZChF0cmlnZ2VyX25hbWVf", - "bGlzdBgLIAMoCRIYChBhdHRhY2hfZW50aXR5X2lkGAQgASgNEhYKDmNyZWF0", - "ZV90aW1lX21zGAcgASgEEhgKEGNhc3Rlcl9lbnRpdHlfaWQYDSABKA0SFgoO", - "c3VtbW9uX3VuaXRfaWQYBSABKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZl", + "aXRJbmZvEhkKEXRyaWdnZXJfbmFtZV9saXN0GAsgAygJEhQKDGxpZmVfdGlt", + "ZV9tcxgPIAEoERIYChBjYXN0ZXJfZW50aXR5X2lkGAQgASgNEhgKEGF0dGFj", + "aF9lbnRpdHlfaWQYBSABKA0SFgoOc3VtbW9uX3VuaXRfaWQYDSABKA0SFgoO", + "Y3JlYXRlX3RpbWVfbXMYByABKARCHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZl", "ci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SceneSummonUnitInfo), global::EggLink.DanhengServer.Proto.SceneSummonUnitInfo.Parser, new[]{ "LifeTimeMs", "TriggerNameList", "AttachEntityId", "CreateTimeMs", "CasterEntityId", "SummonUnitId" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SceneSummonUnitInfo), global::EggLink.DanhengServer.Proto.SceneSummonUnitInfo.Parser, new[]{ "TriggerNameList", "LifeTimeMs", "CasterEntityId", "AttachEntityId", "SummonUnitId", "CreateTimeMs" }, null, null, null, null) })); } #endregion } #region Messages - /// - ///? - /// [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] public sealed partial class SceneSummonUnitInfo : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE @@ -78,12 +75,12 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public SceneSummonUnitInfo(SceneSummonUnitInfo other) : this() { - lifeTimeMs_ = other.lifeTimeMs_; triggerNameList_ = other.triggerNameList_.Clone(); - attachEntityId_ = other.attachEntityId_; - createTimeMs_ = other.createTimeMs_; + lifeTimeMs_ = other.lifeTimeMs_; casterEntityId_ = other.casterEntityId_; + attachEntityId_ = other.attachEntityId_; summonUnitId_ = other.summonUnitId_; + createTimeMs_ = other.createTimeMs_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -93,6 +90,17 @@ namespace EggLink.DanhengServer.Proto { return new SceneSummonUnitInfo(this); } + /// Field number for the "trigger_name_list" field. + public const int TriggerNameListFieldNumber = 11; + private static readonly pb::FieldCodec _repeated_triggerNameList_codec + = pb::FieldCodec.ForString(90); + private readonly pbc::RepeatedField triggerNameList_ = new pbc::RepeatedField(); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField TriggerNameList { + get { return triggerNameList_; } + } + /// Field number for the "life_time_ms" field. public const int LifeTimeMsFieldNumber = 15; private int lifeTimeMs_; @@ -105,19 +113,20 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "trigger_name_list" field. - public const int TriggerNameListFieldNumber = 11; - private static readonly pb::FieldCodec _repeated_triggerNameList_codec - = pb::FieldCodec.ForString(90); - private readonly pbc::RepeatedField triggerNameList_ = new pbc::RepeatedField(); + /// Field number for the "caster_entity_id" field. + public const int CasterEntityIdFieldNumber = 4; + private uint casterEntityId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField TriggerNameList { - get { return triggerNameList_; } + public uint CasterEntityId { + get { return casterEntityId_; } + set { + casterEntityId_ = value; + } } /// Field number for the "attach_entity_id" field. - public const int AttachEntityIdFieldNumber = 4; + public const int AttachEntityIdFieldNumber = 5; private uint attachEntityId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] @@ -128,6 +137,18 @@ namespace EggLink.DanhengServer.Proto { } } + /// Field number for the "summon_unit_id" field. + public const int SummonUnitIdFieldNumber = 13; + private uint summonUnitId_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint SummonUnitId { + get { return summonUnitId_; } + set { + summonUnitId_ = value; + } + } + /// Field number for the "create_time_ms" field. public const int CreateTimeMsFieldNumber = 7; private ulong createTimeMs_; @@ -140,30 +161,6 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "caster_entity_id" field. - public const int CasterEntityIdFieldNumber = 13; - private uint casterEntityId_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint CasterEntityId { - get { return casterEntityId_; } - set { - casterEntityId_ = value; - } - } - - /// Field number for the "summon_unit_id" field. - public const int SummonUnitIdFieldNumber = 5; - private uint summonUnitId_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint SummonUnitId { - get { return summonUnitId_; } - set { - summonUnitId_ = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -179,12 +176,12 @@ namespace EggLink.DanhengServer.Proto { if (ReferenceEquals(other, this)) { return true; } - if (LifeTimeMs != other.LifeTimeMs) return false; if(!triggerNameList_.Equals(other.triggerNameList_)) return false; - if (AttachEntityId != other.AttachEntityId) return false; - if (CreateTimeMs != other.CreateTimeMs) return false; + if (LifeTimeMs != other.LifeTimeMs) return false; if (CasterEntityId != other.CasterEntityId) return false; + if (AttachEntityId != other.AttachEntityId) return false; if (SummonUnitId != other.SummonUnitId) return false; + if (CreateTimeMs != other.CreateTimeMs) return false; return Equals(_unknownFields, other._unknownFields); } @@ -192,12 +189,12 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - if (LifeTimeMs != 0) hash ^= LifeTimeMs.GetHashCode(); hash ^= triggerNameList_.GetHashCode(); - if (AttachEntityId != 0) hash ^= AttachEntityId.GetHashCode(); - if (CreateTimeMs != 0UL) hash ^= CreateTimeMs.GetHashCode(); + if (LifeTimeMs != 0) hash ^= LifeTimeMs.GetHashCode(); if (CasterEntityId != 0) hash ^= CasterEntityId.GetHashCode(); + if (AttachEntityId != 0) hash ^= AttachEntityId.GetHashCode(); if (SummonUnitId != 0) hash ^= SummonUnitId.GetHashCode(); + if (CreateTimeMs != 0UL) hash ^= CreateTimeMs.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -216,26 +213,26 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (AttachEntityId != 0) { + if (CasterEntityId != 0) { output.WriteRawTag(32); - output.WriteUInt32(AttachEntityId); + output.WriteUInt32(CasterEntityId); } - if (SummonUnitId != 0) { + if (AttachEntityId != 0) { output.WriteRawTag(40); - output.WriteUInt32(SummonUnitId); + output.WriteUInt32(AttachEntityId); } if (CreateTimeMs != 0UL) { output.WriteRawTag(56); output.WriteUInt64(CreateTimeMs); } triggerNameList_.WriteTo(output, _repeated_triggerNameList_codec); - if (CasterEntityId != 0) { + if (SummonUnitId != 0) { output.WriteRawTag(104); - output.WriteUInt32(CasterEntityId); + output.WriteUInt32(SummonUnitId); } if (LifeTimeMs != 0) { output.WriteRawTag(120); - output.WriteInt32(LifeTimeMs); + output.WriteSInt32(LifeTimeMs); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -247,26 +244,26 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (AttachEntityId != 0) { + if (CasterEntityId != 0) { output.WriteRawTag(32); - output.WriteUInt32(AttachEntityId); + output.WriteUInt32(CasterEntityId); } - if (SummonUnitId != 0) { + if (AttachEntityId != 0) { output.WriteRawTag(40); - output.WriteUInt32(SummonUnitId); + output.WriteUInt32(AttachEntityId); } if (CreateTimeMs != 0UL) { output.WriteRawTag(56); output.WriteUInt64(CreateTimeMs); } triggerNameList_.WriteTo(ref output, _repeated_triggerNameList_codec); - if (CasterEntityId != 0) { + if (SummonUnitId != 0) { output.WriteRawTag(104); - output.WriteUInt32(CasterEntityId); + output.WriteUInt32(SummonUnitId); } if (LifeTimeMs != 0) { output.WriteRawTag(120); - output.WriteInt32(LifeTimeMs); + output.WriteSInt32(LifeTimeMs); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -278,22 +275,22 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - if (LifeTimeMs != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(LifeTimeMs); - } size += triggerNameList_.CalculateSize(_repeated_triggerNameList_codec); - if (AttachEntityId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(AttachEntityId); - } - if (CreateTimeMs != 0UL) { - size += 1 + pb::CodedOutputStream.ComputeUInt64Size(CreateTimeMs); + if (LifeTimeMs != 0) { + size += 1 + pb::CodedOutputStream.ComputeSInt32Size(LifeTimeMs); } if (CasterEntityId != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CasterEntityId); } + if (AttachEntityId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(AttachEntityId); + } if (SummonUnitId != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(SummonUnitId); } + if (CreateTimeMs != 0UL) { + size += 1 + pb::CodedOutputStream.ComputeUInt64Size(CreateTimeMs); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -306,22 +303,22 @@ namespace EggLink.DanhengServer.Proto { if (other == null) { return; } + triggerNameList_.Add(other.triggerNameList_); if (other.LifeTimeMs != 0) { LifeTimeMs = other.LifeTimeMs; } - triggerNameList_.Add(other.triggerNameList_); - if (other.AttachEntityId != 0) { - AttachEntityId = other.AttachEntityId; - } - if (other.CreateTimeMs != 0UL) { - CreateTimeMs = other.CreateTimeMs; - } if (other.CasterEntityId != 0) { CasterEntityId = other.CasterEntityId; } + if (other.AttachEntityId != 0) { + AttachEntityId = other.AttachEntityId; + } if (other.SummonUnitId != 0) { SummonUnitId = other.SummonUnitId; } + if (other.CreateTimeMs != 0UL) { + CreateTimeMs = other.CreateTimeMs; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -338,11 +335,11 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 32: { - AttachEntityId = input.ReadUInt32(); + CasterEntityId = input.ReadUInt32(); break; } case 40: { - SummonUnitId = input.ReadUInt32(); + AttachEntityId = input.ReadUInt32(); break; } case 56: { @@ -354,11 +351,11 @@ namespace EggLink.DanhengServer.Proto { break; } case 104: { - CasterEntityId = input.ReadUInt32(); + SummonUnitId = input.ReadUInt32(); break; } case 120: { - LifeTimeMs = input.ReadInt32(); + LifeTimeMs = input.ReadSInt32(); break; } } @@ -377,11 +374,11 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 32: { - AttachEntityId = input.ReadUInt32(); + CasterEntityId = input.ReadUInt32(); break; } case 40: { - SummonUnitId = input.ReadUInt32(); + AttachEntityId = input.ReadUInt32(); break; } case 56: { @@ -393,11 +390,11 @@ namespace EggLink.DanhengServer.Proto { break; } case 104: { - CasterEntityId = input.ReadUInt32(); + SummonUnitId = input.ReadUInt32(); break; } case 120: { - LifeTimeMs = input.ReadInt32(); + LifeTimeMs = input.ReadSInt32(); break; } }