From 06a53f73621393d0652f333c8e82b0e71776861d Mon Sep 17 00:00:00 2001 From: letheriver2007 Date: Mon, 14 Apr 2025 20:09:10 +0800 Subject: [PATCH] feat: personal card & phone case --- Command/Command/Cmd/CommandGiveall.cs | 2 + Common/Configuration/ConfigContainer.cs | 1 + Common/Database/Player/PlayerData.cs | 9 +- Common/Database/Player/PlayerUnlockData.cs | 5 +- GameServer/Game/Friend/FriendManager.cs | 1 + GameServer/Game/Inventory/InventoryManager.cs | 6 + .../Friend/HandlerGetPlayerDetailInfoCsReq.cs | 3 +- .../Recv/Phone/HandlerSelectPhoneCaseCsReq.cs | 18 ++ .../Recv/Phone/HandlerSetPersonalCardCsReq.cs | 18 ++ .../Send/Phone/PacketGetPhoneDataScRsp.cs | 8 +- .../Send/Phone/PacketSelectPhoneCaseScRsp.cs | 17 ++ .../Send/Phone/PacketSetPersonalCardScRsp.cs | 17 ++ .../PacketGetPlayerBoardDataScRsp.cs | 22 +-- .../PlayerBoard/PacketSetHeadIconScRsp.cs | 2 +- Proto/GetPhoneDataScRsp.cs | 82 +++++----- Proto/GetPlayerBoardDataScRsp.cs | 154 +++++++++--------- Proto/PlayerBoardModuleSync.cs | 40 ++--- Proto/PlayerDetailInfo.cs | 66 ++++---- Proto/PlayerSimpleInfo.cs | 60 +++---- ...PDNNFCNOHIK.cs => SelectPhoneCaseCsReq.cs} | 78 ++++----- Proto/SelectPhoneCaseScRsp.cs | 48 +++--- Proto/SetHeadIconScRsp.cs | 46 +++--- ...EFKAOICFGCL.cs => SetPersonalCardCsReq.cs} | 39 ++--- Proto/SetPersonalCardScRsp.cs | 47 +++--- Proto/UnlockPhoneCaseScNotify.cs | 46 +++--- 25 files changed, 456 insertions(+), 379 deletions(-) create mode 100644 GameServer/Server/Packet/Recv/Phone/HandlerSelectPhoneCaseCsReq.cs create mode 100644 GameServer/Server/Packet/Recv/Phone/HandlerSetPersonalCardCsReq.cs create mode 100644 GameServer/Server/Packet/Send/Phone/PacketSelectPhoneCaseScRsp.cs create mode 100644 GameServer/Server/Packet/Send/Phone/PacketSetPersonalCardScRsp.cs rename Proto/{PDNNFCNOHIK.cs => SelectPhoneCaseCsReq.cs} (73%) rename Proto/{EFKAOICFGCL.cs => SetPersonalCardCsReq.cs} (82%) diff --git a/Command/Command/Cmd/CommandGiveall.cs b/Command/Command/Cmd/CommandGiveall.cs index ce420c71..80b91962 100644 --- a/Command/Command/Cmd/CommandGiveall.cs +++ b/Command/Command/Cmd/CommandGiveall.cs @@ -235,6 +235,8 @@ public class CommandGiveall : ICommand if (material.ItemSubType == ItemSubTypeEnum.HeadIcon || material.ItemSubType == ItemSubTypeEnum.PhoneTheme || material.ItemSubType == ItemSubTypeEnum.ChatBubble || + material.ItemSubType == ItemSubTypeEnum.PersonalCard || + material.ItemSubType == ItemSubTypeEnum.PhoneCase || material.ItemSubType == ItemSubTypeEnum.AvatarSkin) await player.InventoryManager!.AddItem(material.ID, 1, false); diff --git a/Common/Configuration/ConfigContainer.cs b/Common/Configuration/ConfigContainer.cs index 72fdad59..00896d19 100644 --- a/Common/Configuration/ConfigContainer.cs +++ b/Common/Configuration/ConfigContainer.cs @@ -109,6 +109,7 @@ public class ServerProfile public int Level { get; set; } = 1; public int HeadIcon { get; set; } = 200105; public int ChatBubbleId { get; set; } = 220001; + public int PersonalCardId { get; set; } = 253001; public int DisplayAvatarId { get; set; } = 1001; public int DisplayAvatarLevel { get; set; } = 1; } diff --git a/Common/Database/Player/PlayerData.cs b/Common/Database/Player/PlayerData.cs index 30f722d4..17b3e363 100644 --- a/Common/Database/Player/PlayerData.cs +++ b/Common/Database/Player/PlayerData.cs @@ -15,6 +15,8 @@ public class PlayerData : BaseDatabaseDataHelper public int HeadIcon { get; set; } = 208001; public int PhoneTheme { get; set; } = 221000; public int ChatBubble { get; set; } = 220000; + public int PersonalCard { get; set; } = 253000; + public int PhoneCase { get; set; } = 254000; public int CurrentBgm { get; set; } = 210007; public int CurrentPamSkin { get; set; } = 252000; public int Pet { get; set; } = 0; @@ -77,9 +79,6 @@ public class PlayerData : BaseDatabaseDataHelper public PlayerSimpleInfo ToSimpleProto(FriendOnlineStatus status) { - if (!GameData.ChatBubbleConfigData.ContainsKey(ChatBubble)) // to avoid npe - ChatBubble = 220000; - var info = new PlayerSimpleInfo { Nickname = Name, @@ -90,7 +89,8 @@ public class PlayerData : BaseDatabaseDataHelper HeadIcon = (uint)HeadIcon, Platform = PlatformType.Pc, LastActiveTime = LastActiveTime, - ChatBubbleId = (uint)ChatBubble + ChatBubbleId = (uint)ChatBubble, + PersonalCard = (uint)PersonalCard }; var pos = 0; @@ -116,6 +116,7 @@ public class PlayerData : BaseDatabaseDataHelper Signature = Signature, IsBanned = false, HeadIcon = (uint)HeadIcon, + PersonalCard = (uint)PersonalCard, Platform = PlatformType.Pc, Uid = (uint)Uid, WorldLevel = (uint)WorldLevel, diff --git a/Common/Database/Player/PlayerUnlockData.cs b/Common/Database/Player/PlayerUnlockData.cs index f0491d96..6b24f188 100644 --- a/Common/Database/Player/PlayerUnlockData.cs +++ b/Common/Database/Player/PlayerUnlockData.cs @@ -6,10 +6,9 @@ namespace EggLink.DanhengServer.Database.Player; public class PlayerUnlockData : BaseDatabaseDataHelper { [SugarColumn(IsJson = true)] public List HeadIcons { get; set; } = []; - [SugarColumn(IsJson = true)] public List ChatBubbles { get; set; } = []; - [SugarColumn(IsJson = true)] public List PhoneThemes { get; set; } = []; - + [SugarColumn(IsJson = true)] public List PersonalCards { get; set; } = []; + [SugarColumn(IsJson = true)] public List PhoneCases { get; set; } = []; [SugarColumn(IsJson = true)] public Dictionary> Skins { get; set; } = []; } \ No newline at end of file diff --git a/GameServer/Game/Friend/FriendManager.cs b/GameServer/Game/Friend/FriendManager.cs index 53c67ad0..51ff4953 100644 --- a/GameServer/Game/Friend/FriendManager.cs +++ b/GameServer/Game/Friend/FriendManager.cs @@ -269,6 +269,7 @@ public class FriendManager(PlayerInstance player) : BasePlayerManager(player) Level = (uint)serverProfile.Level, Nickname = serverProfile.Name, ChatBubbleId = (uint)serverProfile.ChatBubbleId, + PersonalCard = (uint)serverProfile.PersonalCardId, OnlineStatus = FriendOnlineStatus.Online, Platform = PlatformType.Pc, Signature = serverProfile.Signature diff --git a/GameServer/Game/Inventory/InventoryManager.cs b/GameServer/Game/Inventory/InventoryManager.cs index 3191b88f..41a559ef 100644 --- a/GameServer/Game/Inventory/InventoryManager.cs +++ b/GameServer/Game/Inventory/InventoryManager.cs @@ -78,6 +78,12 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player) case ItemSubTypeEnum.PhoneTheme: Player.PlayerUnlockData!.PhoneThemes.Add(itemId); break; + case ItemSubTypeEnum.PersonalCard: + Player.PlayerUnlockData!.PersonalCards.Add(itemId); + break; + case ItemSubTypeEnum.PhoneCase: + Player.PlayerUnlockData!.PhoneCases.Add(itemId); + break; case ItemSubTypeEnum.AvatarSkin: var avatarId = GameData.AvatarSkinData[itemId].AvatarID; if (!Player.PlayerUnlockData!.Skins.TryGetValue(avatarId, out var value)) diff --git a/GameServer/Server/Packet/Recv/Friend/HandlerGetPlayerDetailInfoCsReq.cs b/GameServer/Server/Packet/Recv/Friend/HandlerGetPlayerDetailInfoCsReq.cs index 972ecd69..61013e36 100644 --- a/GameServer/Server/Packet/Recv/Friend/HandlerGetPlayerDetailInfoCsReq.cs +++ b/GameServer/Server/Packet/Recv/Friend/HandlerGetPlayerDetailInfoCsReq.cs @@ -28,7 +28,8 @@ public class HandlerGetPlayerDetailInfoCsReq : Handler Level = serverProfile.Level, WorldLevel = 0, Name = serverProfile.Name, - ChatBubble = serverProfile.ChatBubbleId + ChatBubble = serverProfile.ChatBubbleId, + PersonalCard = serverProfile.PersonalCardId }; } else diff --git a/GameServer/Server/Packet/Recv/Phone/HandlerSelectPhoneCaseCsReq.cs b/GameServer/Server/Packet/Recv/Phone/HandlerSelectPhoneCaseCsReq.cs new file mode 100644 index 00000000..6e4c5d1b --- /dev/null +++ b/GameServer/Server/Packet/Recv/Phone/HandlerSelectPhoneCaseCsReq.cs @@ -0,0 +1,18 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Phone; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Phone; + +[Opcode(CmdIds.SelectPhoneCaseCsReq)] +public class HandlerSelectPhoneCaseCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + var req = SelectPhoneCaseCsReq.Parser.ParseFrom(data); + + connection.Player!.Data.PhoneCase = (int)req.PhoneCase; + + await connection.SendPacket(new PacketSelectPhoneCaseScRsp(req.PhoneCase)); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Phone/HandlerSetPersonalCardCsReq.cs b/GameServer/Server/Packet/Recv/Phone/HandlerSetPersonalCardCsReq.cs new file mode 100644 index 00000000..f8704528 --- /dev/null +++ b/GameServer/Server/Packet/Recv/Phone/HandlerSetPersonalCardCsReq.cs @@ -0,0 +1,18 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Phone; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Phone; + +[Opcode(CmdIds.SetPersonalCardCsReq)] +public class HandlerSetPersonalCardCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + var req = SetPersonalCardCsReq.Parser.ParseFrom(data); + + connection.Player!.Data.PersonalCard = (int)req.Id; + + await connection.SendPacket(new PacketSetPersonalCardScRsp(req.Id)); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Phone/PacketGetPhoneDataScRsp.cs b/GameServer/Server/Packet/Send/Phone/PacketGetPhoneDataScRsp.cs index d048b616..0a57c0e5 100644 --- a/GameServer/Server/Packet/Send/Phone/PacketGetPhoneDataScRsp.cs +++ b/GameServer/Server/Packet/Send/Phone/PacketGetPhoneDataScRsp.cs @@ -9,18 +9,16 @@ public class PacketGetPhoneDataScRsp : BasePacket { public PacketGetPhoneDataScRsp(PlayerInstance player) : base(CmdIds.GetPhoneDataScRsp) { - if (!GameData.ChatBubbleConfigData.ContainsKey(player.Data.ChatBubble)) // to avoid npe - player.Data.ChatBubble = 220000; - var proto = new GetPhoneDataScRsp { CurChatBubble = (uint)player.Data.ChatBubble, - CurPhoneTheme = (uint)player.Data.PhoneTheme + CurPhoneTheme = (uint)player.Data.PhoneTheme, + CurPhoneCase = (uint)player.Data.PhoneCase }; foreach (var item in player.PlayerUnlockData!.PhoneThemes) proto.OwnedPhoneThemes.Add((uint)item); - foreach (var item in player.PlayerUnlockData!.ChatBubbles) proto.OwnedChatBubbles.Add((uint)item); + foreach (var item in player.PlayerUnlockData!.PhoneCases) proto.OwnedPhoneCases.Add((uint)item); SetData(proto); } diff --git a/GameServer/Server/Packet/Send/Phone/PacketSelectPhoneCaseScRsp.cs b/GameServer/Server/Packet/Send/Phone/PacketSelectPhoneCaseScRsp.cs new file mode 100644 index 00000000..13486990 --- /dev/null +++ b/GameServer/Server/Packet/Send/Phone/PacketSelectPhoneCaseScRsp.cs @@ -0,0 +1,17 @@ +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Phone; + +public class PacketSelectPhoneCaseScRsp : BasePacket +{ + public PacketSelectPhoneCaseScRsp(uint id) : base(CmdIds.SelectPhoneCaseScRsp) + { + var proto = new SelectPhoneCaseScRsp + { + CurPhoneCase = id + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Phone/PacketSetPersonalCardScRsp.cs b/GameServer/Server/Packet/Send/Phone/PacketSetPersonalCardScRsp.cs new file mode 100644 index 00000000..d862337b --- /dev/null +++ b/GameServer/Server/Packet/Send/Phone/PacketSetPersonalCardScRsp.cs @@ -0,0 +1,17 @@ +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Phone; + +public class PacketSetPersonalCardScRsp : BasePacket +{ + public PacketSetPersonalCardScRsp(uint id) : base(CmdIds.SetPersonalCardScRsp) + { + var proto = new SetPersonalCardScRsp + { + CurPersonalCard = id + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/PlayerBoard/PacketGetPlayerBoardDataScRsp.cs b/GameServer/Server/Packet/Send/PlayerBoard/PacketGetPlayerBoardDataScRsp.cs index cbeec540..e225b19b 100644 --- a/GameServer/Server/Packet/Send/PlayerBoard/PacketGetPlayerBoardDataScRsp.cs +++ b/GameServer/Server/Packet/Send/PlayerBoard/PacketGetPlayerBoardDataScRsp.cs @@ -10,28 +10,24 @@ public class PacketGetPlayerBoardDataScRsp : BasePacket { var proto = new GetPlayerBoardDataScRsp { - CurrentHeadIconId = (uint)player.Data.HeadIcon, - Signature = player.Data.Signature + Signature = player.Data.Signature, + CurHeadIcon = (uint)player.Data.HeadIcon, + CurPersonalCard = (uint)player.Data.PersonalCard, + UnlockedPersonalCard = { player.PlayerUnlockData!.PersonalCards.Select(x => (uint)x) }, + UnlockedHeadIcon = { player.PlayerUnlockData!.HeadIcons.Select(x => new HeadIconData { Id = (uint)x }) }, + AssistAvatarIdList = { player.Data.AssistAvatars.Select(x => (uint)x) }, + DisplayAvatarVec = new DisplayAvatarVec() }; - player.PlayerUnlockData?.HeadIcons.ForEach(id => - { - HeadIconData headIcon = new() { Id = (uint)id }; - proto.UnlockedHeadIconList.Add(headIcon); - }); - - proto.DisplayAvatarVec = new DisplayAvatarVec(); var pos = 0; player.Data.DisplayAvatars.ForEach(avatar => { - DisplayAvatarData displayAvatar = new() + proto.DisplayAvatarVec.DisplayAvatarList.Add(new DisplayAvatarData { AvatarId = (uint)avatar, Pos = (uint)pos++ - }; - proto.DisplayAvatarVec.DisplayAvatarList.Add(displayAvatar); + }); }); - player.Data.AssistAvatars.ForEach(x => proto.AssistAvatarIdList.Add((uint)x)); SetData(proto); } diff --git a/GameServer/Server/Packet/Send/PlayerBoard/PacketSetHeadIconScRsp.cs b/GameServer/Server/Packet/Send/PlayerBoard/PacketSetHeadIconScRsp.cs index 3a7da763..b4884bb6 100644 --- a/GameServer/Server/Packet/Send/PlayerBoard/PacketSetHeadIconScRsp.cs +++ b/GameServer/Server/Packet/Send/PlayerBoard/PacketSetHeadIconScRsp.cs @@ -10,7 +10,7 @@ public class PacketSetHeadIconScRsp : BasePacket { var proto = new SetHeadIconScRsp { - CurrentHeadIconId = (uint)player.Data.HeadIcon + CurHeadIcon = (uint)player.Data.HeadIcon }; SetData(proto); } diff --git a/Proto/GetPhoneDataScRsp.cs b/Proto/GetPhoneDataScRsp.cs index f46a53bc..3dfce78d 100644 --- a/Proto/GetPhoneDataScRsp.cs +++ b/Proto/GetPhoneDataScRsp.cs @@ -24,16 +24,16 @@ namespace EggLink.DanhengServer.Proto { static GetPhoneDataScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChdHZXRQaG9uZURhdGFTY1JzcC5wcm90byK4AQoRR2V0UGhvbmVEYXRhU2NS", - "c3ASEwoLS0tORUVHREtFTUQYCCADKA0SGgoSb3duZWRfcGhvbmVfdGhlbWVz", - "GA4gAygNEhcKD2N1cl9waG9uZV90aGVtZRgMIAEoDRIPCgdyZXRjb2RlGAMg", - "ASgNEhcKD2N1cl9jaGF0X2J1YmJsZRgJIAEoDRITCgtMTU9DQU1LTEtQSRgE", - "IAEoDRIaChJvd25lZF9jaGF0X2J1YmJsZXMYDyADKA1CHqoCG0VnZ0xpbmsu", - "RGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); + "ChdHZXRQaG9uZURhdGFTY1JzcC5wcm90byLBAQoRR2V0UGhvbmVEYXRhU2NS", + "c3ASGQoRb3duZWRfcGhvbmVfY2FzZXMYCCADKA0SGgoSb3duZWRfcGhvbmVf", + "dGhlbWVzGA4gAygNEhcKD2N1cl9waG9uZV90aGVtZRgMIAEoDRIPCgdyZXRj", + "b2RlGAMgASgNEhcKD2N1cl9jaGF0X2J1YmJsZRgJIAEoDRIWCg5jdXJfcGhv", + "bmVfY2FzZRgEIAEoDRIaChJvd25lZF9jaGF0X2J1YmJsZXMYDyADKA1CHqoC", + "G0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetPhoneDataScRsp), global::EggLink.DanhengServer.Proto.GetPhoneDataScRsp.Parser, new[]{ "KKNEEGDKEMD", "OwnedPhoneThemes", "CurPhoneTheme", "Retcode", "CurChatBubble", "LMOCAMKLKPI", "OwnedChatBubbles" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetPhoneDataScRsp), global::EggLink.DanhengServer.Proto.GetPhoneDataScRsp.Parser, new[]{ "OwnedPhoneCases", "OwnedPhoneThemes", "CurPhoneTheme", "Retcode", "CurChatBubble", "CurPhoneCase", "OwnedChatBubbles" }, null, null, null, null) })); } #endregion @@ -75,12 +75,12 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public GetPhoneDataScRsp(GetPhoneDataScRsp other) : this() { - kKNEEGDKEMD_ = other.kKNEEGDKEMD_.Clone(); + ownedPhoneCases_ = other.ownedPhoneCases_.Clone(); ownedPhoneThemes_ = other.ownedPhoneThemes_.Clone(); curPhoneTheme_ = other.curPhoneTheme_; retcode_ = other.retcode_; curChatBubble_ = other.curChatBubble_; - lMOCAMKLKPI_ = other.lMOCAMKLKPI_; + curPhoneCase_ = other.curPhoneCase_; ownedChatBubbles_ = other.ownedChatBubbles_.Clone(); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -91,15 +91,15 @@ namespace EggLink.DanhengServer.Proto { return new GetPhoneDataScRsp(this); } - /// Field number for the "KKNEEGDKEMD" field. - public const int KKNEEGDKEMDFieldNumber = 8; - private static readonly pb::FieldCodec _repeated_kKNEEGDKEMD_codec + /// Field number for the "owned_phone_cases" field. + public const int OwnedPhoneCasesFieldNumber = 8; + private static readonly pb::FieldCodec _repeated_ownedPhoneCases_codec = pb::FieldCodec.ForUInt32(66); - private readonly pbc::RepeatedField kKNEEGDKEMD_ = new pbc::RepeatedField(); + private readonly pbc::RepeatedField ownedPhoneCases_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField KKNEEGDKEMD { - get { return kKNEEGDKEMD_; } + public pbc::RepeatedField OwnedPhoneCases { + get { return ownedPhoneCases_; } } /// Field number for the "owned_phone_themes" field. @@ -149,15 +149,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "LMOCAMKLKPI" field. - public const int LMOCAMKLKPIFieldNumber = 4; - private uint lMOCAMKLKPI_; + /// Field number for the "cur_phone_case" field. + public const int CurPhoneCaseFieldNumber = 4; + private uint curPhoneCase_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint LMOCAMKLKPI { - get { return lMOCAMKLKPI_; } + public uint CurPhoneCase { + get { return curPhoneCase_; } set { - lMOCAMKLKPI_ = value; + curPhoneCase_ = value; } } @@ -187,12 +187,12 @@ namespace EggLink.DanhengServer.Proto { if (ReferenceEquals(other, this)) { return true; } - if(!kKNEEGDKEMD_.Equals(other.kKNEEGDKEMD_)) return false; + if(!ownedPhoneCases_.Equals(other.ownedPhoneCases_)) return false; if(!ownedPhoneThemes_.Equals(other.ownedPhoneThemes_)) return false; if (CurPhoneTheme != other.CurPhoneTheme) return false; if (Retcode != other.Retcode) return false; if (CurChatBubble != other.CurChatBubble) return false; - if (LMOCAMKLKPI != other.LMOCAMKLKPI) return false; + if (CurPhoneCase != other.CurPhoneCase) return false; if(!ownedChatBubbles_.Equals(other.ownedChatBubbles_)) return false; return Equals(_unknownFields, other._unknownFields); } @@ -201,12 +201,12 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - hash ^= kKNEEGDKEMD_.GetHashCode(); + hash ^= ownedPhoneCases_.GetHashCode(); hash ^= ownedPhoneThemes_.GetHashCode(); if (CurPhoneTheme != 0) hash ^= CurPhoneTheme.GetHashCode(); if (Retcode != 0) hash ^= Retcode.GetHashCode(); if (CurChatBubble != 0) hash ^= CurChatBubble.GetHashCode(); - if (LMOCAMKLKPI != 0) hash ^= LMOCAMKLKPI.GetHashCode(); + if (CurPhoneCase != 0) hash ^= CurPhoneCase.GetHashCode(); hash ^= ownedChatBubbles_.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -230,11 +230,11 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(24); output.WriteUInt32(Retcode); } - if (LMOCAMKLKPI != 0) { + if (CurPhoneCase != 0) { output.WriteRawTag(32); - output.WriteUInt32(LMOCAMKLKPI); + output.WriteUInt32(CurPhoneCase); } - kKNEEGDKEMD_.WriteTo(output, _repeated_kKNEEGDKEMD_codec); + ownedPhoneCases_.WriteTo(output, _repeated_ownedPhoneCases_codec); if (CurChatBubble != 0) { output.WriteRawTag(72); output.WriteUInt32(CurChatBubble); @@ -259,11 +259,11 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(24); output.WriteUInt32(Retcode); } - if (LMOCAMKLKPI != 0) { + if (CurPhoneCase != 0) { output.WriteRawTag(32); - output.WriteUInt32(LMOCAMKLKPI); + output.WriteUInt32(CurPhoneCase); } - kKNEEGDKEMD_.WriteTo(ref output, _repeated_kKNEEGDKEMD_codec); + ownedPhoneCases_.WriteTo(ref output, _repeated_ownedPhoneCases_codec); if (CurChatBubble != 0) { output.WriteRawTag(72); output.WriteUInt32(CurChatBubble); @@ -284,7 +284,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - size += kKNEEGDKEMD_.CalculateSize(_repeated_kKNEEGDKEMD_codec); + size += ownedPhoneCases_.CalculateSize(_repeated_ownedPhoneCases_codec); size += ownedPhoneThemes_.CalculateSize(_repeated_ownedPhoneThemes_codec); if (CurPhoneTheme != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurPhoneTheme); @@ -295,8 +295,8 @@ namespace EggLink.DanhengServer.Proto { if (CurChatBubble != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurChatBubble); } - if (LMOCAMKLKPI != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(LMOCAMKLKPI); + if (CurPhoneCase != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurPhoneCase); } size += ownedChatBubbles_.CalculateSize(_repeated_ownedChatBubbles_codec); if (_unknownFields != null) { @@ -311,7 +311,7 @@ namespace EggLink.DanhengServer.Proto { if (other == null) { return; } - kKNEEGDKEMD_.Add(other.kKNEEGDKEMD_); + ownedPhoneCases_.Add(other.ownedPhoneCases_); ownedPhoneThemes_.Add(other.ownedPhoneThemes_); if (other.CurPhoneTheme != 0) { CurPhoneTheme = other.CurPhoneTheme; @@ -322,8 +322,8 @@ namespace EggLink.DanhengServer.Proto { if (other.CurChatBubble != 0) { CurChatBubble = other.CurChatBubble; } - if (other.LMOCAMKLKPI != 0) { - LMOCAMKLKPI = other.LMOCAMKLKPI; + if (other.CurPhoneCase != 0) { + CurPhoneCase = other.CurPhoneCase; } ownedChatBubbles_.Add(other.ownedChatBubbles_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); @@ -346,12 +346,12 @@ namespace EggLink.DanhengServer.Proto { break; } case 32: { - LMOCAMKLKPI = input.ReadUInt32(); + CurPhoneCase = input.ReadUInt32(); break; } case 66: case 64: { - kKNEEGDKEMD_.AddEntriesFrom(input, _repeated_kKNEEGDKEMD_codec); + ownedPhoneCases_.AddEntriesFrom(input, _repeated_ownedPhoneCases_codec); break; } case 72: { @@ -392,12 +392,12 @@ namespace EggLink.DanhengServer.Proto { break; } case 32: { - LMOCAMKLKPI = input.ReadUInt32(); + CurPhoneCase = input.ReadUInt32(); break; } case 66: case 64: { - kKNEEGDKEMD_.AddEntriesFrom(ref input, _repeated_kKNEEGDKEMD_codec); + ownedPhoneCases_.AddEntriesFrom(ref input, _repeated_ownedPhoneCases_codec); break; } case 72: { diff --git a/Proto/GetPlayerBoardDataScRsp.cs b/Proto/GetPlayerBoardDataScRsp.cs index c43eee4b..55879d48 100644 --- a/Proto/GetPlayerBoardDataScRsp.cs +++ b/Proto/GetPlayerBoardDataScRsp.cs @@ -25,18 +25,18 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "Ch1HZXRQbGF5ZXJCb2FyZERhdGFTY1JzcC5wcm90bxoWRGlzcGxheUF2YXRh", - "clZlYy5wcm90bxoSSGVhZEljb25EYXRhLnByb3RvIoMCChdHZXRQbGF5ZXJC", - "b2FyZERhdGFTY1JzcBIRCglzaWduYXR1cmUYBCABKAkSEwoLS0tOSkhFTk1H", - "UEsYCyADKA0SHQoVYXNzaXN0X2F2YXRhcl9pZF9saXN0GAUgAygNEi0KEmRp", - "c3BsYXlfYXZhdGFyX3ZlYxgMIAEoCzIRLkRpc3BsYXlBdmF0YXJWZWMSHAoU", - "Y3VycmVudF9oZWFkX2ljb25faWQYCSABKA0SDwoHcmV0Y29kZRgIIAEoDRIT", - "CgtPTERNSk9OQkpPTRgPIAEoDRIuChd1bmxvY2tlZF9oZWFkX2ljb25fbGlz", - "dBgBIAMoCzINLkhlYWRJY29uRGF0YUIeqgIbRWdnTGluay5EYW5oZW5nU2Vy", - "dmVyLlByb3RvYgZwcm90bzM=")); + "clZlYy5wcm90bxoSSGVhZEljb25EYXRhLnByb3RvIogCChdHZXRQbGF5ZXJC", + "b2FyZERhdGFTY1JzcBIRCglzaWduYXR1cmUYBCABKAkSHgoWdW5sb2NrZWRf", + "cGVyc29uYWxfY2FyZBgLIAMoDRIdChVhc3Npc3RfYXZhdGFyX2lkX2xpc3QY", + "BSADKA0SLQoSZGlzcGxheV9hdmF0YXJfdmVjGAwgASgLMhEuRGlzcGxheUF2", + "YXRhclZlYxIVCg1jdXJfaGVhZF9pY29uGAkgASgNEg8KB3JldGNvZGUYCCAB", + "KA0SGQoRY3VyX3BlcnNvbmFsX2NhcmQYDyABKA0SKQoSdW5sb2NrZWRfaGVh", + "ZF9pY29uGAEgAygLMg0uSGVhZEljb25EYXRhQh6qAhtFZ2dMaW5rLkRhbmhl", + "bmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.DisplayAvatarVecReflection.Descriptor, global::EggLink.DanhengServer.Proto.HeadIconDataReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetPlayerBoardDataScRsp), global::EggLink.DanhengServer.Proto.GetPlayerBoardDataScRsp.Parser, new[]{ "Signature", "KKNJHENMGPK", "AssistAvatarIdList", "DisplayAvatarVec", "CurrentHeadIconId", "Retcode", "OLDMJONBJOM", "UnlockedHeadIconList" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.GetPlayerBoardDataScRsp), global::EggLink.DanhengServer.Proto.GetPlayerBoardDataScRsp.Parser, new[]{ "Signature", "UnlockedPersonalCard", "AssistAvatarIdList", "DisplayAvatarVec", "CurHeadIcon", "Retcode", "CurPersonalCard", "UnlockedHeadIcon" }, null, null, null, null) })); } #endregion @@ -79,13 +79,13 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public GetPlayerBoardDataScRsp(GetPlayerBoardDataScRsp other) : this() { signature_ = other.signature_; - kKNJHENMGPK_ = other.kKNJHENMGPK_.Clone(); + unlockedPersonalCard_ = other.unlockedPersonalCard_.Clone(); assistAvatarIdList_ = other.assistAvatarIdList_.Clone(); displayAvatarVec_ = other.displayAvatarVec_ != null ? other.displayAvatarVec_.Clone() : null; - currentHeadIconId_ = other.currentHeadIconId_; + curHeadIcon_ = other.curHeadIcon_; retcode_ = other.retcode_; - oLDMJONBJOM_ = other.oLDMJONBJOM_; - unlockedHeadIconList_ = other.unlockedHeadIconList_.Clone(); + curPersonalCard_ = other.curPersonalCard_; + unlockedHeadIcon_ = other.unlockedHeadIcon_.Clone(); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -107,15 +107,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "KKNJHENMGPK" field. - public const int KKNJHENMGPKFieldNumber = 11; - private static readonly pb::FieldCodec _repeated_kKNJHENMGPK_codec + /// Field number for the "unlocked_personal_card" field. + public const int UnlockedPersonalCardFieldNumber = 11; + private static readonly pb::FieldCodec _repeated_unlockedPersonalCard_codec = pb::FieldCodec.ForUInt32(90); - private readonly pbc::RepeatedField kKNJHENMGPK_ = new pbc::RepeatedField(); + private readonly pbc::RepeatedField unlockedPersonalCard_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField KKNJHENMGPK { - get { return kKNJHENMGPK_; } + public pbc::RepeatedField UnlockedPersonalCard { + get { return unlockedPersonalCard_; } } /// Field number for the "assist_avatar_id_list" field. @@ -141,15 +141,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "current_head_icon_id" field. - public const int CurrentHeadIconIdFieldNumber = 9; - private uint currentHeadIconId_; + /// Field number for the "cur_head_icon" field. + public const int CurHeadIconFieldNumber = 9; + private uint curHeadIcon_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint CurrentHeadIconId { - get { return currentHeadIconId_; } + public uint CurHeadIcon { + get { return curHeadIcon_; } set { - currentHeadIconId_ = value; + curHeadIcon_ = value; } } @@ -165,27 +165,27 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "OLDMJONBJOM" field. - public const int OLDMJONBJOMFieldNumber = 15; - private uint oLDMJONBJOM_; + /// Field number for the "cur_personal_card" field. + public const int CurPersonalCardFieldNumber = 15; + private uint curPersonalCard_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint OLDMJONBJOM { - get { return oLDMJONBJOM_; } + public uint CurPersonalCard { + get { return curPersonalCard_; } set { - oLDMJONBJOM_ = value; + curPersonalCard_ = value; } } - /// Field number for the "unlocked_head_icon_list" field. - public const int UnlockedHeadIconListFieldNumber = 1; - private static readonly pb::FieldCodec _repeated_unlockedHeadIconList_codec + /// Field number for the "unlocked_head_icon" field. + public const int UnlockedHeadIconFieldNumber = 1; + private static readonly pb::FieldCodec _repeated_unlockedHeadIcon_codec = pb::FieldCodec.ForMessage(10, global::EggLink.DanhengServer.Proto.HeadIconData.Parser); - private readonly pbc::RepeatedField unlockedHeadIconList_ = new pbc::RepeatedField(); + private readonly pbc::RepeatedField unlockedHeadIcon_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField UnlockedHeadIconList { - get { return unlockedHeadIconList_; } + public pbc::RepeatedField UnlockedHeadIcon { + get { return unlockedHeadIcon_; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -204,13 +204,13 @@ namespace EggLink.DanhengServer.Proto { return true; } if (Signature != other.Signature) return false; - if(!kKNJHENMGPK_.Equals(other.kKNJHENMGPK_)) return false; + if(!unlockedPersonalCard_.Equals(other.unlockedPersonalCard_)) return false; if(!assistAvatarIdList_.Equals(other.assistAvatarIdList_)) return false; if (!object.Equals(DisplayAvatarVec, other.DisplayAvatarVec)) return false; - if (CurrentHeadIconId != other.CurrentHeadIconId) return false; + if (CurHeadIcon != other.CurHeadIcon) return false; if (Retcode != other.Retcode) return false; - if (OLDMJONBJOM != other.OLDMJONBJOM) return false; - if(!unlockedHeadIconList_.Equals(other.unlockedHeadIconList_)) return false; + if (CurPersonalCard != other.CurPersonalCard) return false; + if(!unlockedHeadIcon_.Equals(other.unlockedHeadIcon_)) return false; return Equals(_unknownFields, other._unknownFields); } @@ -219,13 +219,13 @@ namespace EggLink.DanhengServer.Proto { public override int GetHashCode() { int hash = 1; if (Signature.Length != 0) hash ^= Signature.GetHashCode(); - hash ^= kKNJHENMGPK_.GetHashCode(); + hash ^= unlockedPersonalCard_.GetHashCode(); hash ^= assistAvatarIdList_.GetHashCode(); if (displayAvatarVec_ != null) hash ^= DisplayAvatarVec.GetHashCode(); - if (CurrentHeadIconId != 0) hash ^= CurrentHeadIconId.GetHashCode(); + if (CurHeadIcon != 0) hash ^= CurHeadIcon.GetHashCode(); if (Retcode != 0) hash ^= Retcode.GetHashCode(); - if (OLDMJONBJOM != 0) hash ^= OLDMJONBJOM.GetHashCode(); - hash ^= unlockedHeadIconList_.GetHashCode(); + if (CurPersonalCard != 0) hash ^= CurPersonalCard.GetHashCode(); + hash ^= unlockedHeadIcon_.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -244,7 +244,7 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - unlockedHeadIconList_.WriteTo(output, _repeated_unlockedHeadIconList_codec); + unlockedHeadIcon_.WriteTo(output, _repeated_unlockedHeadIcon_codec); if (Signature.Length != 0) { output.WriteRawTag(34); output.WriteString(Signature); @@ -254,18 +254,18 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(64); output.WriteUInt32(Retcode); } - if (CurrentHeadIconId != 0) { + if (CurHeadIcon != 0) { output.WriteRawTag(72); - output.WriteUInt32(CurrentHeadIconId); + output.WriteUInt32(CurHeadIcon); } - kKNJHENMGPK_.WriteTo(output, _repeated_kKNJHENMGPK_codec); + unlockedPersonalCard_.WriteTo(output, _repeated_unlockedPersonalCard_codec); if (displayAvatarVec_ != null) { output.WriteRawTag(98); output.WriteMessage(DisplayAvatarVec); } - if (OLDMJONBJOM != 0) { + if (CurPersonalCard != 0) { output.WriteRawTag(120); - output.WriteUInt32(OLDMJONBJOM); + output.WriteUInt32(CurPersonalCard); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -277,7 +277,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - unlockedHeadIconList_.WriteTo(ref output, _repeated_unlockedHeadIconList_codec); + unlockedHeadIcon_.WriteTo(ref output, _repeated_unlockedHeadIcon_codec); if (Signature.Length != 0) { output.WriteRawTag(34); output.WriteString(Signature); @@ -287,18 +287,18 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(64); output.WriteUInt32(Retcode); } - if (CurrentHeadIconId != 0) { + if (CurHeadIcon != 0) { output.WriteRawTag(72); - output.WriteUInt32(CurrentHeadIconId); + output.WriteUInt32(CurHeadIcon); } - kKNJHENMGPK_.WriteTo(ref output, _repeated_kKNJHENMGPK_codec); + unlockedPersonalCard_.WriteTo(ref output, _repeated_unlockedPersonalCard_codec); if (displayAvatarVec_ != null) { output.WriteRawTag(98); output.WriteMessage(DisplayAvatarVec); } - if (OLDMJONBJOM != 0) { + if (CurPersonalCard != 0) { output.WriteRawTag(120); - output.WriteUInt32(OLDMJONBJOM); + output.WriteUInt32(CurPersonalCard); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -313,21 +313,21 @@ namespace EggLink.DanhengServer.Proto { if (Signature.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(Signature); } - size += kKNJHENMGPK_.CalculateSize(_repeated_kKNJHENMGPK_codec); + size += unlockedPersonalCard_.CalculateSize(_repeated_unlockedPersonalCard_codec); size += assistAvatarIdList_.CalculateSize(_repeated_assistAvatarIdList_codec); if (displayAvatarVec_ != null) { size += 1 + pb::CodedOutputStream.ComputeMessageSize(DisplayAvatarVec); } - if (CurrentHeadIconId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurrentHeadIconId); + if (CurHeadIcon != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurHeadIcon); } if (Retcode != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Retcode); } - if (OLDMJONBJOM != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(OLDMJONBJOM); + if (CurPersonalCard != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurPersonalCard); } - size += unlockedHeadIconList_.CalculateSize(_repeated_unlockedHeadIconList_codec); + size += unlockedHeadIcon_.CalculateSize(_repeated_unlockedHeadIcon_codec); if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -343,7 +343,7 @@ namespace EggLink.DanhengServer.Proto { if (other.Signature.Length != 0) { Signature = other.Signature; } - kKNJHENMGPK_.Add(other.kKNJHENMGPK_); + unlockedPersonalCard_.Add(other.unlockedPersonalCard_); assistAvatarIdList_.Add(other.assistAvatarIdList_); if (other.displayAvatarVec_ != null) { if (displayAvatarVec_ == null) { @@ -351,16 +351,16 @@ namespace EggLink.DanhengServer.Proto { } DisplayAvatarVec.MergeFrom(other.DisplayAvatarVec); } - if (other.CurrentHeadIconId != 0) { - CurrentHeadIconId = other.CurrentHeadIconId; + if (other.CurHeadIcon != 0) { + CurHeadIcon = other.CurHeadIcon; } if (other.Retcode != 0) { Retcode = other.Retcode; } - if (other.OLDMJONBJOM != 0) { - OLDMJONBJOM = other.OLDMJONBJOM; + if (other.CurPersonalCard != 0) { + CurPersonalCard = other.CurPersonalCard; } - unlockedHeadIconList_.Add(other.unlockedHeadIconList_); + unlockedHeadIcon_.Add(other.unlockedHeadIcon_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -377,7 +377,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 10: { - unlockedHeadIconList_.AddEntriesFrom(input, _repeated_unlockedHeadIconList_codec); + unlockedHeadIcon_.AddEntriesFrom(input, _repeated_unlockedHeadIcon_codec); break; } case 34: { @@ -394,12 +394,12 @@ namespace EggLink.DanhengServer.Proto { break; } case 72: { - CurrentHeadIconId = input.ReadUInt32(); + CurHeadIcon = input.ReadUInt32(); break; } case 90: case 88: { - kKNJHENMGPK_.AddEntriesFrom(input, _repeated_kKNJHENMGPK_codec); + unlockedPersonalCard_.AddEntriesFrom(input, _repeated_unlockedPersonalCard_codec); break; } case 98: { @@ -410,7 +410,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 120: { - OLDMJONBJOM = input.ReadUInt32(); + CurPersonalCard = input.ReadUInt32(); break; } } @@ -429,7 +429,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 10: { - unlockedHeadIconList_.AddEntriesFrom(ref input, _repeated_unlockedHeadIconList_codec); + unlockedHeadIcon_.AddEntriesFrom(ref input, _repeated_unlockedHeadIcon_codec); break; } case 34: { @@ -446,12 +446,12 @@ namespace EggLink.DanhengServer.Proto { break; } case 72: { - CurrentHeadIconId = input.ReadUInt32(); + CurHeadIcon = input.ReadUInt32(); break; } case 90: case 88: { - kKNJHENMGPK_.AddEntriesFrom(ref input, _repeated_kKNJHENMGPK_codec); + unlockedPersonalCard_.AddEntriesFrom(ref input, _repeated_unlockedPersonalCard_codec); break; } case 98: { @@ -462,7 +462,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 120: { - OLDMJONBJOM = input.ReadUInt32(); + CurPersonalCard = input.ReadUInt32(); break; } } diff --git a/Proto/PlayerBoardModuleSync.cs b/Proto/PlayerBoardModuleSync.cs index 2a242599..f625767b 100644 --- a/Proto/PlayerBoardModuleSync.cs +++ b/Proto/PlayerBoardModuleSync.cs @@ -25,14 +25,14 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChtQbGF5ZXJCb2FyZE1vZHVsZVN5bmMucHJvdG8aEkhlYWRJY29uRGF0YS5w", - "cm90byKEAQoVUGxheWVyQm9hcmRNb2R1bGVTeW5jEhEKCXNpZ25hdHVyZRgM", - "IAEoCRIuChd1bmxvY2tlZF9oZWFkX2ljb25fbGlzdBgDIAMoCzINLkhlYWRJ", - "Y29uRGF0YRITCgtQQUdKS0RKSUdQSRgOIAEoCBITCgtBTE1NSEtGS0hMSxgI", - "IAMoDUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); + "cm90byJ/ChVQbGF5ZXJCb2FyZE1vZHVsZVN5bmMSEQoJc2lnbmF0dXJlGAwg", + "ASgJEikKEnVubG9ja2VkX2hlYWRfaWNvbhgDIAMoCzINLkhlYWRJY29uRGF0", + "YRITCgtQQUdKS0RKSUdQSRgOIAEoCBITCgtBTE1NSEtGS0hMSxgIIAMoDUIe", + "qgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.HeadIconDataReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PlayerBoardModuleSync), global::EggLink.DanhengServer.Proto.PlayerBoardModuleSync.Parser, new[]{ "Signature", "UnlockedHeadIconList", "PAGJKDJIGPI", "ALMMHKFKHLK" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PlayerBoardModuleSync), global::EggLink.DanhengServer.Proto.PlayerBoardModuleSync.Parser, new[]{ "Signature", "UnlockedHeadIcon", "PAGJKDJIGPI", "ALMMHKFKHLK" }, null, null, null, null) })); } #endregion @@ -75,7 +75,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public PlayerBoardModuleSync(PlayerBoardModuleSync other) : this() { signature_ = other.signature_; - unlockedHeadIconList_ = other.unlockedHeadIconList_.Clone(); + unlockedHeadIcon_ = other.unlockedHeadIcon_.Clone(); pAGJKDJIGPI_ = other.pAGJKDJIGPI_; aLMMHKFKHLK_ = other.aLMMHKFKHLK_.Clone(); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); @@ -99,15 +99,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "unlocked_head_icon_list" field. - public const int UnlockedHeadIconListFieldNumber = 3; - private static readonly pb::FieldCodec _repeated_unlockedHeadIconList_codec + /// Field number for the "unlocked_head_icon" field. + public const int UnlockedHeadIconFieldNumber = 3; + private static readonly pb::FieldCodec _repeated_unlockedHeadIcon_codec = pb::FieldCodec.ForMessage(26, global::EggLink.DanhengServer.Proto.HeadIconData.Parser); - private readonly pbc::RepeatedField unlockedHeadIconList_ = new pbc::RepeatedField(); + private readonly pbc::RepeatedField unlockedHeadIcon_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField UnlockedHeadIconList { - get { return unlockedHeadIconList_; } + public pbc::RepeatedField UnlockedHeadIcon { + get { return unlockedHeadIcon_; } } /// Field number for the "PAGJKDJIGPI" field. @@ -149,7 +149,7 @@ namespace EggLink.DanhengServer.Proto { return true; } if (Signature != other.Signature) return false; - if(!unlockedHeadIconList_.Equals(other.unlockedHeadIconList_)) return false; + if(!unlockedHeadIcon_.Equals(other.unlockedHeadIcon_)) return false; if (PAGJKDJIGPI != other.PAGJKDJIGPI) return false; if(!aLMMHKFKHLK_.Equals(other.aLMMHKFKHLK_)) return false; return Equals(_unknownFields, other._unknownFields); @@ -160,7 +160,7 @@ namespace EggLink.DanhengServer.Proto { public override int GetHashCode() { int hash = 1; if (Signature.Length != 0) hash ^= Signature.GetHashCode(); - hash ^= unlockedHeadIconList_.GetHashCode(); + hash ^= unlockedHeadIcon_.GetHashCode(); if (PAGJKDJIGPI != false) hash ^= PAGJKDJIGPI.GetHashCode(); hash ^= aLMMHKFKHLK_.GetHashCode(); if (_unknownFields != null) { @@ -181,7 +181,7 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - unlockedHeadIconList_.WriteTo(output, _repeated_unlockedHeadIconList_codec); + unlockedHeadIcon_.WriteTo(output, _repeated_unlockedHeadIcon_codec); aLMMHKFKHLK_.WriteTo(output, _repeated_aLMMHKFKHLK_codec); if (Signature.Length != 0) { output.WriteRawTag(98); @@ -201,7 +201,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - unlockedHeadIconList_.WriteTo(ref output, _repeated_unlockedHeadIconList_codec); + unlockedHeadIcon_.WriteTo(ref output, _repeated_unlockedHeadIcon_codec); aLMMHKFKHLK_.WriteTo(ref output, _repeated_aLMMHKFKHLK_codec); if (Signature.Length != 0) { output.WriteRawTag(98); @@ -224,7 +224,7 @@ namespace EggLink.DanhengServer.Proto { if (Signature.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(Signature); } - size += unlockedHeadIconList_.CalculateSize(_repeated_unlockedHeadIconList_codec); + size += unlockedHeadIcon_.CalculateSize(_repeated_unlockedHeadIcon_codec); if (PAGJKDJIGPI != false) { size += 1 + 1; } @@ -244,7 +244,7 @@ namespace EggLink.DanhengServer.Proto { if (other.Signature.Length != 0) { Signature = other.Signature; } - unlockedHeadIconList_.Add(other.unlockedHeadIconList_); + unlockedHeadIcon_.Add(other.unlockedHeadIcon_); if (other.PAGJKDJIGPI != false) { PAGJKDJIGPI = other.PAGJKDJIGPI; } @@ -265,7 +265,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 26: { - unlockedHeadIconList_.AddEntriesFrom(input, _repeated_unlockedHeadIconList_codec); + unlockedHeadIcon_.AddEntriesFrom(input, _repeated_unlockedHeadIcon_codec); break; } case 66: @@ -297,7 +297,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 26: { - unlockedHeadIconList_.AddEntriesFrom(ref input, _repeated_unlockedHeadIconList_codec); + unlockedHeadIcon_.AddEntriesFrom(ref input, _repeated_unlockedHeadIcon_codec); break; } case 66: diff --git a/Proto/PlayerDetailInfo.cs b/Proto/PlayerDetailInfo.cs index a9ac820b..5be6bf3c 100644 --- a/Proto/PlayerDetailInfo.cs +++ b/Proto/PlayerDetailInfo.cs @@ -27,24 +27,24 @@ namespace EggLink.DanhengServer.Proto { "ChZQbGF5ZXJEZXRhaWxJbmZvLnByb3RvGhVQcml2YWN5U2V0dGluZ3MucHJv", "dG8aElBsYXRmb3JtVHlwZS5wcm90bxodRGlzcGxheUF2YXRhckRldGFpbElu", "Zm8ucHJvdG8aFlBsYXllclJlY29yZEluZm8ucHJvdG8aG1BsYXllckRpc3Bs", - "YXlTZXR0aW5ncy5wcm90byKfBAoQUGxheWVyRGV0YWlsSW5mbxImCgtyZWNv", + "YXlTZXR0aW5ncy5wcm90byKhBAoQUGxheWVyRGV0YWlsSW5mbxImCgtyZWNv", "cmRfaW5mbxgGIAEoCzIRLlBsYXllclJlY29yZEluZm8SEAoIbmlja25hbWUY", - "CyABKAkSFAoLQU5QTExBT0JGSkkY/Q8gASgNEhMKC0FLQ0VKRkNGQkFOGAMg", - "ASgJEhEKCWhlYWRfaWNvbhgFIAEoDRITCgtPT09QQkhJTU5GRBgEIAEoDRI1", - "ChJhc3Npc3RfYXZhdGFyX2xpc3QY8wkgAygLMhguRGlzcGxheUF2YXRhckRl", - "dGFpbEluZm8SEQoJaXNfYmFubmVkGAggASgIEh8KCHBsYXRmb3JtGA0gASgO", - "Mg0uUGxhdGZvcm1UeXBlEhMKC0dNQUxDUE5PSEJGGAEgASgJEhMKC3dvcmxk", - "X2xldmVsGAwgASgNEhMKC0tCTUdCTklORkJLGA8gASgNEhMKC0VNT0JJSkJE", - "S0VJGAogASgIEgsKA3VpZBgCIAEoDRINCgVsZXZlbBgOIAEoDRIrChBwcml2", - "YWN5X3NldHRpbmdzGOsBIAEoCzIQLlByaXZhY3lTZXR0aW5ncxIRCglzaWdu", - "YXR1cmUYCSABKAkSNQoTZGlzcGxheV9hdmF0YXJfbGlzdBgHIAMoCzIYLkRp", - "c3BsYXlBdmF0YXJEZXRhaWxJbmZvEiwKC09OS0hMSE9KSEdOGKUNIAEoCzIW", - "LlBsYXllckRpc3BsYXlTZXR0aW5nc0IeqgIbRWdnTGluay5EYW5oZW5nU2Vy", - "dmVyLlByb3RvYgZwcm90bzM=")); + "CyABKAkSFgoNcGVyc29uYWxfY2FyZBj9DyABKA0SEwoLQUtDRUpGQ0ZCQU4Y", + "AyABKAkSEQoJaGVhZF9pY29uGAUgASgNEhMKC09PT1BCSElNTkZEGAQgASgN", + "EjUKEmFzc2lzdF9hdmF0YXJfbGlzdBjzCSADKAsyGC5EaXNwbGF5QXZhdGFy", + "RGV0YWlsSW5mbxIRCglpc19iYW5uZWQYCCABKAgSHwoIcGxhdGZvcm0YDSAB", + "KA4yDS5QbGF0Zm9ybVR5cGUSEwoLR01BTENQTk9IQkYYASABKAkSEwoLd29y", + "bGRfbGV2ZWwYDCABKA0SEwoLS0JNR0JOSU5GQksYDyABKA0SEwoLRU1PQklK", + "QkRLRUkYCiABKAgSCwoDdWlkGAIgASgNEg0KBWxldmVsGA4gASgNEisKEHBy", + "aXZhY3lfc2V0dGluZ3MY6wEgASgLMhAuUHJpdmFjeVNldHRpbmdzEhEKCXNp", + "Z25hdHVyZRgJIAEoCRI1ChNkaXNwbGF5X2F2YXRhcl9saXN0GAcgAygLMhgu", + "RGlzcGxheUF2YXRhckRldGFpbEluZm8SLAoLT05LSExIT0pIR04YpQ0gASgL", + "MhYuUGxheWVyRGlzcGxheVNldHRpbmdzQh6qAhtFZ2dMaW5rLkRhbmhlbmdT", + "ZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.PrivacySettingsReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlatformTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.DisplayAvatarDetailInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlayerRecordInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlayerDisplaySettingsReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PlayerDetailInfo), global::EggLink.DanhengServer.Proto.PlayerDetailInfo.Parser, new[]{ "RecordInfo", "Nickname", "ANPLLAOBFJI", "AKCEJFCFBAN", "HeadIcon", "OOOPBHIMNFD", "AssistAvatarList", "IsBanned", "Platform", "GMALCPNOHBF", "WorldLevel", "KBMGBNINFBK", "EMOBIJBDKEI", "Uid", "Level", "PrivacySettings", "Signature", "DisplayAvatarList", "ONKHLHOJHGN" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PlayerDetailInfo), global::EggLink.DanhengServer.Proto.PlayerDetailInfo.Parser, new[]{ "RecordInfo", "Nickname", "PersonalCard", "AKCEJFCFBAN", "HeadIcon", "OOOPBHIMNFD", "AssistAvatarList", "IsBanned", "Platform", "GMALCPNOHBF", "WorldLevel", "KBMGBNINFBK", "EMOBIJBDKEI", "Uid", "Level", "PrivacySettings", "Signature", "DisplayAvatarList", "ONKHLHOJHGN" }, null, null, null, null) })); } #endregion @@ -88,7 +88,7 @@ namespace EggLink.DanhengServer.Proto { public PlayerDetailInfo(PlayerDetailInfo other) : this() { recordInfo_ = other.recordInfo_ != null ? other.recordInfo_.Clone() : null; nickname_ = other.nickname_; - aNPLLAOBFJI_ = other.aNPLLAOBFJI_; + personalCard_ = other.personalCard_; aKCEJFCFBAN_ = other.aKCEJFCFBAN_; headIcon_ = other.headIcon_; oOOPBHIMNFD_ = other.oOOPBHIMNFD_; @@ -138,15 +138,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "ANPLLAOBFJI" field. - public const int ANPLLAOBFJIFieldNumber = 2045; - private uint aNPLLAOBFJI_; + /// Field number for the "personal_card" field. + public const int PersonalCardFieldNumber = 2045; + private uint personalCard_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint ANPLLAOBFJI { - get { return aNPLLAOBFJI_; } + public uint PersonalCard { + get { return personalCard_; } set { - aNPLLAOBFJI_ = value; + personalCard_ = value; } } @@ -357,7 +357,7 @@ namespace EggLink.DanhengServer.Proto { } if (!object.Equals(RecordInfo, other.RecordInfo)) return false; if (Nickname != other.Nickname) return false; - if (ANPLLAOBFJI != other.ANPLLAOBFJI) return false; + if (PersonalCard != other.PersonalCard) return false; if (AKCEJFCFBAN != other.AKCEJFCFBAN) return false; if (HeadIcon != other.HeadIcon) return false; if (OOOPBHIMNFD != other.OOOPBHIMNFD) return false; @@ -383,7 +383,7 @@ namespace EggLink.DanhengServer.Proto { int hash = 1; if (recordInfo_ != null) hash ^= RecordInfo.GetHashCode(); if (Nickname.Length != 0) hash ^= Nickname.GetHashCode(); - if (ANPLLAOBFJI != 0) hash ^= ANPLLAOBFJI.GetHashCode(); + if (PersonalCard != 0) hash ^= PersonalCard.GetHashCode(); if (AKCEJFCFBAN.Length != 0) hash ^= AKCEJFCFBAN.GetHashCode(); if (HeadIcon != 0) hash ^= HeadIcon.GetHashCode(); if (OOOPBHIMNFD != 0) hash ^= OOOPBHIMNFD.GetHashCode(); @@ -484,9 +484,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(170, 106); output.WriteMessage(ONKHLHOJHGN); } - if (ANPLLAOBFJI != 0) { + if (PersonalCard != 0) { output.WriteRawTag(232, 127); - output.WriteUInt32(ANPLLAOBFJI); + output.WriteUInt32(PersonalCard); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -564,9 +564,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(170, 106); output.WriteMessage(ONKHLHOJHGN); } - if (ANPLLAOBFJI != 0) { + if (PersonalCard != 0) { output.WriteRawTag(232, 127); - output.WriteUInt32(ANPLLAOBFJI); + output.WriteUInt32(PersonalCard); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -584,8 +584,8 @@ namespace EggLink.DanhengServer.Proto { if (Nickname.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(Nickname); } - if (ANPLLAOBFJI != 0) { - size += 2 + pb::CodedOutputStream.ComputeUInt32Size(ANPLLAOBFJI); + if (PersonalCard != 0) { + size += 2 + pb::CodedOutputStream.ComputeUInt32Size(PersonalCard); } if (AKCEJFCFBAN.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(AKCEJFCFBAN); @@ -652,8 +652,8 @@ namespace EggLink.DanhengServer.Proto { if (other.Nickname.Length != 0) { Nickname = other.Nickname; } - if (other.ANPLLAOBFJI != 0) { - ANPLLAOBFJI = other.ANPLLAOBFJI; + if (other.PersonalCard != 0) { + PersonalCard = other.PersonalCard; } if (other.AKCEJFCFBAN.Length != 0) { AKCEJFCFBAN = other.AKCEJFCFBAN; @@ -802,7 +802,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 16360: { - ANPLLAOBFJI = input.ReadUInt32(); + PersonalCard = input.ReadUInt32(); break; } } @@ -902,7 +902,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 16360: { - ANPLLAOBFJI = input.ReadUInt32(); + PersonalCard = input.ReadUInt32(); break; } } diff --git a/Proto/PlayerSimpleInfo.cs b/Proto/PlayerSimpleInfo.cs index bc382c4f..5f8d9db2 100644 --- a/Proto/PlayerSimpleInfo.cs +++ b/Proto/PlayerSimpleInfo.cs @@ -26,20 +26,20 @@ namespace EggLink.DanhengServer.Proto { string.Concat( "ChZQbGF5ZXJTaW1wbGVJbmZvLnByb3RvGhZBc3Npc3RTaW1wbGVJbmZvLnBy", "b3RvGhJQbGF0Zm9ybVR5cGUucHJvdG8aGEZyaWVuZE9ubGluZVN0YXR1cy5w", - "cm90byLrAgoQUGxheWVyU2ltcGxlSW5mbxIfCghwbGF0Zm9ybRgJIAEoDjIN", - "LlBsYXRmb3JtVHlwZRITCgtBTlBMTEFPQkZKSRgOIAEoDRILCgN1aWQYCiAB", - "KA0SEQoJaGVhZF9pY29uGAIgASgNEhAKCG5pY2tuYW1lGA8gASgJEhEKCXNp", - "Z25hdHVyZRgGIAEoCRIRCglpc19iYW5uZWQYByABKAgSEwoLR01BTENQTk9I", - "QkYYDSABKAkSMgoXYXNzaXN0X3NpbXBsZV9pbmZvX2xpc3QYBSADKAsyES5B", - "c3Npc3RTaW1wbGVJbmZvEhYKDmNoYXRfYnViYmxlX2lkGAggASgNEhgKEGxh", - "c3RfYWN0aXZlX3RpbWUYCyABKAMSDQoFbGV2ZWwYAyABKA0SKgoNb25saW5l", - "X3N0YXR1cxgMIAEoDjITLkZyaWVuZE9ubGluZVN0YXR1cxITCgtBS0NFSkZD", - "RkJBThgEIAEoCUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZw", - "cm90bzM=")); + "cm90byLtAgoQUGxheWVyU2ltcGxlSW5mbxIfCghwbGF0Zm9ybRgJIAEoDjIN", + "LlBsYXRmb3JtVHlwZRIVCg1wZXJzb25hbF9jYXJkGA4gASgNEgsKA3VpZBgK", + "IAEoDRIRCgloZWFkX2ljb24YAiABKA0SEAoIbmlja25hbWUYDyABKAkSEQoJ", + "c2lnbmF0dXJlGAYgASgJEhEKCWlzX2Jhbm5lZBgHIAEoCBITCgtHTUFMQ1BO", + "T0hCRhgNIAEoCRIyChdhc3Npc3Rfc2ltcGxlX2luZm9fbGlzdBgFIAMoCzIR", + "LkFzc2lzdFNpbXBsZUluZm8SFgoOY2hhdF9idWJibGVfaWQYCCABKA0SGAoQ", + "bGFzdF9hY3RpdmVfdGltZRgLIAEoAxINCgVsZXZlbBgDIAEoDRIqCg1vbmxp", + "bmVfc3RhdHVzGAwgASgOMhMuRnJpZW5kT25saW5lU3RhdHVzEhMKC0FLQ0VK", + "RkNGQkFOGAQgASgJQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9i", + "BnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.AssistSimpleInfoReflection.Descriptor, global::EggLink.DanhengServer.Proto.PlatformTypeReflection.Descriptor, global::EggLink.DanhengServer.Proto.FriendOnlineStatusReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PlayerSimpleInfo), global::EggLink.DanhengServer.Proto.PlayerSimpleInfo.Parser, new[]{ "Platform", "ANPLLAOBFJI", "Uid", "HeadIcon", "Nickname", "Signature", "IsBanned", "GMALCPNOHBF", "AssistSimpleInfoList", "ChatBubbleId", "LastActiveTime", "Level", "OnlineStatus", "AKCEJFCFBAN" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PlayerSimpleInfo), global::EggLink.DanhengServer.Proto.PlayerSimpleInfo.Parser, new[]{ "Platform", "PersonalCard", "Uid", "HeadIcon", "Nickname", "Signature", "IsBanned", "GMALCPNOHBF", "AssistSimpleInfoList", "ChatBubbleId", "LastActiveTime", "Level", "OnlineStatus", "AKCEJFCFBAN" }, null, null, null, null) })); } #endregion @@ -82,7 +82,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public PlayerSimpleInfo(PlayerSimpleInfo other) : this() { platform_ = other.platform_; - aNPLLAOBFJI_ = other.aNPLLAOBFJI_; + personalCard_ = other.personalCard_; uid_ = other.uid_; headIcon_ = other.headIcon_; nickname_ = other.nickname_; @@ -116,15 +116,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "ANPLLAOBFJI" field. - public const int ANPLLAOBFJIFieldNumber = 14; - private uint aNPLLAOBFJI_; + /// Field number for the "personal_card" field. + public const int PersonalCardFieldNumber = 14; + private uint personalCard_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint ANPLLAOBFJI { - get { return aNPLLAOBFJI_; } + public uint PersonalCard { + get { return personalCard_; } set { - aNPLLAOBFJI_ = value; + personalCard_ = value; } } @@ -287,7 +287,7 @@ namespace EggLink.DanhengServer.Proto { return true; } if (Platform != other.Platform) return false; - if (ANPLLAOBFJI != other.ANPLLAOBFJI) return false; + if (PersonalCard != other.PersonalCard) return false; if (Uid != other.Uid) return false; if (HeadIcon != other.HeadIcon) return false; if (Nickname != other.Nickname) return false; @@ -308,7 +308,7 @@ namespace EggLink.DanhengServer.Proto { public override int GetHashCode() { int hash = 1; if (Platform != global::EggLink.DanhengServer.Proto.PlatformType.Editor) hash ^= Platform.GetHashCode(); - if (ANPLLAOBFJI != 0) hash ^= ANPLLAOBFJI.GetHashCode(); + if (PersonalCard != 0) hash ^= PersonalCard.GetHashCode(); if (Uid != 0) hash ^= Uid.GetHashCode(); if (HeadIcon != 0) hash ^= HeadIcon.GetHashCode(); if (Nickname.Length != 0) hash ^= Nickname.GetHashCode(); @@ -384,9 +384,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(106); output.WriteString(GMALCPNOHBF); } - if (ANPLLAOBFJI != 0) { + if (PersonalCard != 0) { output.WriteRawTag(112); - output.WriteUInt32(ANPLLAOBFJI); + output.WriteUInt32(PersonalCard); } if (Nickname.Length != 0) { output.WriteRawTag(122); @@ -447,9 +447,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(106); output.WriteString(GMALCPNOHBF); } - if (ANPLLAOBFJI != 0) { + if (PersonalCard != 0) { output.WriteRawTag(112); - output.WriteUInt32(ANPLLAOBFJI); + output.WriteUInt32(PersonalCard); } if (Nickname.Length != 0) { output.WriteRawTag(122); @@ -468,8 +468,8 @@ namespace EggLink.DanhengServer.Proto { if (Platform != global::EggLink.DanhengServer.Proto.PlatformType.Editor) { size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Platform); } - if (ANPLLAOBFJI != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ANPLLAOBFJI); + if (PersonalCard != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PersonalCard); } if (Uid != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Uid); @@ -520,8 +520,8 @@ namespace EggLink.DanhengServer.Proto { if (other.Platform != global::EggLink.DanhengServer.Proto.PlatformType.Editor) { Platform = other.Platform; } - if (other.ANPLLAOBFJI != 0) { - ANPLLAOBFJI = other.ANPLLAOBFJI; + if (other.PersonalCard != 0) { + PersonalCard = other.PersonalCard; } if (other.Uid != 0) { Uid = other.Uid; @@ -621,7 +621,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 112: { - ANPLLAOBFJI = input.ReadUInt32(); + PersonalCard = input.ReadUInt32(); break; } case 122: { @@ -692,7 +692,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 112: { - ANPLLAOBFJI = input.ReadUInt32(); + PersonalCard = input.ReadUInt32(); break; } case 122: { diff --git a/Proto/PDNNFCNOHIK.cs b/Proto/SelectPhoneCaseCsReq.cs similarity index 73% rename from Proto/PDNNFCNOHIK.cs rename to Proto/SelectPhoneCaseCsReq.cs index cdeb00f5..b2d3e77f 100644 --- a/Proto/PDNNFCNOHIK.cs +++ b/Proto/SelectPhoneCaseCsReq.cs @@ -1,6 +1,6 @@ // // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: PDNNFCNOHIK.proto +// source: SelectPhoneCaseCsReq.proto // #pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code @@ -11,26 +11,26 @@ using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; namespace EggLink.DanhengServer.Proto { - /// Holder for reflection information generated from PDNNFCNOHIK.proto - public static partial class PDNNFCNOHIKReflection { + /// Holder for reflection information generated from SelectPhoneCaseCsReq.proto + public static partial class SelectPhoneCaseCsReqReflection { #region Descriptor - /// File descriptor for PDNNFCNOHIK.proto + /// File descriptor for SelectPhoneCaseCsReq.proto public static pbr::FileDescriptor Descriptor { get { return descriptor; } } private static pbr::FileDescriptor descriptor; - static PDNNFCNOHIKReflection() { + static SelectPhoneCaseCsReqReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFQRE5ORkNOT0hJSy5wcm90byIiCgtQRE5ORkNOT0hJSxITCgtHSUFOSExJ", - "SUtJQRgBIAEoDUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZw", - "cm90bzM=")); + "ChpTZWxlY3RQaG9uZUNhc2VDc1JlcS5wcm90byIqChRTZWxlY3RQaG9uZUNh", + "c2VDc1JlcRISCgpwaG9uZV9jYXNlGAEgASgNQh6qAhtFZ2dMaW5rLkRhbmhl", + "bmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.PDNNFCNOHIK), global::EggLink.DanhengServer.Proto.PDNNFCNOHIK.Parser, new[]{ "GIANHLIIKIA" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SelectPhoneCaseCsReq), global::EggLink.DanhengServer.Proto.SelectPhoneCaseCsReq.Parser, new[]{ "PhoneCase" }, null, null, null, null) })); } #endregion @@ -38,21 +38,21 @@ namespace EggLink.DanhengServer.Proto { } #region Messages [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] - public sealed partial class PDNNFCNOHIK : pb::IMessage + public sealed partial class SelectPhoneCaseCsReq : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage #endif { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PDNNFCNOHIK()); + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new SelectPhoneCaseCsReq()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pb::MessageParser Parser { get { return _parser; } } + public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::EggLink.DanhengServer.Proto.PDNNFCNOHIKReflection.Descriptor.MessageTypes[0]; } + get { return global::EggLink.DanhengServer.Proto.SelectPhoneCaseCsReqReflection.Descriptor.MessageTypes[0]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -63,7 +63,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public PDNNFCNOHIK() { + public SelectPhoneCaseCsReq() { OnConstruction(); } @@ -71,45 +71,45 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public PDNNFCNOHIK(PDNNFCNOHIK other) : this() { - gIANHLIIKIA_ = other.gIANHLIIKIA_; + public SelectPhoneCaseCsReq(SelectPhoneCaseCsReq other) : this() { + phoneCase_ = other.phoneCase_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public PDNNFCNOHIK Clone() { - return new PDNNFCNOHIK(this); + public SelectPhoneCaseCsReq Clone() { + return new SelectPhoneCaseCsReq(this); } - /// Field number for the "GIANHLIIKIA" field. - public const int GIANHLIIKIAFieldNumber = 1; - private uint gIANHLIIKIA_; + /// Field number for the "phone_case" field. + public const int PhoneCaseFieldNumber = 1; + private uint phoneCase_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint GIANHLIIKIA { - get { return gIANHLIIKIA_; } + public uint PhoneCase { + get { return phoneCase_; } set { - gIANHLIIKIA_ = value; + phoneCase_ = value; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { - return Equals(other as PDNNFCNOHIK); + return Equals(other as SelectPhoneCaseCsReq); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(PDNNFCNOHIK other) { + public bool Equals(SelectPhoneCaseCsReq other) { if (ReferenceEquals(other, null)) { return false; } if (ReferenceEquals(other, this)) { return true; } - if (GIANHLIIKIA != other.GIANHLIIKIA) return false; + if (PhoneCase != other.PhoneCase) return false; return Equals(_unknownFields, other._unknownFields); } @@ -117,7 +117,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - if (GIANHLIIKIA != 0) hash ^= GIANHLIIKIA.GetHashCode(); + if (PhoneCase != 0) hash ^= PhoneCase.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -136,9 +136,9 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (GIANHLIIKIA != 0) { + if (PhoneCase != 0) { output.WriteRawTag(8); - output.WriteUInt32(GIANHLIIKIA); + output.WriteUInt32(PhoneCase); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -150,9 +150,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 (GIANHLIIKIA != 0) { + if (PhoneCase != 0) { output.WriteRawTag(8); - output.WriteUInt32(GIANHLIIKIA); + output.WriteUInt32(PhoneCase); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -164,8 +164,8 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - if (GIANHLIIKIA != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(GIANHLIIKIA); + if (PhoneCase != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PhoneCase); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -175,12 +175,12 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(PDNNFCNOHIK other) { + public void MergeFrom(SelectPhoneCaseCsReq other) { if (other == null) { return; } - if (other.GIANHLIIKIA != 0) { - GIANHLIIKIA = other.GIANHLIIKIA; + if (other.PhoneCase != 0) { + PhoneCase = other.PhoneCase; } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -198,7 +198,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 8: { - GIANHLIIKIA = input.ReadUInt32(); + PhoneCase = input.ReadUInt32(); break; } } @@ -217,7 +217,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 8: { - GIANHLIIKIA = input.ReadUInt32(); + PhoneCase = input.ReadUInt32(); break; } } diff --git a/Proto/SelectPhoneCaseScRsp.cs b/Proto/SelectPhoneCaseScRsp.cs index c6d03ab1..53dc63df 100644 --- a/Proto/SelectPhoneCaseScRsp.cs +++ b/Proto/SelectPhoneCaseScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static SelectPhoneCaseScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChpTZWxlY3RQaG9uZUNhc2VTY1JzcC5wcm90byJRChRTZWxlY3RQaG9uZUNh", - "c2VTY1JzcBITCgtMTU9DQU1LTEtQSRgPIAEoDRITCgtQREFDSkRJRU9KRxgG", - "IAEoDRIPCgdyZXRjb2RlGAggASgNQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2", - "ZXIuUHJvdG9iBnByb3RvMw==")); + "ChpTZWxlY3RQaG9uZUNhc2VTY1JzcC5wcm90byJUChRTZWxlY3RQaG9uZUNh", + "c2VTY1JzcBIWCg5jdXJfcGhvbmVfY2FzZRgPIAEoDRITCgtQREFDSkRJRU9K", + "RxgGIAEoDRIPCgdyZXRjb2RlGAggASgNQh6qAhtFZ2dMaW5rLkRhbmhlbmdT", + "ZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SelectPhoneCaseScRsp), global::EggLink.DanhengServer.Proto.SelectPhoneCaseScRsp.Parser, new[]{ "LMOCAMKLKPI", "PDACJDIEOJG", "Retcode" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SelectPhoneCaseScRsp), global::EggLink.DanhengServer.Proto.SelectPhoneCaseScRsp.Parser, new[]{ "CurPhoneCase", "PDACJDIEOJG", "Retcode" }, 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 SelectPhoneCaseScRsp(SelectPhoneCaseScRsp other) : this() { - lMOCAMKLKPI_ = other.lMOCAMKLKPI_; + curPhoneCase_ = other.curPhoneCase_; pDACJDIEOJG_ = other.pDACJDIEOJG_; retcode_ = other.retcode_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); @@ -85,15 +85,15 @@ namespace EggLink.DanhengServer.Proto { return new SelectPhoneCaseScRsp(this); } - /// Field number for the "LMOCAMKLKPI" field. - public const int LMOCAMKLKPIFieldNumber = 15; - private uint lMOCAMKLKPI_; + /// Field number for the "cur_phone_case" field. + public const int CurPhoneCaseFieldNumber = 15; + private uint curPhoneCase_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint LMOCAMKLKPI { - get { return lMOCAMKLKPI_; } + public uint CurPhoneCase { + get { return curPhoneCase_; } set { - lMOCAMKLKPI_ = value; + curPhoneCase_ = value; } } @@ -136,7 +136,7 @@ namespace EggLink.DanhengServer.Proto { if (ReferenceEquals(other, this)) { return true; } - if (LMOCAMKLKPI != other.LMOCAMKLKPI) return false; + if (CurPhoneCase != other.CurPhoneCase) return false; if (PDACJDIEOJG != other.PDACJDIEOJG) return false; if (Retcode != other.Retcode) return false; return Equals(_unknownFields, other._unknownFields); @@ -146,7 +146,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - if (LMOCAMKLKPI != 0) hash ^= LMOCAMKLKPI.GetHashCode(); + if (CurPhoneCase != 0) hash ^= CurPhoneCase.GetHashCode(); if (PDACJDIEOJG != 0) hash ^= PDACJDIEOJG.GetHashCode(); if (Retcode != 0) hash ^= Retcode.GetHashCode(); if (_unknownFields != null) { @@ -175,9 +175,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(64); output.WriteUInt32(Retcode); } - if (LMOCAMKLKPI != 0) { + if (CurPhoneCase != 0) { output.WriteRawTag(120); - output.WriteUInt32(LMOCAMKLKPI); + output.WriteUInt32(CurPhoneCase); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -197,9 +197,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(64); output.WriteUInt32(Retcode); } - if (LMOCAMKLKPI != 0) { + if (CurPhoneCase != 0) { output.WriteRawTag(120); - output.WriteUInt32(LMOCAMKLKPI); + output.WriteUInt32(CurPhoneCase); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -211,8 +211,8 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - if (LMOCAMKLKPI != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(LMOCAMKLKPI); + if (CurPhoneCase != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurPhoneCase); } if (PDACJDIEOJG != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PDACJDIEOJG); @@ -232,8 +232,8 @@ namespace EggLink.DanhengServer.Proto { if (other == null) { return; } - if (other.LMOCAMKLKPI != 0) { - LMOCAMKLKPI = other.LMOCAMKLKPI; + if (other.CurPhoneCase != 0) { + CurPhoneCase = other.CurPhoneCase; } if (other.PDACJDIEOJG != 0) { PDACJDIEOJG = other.PDACJDIEOJG; @@ -265,7 +265,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 120: { - LMOCAMKLKPI = input.ReadUInt32(); + CurPhoneCase = input.ReadUInt32(); break; } } @@ -292,7 +292,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 120: { - LMOCAMKLKPI = input.ReadUInt32(); + CurPhoneCase = input.ReadUInt32(); break; } } diff --git a/Proto/SetHeadIconScRsp.cs b/Proto/SetHeadIconScRsp.cs index e020dc33..6e11718b 100644 --- a/Proto/SetHeadIconScRsp.cs +++ b/Proto/SetHeadIconScRsp.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static SetHeadIconScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChZTZXRIZWFkSWNvblNjUnNwLnByb3RvIkEKEFNldEhlYWRJY29uU2NSc3AS", - "DwoHcmV0Y29kZRgFIAEoDRIcChRjdXJyZW50X2hlYWRfaWNvbl9pZBgGIAEo", - "DUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); + "ChZTZXRIZWFkSWNvblNjUnNwLnByb3RvIjoKEFNldEhlYWRJY29uU2NSc3AS", + "DwoHcmV0Y29kZRgFIAEoDRIVCg1jdXJfaGVhZF9pY29uGAYgASgNQh6qAhtF", + "Z2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SetHeadIconScRsp), global::EggLink.DanhengServer.Proto.SetHeadIconScRsp.Parser, new[]{ "Retcode", "CurrentHeadIconId" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SetHeadIconScRsp), global::EggLink.DanhengServer.Proto.SetHeadIconScRsp.Parser, new[]{ "Retcode", "CurHeadIcon" }, null, null, null, null) })); } #endregion @@ -73,7 +73,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public SetHeadIconScRsp(SetHeadIconScRsp other) : this() { retcode_ = other.retcode_; - currentHeadIconId_ = other.currentHeadIconId_; + curHeadIcon_ = other.curHeadIcon_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -95,15 +95,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "current_head_icon_id" field. - public const int CurrentHeadIconIdFieldNumber = 6; - private uint currentHeadIconId_; + /// Field number for the "cur_head_icon" field. + public const int CurHeadIconFieldNumber = 6; + private uint curHeadIcon_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint CurrentHeadIconId { - get { return currentHeadIconId_; } + public uint CurHeadIcon { + get { return curHeadIcon_; } set { - currentHeadIconId_ = value; + curHeadIcon_ = value; } } @@ -123,7 +123,7 @@ namespace EggLink.DanhengServer.Proto { return true; } if (Retcode != other.Retcode) return false; - if (CurrentHeadIconId != other.CurrentHeadIconId) return false; + if (CurHeadIcon != other.CurHeadIcon) return false; return Equals(_unknownFields, other._unknownFields); } @@ -132,7 +132,7 @@ namespace EggLink.DanhengServer.Proto { public override int GetHashCode() { int hash = 1; if (Retcode != 0) hash ^= Retcode.GetHashCode(); - if (CurrentHeadIconId != 0) hash ^= CurrentHeadIconId.GetHashCode(); + if (CurHeadIcon != 0) hash ^= CurHeadIcon.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -155,9 +155,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(40); output.WriteUInt32(Retcode); } - if (CurrentHeadIconId != 0) { + if (CurHeadIcon != 0) { output.WriteRawTag(48); - output.WriteUInt32(CurrentHeadIconId); + output.WriteUInt32(CurHeadIcon); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -173,9 +173,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(40); output.WriteUInt32(Retcode); } - if (CurrentHeadIconId != 0) { + if (CurHeadIcon != 0) { output.WriteRawTag(48); - output.WriteUInt32(CurrentHeadIconId); + output.WriteUInt32(CurHeadIcon); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -190,8 +190,8 @@ namespace EggLink.DanhengServer.Proto { if (Retcode != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Retcode); } - if (CurrentHeadIconId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurrentHeadIconId); + if (CurHeadIcon != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurHeadIcon); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -208,8 +208,8 @@ namespace EggLink.DanhengServer.Proto { if (other.Retcode != 0) { Retcode = other.Retcode; } - if (other.CurrentHeadIconId != 0) { - CurrentHeadIconId = other.CurrentHeadIconId; + if (other.CurHeadIcon != 0) { + CurHeadIcon = other.CurHeadIcon; } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -231,7 +231,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 48: { - CurrentHeadIconId = input.ReadUInt32(); + CurHeadIcon = input.ReadUInt32(); break; } } @@ -254,7 +254,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 48: { - CurrentHeadIconId = input.ReadUInt32(); + CurHeadIcon = input.ReadUInt32(); break; } } diff --git a/Proto/EFKAOICFGCL.cs b/Proto/SetPersonalCardCsReq.cs similarity index 82% rename from Proto/EFKAOICFGCL.cs rename to Proto/SetPersonalCardCsReq.cs index 19cd3986..e0e8161f 100644 --- a/Proto/EFKAOICFGCL.cs +++ b/Proto/SetPersonalCardCsReq.cs @@ -1,6 +1,6 @@ // // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: EFKAOICFGCL.proto +// source: SetPersonalCardCsReq.proto // #pragma warning disable 1591, 0612, 3021, 8981 #region Designer generated code @@ -11,25 +11,26 @@ using pbr = global::Google.Protobuf.Reflection; using scg = global::System.Collections.Generic; namespace EggLink.DanhengServer.Proto { - /// Holder for reflection information generated from EFKAOICFGCL.proto - public static partial class EFKAOICFGCLReflection { + /// Holder for reflection information generated from SetPersonalCardCsReq.proto + public static partial class SetPersonalCardCsReqReflection { #region Descriptor - /// File descriptor for EFKAOICFGCL.proto + /// File descriptor for SetPersonalCardCsReq.proto public static pbr::FileDescriptor Descriptor { get { return descriptor; } } private static pbr::FileDescriptor descriptor; - static EFKAOICFGCLReflection() { + static SetPersonalCardCsReqReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFFRktBT0lDRkdDTC5wcm90byIZCgtFRktBT0lDRkdDTBIKCgJpZBgIIAEo", - "DUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); + "ChpTZXRQZXJzb25hbENhcmRDc1JlcS5wcm90byIiChRTZXRQZXJzb25hbENh", + "cmRDc1JlcRIKCgJpZBgIIAEoDUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVy", + "LlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.EFKAOICFGCL), global::EggLink.DanhengServer.Proto.EFKAOICFGCL.Parser, new[]{ "Id" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SetPersonalCardCsReq), global::EggLink.DanhengServer.Proto.SetPersonalCardCsReq.Parser, new[]{ "Id" }, null, null, null, null) })); } #endregion @@ -37,21 +38,21 @@ namespace EggLink.DanhengServer.Proto { } #region Messages [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] - public sealed partial class EFKAOICFGCL : pb::IMessage + public sealed partial class SetPersonalCardCsReq : pb::IMessage #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE , pb::IBufferMessage #endif { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new EFKAOICFGCL()); + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new SetPersonalCardCsReq()); private pb::UnknownFieldSet _unknownFields; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pb::MessageParser Parser { get { return _parser; } } + public static pb::MessageParser Parser { get { return _parser; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pbr::MessageDescriptor Descriptor { - get { return global::EggLink.DanhengServer.Proto.EFKAOICFGCLReflection.Descriptor.MessageTypes[0]; } + get { return global::EggLink.DanhengServer.Proto.SetPersonalCardCsReqReflection.Descriptor.MessageTypes[0]; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -62,7 +63,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public EFKAOICFGCL() { + public SetPersonalCardCsReq() { OnConstruction(); } @@ -70,15 +71,15 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public EFKAOICFGCL(EFKAOICFGCL other) : this() { + public SetPersonalCardCsReq(SetPersonalCardCsReq other) : this() { id_ = other.id_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public EFKAOICFGCL Clone() { - return new EFKAOICFGCL(this); + public SetPersonalCardCsReq Clone() { + return new SetPersonalCardCsReq(this); } /// Field number for the "id" field. @@ -96,12 +97,12 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { - return Equals(other as EFKAOICFGCL); + return Equals(other as SetPersonalCardCsReq); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(EFKAOICFGCL other) { + public bool Equals(SetPersonalCardCsReq other) { if (ReferenceEquals(other, null)) { return false; } @@ -174,7 +175,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(EFKAOICFGCL other) { + public void MergeFrom(SetPersonalCardCsReq other) { if (other == null) { return; } diff --git a/Proto/SetPersonalCardScRsp.cs b/Proto/SetPersonalCardScRsp.cs index 785769ec..b2a80296 100644 --- a/Proto/SetPersonalCardScRsp.cs +++ b/Proto/SetPersonalCardScRsp.cs @@ -24,13 +24,14 @@ namespace EggLink.DanhengServer.Proto { static SetPersonalCardScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChpTZXRQZXJzb25hbENhcmRTY1JzcC5wcm90byI8ChRTZXRQZXJzb25hbENh", - "cmRTY1JzcBIPCgdyZXRjb2RlGAIgASgNEhMKC09MRE1KT05CSk9NGAwgASgN", - "Qh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); + "ChpTZXRQZXJzb25hbENhcmRTY1JzcC5wcm90byJCChRTZXRQZXJzb25hbENh", + "cmRTY1JzcBIPCgdyZXRjb2RlGAIgASgNEhkKEWN1cl9wZXJzb25hbF9jYXJk", + "GAwgASgNQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3Rv", + "Mw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SetPersonalCardScRsp), global::EggLink.DanhengServer.Proto.SetPersonalCardScRsp.Parser, new[]{ "Retcode", "OLDMJONBJOM" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.SetPersonalCardScRsp), global::EggLink.DanhengServer.Proto.SetPersonalCardScRsp.Parser, new[]{ "Retcode", "CurPersonalCard" }, null, null, null, null) })); } #endregion @@ -73,7 +74,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public SetPersonalCardScRsp(SetPersonalCardScRsp other) : this() { retcode_ = other.retcode_; - oLDMJONBJOM_ = other.oLDMJONBJOM_; + curPersonalCard_ = other.curPersonalCard_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -95,15 +96,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "OLDMJONBJOM" field. - public const int OLDMJONBJOMFieldNumber = 12; - private uint oLDMJONBJOM_; + /// Field number for the "cur_personal_card" field. + public const int CurPersonalCardFieldNumber = 12; + private uint curPersonalCard_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint OLDMJONBJOM { - get { return oLDMJONBJOM_; } + public uint CurPersonalCard { + get { return curPersonalCard_; } set { - oLDMJONBJOM_ = value; + curPersonalCard_ = value; } } @@ -123,7 +124,7 @@ namespace EggLink.DanhengServer.Proto { return true; } if (Retcode != other.Retcode) return false; - if (OLDMJONBJOM != other.OLDMJONBJOM) return false; + if (CurPersonalCard != other.CurPersonalCard) return false; return Equals(_unknownFields, other._unknownFields); } @@ -132,7 +133,7 @@ namespace EggLink.DanhengServer.Proto { public override int GetHashCode() { int hash = 1; if (Retcode != 0) hash ^= Retcode.GetHashCode(); - if (OLDMJONBJOM != 0) hash ^= OLDMJONBJOM.GetHashCode(); + if (CurPersonalCard != 0) hash ^= CurPersonalCard.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -155,9 +156,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(16); output.WriteUInt32(Retcode); } - if (OLDMJONBJOM != 0) { + if (CurPersonalCard != 0) { output.WriteRawTag(96); - output.WriteUInt32(OLDMJONBJOM); + output.WriteUInt32(CurPersonalCard); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -173,9 +174,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(16); output.WriteUInt32(Retcode); } - if (OLDMJONBJOM != 0) { + if (CurPersonalCard != 0) { output.WriteRawTag(96); - output.WriteUInt32(OLDMJONBJOM); + output.WriteUInt32(CurPersonalCard); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -190,8 +191,8 @@ namespace EggLink.DanhengServer.Proto { if (Retcode != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Retcode); } - if (OLDMJONBJOM != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(OLDMJONBJOM); + if (CurPersonalCard != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurPersonalCard); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -208,8 +209,8 @@ namespace EggLink.DanhengServer.Proto { if (other.Retcode != 0) { Retcode = other.Retcode; } - if (other.OLDMJONBJOM != 0) { - OLDMJONBJOM = other.OLDMJONBJOM; + if (other.CurPersonalCard != 0) { + CurPersonalCard = other.CurPersonalCard; } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -231,7 +232,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 96: { - OLDMJONBJOM = input.ReadUInt32(); + CurPersonalCard = input.ReadUInt32(); break; } } @@ -254,7 +255,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 96: { - OLDMJONBJOM = input.ReadUInt32(); + CurPersonalCard = input.ReadUInt32(); break; } } diff --git a/Proto/UnlockPhoneCaseScNotify.cs b/Proto/UnlockPhoneCaseScNotify.cs index 2544f435..44ea8a1b 100644 --- a/Proto/UnlockPhoneCaseScNotify.cs +++ b/Proto/UnlockPhoneCaseScNotify.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static UnlockPhoneCaseScNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Ch1VbmxvY2tQaG9uZUNhc2VTY05vdGlmeS5wcm90byIuChdVbmxvY2tQaG9u", - "ZUNhc2VTY05vdGlmeRITCgtHSUFOSExJSUtJQRgIIAEoDUIeqgIbRWdnTGlu", - "ay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); + "Ch1VbmxvY2tQaG9uZUNhc2VTY05vdGlmeS5wcm90byItChdVbmxvY2tQaG9u", + "ZUNhc2VTY05vdGlmeRISCgpwaG9uZV9jYXNlGAggASgNQh6qAhtFZ2dMaW5r", + "LkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.UnlockPhoneCaseScNotify), global::EggLink.DanhengServer.Proto.UnlockPhoneCaseScNotify.Parser, new[]{ "GIANHLIIKIA" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.UnlockPhoneCaseScNotify), global::EggLink.DanhengServer.Proto.UnlockPhoneCaseScNotify.Parser, new[]{ "PhoneCase" }, null, null, null, null) })); } #endregion @@ -72,7 +72,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public UnlockPhoneCaseScNotify(UnlockPhoneCaseScNotify other) : this() { - gIANHLIIKIA_ = other.gIANHLIIKIA_; + phoneCase_ = other.phoneCase_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -82,15 +82,15 @@ namespace EggLink.DanhengServer.Proto { return new UnlockPhoneCaseScNotify(this); } - /// Field number for the "GIANHLIIKIA" field. - public const int GIANHLIIKIAFieldNumber = 8; - private uint gIANHLIIKIA_; + /// Field number for the "phone_case" field. + public const int PhoneCaseFieldNumber = 8; + private uint phoneCase_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint GIANHLIIKIA { - get { return gIANHLIIKIA_; } + public uint PhoneCase { + get { return phoneCase_; } set { - gIANHLIIKIA_ = value; + phoneCase_ = value; } } @@ -109,7 +109,7 @@ namespace EggLink.DanhengServer.Proto { if (ReferenceEquals(other, this)) { return true; } - if (GIANHLIIKIA != other.GIANHLIIKIA) return false; + if (PhoneCase != other.PhoneCase) return false; return Equals(_unknownFields, other._unknownFields); } @@ -117,7 +117,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - if (GIANHLIIKIA != 0) hash ^= GIANHLIIKIA.GetHashCode(); + if (PhoneCase != 0) hash ^= PhoneCase.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -136,9 +136,9 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (GIANHLIIKIA != 0) { + if (PhoneCase != 0) { output.WriteRawTag(64); - output.WriteUInt32(GIANHLIIKIA); + output.WriteUInt32(PhoneCase); } if (_unknownFields != null) { _unknownFields.WriteTo(output); @@ -150,9 +150,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 (GIANHLIIKIA != 0) { + if (PhoneCase != 0) { output.WriteRawTag(64); - output.WriteUInt32(GIANHLIIKIA); + output.WriteUInt32(PhoneCase); } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); @@ -164,8 +164,8 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - if (GIANHLIIKIA != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(GIANHLIIKIA); + if (PhoneCase != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PhoneCase); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -179,8 +179,8 @@ namespace EggLink.DanhengServer.Proto { if (other == null) { return; } - if (other.GIANHLIIKIA != 0) { - GIANHLIIKIA = other.GIANHLIIKIA; + if (other.PhoneCase != 0) { + PhoneCase = other.PhoneCase; } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -198,7 +198,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 64: { - GIANHLIIKIA = input.ReadUInt32(); + PhoneCase = input.ReadUInt32(); break; } } @@ -217,7 +217,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 64: { - GIANHLIIKIA = input.ReadUInt32(); + PhoneCase = input.ReadUInt32(); break; } }