From e7bf7fcebde1b068594c157582b8ea587d17a512 Mon Sep 17 00:00:00 2001 From: letheriver2007 Date: Mon, 7 Oct 2024 23:08:09 +0800 Subject: [PATCH] Fix music system --- Common/Data/Excel/MusicRhythmGroupExcel.cs | 19 + Common/Data/Excel/MusicRhythmLevelExcel.cs | 17 + Common/Data/Excel/MusicRhythmPhaseExcel.cs | 18 + Common/Data/Excel/MusicRhythmSongExcel.cs | 17 + .../Data/Excel/MusicRhythmSoundEffectExcel.cs | 17 + Common/Data/Excel/MusicRhythmTrackExcel.cs | 17 + Common/Data/GameData.cs | 6 + Common/Database/Player/PlayerData.cs | 1 + .../Recv/Music/HandlerMusicRhythmDataCsReq.cs | 21 ++ .../HandlerMusicRhythmFinishLevelCsReq.cs | 14 + .../HandlerMusicRhythmStartLevelCsReq.cs | 19 + .../Send/Music/PacketMusicRhythmDataScRsp.cs | 52 +++ .../PacketMusicRhythmFinishLevelScRsp.cs | 17 + .../Music/PacketMusicRhythmStartLevelScRsp.cs | 17 + .../PacketMusicRhythmUnlockSongNotify.cs | 20 ++ .../PacketMusicRhythmUnlockSongSfxScNotify.cs | 20 ++ .../PacketMusicRhythmUnlockTrackScNotify.cs | 20 ++ Proto/MusicRhythmDataCsReq.cs | 42 +-- Proto/MusicRhythmDataScRsp.cs | 287 +++++++-------- Proto/MusicRhythmFinishLevelCsReq.cs | 48 +-- Proto/MusicRhythmFinishLevelScRsp.cs | 48 +-- Proto/MusicRhythmGroup.cs | 328 ++++++++++++++++++ Proto/MusicRhythmLevel.cs | 309 +++++++++++++++++ Proto/MusicRhythmSaveSongConfigDataCsReq.cs | 21 +- Proto/MusicRhythmSaveSongConfigDataScRsp.cs | 42 +-- Proto/MusicRhythmStartLevelCsReq.cs | 46 +-- Proto/MusicRhythmStartLevelScRsp.cs | 48 +-- Proto/MusicRhythmUnlockSongNotify.cs | 38 +- Proto/MusicRhythmUnlockSongSfxScNotify.cs | 40 +-- Proto/MusicRhythmUnlockTrackScNotify.cs | 39 ++- StarRail_Danheng.proto | 69 ++-- 31 files changed, 1335 insertions(+), 382 deletions(-) create mode 100644 Common/Data/Excel/MusicRhythmGroupExcel.cs create mode 100644 Common/Data/Excel/MusicRhythmLevelExcel.cs create mode 100644 Common/Data/Excel/MusicRhythmPhaseExcel.cs create mode 100644 Common/Data/Excel/MusicRhythmSongExcel.cs create mode 100644 Common/Data/Excel/MusicRhythmSoundEffectExcel.cs create mode 100644 Common/Data/Excel/MusicRhythmTrackExcel.cs create mode 100644 GameServer/Server/Packet/Recv/Music/HandlerMusicRhythmDataCsReq.cs create mode 100644 GameServer/Server/Packet/Recv/Music/HandlerMusicRhythmFinishLevelCsReq.cs create mode 100644 GameServer/Server/Packet/Recv/Music/HandlerMusicRhythmStartLevelCsReq.cs create mode 100644 GameServer/Server/Packet/Send/Music/PacketMusicRhythmDataScRsp.cs create mode 100644 GameServer/Server/Packet/Send/Music/PacketMusicRhythmFinishLevelScRsp.cs create mode 100644 GameServer/Server/Packet/Send/Music/PacketMusicRhythmStartLevelScRsp.cs create mode 100644 GameServer/Server/Packet/Send/Music/PacketMusicRhythmUnlockSongNotify.cs create mode 100644 GameServer/Server/Packet/Send/Music/PacketMusicRhythmUnlockSongSfxScNotify.cs create mode 100644 GameServer/Server/Packet/Send/Music/PacketMusicRhythmUnlockTrackScNotify.cs create mode 100644 Proto/MusicRhythmGroup.cs create mode 100644 Proto/MusicRhythmLevel.cs diff --git a/Common/Data/Excel/MusicRhythmGroupExcel.cs b/Common/Data/Excel/MusicRhythmGroupExcel.cs new file mode 100644 index 00000000..6d5811fe --- /dev/null +++ b/Common/Data/Excel/MusicRhythmGroupExcel.cs @@ -0,0 +1,19 @@ +namespace EggLink.DanhengServer.Data.Excel; + +[ResourceEntity("MusicRhythmGroup.json")] +public class MusicRhythmGroupExcel : ExcelResource +{ + public int ID { get; set; } + public int Index { get; set; } + public int Phase { get; set; } + + public override int GetId() + { + return ID; + } + + public override void Loaded() + { + GameData.MusicRhythmGroupData.Add(ID, this); + } +} \ No newline at end of file diff --git a/Common/Data/Excel/MusicRhythmLevelExcel.cs b/Common/Data/Excel/MusicRhythmLevelExcel.cs new file mode 100644 index 00000000..847ea0e6 --- /dev/null +++ b/Common/Data/Excel/MusicRhythmLevelExcel.cs @@ -0,0 +1,17 @@ +namespace EggLink.DanhengServer.Data.Excel; + +[ResourceEntity("MusicRhythmLevel.json")] +public class MusicRhythmLevelExcel : ExcelResource +{ + public int ID { get; set; } + + public override int GetId() + { + return ID; + } + + public override void Loaded() + { + GameData.MusicRhythmLevelData.Add(ID, this); + } +} \ No newline at end of file diff --git a/Common/Data/Excel/MusicRhythmPhaseExcel.cs b/Common/Data/Excel/MusicRhythmPhaseExcel.cs new file mode 100644 index 00000000..8fc2b3ee --- /dev/null +++ b/Common/Data/Excel/MusicRhythmPhaseExcel.cs @@ -0,0 +1,18 @@ +namespace EggLink.DanhengServer.Data.Excel; + +[ResourceEntity("MusicRhythmPhase.json")] +public class MusicRhythmPhaseExcel : ExcelResource +{ + public int Phase { get; set; } + public int SongID { get; set; } + + public override int GetId() + { + return Phase; + } + + public override void Loaded() + { + GameData.MusicRhythmPhaseData.Add(Phase, this); + } +} \ No newline at end of file diff --git a/Common/Data/Excel/MusicRhythmSongExcel.cs b/Common/Data/Excel/MusicRhythmSongExcel.cs new file mode 100644 index 00000000..3d273d16 --- /dev/null +++ b/Common/Data/Excel/MusicRhythmSongExcel.cs @@ -0,0 +1,17 @@ +namespace EggLink.DanhengServer.Data.Excel; + +[ResourceEntity("MusicRhythmSong.json")] +public class MusicRhythmSongExcel : ExcelResource +{ + public int ID { get; set; } + + public override int GetId() + { + return ID; + } + + public override void Loaded() + { + GameData.MusicRhythmSongData.Add(ID, this); + } +} \ No newline at end of file diff --git a/Common/Data/Excel/MusicRhythmSoundEffectExcel.cs b/Common/Data/Excel/MusicRhythmSoundEffectExcel.cs new file mode 100644 index 00000000..38ced87a --- /dev/null +++ b/Common/Data/Excel/MusicRhythmSoundEffectExcel.cs @@ -0,0 +1,17 @@ +namespace EggLink.DanhengServer.Data.Excel; + +[ResourceEntity("MusicRhythmSoundEffect.json")] +public class MusicRhythmSoundEffectExcel : ExcelResource +{ + public int ID { get; set; } + + public override int GetId() + { + return ID; + } + + public override void Loaded() + { + GameData.MusicRhythmSoundEffectData.Add(ID, this); + } +} \ No newline at end of file diff --git a/Common/Data/Excel/MusicRhythmTrackExcel.cs b/Common/Data/Excel/MusicRhythmTrackExcel.cs new file mode 100644 index 00000000..6f5fe20c --- /dev/null +++ b/Common/Data/Excel/MusicRhythmTrackExcel.cs @@ -0,0 +1,17 @@ +namespace EggLink.DanhengServer.Data.Excel; + +[ResourceEntity("MusicRhythmTrack.json")] +public class MusicRhythmTrackExcel : ExcelResource +{ + public int ID { get; set; } + + public override int GetId() + { + return ID; + } + + public override void Loaded() + { + GameData.MusicRhythmTrackData.Add(ID, this); + } +} \ No newline at end of file diff --git a/Common/Data/GameData.cs b/Common/Data/GameData.cs index 107304d4..a7b9ac5b 100644 --- a/Common/Data/GameData.cs +++ b/Common/Data/GameData.cs @@ -108,6 +108,12 @@ public static class GameData public static Dictionary ContentPackageConfigData { get; private set; } = []; public static Dictionary GroupSystemUnlockDataData { get; private set; } = []; public static Dictionary FuncUnlockDataData { get; private set; } = []; + public static Dictionary MusicRhythmLevelData { get; private set; } = []; + public static Dictionary MusicRhythmGroupData { get; private set; } = []; + public static Dictionary MusicRhythmPhaseData { get; private set; } = []; + public static Dictionary MusicRhythmSongData { get; private set; } = []; + public static Dictionary MusicRhythmSoundEffectData { get; private set; } = []; + public static Dictionary MusicRhythmTrackData { get; private set; } = []; #endregion diff --git a/Common/Database/Player/PlayerData.cs b/Common/Database/Player/PlayerData.cs index 92ad5c3b..6be343c9 100644 --- a/Common/Database/Player/PlayerData.cs +++ b/Common/Database/Player/PlayerData.cs @@ -28,6 +28,7 @@ public class PlayerData : BaseDatabaseDataHelper public int TalentPoints { get; set; } = 0; // Rogue talent points public int Pet { get; set; } = 0; + [SugarColumn(IsNullable = true)] public int CurMusicLevel { get; set; } public int Stamina { get; set; } = 240; public double StaminaReserve { get; set; } = 0; diff --git a/GameServer/Server/Packet/Recv/Music/HandlerMusicRhythmDataCsReq.cs b/GameServer/Server/Packet/Recv/Music/HandlerMusicRhythmDataCsReq.cs new file mode 100644 index 00000000..7ce3237f --- /dev/null +++ b/GameServer/Server/Packet/Recv/Music/HandlerMusicRhythmDataCsReq.cs @@ -0,0 +1,21 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Music; +using EggLink.DanhengServer.Kcp; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Music; + +[Opcode(CmdIds.MusicRhythmDataCsReq)] +public class HandlerMusicRhythmDataCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + await connection.SendPacket(new PacketMusicRhythmDataScRsp()); + + // Unlock max difficulty level + await connection.SendPacket(CmdIds.MusicRhythmMaxDifficultyLevelsUnlockNotify); + + // Unknwon fields + await connection.SendPacket(new PacketMusicRhythmUnlockSongNotify()); + await connection.SendPacket(new PacketMusicRhythmUnlockSongSfxScNotify()); + await connection.SendPacket(new PacketMusicRhythmUnlockTrackScNotify()); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Music/HandlerMusicRhythmFinishLevelCsReq.cs b/GameServer/Server/Packet/Recv/Music/HandlerMusicRhythmFinishLevelCsReq.cs new file mode 100644 index 00000000..2daa3f60 --- /dev/null +++ b/GameServer/Server/Packet/Recv/Music/HandlerMusicRhythmFinishLevelCsReq.cs @@ -0,0 +1,14 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Music; +using EggLink.DanhengServer.Kcp; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Music; + +[Opcode(CmdIds.MusicRhythmFinishLevelCsReq)] +public class HandlerMusicRhythmFinishLevelCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + int curLevel = connection.Player!.Data.CurMusicLevel; + await connection.SendPacket(new PacketMusicRhythmFinishLevelScRsp((uint)curLevel)); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/Music/HandlerMusicRhythmStartLevelCsReq.cs b/GameServer/Server/Packet/Recv/Music/HandlerMusicRhythmStartLevelCsReq.cs new file mode 100644 index 00000000..4dd0fcd6 --- /dev/null +++ b/GameServer/Server/Packet/Recv/Music/HandlerMusicRhythmStartLevelCsReq.cs @@ -0,0 +1,19 @@ +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Music; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Recv.Music; + +[Opcode(CmdIds.MusicRhythmStartLevelCsReq)] +public class HandlerMusicRhythmStartLevelCsReq : Handler +{ + public override async Task OnHandle(Connection connection, byte[] header, byte[] data) + { + var req = MusicRhythmStartLevelCsReq.Parser.ParseFrom(data); + uint curLevel = req.LevelId; + + connection.Player!.Data.CurMusicLevel = (int)curLevel; + + await connection.SendPacket(new PacketMusicRhythmStartLevelScRsp(curLevel)); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Music/PacketMusicRhythmDataScRsp.cs b/GameServer/Server/Packet/Send/Music/PacketMusicRhythmDataScRsp.cs new file mode 100644 index 00000000..1d22e6cd --- /dev/null +++ b/GameServer/Server/Packet/Send/Music/PacketMusicRhythmDataScRsp.cs @@ -0,0 +1,52 @@ +using EggLink.DanhengServer.Data; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Music; + +public class PacketMusicRhythmDataScRsp : BasePacket +{ + public PacketMusicRhythmDataScRsp() : base(CmdIds.MusicRhythmDataScRsp) + { + var proto = new MusicRhythmDataScRsp + { + ShowHint = true + }; + + foreach (var level in GameData.MusicRhythmLevelData.Values) + { + proto.MusicLevel.Add(new MusicRhythmLevel + { + LevelId = (uint)level.GetId(), + IsFullCombo = true, + UnlockLevel = 3 + }); + } + + foreach (var group in GameData.MusicRhythmGroupData.Values) + { + proto.MusicGroup.Add(new MusicRhythmGroup + { + MusicGroupId = (uint)group.GetId(), + MusicGroupPhase = (uint)group.Phase + }); + } + + foreach (var song in GameData.MusicRhythmSongData.Values) + { + proto.UnlockSongList.Add((uint)song.GetId()); + } + + foreach (var track in GameData.MusicRhythmTrackData.Values) + { + proto.UnlockTrackList.Add((uint)track.GetId()); + } + + foreach (var phase in GameData.MusicRhythmPhaseData.Values) + { + proto.UnlockPhaseList.Add((uint)phase.GetId()); + } + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Music/PacketMusicRhythmFinishLevelScRsp.cs b/GameServer/Server/Packet/Send/Music/PacketMusicRhythmFinishLevelScRsp.cs new file mode 100644 index 00000000..de454d16 --- /dev/null +++ b/GameServer/Server/Packet/Send/Music/PacketMusicRhythmFinishLevelScRsp.cs @@ -0,0 +1,17 @@ +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Music; + +public class PacketMusicRhythmFinishLevelScRsp : BasePacket +{ + public PacketMusicRhythmFinishLevelScRsp(uint curLevel) : base(CmdIds.MusicRhythmFinishLevelScRsp) + { + var proto = new MusicRhythmFinishLevelScRsp + { + LevelId = curLevel, + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Music/PacketMusicRhythmStartLevelScRsp.cs b/GameServer/Server/Packet/Send/Music/PacketMusicRhythmStartLevelScRsp.cs new file mode 100644 index 00000000..70d7dc2b --- /dev/null +++ b/GameServer/Server/Packet/Send/Music/PacketMusicRhythmStartLevelScRsp.cs @@ -0,0 +1,17 @@ +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Music; + +public class PacketMusicRhythmStartLevelScRsp : BasePacket +{ + public PacketMusicRhythmStartLevelScRsp(uint levelId) : base(CmdIds.MusicRhythmStartLevelScRsp) + { + var proto = new MusicRhythmStartLevelScRsp + { + LevelId = levelId, + }; + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Music/PacketMusicRhythmUnlockSongNotify.cs b/GameServer/Server/Packet/Send/Music/PacketMusicRhythmUnlockSongNotify.cs new file mode 100644 index 00000000..6e7826cc --- /dev/null +++ b/GameServer/Server/Packet/Send/Music/PacketMusicRhythmUnlockSongNotify.cs @@ -0,0 +1,20 @@ +using EggLink.DanhengServer.Data; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Music; + +public class PacketMusicRhythmUnlockSongNotify : BasePacket +{ + public PacketMusicRhythmUnlockSongNotify() : base(CmdIds.MusicRhythmUnlockSongNotify) + { + var proto = new MusicRhythmUnlockSongNotify(); + + foreach (var song in GameData.MusicRhythmSongData.Values) + { + proto.MusicUnlockList.Add((uint)song.GetId()); + } + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Music/PacketMusicRhythmUnlockSongSfxScNotify.cs b/GameServer/Server/Packet/Send/Music/PacketMusicRhythmUnlockSongSfxScNotify.cs new file mode 100644 index 00000000..036951b2 --- /dev/null +++ b/GameServer/Server/Packet/Send/Music/PacketMusicRhythmUnlockSongSfxScNotify.cs @@ -0,0 +1,20 @@ +using EggLink.DanhengServer.Data; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Music; + +public class PacketMusicRhythmUnlockSongSfxScNotify : BasePacket +{ + public PacketMusicRhythmUnlockSongSfxScNotify() : base(CmdIds.MusicRhythmUnlockSongSfxScNotify) + { + var proto = new MusicRhythmUnlockSongSfxScNotify(); + + foreach (var sfx in GameData.MusicRhythmSoundEffectData.Values) + { + proto.MusicUnlockList.Add((uint)sfx.GetId()); + } + + SetData(proto); + } +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Music/PacketMusicRhythmUnlockTrackScNotify.cs b/GameServer/Server/Packet/Send/Music/PacketMusicRhythmUnlockTrackScNotify.cs new file mode 100644 index 00000000..6785fbf4 --- /dev/null +++ b/GameServer/Server/Packet/Send/Music/PacketMusicRhythmUnlockTrackScNotify.cs @@ -0,0 +1,20 @@ +using EggLink.DanhengServer.Data; +using EggLink.DanhengServer.Kcp; +using EggLink.DanhengServer.Proto; + +namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Music; + +public class PacketMusicRhythmUnlockTrackScNotify : BasePacket +{ + public PacketMusicRhythmUnlockTrackScNotify() : base(CmdIds.MusicRhythmUnlockTrackScNotify) + { + var proto = new MusicRhythmUnlockTrackScNotify(); + + foreach (var sfx in GameData.MusicRhythmTrackData.Values) + { + proto.TrackUnlockList.Add((uint)sfx.GetId()); + } + + SetData(proto); + } +} \ No newline at end of file diff --git a/Proto/MusicRhythmDataCsReq.cs b/Proto/MusicRhythmDataCsReq.cs index e4ca8d52..88e14417 100644 --- a/Proto/MusicRhythmDataCsReq.cs +++ b/Proto/MusicRhythmDataCsReq.cs @@ -25,12 +25,12 @@ namespace EggLink.DanhengServer.Proto { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChpNdXNpY1JoeXRobURhdGFDc1JlcS5wcm90byIrChRNdXNpY1JoeXRobURh", - "dGFDc1JlcRITCgtOTUdOT0hQT0pPUBgGIAEoDUIeqgIbRWdnTGluay5EYW5o", + "dGFDc1JlcRITCgtwbGF5ZXJfZGF0YRgGIAEoDUIeqgIbRWdnTGluay5EYW5o", "ZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmDataCsReq), global::EggLink.DanhengServer.Proto.MusicRhythmDataCsReq.Parser, new[]{ "NMGNOHPOJOP" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmDataCsReq), global::EggLink.DanhengServer.Proto.MusicRhythmDataCsReq.Parser, new[]{ "PlayerData" }, 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 MusicRhythmDataCsReq(MusicRhythmDataCsReq other) : this() { - nMGNOHPOJOP_ = other.nMGNOHPOJOP_; + playerData_ = other.playerData_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -82,15 +82,15 @@ namespace EggLink.DanhengServer.Proto { return new MusicRhythmDataCsReq(this); } - /// Field number for the "NMGNOHPOJOP" field. - public const int NMGNOHPOJOPFieldNumber = 6; - private uint nMGNOHPOJOP_; + /// Field number for the "player_data" field. + public const int PlayerDataFieldNumber = 6; + private uint playerData_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint NMGNOHPOJOP { - get { return nMGNOHPOJOP_; } + public uint PlayerData { + get { return playerData_; } set { - nMGNOHPOJOP_ = value; + playerData_ = value; } } @@ -109,7 +109,7 @@ namespace EggLink.DanhengServer.Proto { if (ReferenceEquals(other, this)) { return true; } - if (NMGNOHPOJOP != other.NMGNOHPOJOP) return false; + if (PlayerData != other.PlayerData) 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 (NMGNOHPOJOP != 0) hash ^= NMGNOHPOJOP.GetHashCode(); + if (PlayerData != 0) hash ^= PlayerData.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 (NMGNOHPOJOP != 0) { + if (PlayerData != 0) { output.WriteRawTag(48); - output.WriteUInt32(NMGNOHPOJOP); + output.WriteUInt32(PlayerData); } 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 (NMGNOHPOJOP != 0) { + if (PlayerData != 0) { output.WriteRawTag(48); - output.WriteUInt32(NMGNOHPOJOP); + output.WriteUInt32(PlayerData); } 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 (NMGNOHPOJOP != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(NMGNOHPOJOP); + if (PlayerData != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PlayerData); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -179,8 +179,8 @@ namespace EggLink.DanhengServer.Proto { if (other == null) { return; } - if (other.NMGNOHPOJOP != 0) { - NMGNOHPOJOP = other.NMGNOHPOJOP; + if (other.PlayerData != 0) { + PlayerData = other.PlayerData; } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -198,7 +198,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 48: { - NMGNOHPOJOP = input.ReadUInt32(); + PlayerData = input.ReadUInt32(); break; } } @@ -217,7 +217,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 48: { - NMGNOHPOJOP = input.ReadUInt32(); + PlayerData = input.ReadUInt32(); break; } } diff --git a/Proto/MusicRhythmDataScRsp.cs b/Proto/MusicRhythmDataScRsp.cs index 32405049..ddee735a 100644 --- a/Proto/MusicRhythmDataScRsp.cs +++ b/Proto/MusicRhythmDataScRsp.cs @@ -24,18 +24,19 @@ namespace EggLink.DanhengServer.Proto { static MusicRhythmDataScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChpNdXNpY1JoeXRobURhdGFTY1JzcC5wcm90bxoRSEVLUElDSExNRU4ucHJv", - "dG8aEU1ESEhGSkdPSk5HLnByb3RvIusBChRNdXNpY1JoeXRobURhdGFTY1Jz", - "cBITCgtHQk1MTkhPQ0pNTxgPIAMoDRITCgtQRUZDQk1PRFBPSRgCIAEoDRIT", - "CgtPUEZPSUxGREJLRxgIIAMoDRITCgtGRUFISEFNTERGQhgFIAMoDRITCgtG", - "Q0xJTkNLTUlMSxgGIAEoCBIhCgtNRUhLSkpGSkFQSxgBIAMoCzIMLk1ESEhG", - "SkdPSk5HEiEKC01GSUZFQkNESU1NGA0gAygLMgwuSEVLUElDSExNRU4SEwoL", - "Qk1KR0NJSUxIQ0EYCiABKA0SDwoHcmV0Y29kZRgMIAEoDUIeqgIbRWdnTGlu", - "ay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); + "ChpNdXNpY1JoeXRobURhdGFTY1JzcC5wcm90bxoWTXVzaWNSaHl0aG1Hcm91", + "cC5wcm90bxoWTXVzaWNSaHl0aG1MZXZlbC5wcm90byKFAgoUTXVzaWNSaHl0", + "aG1EYXRhU2NSc3ASGAoQdW5sb2NrX3NvbmdfbGlzdBgPIAMoDRITCgtjdXJf", + "c29uZ19pZBgCIAEoDRIZChF1bmxvY2tfdHJhY2tfbGlzdBgIIAMoDRIZChF1", + "bmxvY2tfcGhhc2VfbGlzdBgFIAMoDRIRCglzaG93X2hpbnQYBiABKAgSJgoL", + "bXVzaWNfZ3JvdXAYASADKAsyES5NdXNpY1JoeXRobUdyb3VwEiYKC211c2lj", + "X2xldmVsGA0gAygLMhEuTXVzaWNSaHl0aG1MZXZlbBIUCgxjdXJfbGV2ZWxf", + "aWQYCiABKA0SDwoHcmV0Y29kZRgMIAEoDUIeqgIbRWdnTGluay5EYW5oZW5n", + "U2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.HEKPICHLMENReflection.Descriptor, global::EggLink.DanhengServer.Proto.MDHHFJGOJNGReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MusicRhythmGroupReflection.Descriptor, global::EggLink.DanhengServer.Proto.MusicRhythmLevelReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmDataScRsp), global::EggLink.DanhengServer.Proto.MusicRhythmDataScRsp.Parser, new[]{ "GBMLNHOCJMO", "PEFCBMODPOI", "OPFOILFDBKG", "FEAHHAMLDFB", "FCLINCKMILK", "MEHKJJFJAPK", "MFIFEBCDIMM", "BMJGCIILHCA", "Retcode" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmDataScRsp), global::EggLink.DanhengServer.Proto.MusicRhythmDataScRsp.Parser, new[]{ "UnlockSongList", "CurSongId", "UnlockTrackList", "UnlockPhaseList", "ShowHint", "MusicGroup", "MusicLevel", "CurLevelId", "Retcode" }, null, null, null, null) })); } #endregion @@ -77,14 +78,14 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MusicRhythmDataScRsp(MusicRhythmDataScRsp other) : this() { - gBMLNHOCJMO_ = other.gBMLNHOCJMO_.Clone(); - pEFCBMODPOI_ = other.pEFCBMODPOI_; - oPFOILFDBKG_ = other.oPFOILFDBKG_.Clone(); - fEAHHAMLDFB_ = other.fEAHHAMLDFB_.Clone(); - fCLINCKMILK_ = other.fCLINCKMILK_; - mEHKJJFJAPK_ = other.mEHKJJFJAPK_.Clone(); - mFIFEBCDIMM_ = other.mFIFEBCDIMM_.Clone(); - bMJGCIILHCA_ = other.bMJGCIILHCA_; + unlockSongList_ = other.unlockSongList_.Clone(); + curSongId_ = other.curSongId_; + unlockTrackList_ = other.unlockTrackList_.Clone(); + unlockPhaseList_ = other.unlockPhaseList_.Clone(); + showHint_ = other.showHint_; + musicGroup_ = other.musicGroup_.Clone(); + musicLevel_ = other.musicLevel_.Clone(); + curLevelId_ = other.curLevelId_; retcode_ = other.retcode_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -95,94 +96,94 @@ namespace EggLink.DanhengServer.Proto { return new MusicRhythmDataScRsp(this); } - /// Field number for the "GBMLNHOCJMO" field. - public const int GBMLNHOCJMOFieldNumber = 15; - private static readonly pb::FieldCodec _repeated_gBMLNHOCJMO_codec + /// Field number for the "unlock_song_list" field. + public const int UnlockSongListFieldNumber = 15; + private static readonly pb::FieldCodec _repeated_unlockSongList_codec = pb::FieldCodec.ForUInt32(122); - private readonly pbc::RepeatedField gBMLNHOCJMO_ = new pbc::RepeatedField(); + private readonly pbc::RepeatedField unlockSongList_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField GBMLNHOCJMO { - get { return gBMLNHOCJMO_; } + public pbc::RepeatedField UnlockSongList { + get { return unlockSongList_; } } - /// Field number for the "PEFCBMODPOI" field. - public const int PEFCBMODPOIFieldNumber = 2; - private uint pEFCBMODPOI_; + /// Field number for the "cur_song_id" field. + public const int CurSongIdFieldNumber = 2; + private uint curSongId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint PEFCBMODPOI { - get { return pEFCBMODPOI_; } + public uint CurSongId { + get { return curSongId_; } set { - pEFCBMODPOI_ = value; + curSongId_ = value; } } - /// Field number for the "OPFOILFDBKG" field. - public const int OPFOILFDBKGFieldNumber = 8; - private static readonly pb::FieldCodec _repeated_oPFOILFDBKG_codec + /// Field number for the "unlock_track_list" field. + public const int UnlockTrackListFieldNumber = 8; + private static readonly pb::FieldCodec _repeated_unlockTrackList_codec = pb::FieldCodec.ForUInt32(66); - private readonly pbc::RepeatedField oPFOILFDBKG_ = new pbc::RepeatedField(); + private readonly pbc::RepeatedField unlockTrackList_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField OPFOILFDBKG { - get { return oPFOILFDBKG_; } + public pbc::RepeatedField UnlockTrackList { + get { return unlockTrackList_; } } - /// Field number for the "FEAHHAMLDFB" field. - public const int FEAHHAMLDFBFieldNumber = 5; - private static readonly pb::FieldCodec _repeated_fEAHHAMLDFB_codec + /// Field number for the "unlock_phase_list" field. + public const int UnlockPhaseListFieldNumber = 5; + private static readonly pb::FieldCodec _repeated_unlockPhaseList_codec = pb::FieldCodec.ForUInt32(42); - private readonly pbc::RepeatedField fEAHHAMLDFB_ = new pbc::RepeatedField(); + private readonly pbc::RepeatedField unlockPhaseList_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField FEAHHAMLDFB { - get { return fEAHHAMLDFB_; } + public pbc::RepeatedField UnlockPhaseList { + get { return unlockPhaseList_; } } - /// Field number for the "FCLINCKMILK" field. - public const int FCLINCKMILKFieldNumber = 6; - private bool fCLINCKMILK_; + /// Field number for the "show_hint" field. + public const int ShowHintFieldNumber = 6; + private bool showHint_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool FCLINCKMILK { - get { return fCLINCKMILK_; } + public bool ShowHint { + get { return showHint_; } set { - fCLINCKMILK_ = value; + showHint_ = value; } } - /// Field number for the "MEHKJJFJAPK" field. - public const int MEHKJJFJAPKFieldNumber = 1; - private static readonly pb::FieldCodec _repeated_mEHKJJFJAPK_codec - = pb::FieldCodec.ForMessage(10, global::EggLink.DanhengServer.Proto.MDHHFJGOJNG.Parser); - private readonly pbc::RepeatedField mEHKJJFJAPK_ = new pbc::RepeatedField(); + /// Field number for the "music_group" field. + public const int MusicGroupFieldNumber = 1; + private static readonly pb::FieldCodec _repeated_musicGroup_codec + = pb::FieldCodec.ForMessage(10, global::EggLink.DanhengServer.Proto.MusicRhythmGroup.Parser); + private readonly pbc::RepeatedField musicGroup_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField MEHKJJFJAPK { - get { return mEHKJJFJAPK_; } + public pbc::RepeatedField MusicGroup { + get { return musicGroup_; } } - /// Field number for the "MFIFEBCDIMM" field. - public const int MFIFEBCDIMMFieldNumber = 13; - private static readonly pb::FieldCodec _repeated_mFIFEBCDIMM_codec - = pb::FieldCodec.ForMessage(106, global::EggLink.DanhengServer.Proto.HEKPICHLMEN.Parser); - private readonly pbc::RepeatedField mFIFEBCDIMM_ = new pbc::RepeatedField(); + /// Field number for the "music_level" field. + public const int MusicLevelFieldNumber = 13; + private static readonly pb::FieldCodec _repeated_musicLevel_codec + = pb::FieldCodec.ForMessage(106, global::EggLink.DanhengServer.Proto.MusicRhythmLevel.Parser); + private readonly pbc::RepeatedField musicLevel_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField MFIFEBCDIMM { - get { return mFIFEBCDIMM_; } + public pbc::RepeatedField MusicLevel { + get { return musicLevel_; } } - /// Field number for the "BMJGCIILHCA" field. - public const int BMJGCIILHCAFieldNumber = 10; - private uint bMJGCIILHCA_; + /// Field number for the "cur_level_id" field. + public const int CurLevelIdFieldNumber = 10; + private uint curLevelId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint BMJGCIILHCA { - get { return bMJGCIILHCA_; } + public uint CurLevelId { + get { return curLevelId_; } set { - bMJGCIILHCA_ = value; + curLevelId_ = value; } } @@ -213,14 +214,14 @@ namespace EggLink.DanhengServer.Proto { if (ReferenceEquals(other, this)) { return true; } - if(!gBMLNHOCJMO_.Equals(other.gBMLNHOCJMO_)) return false; - if (PEFCBMODPOI != other.PEFCBMODPOI) return false; - if(!oPFOILFDBKG_.Equals(other.oPFOILFDBKG_)) return false; - if(!fEAHHAMLDFB_.Equals(other.fEAHHAMLDFB_)) return false; - if (FCLINCKMILK != other.FCLINCKMILK) return false; - if(!mEHKJJFJAPK_.Equals(other.mEHKJJFJAPK_)) return false; - if(!mFIFEBCDIMM_.Equals(other.mFIFEBCDIMM_)) return false; - if (BMJGCIILHCA != other.BMJGCIILHCA) return false; + if(!unlockSongList_.Equals(other.unlockSongList_)) return false; + if (CurSongId != other.CurSongId) return false; + if(!unlockTrackList_.Equals(other.unlockTrackList_)) return false; + if(!unlockPhaseList_.Equals(other.unlockPhaseList_)) return false; + if (ShowHint != other.ShowHint) return false; + if(!musicGroup_.Equals(other.musicGroup_)) return false; + if(!musicLevel_.Equals(other.musicLevel_)) return false; + if (CurLevelId != other.CurLevelId) return false; if (Retcode != other.Retcode) return false; return Equals(_unknownFields, other._unknownFields); } @@ -229,14 +230,14 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - hash ^= gBMLNHOCJMO_.GetHashCode(); - if (PEFCBMODPOI != 0) hash ^= PEFCBMODPOI.GetHashCode(); - hash ^= oPFOILFDBKG_.GetHashCode(); - hash ^= fEAHHAMLDFB_.GetHashCode(); - if (FCLINCKMILK != false) hash ^= FCLINCKMILK.GetHashCode(); - hash ^= mEHKJJFJAPK_.GetHashCode(); - hash ^= mFIFEBCDIMM_.GetHashCode(); - if (BMJGCIILHCA != 0) hash ^= BMJGCIILHCA.GetHashCode(); + hash ^= unlockSongList_.GetHashCode(); + if (CurSongId != 0) hash ^= CurSongId.GetHashCode(); + hash ^= unlockTrackList_.GetHashCode(); + hash ^= unlockPhaseList_.GetHashCode(); + if (ShowHint != false) hash ^= ShowHint.GetHashCode(); + hash ^= musicGroup_.GetHashCode(); + hash ^= musicLevel_.GetHashCode(); + if (CurLevelId != 0) hash ^= CurLevelId.GetHashCode(); if (Retcode != 0) hash ^= Retcode.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -256,27 +257,27 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - mEHKJJFJAPK_.WriteTo(output, _repeated_mEHKJJFJAPK_codec); - if (PEFCBMODPOI != 0) { + musicGroup_.WriteTo(output, _repeated_musicGroup_codec); + if (CurSongId != 0) { output.WriteRawTag(16); - output.WriteUInt32(PEFCBMODPOI); + output.WriteUInt32(CurSongId); } - fEAHHAMLDFB_.WriteTo(output, _repeated_fEAHHAMLDFB_codec); - if (FCLINCKMILK != false) { + unlockPhaseList_.WriteTo(output, _repeated_unlockPhaseList_codec); + if (ShowHint != false) { output.WriteRawTag(48); - output.WriteBool(FCLINCKMILK); + output.WriteBool(ShowHint); } - oPFOILFDBKG_.WriteTo(output, _repeated_oPFOILFDBKG_codec); - if (BMJGCIILHCA != 0) { + unlockTrackList_.WriteTo(output, _repeated_unlockTrackList_codec); + if (CurLevelId != 0) { output.WriteRawTag(80); - output.WriteUInt32(BMJGCIILHCA); + output.WriteUInt32(CurLevelId); } if (Retcode != 0) { output.WriteRawTag(96); output.WriteUInt32(Retcode); } - mFIFEBCDIMM_.WriteTo(output, _repeated_mFIFEBCDIMM_codec); - gBMLNHOCJMO_.WriteTo(output, _repeated_gBMLNHOCJMO_codec); + musicLevel_.WriteTo(output, _repeated_musicLevel_codec); + unlockSongList_.WriteTo(output, _repeated_unlockSongList_codec); if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -287,27 +288,27 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - mEHKJJFJAPK_.WriteTo(ref output, _repeated_mEHKJJFJAPK_codec); - if (PEFCBMODPOI != 0) { + musicGroup_.WriteTo(ref output, _repeated_musicGroup_codec); + if (CurSongId != 0) { output.WriteRawTag(16); - output.WriteUInt32(PEFCBMODPOI); + output.WriteUInt32(CurSongId); } - fEAHHAMLDFB_.WriteTo(ref output, _repeated_fEAHHAMLDFB_codec); - if (FCLINCKMILK != false) { + unlockPhaseList_.WriteTo(ref output, _repeated_unlockPhaseList_codec); + if (ShowHint != false) { output.WriteRawTag(48); - output.WriteBool(FCLINCKMILK); + output.WriteBool(ShowHint); } - oPFOILFDBKG_.WriteTo(ref output, _repeated_oPFOILFDBKG_codec); - if (BMJGCIILHCA != 0) { + unlockTrackList_.WriteTo(ref output, _repeated_unlockTrackList_codec); + if (CurLevelId != 0) { output.WriteRawTag(80); - output.WriteUInt32(BMJGCIILHCA); + output.WriteUInt32(CurLevelId); } if (Retcode != 0) { output.WriteRawTag(96); output.WriteUInt32(Retcode); } - mFIFEBCDIMM_.WriteTo(ref output, _repeated_mFIFEBCDIMM_codec); - gBMLNHOCJMO_.WriteTo(ref output, _repeated_gBMLNHOCJMO_codec); + musicLevel_.WriteTo(ref output, _repeated_musicLevel_codec); + unlockSongList_.WriteTo(ref output, _repeated_unlockSongList_codec); if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -318,19 +319,19 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - size += gBMLNHOCJMO_.CalculateSize(_repeated_gBMLNHOCJMO_codec); - if (PEFCBMODPOI != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PEFCBMODPOI); + size += unlockSongList_.CalculateSize(_repeated_unlockSongList_codec); + if (CurSongId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurSongId); } - size += oPFOILFDBKG_.CalculateSize(_repeated_oPFOILFDBKG_codec); - size += fEAHHAMLDFB_.CalculateSize(_repeated_fEAHHAMLDFB_codec); - if (FCLINCKMILK != false) { + size += unlockTrackList_.CalculateSize(_repeated_unlockTrackList_codec); + size += unlockPhaseList_.CalculateSize(_repeated_unlockPhaseList_codec); + if (ShowHint != false) { size += 1 + 1; } - size += mEHKJJFJAPK_.CalculateSize(_repeated_mEHKJJFJAPK_codec); - size += mFIFEBCDIMM_.CalculateSize(_repeated_mFIFEBCDIMM_codec); - if (BMJGCIILHCA != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(BMJGCIILHCA); + size += musicGroup_.CalculateSize(_repeated_musicGroup_codec); + size += musicLevel_.CalculateSize(_repeated_musicLevel_codec); + if (CurLevelId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurLevelId); } if (Retcode != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Retcode); @@ -347,19 +348,19 @@ namespace EggLink.DanhengServer.Proto { if (other == null) { return; } - gBMLNHOCJMO_.Add(other.gBMLNHOCJMO_); - if (other.PEFCBMODPOI != 0) { - PEFCBMODPOI = other.PEFCBMODPOI; + unlockSongList_.Add(other.unlockSongList_); + if (other.CurSongId != 0) { + CurSongId = other.CurSongId; } - oPFOILFDBKG_.Add(other.oPFOILFDBKG_); - fEAHHAMLDFB_.Add(other.fEAHHAMLDFB_); - if (other.FCLINCKMILK != false) { - FCLINCKMILK = other.FCLINCKMILK; + unlockTrackList_.Add(other.unlockTrackList_); + unlockPhaseList_.Add(other.unlockPhaseList_); + if (other.ShowHint != false) { + ShowHint = other.ShowHint; } - mEHKJJFJAPK_.Add(other.mEHKJJFJAPK_); - mFIFEBCDIMM_.Add(other.mFIFEBCDIMM_); - if (other.BMJGCIILHCA != 0) { - BMJGCIILHCA = other.BMJGCIILHCA; + musicGroup_.Add(other.musicGroup_); + musicLevel_.Add(other.musicLevel_); + if (other.CurLevelId != 0) { + CurLevelId = other.CurLevelId; } if (other.Retcode != 0) { Retcode = other.Retcode; @@ -380,29 +381,29 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 10: { - mEHKJJFJAPK_.AddEntriesFrom(input, _repeated_mEHKJJFJAPK_codec); + musicGroup_.AddEntriesFrom(input, _repeated_musicGroup_codec); break; } case 16: { - PEFCBMODPOI = input.ReadUInt32(); + CurSongId = input.ReadUInt32(); break; } case 42: case 40: { - fEAHHAMLDFB_.AddEntriesFrom(input, _repeated_fEAHHAMLDFB_codec); + unlockPhaseList_.AddEntriesFrom(input, _repeated_unlockPhaseList_codec); break; } case 48: { - FCLINCKMILK = input.ReadBool(); + ShowHint = input.ReadBool(); break; } case 66: case 64: { - oPFOILFDBKG_.AddEntriesFrom(input, _repeated_oPFOILFDBKG_codec); + unlockTrackList_.AddEntriesFrom(input, _repeated_unlockTrackList_codec); break; } case 80: { - BMJGCIILHCA = input.ReadUInt32(); + CurLevelId = input.ReadUInt32(); break; } case 96: { @@ -410,12 +411,12 @@ namespace EggLink.DanhengServer.Proto { break; } case 106: { - mFIFEBCDIMM_.AddEntriesFrom(input, _repeated_mFIFEBCDIMM_codec); + musicLevel_.AddEntriesFrom(input, _repeated_musicLevel_codec); break; } case 122: case 120: { - gBMLNHOCJMO_.AddEntriesFrom(input, _repeated_gBMLNHOCJMO_codec); + unlockSongList_.AddEntriesFrom(input, _repeated_unlockSongList_codec); break; } } @@ -434,29 +435,29 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 10: { - mEHKJJFJAPK_.AddEntriesFrom(ref input, _repeated_mEHKJJFJAPK_codec); + musicGroup_.AddEntriesFrom(ref input, _repeated_musicGroup_codec); break; } case 16: { - PEFCBMODPOI = input.ReadUInt32(); + CurSongId = input.ReadUInt32(); break; } case 42: case 40: { - fEAHHAMLDFB_.AddEntriesFrom(ref input, _repeated_fEAHHAMLDFB_codec); + unlockPhaseList_.AddEntriesFrom(ref input, _repeated_unlockPhaseList_codec); break; } case 48: { - FCLINCKMILK = input.ReadBool(); + ShowHint = input.ReadBool(); break; } case 66: case 64: { - oPFOILFDBKG_.AddEntriesFrom(ref input, _repeated_oPFOILFDBKG_codec); + unlockTrackList_.AddEntriesFrom(ref input, _repeated_unlockTrackList_codec); break; } case 80: { - BMJGCIILHCA = input.ReadUInt32(); + CurLevelId = input.ReadUInt32(); break; } case 96: { @@ -464,12 +465,12 @@ namespace EggLink.DanhengServer.Proto { break; } case 106: { - mFIFEBCDIMM_.AddEntriesFrom(ref input, _repeated_mFIFEBCDIMM_codec); + musicLevel_.AddEntriesFrom(ref input, _repeated_musicLevel_codec); break; } case 122: case 120: { - gBMLNHOCJMO_.AddEntriesFrom(ref input, _repeated_gBMLNHOCJMO_codec); + unlockSongList_.AddEntriesFrom(ref input, _repeated_unlockSongList_codec); break; } } diff --git a/Proto/MusicRhythmFinishLevelCsReq.cs b/Proto/MusicRhythmFinishLevelCsReq.cs index ab7888ca..8cb75d7c 100644 --- a/Proto/MusicRhythmFinishLevelCsReq.cs +++ b/Proto/MusicRhythmFinishLevelCsReq.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static MusicRhythmFinishLevelCsReqReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiFNdXNpY1JoeXRobUZpbmlzaExldmVsQ3NSZXEucHJvdG8iRwobTXVzaWNS", - "aHl0aG1GaW5pc2hMZXZlbENzUmVxEhAKCHNjb3JlX2lkGAwgASgNEhYKDk1B", - "SUxfVFlQRV9TVEFSGAsgASgNQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIu", - "UHJvdG9iBnByb3RvMw==")); + "CiFNdXNpY1JoeXRobUZpbmlzaExldmVsQ3NSZXEucHJvdG8iRQobTXVzaWNS", + "aHl0aG1GaW5pc2hMZXZlbENzUmVxEhAKCHNjb3JlX2lkGAwgASgNEhQKDGZp", + "bmlzaF9sZXZlbBgLIAEoDUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlBy", + "b3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmFinishLevelCsReq), global::EggLink.DanhengServer.Proto.MusicRhythmFinishLevelCsReq.Parser, new[]{ "ScoreId", "MAILTYPESTAR" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmFinishLevelCsReq), global::EggLink.DanhengServer.Proto.MusicRhythmFinishLevelCsReq.Parser, new[]{ "ScoreId", "FinishLevel" }, null, null, null, null) })); } #endregion @@ -74,7 +74,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MusicRhythmFinishLevelCsReq(MusicRhythmFinishLevelCsReq other) : this() { scoreId_ = other.scoreId_; - mAILTYPESTAR_ = other.mAILTYPESTAR_; + finishLevel_ = other.finishLevel_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -96,15 +96,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "MAIL_TYPE_STAR" field. - public const int MAILTYPESTARFieldNumber = 11; - private uint mAILTYPESTAR_; + /// Field number for the "finish_level" field. + public const int FinishLevelFieldNumber = 11; + private uint finishLevel_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint MAILTYPESTAR { - get { return mAILTYPESTAR_; } + public uint FinishLevel { + get { return finishLevel_; } set { - mAILTYPESTAR_ = value; + finishLevel_ = value; } } @@ -124,7 +124,7 @@ namespace EggLink.DanhengServer.Proto { return true; } if (ScoreId != other.ScoreId) return false; - if (MAILTYPESTAR != other.MAILTYPESTAR) return false; + if (FinishLevel != other.FinishLevel) return false; return Equals(_unknownFields, other._unknownFields); } @@ -133,7 +133,7 @@ namespace EggLink.DanhengServer.Proto { public override int GetHashCode() { int hash = 1; if (ScoreId != 0) hash ^= ScoreId.GetHashCode(); - if (MAILTYPESTAR != 0) hash ^= MAILTYPESTAR.GetHashCode(); + if (FinishLevel != 0) hash ^= FinishLevel.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -152,9 +152,9 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (MAILTYPESTAR != 0) { + if (FinishLevel != 0) { output.WriteRawTag(88); - output.WriteUInt32(MAILTYPESTAR); + output.WriteUInt32(FinishLevel); } if (ScoreId != 0) { output.WriteRawTag(96); @@ -170,9 +170,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 (MAILTYPESTAR != 0) { + if (FinishLevel != 0) { output.WriteRawTag(88); - output.WriteUInt32(MAILTYPESTAR); + output.WriteUInt32(FinishLevel); } if (ScoreId != 0) { output.WriteRawTag(96); @@ -191,8 +191,8 @@ namespace EggLink.DanhengServer.Proto { if (ScoreId != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ScoreId); } - if (MAILTYPESTAR != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MAILTYPESTAR); + if (FinishLevel != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(FinishLevel); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -209,8 +209,8 @@ namespace EggLink.DanhengServer.Proto { if (other.ScoreId != 0) { ScoreId = other.ScoreId; } - if (other.MAILTYPESTAR != 0) { - MAILTYPESTAR = other.MAILTYPESTAR; + if (other.FinishLevel != 0) { + FinishLevel = other.FinishLevel; } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -228,7 +228,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 88: { - MAILTYPESTAR = input.ReadUInt32(); + FinishLevel = input.ReadUInt32(); break; } case 96: { @@ -251,7 +251,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 88: { - MAILTYPESTAR = input.ReadUInt32(); + FinishLevel = input.ReadUInt32(); break; } case 96: { diff --git a/Proto/MusicRhythmFinishLevelScRsp.cs b/Proto/MusicRhythmFinishLevelScRsp.cs index dce0f71b..6efe8904 100644 --- a/Proto/MusicRhythmFinishLevelScRsp.cs +++ b/Proto/MusicRhythmFinishLevelScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static MusicRhythmFinishLevelScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiFNdXNpY1JoeXRobUZpbmlzaExldmVsU2NSc3AucHJvdG8iQwobTXVzaWNS", - "aHl0aG1GaW5pc2hMZXZlbFNjUnNwEg8KB3JldGNvZGUYCSABKA0SEwoLREdF", - "Sk1DS0lGSkIYBCABKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90", - "b2IGcHJvdG8z")); + "CiFNdXNpY1JoeXRobUZpbmlzaExldmVsU2NSc3AucHJvdG8iQAobTXVzaWNS", + "aHl0aG1GaW5pc2hMZXZlbFNjUnNwEg8KB3JldGNvZGUYCSABKA0SEAoIbGV2", + "ZWxfaWQYBCABKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IG", + "cHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmFinishLevelScRsp), global::EggLink.DanhengServer.Proto.MusicRhythmFinishLevelScRsp.Parser, new[]{ "Retcode", "DGEJMCKIFJB" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmFinishLevelScRsp), global::EggLink.DanhengServer.Proto.MusicRhythmFinishLevelScRsp.Parser, new[]{ "Retcode", "LevelId" }, null, null, null, null) })); } #endregion @@ -74,7 +74,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MusicRhythmFinishLevelScRsp(MusicRhythmFinishLevelScRsp other) : this() { retcode_ = other.retcode_; - dGEJMCKIFJB_ = other.dGEJMCKIFJB_; + levelId_ = other.levelId_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -96,15 +96,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "DGEJMCKIFJB" field. - public const int DGEJMCKIFJBFieldNumber = 4; - private uint dGEJMCKIFJB_; + /// Field number for the "level_id" field. + public const int LevelIdFieldNumber = 4; + private uint levelId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint DGEJMCKIFJB { - get { return dGEJMCKIFJB_; } + public uint LevelId { + get { return levelId_; } set { - dGEJMCKIFJB_ = value; + levelId_ = value; } } @@ -124,7 +124,7 @@ namespace EggLink.DanhengServer.Proto { return true; } if (Retcode != other.Retcode) return false; - if (DGEJMCKIFJB != other.DGEJMCKIFJB) return false; + if (LevelId != other.LevelId) return false; return Equals(_unknownFields, other._unknownFields); } @@ -133,7 +133,7 @@ namespace EggLink.DanhengServer.Proto { public override int GetHashCode() { int hash = 1; if (Retcode != 0) hash ^= Retcode.GetHashCode(); - if (DGEJMCKIFJB != 0) hash ^= DGEJMCKIFJB.GetHashCode(); + if (LevelId != 0) hash ^= LevelId.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -152,9 +152,9 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (DGEJMCKIFJB != 0) { + if (LevelId != 0) { output.WriteRawTag(32); - output.WriteUInt32(DGEJMCKIFJB); + output.WriteUInt32(LevelId); } if (Retcode != 0) { output.WriteRawTag(72); @@ -170,9 +170,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 (DGEJMCKIFJB != 0) { + if (LevelId != 0) { output.WriteRawTag(32); - output.WriteUInt32(DGEJMCKIFJB); + output.WriteUInt32(LevelId); } if (Retcode != 0) { output.WriteRawTag(72); @@ -191,8 +191,8 @@ namespace EggLink.DanhengServer.Proto { if (Retcode != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Retcode); } - if (DGEJMCKIFJB != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(DGEJMCKIFJB); + if (LevelId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(LevelId); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -209,8 +209,8 @@ namespace EggLink.DanhengServer.Proto { if (other.Retcode != 0) { Retcode = other.Retcode; } - if (other.DGEJMCKIFJB != 0) { - DGEJMCKIFJB = other.DGEJMCKIFJB; + if (other.LevelId != 0) { + LevelId = other.LevelId; } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -228,7 +228,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 32: { - DGEJMCKIFJB = input.ReadUInt32(); + LevelId = input.ReadUInt32(); break; } case 72: { @@ -251,7 +251,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 32: { - DGEJMCKIFJB = input.ReadUInt32(); + LevelId = input.ReadUInt32(); break; } case 72: { diff --git a/Proto/MusicRhythmGroup.cs b/Proto/MusicRhythmGroup.cs new file mode 100644 index 00000000..44190d83 --- /dev/null +++ b/Proto/MusicRhythmGroup.cs @@ -0,0 +1,328 @@ +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: MusicRhythmGroup.proto +// +#pragma warning disable 1591, 0612, 3021, 8981 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace EggLink.DanhengServer.Proto { + + /// Holder for reflection information generated from MusicRhythmGroup.proto + public static partial class MusicRhythmGroupReflection { + + #region Descriptor + /// File descriptor for MusicRhythmGroup.proto + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static MusicRhythmGroupReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChZNdXNpY1JoeXRobUdyb3VwLnByb3RvIm8KEE11c2ljUmh5dGhtR3JvdXAS", + "GQoRbXVzaWNfZ3JvdXBfcGhhc2UYCiABKA0SEwoLTVBDRk9KQUxOSE4YAyAD", + "KA0SEwoLT0FMTEpMS0JJT0oYBiADKA0SFgoObXVzaWNfZ3JvdXBfaWQYBSAB", + "KA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmGroup), global::EggLink.DanhengServer.Proto.MusicRhythmGroup.Parser, new[]{ "MusicGroupPhase", "MPCFOJALNHN", "OALLJLKBIOJ", "MusicGroupId" }, null, null, null, null) + })); + } + #endregion + + } + #region Messages + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] + public sealed partial class MusicRhythmGroup : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MusicRhythmGroup()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + 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.MusicRhythmGroupReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public MusicRhythmGroup() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public MusicRhythmGroup(MusicRhythmGroup other) : this() { + musicGroupPhase_ = other.musicGroupPhase_; + mPCFOJALNHN_ = other.mPCFOJALNHN_.Clone(); + oALLJLKBIOJ_ = other.oALLJLKBIOJ_.Clone(); + musicGroupId_ = other.musicGroupId_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public MusicRhythmGroup Clone() { + return new MusicRhythmGroup(this); + } + + /// Field number for the "music_group_phase" field. + public const int MusicGroupPhaseFieldNumber = 10; + private uint musicGroupPhase_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint MusicGroupPhase { + get { return musicGroupPhase_; } + set { + musicGroupPhase_ = value; + } + } + + /// Field number for the "MPCFOJALNHN" field. + public const int MPCFOJALNHNFieldNumber = 3; + private static readonly pb::FieldCodec _repeated_mPCFOJALNHN_codec + = pb::FieldCodec.ForUInt32(26); + private readonly pbc::RepeatedField mPCFOJALNHN_ = new pbc::RepeatedField(); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField MPCFOJALNHN { + get { return mPCFOJALNHN_; } + } + + /// Field number for the "OALLJLKBIOJ" field. + public const int OALLJLKBIOJFieldNumber = 6; + private static readonly pb::FieldCodec _repeated_oALLJLKBIOJ_codec + = pb::FieldCodec.ForUInt32(50); + private readonly pbc::RepeatedField oALLJLKBIOJ_ = new pbc::RepeatedField(); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public pbc::RepeatedField OALLJLKBIOJ { + get { return oALLJLKBIOJ_; } + } + + /// Field number for the "music_group_id" field. + public const int MusicGroupIdFieldNumber = 5; + private uint musicGroupId_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint MusicGroupId { + get { return musicGroupId_; } + set { + musicGroupId_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as MusicRhythmGroup); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(MusicRhythmGroup other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (MusicGroupPhase != other.MusicGroupPhase) return false; + if(!mPCFOJALNHN_.Equals(other.mPCFOJALNHN_)) return false; + if(!oALLJLKBIOJ_.Equals(other.oALLJLKBIOJ_)) return false; + if (MusicGroupId != other.MusicGroupId) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + if (MusicGroupPhase != 0) hash ^= MusicGroupPhase.GetHashCode(); + hash ^= mPCFOJALNHN_.GetHashCode(); + hash ^= oALLJLKBIOJ_.GetHashCode(); + if (MusicGroupId != 0) hash ^= MusicGroupId.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + mPCFOJALNHN_.WriteTo(output, _repeated_mPCFOJALNHN_codec); + if (MusicGroupId != 0) { + output.WriteRawTag(40); + output.WriteUInt32(MusicGroupId); + } + oALLJLKBIOJ_.WriteTo(output, _repeated_oALLJLKBIOJ_codec); + if (MusicGroupPhase != 0) { + output.WriteRawTag(80); + output.WriteUInt32(MusicGroupPhase); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + mPCFOJALNHN_.WriteTo(ref output, _repeated_mPCFOJALNHN_codec); + if (MusicGroupId != 0) { + output.WriteRawTag(40); + output.WriteUInt32(MusicGroupId); + } + oALLJLKBIOJ_.WriteTo(ref output, _repeated_oALLJLKBIOJ_codec); + if (MusicGroupPhase != 0) { + output.WriteRawTag(80); + output.WriteUInt32(MusicGroupPhase); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + if (MusicGroupPhase != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MusicGroupPhase); + } + size += mPCFOJALNHN_.CalculateSize(_repeated_mPCFOJALNHN_codec); + size += oALLJLKBIOJ_.CalculateSize(_repeated_oALLJLKBIOJ_codec); + if (MusicGroupId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MusicGroupId); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(MusicRhythmGroup other) { + if (other == null) { + return; + } + if (other.MusicGroupPhase != 0) { + MusicGroupPhase = other.MusicGroupPhase; + } + mPCFOJALNHN_.Add(other.mPCFOJALNHN_); + oALLJLKBIOJ_.Add(other.oALLJLKBIOJ_); + if (other.MusicGroupId != 0) { + MusicGroupId = other.MusicGroupId; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 26: + case 24: { + mPCFOJALNHN_.AddEntriesFrom(input, _repeated_mPCFOJALNHN_codec); + break; + } + case 40: { + MusicGroupId = input.ReadUInt32(); + break; + } + case 50: + case 48: { + oALLJLKBIOJ_.AddEntriesFrom(input, _repeated_oALLJLKBIOJ_codec); + break; + } + case 80: { + MusicGroupPhase = input.ReadUInt32(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 26: + case 24: { + mPCFOJALNHN_.AddEntriesFrom(ref input, _repeated_mPCFOJALNHN_codec); + break; + } + case 40: { + MusicGroupId = input.ReadUInt32(); + break; + } + case 50: + case 48: { + oALLJLKBIOJ_.AddEntriesFrom(ref input, _repeated_oALLJLKBIOJ_codec); + break; + } + case 80: { + MusicGroupPhase = input.ReadUInt32(); + break; + } + } + } + } + #endif + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Proto/MusicRhythmLevel.cs b/Proto/MusicRhythmLevel.cs new file mode 100644 index 00000000..e959340b --- /dev/null +++ b/Proto/MusicRhythmLevel.cs @@ -0,0 +1,309 @@ +// +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: MusicRhythmLevel.proto +// +#pragma warning disable 1591, 0612, 3021, 8981 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace EggLink.DanhengServer.Proto { + + /// Holder for reflection information generated from MusicRhythmLevel.proto + public static partial class MusicRhythmLevelReflection { + + #region Descriptor + /// File descriptor for MusicRhythmLevel.proto + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static MusicRhythmLevelReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChZNdXNpY1JoeXRobUxldmVsLnByb3RvIlEKEE11c2ljUmh5dGhtTGV2ZWwS", + "FAoMdW5sb2NrX2xldmVsGA0gASgNEhUKDWlzX2Z1bGxfY29tYm8YCCABKAgS", + "EAoIbGV2ZWxfaWQYBSABKA1CHqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Q", + "cm90b2IGcHJvdG8z")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmLevel), global::EggLink.DanhengServer.Proto.MusicRhythmLevel.Parser, new[]{ "UnlockLevel", "IsFullCombo", "LevelId" }, null, null, null, null) + })); + } + #endregion + + } + #region Messages + [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] + public sealed partial class MusicRhythmLevel : pb::IMessage + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + , pb::IBufferMessage + #endif + { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new MusicRhythmLevel()); + private pb::UnknownFieldSet _unknownFields; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + 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.MusicRhythmLevelReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public MusicRhythmLevel() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public MusicRhythmLevel(MusicRhythmLevel other) : this() { + unlockLevel_ = other.unlockLevel_; + isFullCombo_ = other.isFullCombo_; + levelId_ = other.levelId_; + _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public MusicRhythmLevel Clone() { + return new MusicRhythmLevel(this); + } + + /// Field number for the "unlock_level" field. + public const int UnlockLevelFieldNumber = 13; + private uint unlockLevel_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint UnlockLevel { + get { return unlockLevel_; } + set { + unlockLevel_ = value; + } + } + + /// Field number for the "is_full_combo" field. + public const int IsFullComboFieldNumber = 8; + private bool isFullCombo_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool IsFullCombo { + get { return isFullCombo_; } + set { + isFullCombo_ = value; + } + } + + /// Field number for the "level_id" field. + public const int LevelIdFieldNumber = 5; + private uint levelId_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public uint LevelId { + get { return levelId_; } + set { + levelId_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override bool Equals(object other) { + return Equals(other as MusicRhythmLevel); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool Equals(MusicRhythmLevel other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (UnlockLevel != other.UnlockLevel) return false; + if (IsFullCombo != other.IsFullCombo) return false; + if (LevelId != other.LevelId) return false; + return Equals(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override int GetHashCode() { + int hash = 1; + if (UnlockLevel != 0) hash ^= UnlockLevel.GetHashCode(); + if (IsFullCombo != false) hash ^= IsFullCombo.GetHashCode(); + if (LevelId != 0) hash ^= LevelId.GetHashCode(); + if (_unknownFields != null) { + hash ^= _unknownFields.GetHashCode(); + } + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void WriteTo(pb::CodedOutputStream output) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + output.WriteRawMessage(this); + #else + if (LevelId != 0) { + output.WriteRawTag(40); + output.WriteUInt32(LevelId); + } + if (IsFullCombo != false) { + output.WriteRawTag(64); + output.WriteBool(IsFullCombo); + } + if (UnlockLevel != 0) { + output.WriteRawTag(104); + output.WriteUInt32(UnlockLevel); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(output); + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { + if (LevelId != 0) { + output.WriteRawTag(40); + output.WriteUInt32(LevelId); + } + if (IsFullCombo != false) { + output.WriteRawTag(64); + output.WriteBool(IsFullCombo); + } + if (UnlockLevel != 0) { + output.WriteRawTag(104); + output.WriteUInt32(UnlockLevel); + } + if (_unknownFields != null) { + _unknownFields.WriteTo(ref output); + } + } + #endif + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public int CalculateSize() { + int size = 0; + if (UnlockLevel != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(UnlockLevel); + } + if (IsFullCombo != false) { + size += 1 + 1; + } + if (LevelId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(LevelId); + } + if (_unknownFields != null) { + size += _unknownFields.CalculateSize(); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(MusicRhythmLevel other) { + if (other == null) { + return; + } + if (other.UnlockLevel != 0) { + UnlockLevel = other.UnlockLevel; + } + if (other.IsFullCombo != false) { + IsFullCombo = other.IsFullCombo; + } + if (other.LevelId != 0) { + LevelId = other.LevelId; + } + _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void MergeFrom(pb::CodedInputStream input) { + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + input.ReadRawMessage(this); + #else + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); + break; + case 40: { + LevelId = input.ReadUInt32(); + break; + } + case 64: { + IsFullCombo = input.ReadBool(); + break; + } + case 104: { + UnlockLevel = input.ReadUInt32(); + break; + } + } + } + #endif + } + + #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); + break; + case 40: { + LevelId = input.ReadUInt32(); + break; + } + case 64: { + IsFullCombo = input.ReadBool(); + break; + } + case 104: { + UnlockLevel = input.ReadUInt32(); + break; + } + } + } + } + #endif + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Proto/MusicRhythmSaveSongConfigDataCsReq.cs b/Proto/MusicRhythmSaveSongConfigDataCsReq.cs index 48e974d1..c0fd8199 100644 --- a/Proto/MusicRhythmSaveSongConfigDataCsReq.cs +++ b/Proto/MusicRhythmSaveSongConfigDataCsReq.cs @@ -24,12 +24,13 @@ namespace EggLink.DanhengServer.Proto { static MusicRhythmSaveSongConfigDataCsReqReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CihNdXNpY1JoeXRobVNhdmVTb25nQ29uZmlnRGF0YUNzUmVxLnByb3RvGhFN", - "REhIRkpHT0pORy5wcm90byJHCiJNdXNpY1JoeXRobVNhdmVTb25nQ29uZmln", - "RGF0YUNzUmVxEiEKC0NPQUFISENNSUdBGAUgASgLMgwuTURISEZKR09KTkdC", - "HqoCG0VnZ0xpbmsuRGFuaGVuZ1NlcnZlci5Qcm90b2IGcHJvdG8z")); + "CihNdXNpY1JoeXRobVNhdmVTb25nQ29uZmlnRGF0YUNzUmVxLnByb3RvGhZN", + "dXNpY1JoeXRobUdyb3VwLnByb3RvIkwKIk11c2ljUmh5dGhtU2F2ZVNvbmdD", + "b25maWdEYXRhQ3NSZXESJgoLQ09BQUhIQ01JR0EYBSABKAsyES5NdXNpY1Jo", + "eXRobUdyb3VwQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnBy", + "b3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MDHHFJGOJNGReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::EggLink.DanhengServer.Proto.MusicRhythmGroupReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmSaveSongConfigDataCsReq), global::EggLink.DanhengServer.Proto.MusicRhythmSaveSongConfigDataCsReq.Parser, new[]{ "COAAHHCMIGA" }, null, null, null, null) })); @@ -85,10 +86,10 @@ namespace EggLink.DanhengServer.Proto { /// Field number for the "COAAHHCMIGA" field. public const int COAAHHCMIGAFieldNumber = 5; - private global::EggLink.DanhengServer.Proto.MDHHFJGOJNG cOAAHHCMIGA_; + private global::EggLink.DanhengServer.Proto.MusicRhythmGroup cOAAHHCMIGA_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public global::EggLink.DanhengServer.Proto.MDHHFJGOJNG COAAHHCMIGA { + public global::EggLink.DanhengServer.Proto.MusicRhythmGroup COAAHHCMIGA { get { return cOAAHHCMIGA_; } set { cOAAHHCMIGA_ = value; @@ -182,7 +183,7 @@ namespace EggLink.DanhengServer.Proto { } if (other.cOAAHHCMIGA_ != null) { if (cOAAHHCMIGA_ == null) { - COAAHHCMIGA = new global::EggLink.DanhengServer.Proto.MDHHFJGOJNG(); + COAAHHCMIGA = new global::EggLink.DanhengServer.Proto.MusicRhythmGroup(); } COAAHHCMIGA.MergeFrom(other.COAAHHCMIGA); } @@ -203,7 +204,7 @@ namespace EggLink.DanhengServer.Proto { break; case 42: { if (cOAAHHCMIGA_ == null) { - COAAHHCMIGA = new global::EggLink.DanhengServer.Proto.MDHHFJGOJNG(); + COAAHHCMIGA = new global::EggLink.DanhengServer.Proto.MusicRhythmGroup(); } input.ReadMessage(COAAHHCMIGA); break; @@ -225,7 +226,7 @@ namespace EggLink.DanhengServer.Proto { break; case 42: { if (cOAAHHCMIGA_ == null) { - COAAHHCMIGA = new global::EggLink.DanhengServer.Proto.MDHHFJGOJNG(); + COAAHHCMIGA = new global::EggLink.DanhengServer.Proto.MusicRhythmGroup(); } input.ReadMessage(COAAHHCMIGA); break; diff --git a/Proto/MusicRhythmSaveSongConfigDataScRsp.cs b/Proto/MusicRhythmSaveSongConfigDataScRsp.cs index 2c025d4a..1c1d831b 100644 --- a/Proto/MusicRhythmSaveSongConfigDataScRsp.cs +++ b/Proto/MusicRhythmSaveSongConfigDataScRsp.cs @@ -26,12 +26,12 @@ namespace EggLink.DanhengServer.Proto { string.Concat( "CihNdXNpY1JoeXRobVNhdmVTb25nQ29uZmlnRGF0YVNjUnNwLnByb3RvIl8K", "Ik11c2ljUmh5dGhtU2F2ZVNvbmdDb25maWdEYXRhU2NSc3ASEwoLQUxDSE5L", - "RUZNRU4YASABKA0SDwoHcmV0Y29kZRgPIAEoDRITCgtQRUZDQk1PRFBPSRgF", + "RUZNRU4YASABKA0SDwoHcmV0Y29kZRgPIAEoDRITCgtjdXJfc29uZ19pZBgF", "IAEoDUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmSaveSongConfigDataScRsp), global::EggLink.DanhengServer.Proto.MusicRhythmSaveSongConfigDataScRsp.Parser, new[]{ "ALCHNKEFMEN", "Retcode", "PEFCBMODPOI" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmSaveSongConfigDataScRsp), global::EggLink.DanhengServer.Proto.MusicRhythmSaveSongConfigDataScRsp.Parser, new[]{ "ALCHNKEFMEN", "Retcode", "CurSongId" }, null, null, null, null) })); } #endregion @@ -75,7 +75,7 @@ namespace EggLink.DanhengServer.Proto { public MusicRhythmSaveSongConfigDataScRsp(MusicRhythmSaveSongConfigDataScRsp other) : this() { aLCHNKEFMEN_ = other.aLCHNKEFMEN_; retcode_ = other.retcode_; - pEFCBMODPOI_ = other.pEFCBMODPOI_; + curSongId_ = other.curSongId_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -109,15 +109,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "PEFCBMODPOI" field. - public const int PEFCBMODPOIFieldNumber = 5; - private uint pEFCBMODPOI_; + /// Field number for the "cur_song_id" field. + public const int CurSongIdFieldNumber = 5; + private uint curSongId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint PEFCBMODPOI { - get { return pEFCBMODPOI_; } + public uint CurSongId { + get { return curSongId_; } set { - pEFCBMODPOI_ = value; + curSongId_ = value; } } @@ -138,7 +138,7 @@ namespace EggLink.DanhengServer.Proto { } if (ALCHNKEFMEN != other.ALCHNKEFMEN) return false; if (Retcode != other.Retcode) return false; - if (PEFCBMODPOI != other.PEFCBMODPOI) return false; + if (CurSongId != other.CurSongId) return false; return Equals(_unknownFields, other._unknownFields); } @@ -148,7 +148,7 @@ namespace EggLink.DanhengServer.Proto { int hash = 1; if (ALCHNKEFMEN != 0) hash ^= ALCHNKEFMEN.GetHashCode(); if (Retcode != 0) hash ^= Retcode.GetHashCode(); - if (PEFCBMODPOI != 0) hash ^= PEFCBMODPOI.GetHashCode(); + if (CurSongId != 0) hash ^= CurSongId.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -171,9 +171,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(8); output.WriteUInt32(ALCHNKEFMEN); } - if (PEFCBMODPOI != 0) { + if (CurSongId != 0) { output.WriteRawTag(40); - output.WriteUInt32(PEFCBMODPOI); + output.WriteUInt32(CurSongId); } if (Retcode != 0) { output.WriteRawTag(120); @@ -193,9 +193,9 @@ namespace EggLink.DanhengServer.Proto { output.WriteRawTag(8); output.WriteUInt32(ALCHNKEFMEN); } - if (PEFCBMODPOI != 0) { + if (CurSongId != 0) { output.WriteRawTag(40); - output.WriteUInt32(PEFCBMODPOI); + output.WriteUInt32(CurSongId); } if (Retcode != 0) { output.WriteRawTag(120); @@ -217,8 +217,8 @@ namespace EggLink.DanhengServer.Proto { if (Retcode != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Retcode); } - if (PEFCBMODPOI != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(PEFCBMODPOI); + if (CurSongId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CurSongId); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -238,8 +238,8 @@ namespace EggLink.DanhengServer.Proto { if (other.Retcode != 0) { Retcode = other.Retcode; } - if (other.PEFCBMODPOI != 0) { - PEFCBMODPOI = other.PEFCBMODPOI; + if (other.CurSongId != 0) { + CurSongId = other.CurSongId; } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -261,7 +261,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 40: { - PEFCBMODPOI = input.ReadUInt32(); + CurSongId = input.ReadUInt32(); break; } case 120: { @@ -288,7 +288,7 @@ namespace EggLink.DanhengServer.Proto { break; } case 40: { - PEFCBMODPOI = input.ReadUInt32(); + CurSongId = input.ReadUInt32(); break; } case 120: { diff --git a/Proto/MusicRhythmStartLevelCsReq.cs b/Proto/MusicRhythmStartLevelCsReq.cs index 94d681ed..975d2768 100644 --- a/Proto/MusicRhythmStartLevelCsReq.cs +++ b/Proto/MusicRhythmStartLevelCsReq.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static MusicRhythmStartLevelCsReqReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiBNdXNpY1JoeXRobVN0YXJ0TGV2ZWxDc1JlcS5wcm90byIxChpNdXNpY1Jo", - "eXRobVN0YXJ0TGV2ZWxDc1JlcRITCgtER0VKTUNLSUZKQhgDIAEoDUIeqgIb", - "RWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); + "CiBNdXNpY1JoeXRobVN0YXJ0TGV2ZWxDc1JlcS5wcm90byIuChpNdXNpY1Jo", + "eXRobVN0YXJ0TGV2ZWxDc1JlcRIQCghsZXZlbF9pZBgDIAEoDUIeqgIbRWdn", + "TGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmStartLevelCsReq), global::EggLink.DanhengServer.Proto.MusicRhythmStartLevelCsReq.Parser, new[]{ "DGEJMCKIFJB" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmStartLevelCsReq), global::EggLink.DanhengServer.Proto.MusicRhythmStartLevelCsReq.Parser, new[]{ "LevelId" }, 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 MusicRhythmStartLevelCsReq(MusicRhythmStartLevelCsReq other) : this() { - dGEJMCKIFJB_ = other.dGEJMCKIFJB_; + levelId_ = other.levelId_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -82,15 +82,15 @@ namespace EggLink.DanhengServer.Proto { return new MusicRhythmStartLevelCsReq(this); } - /// Field number for the "DGEJMCKIFJB" field. - public const int DGEJMCKIFJBFieldNumber = 3; - private uint dGEJMCKIFJB_; + /// Field number for the "level_id" field. + public const int LevelIdFieldNumber = 3; + private uint levelId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint DGEJMCKIFJB { - get { return dGEJMCKIFJB_; } + public uint LevelId { + get { return levelId_; } set { - dGEJMCKIFJB_ = value; + levelId_ = value; } } @@ -109,7 +109,7 @@ namespace EggLink.DanhengServer.Proto { if (ReferenceEquals(other, this)) { return true; } - if (DGEJMCKIFJB != other.DGEJMCKIFJB) return false; + if (LevelId != other.LevelId) 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 (DGEJMCKIFJB != 0) hash ^= DGEJMCKIFJB.GetHashCode(); + if (LevelId != 0) hash ^= LevelId.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 (DGEJMCKIFJB != 0) { + if (LevelId != 0) { output.WriteRawTag(24); - output.WriteUInt32(DGEJMCKIFJB); + output.WriteUInt32(LevelId); } 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 (DGEJMCKIFJB != 0) { + if (LevelId != 0) { output.WriteRawTag(24); - output.WriteUInt32(DGEJMCKIFJB); + output.WriteUInt32(LevelId); } 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 (DGEJMCKIFJB != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(DGEJMCKIFJB); + if (LevelId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(LevelId); } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); @@ -179,8 +179,8 @@ namespace EggLink.DanhengServer.Proto { if (other == null) { return; } - if (other.DGEJMCKIFJB != 0) { - DGEJMCKIFJB = other.DGEJMCKIFJB; + if (other.LevelId != 0) { + LevelId = other.LevelId; } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -198,7 +198,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 24: { - DGEJMCKIFJB = input.ReadUInt32(); + LevelId = input.ReadUInt32(); break; } } @@ -217,7 +217,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 24: { - DGEJMCKIFJB = input.ReadUInt32(); + LevelId = input.ReadUInt32(); break; } } diff --git a/Proto/MusicRhythmStartLevelScRsp.cs b/Proto/MusicRhythmStartLevelScRsp.cs index 25430e53..4e6c2e2c 100644 --- a/Proto/MusicRhythmStartLevelScRsp.cs +++ b/Proto/MusicRhythmStartLevelScRsp.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static MusicRhythmStartLevelScRspReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiBNdXNpY1JoeXRobVN0YXJ0TGV2ZWxTY1JzcC5wcm90byJXChpNdXNpY1Jo", - "eXRobVN0YXJ0TGV2ZWxTY1JzcBIPCgdyZXRjb2RlGAYgASgNEhMKC0RHRUpN", - "Q0tJRkpCGAMgASgNEhMKC05KT09OUEZLSEdFGAggASgJQh6qAhtFZ2dMaW5r", - "LkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); + "CiBNdXNpY1JoeXRobVN0YXJ0TGV2ZWxTY1JzcC5wcm90byJUChpNdXNpY1Jo", + "eXRobVN0YXJ0TGV2ZWxTY1JzcBIPCgdyZXRjb2RlGAYgASgNEhAKCGxldmVs", + "X2lkGAMgASgNEhMKC05KT09OUEZLSEdFGAggASgJQh6qAhtFZ2dMaW5rLkRh", + "bmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmStartLevelScRsp), global::EggLink.DanhengServer.Proto.MusicRhythmStartLevelScRsp.Parser, new[]{ "Retcode", "DGEJMCKIFJB", "NJOONPFKHGE" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmStartLevelScRsp), global::EggLink.DanhengServer.Proto.MusicRhythmStartLevelScRsp.Parser, new[]{ "Retcode", "LevelId", "NJOONPFKHGE" }, null, null, null, null) })); } #endregion @@ -74,7 +74,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MusicRhythmStartLevelScRsp(MusicRhythmStartLevelScRsp other) : this() { retcode_ = other.retcode_; - dGEJMCKIFJB_ = other.dGEJMCKIFJB_; + levelId_ = other.levelId_; nJOONPFKHGE_ = other.nJOONPFKHGE_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -97,15 +97,15 @@ namespace EggLink.DanhengServer.Proto { } } - /// Field number for the "DGEJMCKIFJB" field. - public const int DGEJMCKIFJBFieldNumber = 3; - private uint dGEJMCKIFJB_; + /// Field number for the "level_id" field. + public const int LevelIdFieldNumber = 3; + private uint levelId_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public uint DGEJMCKIFJB { - get { return dGEJMCKIFJB_; } + public uint LevelId { + get { return levelId_; } set { - dGEJMCKIFJB_ = value; + levelId_ = value; } } @@ -137,7 +137,7 @@ namespace EggLink.DanhengServer.Proto { return true; } if (Retcode != other.Retcode) return false; - if (DGEJMCKIFJB != other.DGEJMCKIFJB) return false; + if (LevelId != other.LevelId) return false; if (NJOONPFKHGE != other.NJOONPFKHGE) return false; return Equals(_unknownFields, other._unknownFields); } @@ -147,7 +147,7 @@ namespace EggLink.DanhengServer.Proto { public override int GetHashCode() { int hash = 1; if (Retcode != 0) hash ^= Retcode.GetHashCode(); - if (DGEJMCKIFJB != 0) hash ^= DGEJMCKIFJB.GetHashCode(); + if (LevelId != 0) hash ^= LevelId.GetHashCode(); if (NJOONPFKHGE.Length != 0) hash ^= NJOONPFKHGE.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -167,9 +167,9 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - if (DGEJMCKIFJB != 0) { + if (LevelId != 0) { output.WriteRawTag(24); - output.WriteUInt32(DGEJMCKIFJB); + output.WriteUInt32(LevelId); } if (Retcode != 0) { output.WriteRawTag(48); @@ -189,9 +189,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 (DGEJMCKIFJB != 0) { + if (LevelId != 0) { output.WriteRawTag(24); - output.WriteUInt32(DGEJMCKIFJB); + output.WriteUInt32(LevelId); } if (Retcode != 0) { output.WriteRawTag(48); @@ -214,8 +214,8 @@ namespace EggLink.DanhengServer.Proto { if (Retcode != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Retcode); } - if (DGEJMCKIFJB != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(DGEJMCKIFJB); + if (LevelId != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(LevelId); } if (NJOONPFKHGE.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(NJOONPFKHGE); @@ -235,8 +235,8 @@ namespace EggLink.DanhengServer.Proto { if (other.Retcode != 0) { Retcode = other.Retcode; } - if (other.DGEJMCKIFJB != 0) { - DGEJMCKIFJB = other.DGEJMCKIFJB; + if (other.LevelId != 0) { + LevelId = other.LevelId; } if (other.NJOONPFKHGE.Length != 0) { NJOONPFKHGE = other.NJOONPFKHGE; @@ -257,7 +257,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); break; case 24: { - DGEJMCKIFJB = input.ReadUInt32(); + LevelId = input.ReadUInt32(); break; } case 48: { @@ -284,7 +284,7 @@ namespace EggLink.DanhengServer.Proto { _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); break; case 24: { - DGEJMCKIFJB = input.ReadUInt32(); + LevelId = input.ReadUInt32(); break; } case 48: { diff --git a/Proto/MusicRhythmUnlockSongNotify.cs b/Proto/MusicRhythmUnlockSongNotify.cs index 027adc1d..f2fa5b5a 100644 --- a/Proto/MusicRhythmUnlockSongNotify.cs +++ b/Proto/MusicRhythmUnlockSongNotify.cs @@ -24,13 +24,13 @@ namespace EggLink.DanhengServer.Proto { static MusicRhythmUnlockSongNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiFNdXNpY1JoeXRobVVubG9ja1NvbmdOb3RpZnkucHJvdG8iMgobTXVzaWNS", - "aHl0aG1VbmxvY2tTb25nTm90aWZ5EhMKC0xJR0ZDR0FFRVBGGAcgAygNQh6q", - "AhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); + "CiFNdXNpY1JoeXRobVVubG9ja1NvbmdOb3RpZnkucHJvdG8iOAobTXVzaWNS", + "aHl0aG1VbmxvY2tTb25nTm90aWZ5EhkKEW11c2ljX3VubG9ja19saXN0GAcg", + "AygNQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmUnlockSongNotify), global::EggLink.DanhengServer.Proto.MusicRhythmUnlockSongNotify.Parser, new[]{ "LIGFCGAEEPF" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmUnlockSongNotify), global::EggLink.DanhengServer.Proto.MusicRhythmUnlockSongNotify.Parser, new[]{ "MusicUnlockList" }, 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 MusicRhythmUnlockSongNotify(MusicRhythmUnlockSongNotify other) : this() { - lIGFCGAEEPF_ = other.lIGFCGAEEPF_.Clone(); + musicUnlockList_ = other.musicUnlockList_.Clone(); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -82,15 +82,15 @@ namespace EggLink.DanhengServer.Proto { return new MusicRhythmUnlockSongNotify(this); } - /// Field number for the "LIGFCGAEEPF" field. - public const int LIGFCGAEEPFFieldNumber = 7; - private static readonly pb::FieldCodec _repeated_lIGFCGAEEPF_codec + /// Field number for the "music_unlock_list" field. + public const int MusicUnlockListFieldNumber = 7; + private static readonly pb::FieldCodec _repeated_musicUnlockList_codec = pb::FieldCodec.ForUInt32(58); - private readonly pbc::RepeatedField lIGFCGAEEPF_ = new pbc::RepeatedField(); + private readonly pbc::RepeatedField musicUnlockList_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField LIGFCGAEEPF { - get { return lIGFCGAEEPF_; } + public pbc::RepeatedField MusicUnlockList { + get { return musicUnlockList_; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -108,7 +108,7 @@ namespace EggLink.DanhengServer.Proto { if (ReferenceEquals(other, this)) { return true; } - if(!lIGFCGAEEPF_.Equals(other.lIGFCGAEEPF_)) return false; + if(!musicUnlockList_.Equals(other.musicUnlockList_)) return false; return Equals(_unknownFields, other._unknownFields); } @@ -116,7 +116,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - hash ^= lIGFCGAEEPF_.GetHashCode(); + hash ^= musicUnlockList_.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -135,7 +135,7 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - lIGFCGAEEPF_.WriteTo(output, _repeated_lIGFCGAEEPF_codec); + musicUnlockList_.WriteTo(output, _repeated_musicUnlockList_codec); if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -146,7 +146,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - lIGFCGAEEPF_.WriteTo(ref output, _repeated_lIGFCGAEEPF_codec); + musicUnlockList_.WriteTo(ref output, _repeated_musicUnlockList_codec); if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -157,7 +157,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - size += lIGFCGAEEPF_.CalculateSize(_repeated_lIGFCGAEEPF_codec); + size += musicUnlockList_.CalculateSize(_repeated_musicUnlockList_codec); if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -170,7 +170,7 @@ namespace EggLink.DanhengServer.Proto { if (other == null) { return; } - lIGFCGAEEPF_.Add(other.lIGFCGAEEPF_); + musicUnlockList_.Add(other.musicUnlockList_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -188,7 +188,7 @@ namespace EggLink.DanhengServer.Proto { break; case 58: case 56: { - lIGFCGAEEPF_.AddEntriesFrom(input, _repeated_lIGFCGAEEPF_codec); + musicUnlockList_.AddEntriesFrom(input, _repeated_musicUnlockList_codec); break; } } @@ -208,7 +208,7 @@ namespace EggLink.DanhengServer.Proto { break; case 58: case 56: { - lIGFCGAEEPF_.AddEntriesFrom(ref input, _repeated_lIGFCGAEEPF_codec); + musicUnlockList_.AddEntriesFrom(ref input, _repeated_musicUnlockList_codec); break; } } diff --git a/Proto/MusicRhythmUnlockSongSfxScNotify.cs b/Proto/MusicRhythmUnlockSongSfxScNotify.cs index b74ec756..0ac0b3ea 100644 --- a/Proto/MusicRhythmUnlockSongSfxScNotify.cs +++ b/Proto/MusicRhythmUnlockSongSfxScNotify.cs @@ -24,14 +24,14 @@ namespace EggLink.DanhengServer.Proto { static MusicRhythmUnlockSongSfxScNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiZNdXNpY1JoeXRobVVubG9ja1NvbmdTZnhTY05vdGlmeS5wcm90byI3CiBN", - "dXNpY1JoeXRobVVubG9ja1NvbmdTZnhTY05vdGlmeRITCgtMSUdGQ0dBRUVQ", - "RhgOIAMoDUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3RvYgZwcm90", - "bzM=")); + "CiZNdXNpY1JoeXRobVVubG9ja1NvbmdTZnhTY05vdGlmeS5wcm90byI9CiBN", + "dXNpY1JoeXRobVVubG9ja1NvbmdTZnhTY05vdGlmeRIZChFtdXNpY191bmxv", + "Y2tfbGlzdBgOIAMoDUIeqgIbRWdnTGluay5EYW5oZW5nU2VydmVyLlByb3Rv", + "YgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmUnlockSongSfxScNotify), global::EggLink.DanhengServer.Proto.MusicRhythmUnlockSongSfxScNotify.Parser, new[]{ "LIGFCGAEEPF" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmUnlockSongSfxScNotify), global::EggLink.DanhengServer.Proto.MusicRhythmUnlockSongSfxScNotify.Parser, new[]{ "MusicUnlockList" }, 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 MusicRhythmUnlockSongSfxScNotify(MusicRhythmUnlockSongSfxScNotify other) : this() { - lIGFCGAEEPF_ = other.lIGFCGAEEPF_.Clone(); + musicUnlockList_ = other.musicUnlockList_.Clone(); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -83,15 +83,15 @@ namespace EggLink.DanhengServer.Proto { return new MusicRhythmUnlockSongSfxScNotify(this); } - /// Field number for the "LIGFCGAEEPF" field. - public const int LIGFCGAEEPFFieldNumber = 14; - private static readonly pb::FieldCodec _repeated_lIGFCGAEEPF_codec + /// Field number for the "music_unlock_list" field. + public const int MusicUnlockListFieldNumber = 14; + private static readonly pb::FieldCodec _repeated_musicUnlockList_codec = pb::FieldCodec.ForUInt32(114); - private readonly pbc::RepeatedField lIGFCGAEEPF_ = new pbc::RepeatedField(); + private readonly pbc::RepeatedField musicUnlockList_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField LIGFCGAEEPF { - get { return lIGFCGAEEPF_; } + public pbc::RepeatedField MusicUnlockList { + get { return musicUnlockList_; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -109,7 +109,7 @@ namespace EggLink.DanhengServer.Proto { if (ReferenceEquals(other, this)) { return true; } - if(!lIGFCGAEEPF_.Equals(other.lIGFCGAEEPF_)) return false; + if(!musicUnlockList_.Equals(other.musicUnlockList_)) 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; - hash ^= lIGFCGAEEPF_.GetHashCode(); + hash ^= musicUnlockList_.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -136,7 +136,7 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - lIGFCGAEEPF_.WriteTo(output, _repeated_lIGFCGAEEPF_codec); + musicUnlockList_.WriteTo(output, _repeated_musicUnlockList_codec); if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -147,7 +147,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - lIGFCGAEEPF_.WriteTo(ref output, _repeated_lIGFCGAEEPF_codec); + musicUnlockList_.WriteTo(ref output, _repeated_musicUnlockList_codec); if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -158,7 +158,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - size += lIGFCGAEEPF_.CalculateSize(_repeated_lIGFCGAEEPF_codec); + size += musicUnlockList_.CalculateSize(_repeated_musicUnlockList_codec); if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -171,7 +171,7 @@ namespace EggLink.DanhengServer.Proto { if (other == null) { return; } - lIGFCGAEEPF_.Add(other.lIGFCGAEEPF_); + musicUnlockList_.Add(other.musicUnlockList_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -189,7 +189,7 @@ namespace EggLink.DanhengServer.Proto { break; case 114: case 112: { - lIGFCGAEEPF_.AddEntriesFrom(input, _repeated_lIGFCGAEEPF_codec); + musicUnlockList_.AddEntriesFrom(input, _repeated_musicUnlockList_codec); break; } } @@ -209,7 +209,7 @@ namespace EggLink.DanhengServer.Proto { break; case 114: case 112: { - lIGFCGAEEPF_.AddEntriesFrom(ref input, _repeated_lIGFCGAEEPF_codec); + musicUnlockList_.AddEntriesFrom(ref input, _repeated_musicUnlockList_codec); break; } } diff --git a/Proto/MusicRhythmUnlockTrackScNotify.cs b/Proto/MusicRhythmUnlockTrackScNotify.cs index 51020d89..3a060407 100644 --- a/Proto/MusicRhythmUnlockTrackScNotify.cs +++ b/Proto/MusicRhythmUnlockTrackScNotify.cs @@ -24,13 +24,14 @@ namespace EggLink.DanhengServer.Proto { static MusicRhythmUnlockTrackScNotifyReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CiRNdXNpY1JoeXRobVVubG9ja1RyYWNrU2NOb3RpZnkucHJvdG8iNQoeTXVz", - "aWNSaHl0aG1VbmxvY2tUcmFja1NjTm90aWZ5EhMKC05ETkNFS0ZJTERDGA4g", - "AygNQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnByb3RvMw==")); + "CiRNdXNpY1JoeXRobVVubG9ja1RyYWNrU2NOb3RpZnkucHJvdG8iOwoeTXVz", + "aWNSaHl0aG1VbmxvY2tUcmFja1NjTm90aWZ5EhkKEXRyYWNrX3VubG9ja19s", + "aXN0GA4gAygNQh6qAhtFZ2dMaW5rLkRhbmhlbmdTZXJ2ZXIuUHJvdG9iBnBy", + "b3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmUnlockTrackScNotify), global::EggLink.DanhengServer.Proto.MusicRhythmUnlockTrackScNotify.Parser, new[]{ "NDNCEKFILDC" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::EggLink.DanhengServer.Proto.MusicRhythmUnlockTrackScNotify), global::EggLink.DanhengServer.Proto.MusicRhythmUnlockTrackScNotify.Parser, new[]{ "TrackUnlockList" }, null, null, null, null) })); } #endregion @@ -72,7 +73,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public MusicRhythmUnlockTrackScNotify(MusicRhythmUnlockTrackScNotify other) : this() { - nDNCEKFILDC_ = other.nDNCEKFILDC_.Clone(); + trackUnlockList_ = other.trackUnlockList_.Clone(); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -82,15 +83,15 @@ namespace EggLink.DanhengServer.Proto { return new MusicRhythmUnlockTrackScNotify(this); } - /// Field number for the "NDNCEKFILDC" field. - public const int NDNCEKFILDCFieldNumber = 14; - private static readonly pb::FieldCodec _repeated_nDNCEKFILDC_codec + /// Field number for the "track_unlock_list" field. + public const int TrackUnlockListFieldNumber = 14; + private static readonly pb::FieldCodec _repeated_trackUnlockList_codec = pb::FieldCodec.ForUInt32(114); - private readonly pbc::RepeatedField nDNCEKFILDC_ = new pbc::RepeatedField(); + private readonly pbc::RepeatedField trackUnlockList_ = new pbc::RepeatedField(); [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public pbc::RepeatedField NDNCEKFILDC { - get { return nDNCEKFILDC_; } + public pbc::RepeatedField TrackUnlockList { + get { return trackUnlockList_; } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -108,7 +109,7 @@ namespace EggLink.DanhengServer.Proto { if (ReferenceEquals(other, this)) { return true; } - if(!nDNCEKFILDC_.Equals(other.nDNCEKFILDC_)) return false; + if(!trackUnlockList_.Equals(other.trackUnlockList_)) return false; return Equals(_unknownFields, other._unknownFields); } @@ -116,7 +117,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override int GetHashCode() { int hash = 1; - hash ^= nDNCEKFILDC_.GetHashCode(); + hash ^= trackUnlockList_.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -135,7 +136,7 @@ namespace EggLink.DanhengServer.Proto { #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE output.WriteRawMessage(this); #else - nDNCEKFILDC_.WriteTo(output, _repeated_nDNCEKFILDC_codec); + trackUnlockList_.WriteTo(output, _repeated_trackUnlockList_codec); if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -146,7 +147,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - nDNCEKFILDC_.WriteTo(ref output, _repeated_nDNCEKFILDC_codec); + trackUnlockList_.WriteTo(ref output, _repeated_trackUnlockList_codec); if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -157,7 +158,7 @@ namespace EggLink.DanhengServer.Proto { [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public int CalculateSize() { int size = 0; - size += nDNCEKFILDC_.CalculateSize(_repeated_nDNCEKFILDC_codec); + size += trackUnlockList_.CalculateSize(_repeated_trackUnlockList_codec); if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -170,7 +171,7 @@ namespace EggLink.DanhengServer.Proto { if (other == null) { return; } - nDNCEKFILDC_.Add(other.nDNCEKFILDC_); + trackUnlockList_.Add(other.trackUnlockList_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -188,7 +189,7 @@ namespace EggLink.DanhengServer.Proto { break; case 114: case 112: { - nDNCEKFILDC_.AddEntriesFrom(input, _repeated_nDNCEKFILDC_codec); + trackUnlockList_.AddEntriesFrom(input, _repeated_trackUnlockList_codec); break; } } @@ -208,7 +209,7 @@ namespace EggLink.DanhengServer.Proto { break; case 114: case 112: { - nDNCEKFILDC_.AddEntriesFrom(ref input, _repeated_nDNCEKFILDC_codec); + trackUnlockList_.AddEntriesFrom(ref input, _repeated_trackUnlockList_codec); break; } } diff --git a/StarRail_Danheng.proto b/StarRail_Danheng.proto index e20bd169..c649273e 100644 --- a/StarRail_Danheng.proto +++ b/StarRail_Danheng.proto @@ -5767,7 +5767,7 @@ message EvolveBuildLevelInfo { message EJKBGEPDPMF { uint32 KHHFCELAFJA = 13; uint32 max_score = 3; - uint32 DGEJMCKIFJB = 11; + uint32 level_id = 11; } message NHCDHNDCJMI { @@ -5776,7 +5776,7 @@ message NHCDHNDCJMI { } message LCINGIMGEEM { - uint32 DGEJMCKIFJB = 11; + uint32 level_id = 11; bool HOAMCDKDELJ = 12; repeated uint32 NEKECKBBFMH = 5; bool PBBEHNBHIIM = 9; @@ -5805,7 +5805,7 @@ message EvolveBuildQueryInfoScRsp { } message EvolveBuildStartLevelCsReq { - uint32 DGEJMCKIFJB = 4; + uint32 level_id = 4; repeated EvolveBuildAvatar avatar_list = 13; NGIKGHKMAHA JJLFIBAAJNJ = 12; } @@ -5817,7 +5817,7 @@ message EvolveBuildStartLevelScRsp { } message EvolveBuildStartStageCsReq { - uint32 DGEJMCKIFJB = 3; + uint32 level_id = 3; } message EvolveBuildStartStageScRsp { @@ -5855,7 +5855,7 @@ message EvolveBuildFinishScNotify { } message EvolveBuildReRandomStageCsReq { - uint32 DGEJMCKIFJB = 13; + uint32 level_id = 13; } message EvolveBuildReRandomStageScRsp { @@ -6480,7 +6480,7 @@ message KEKABJPICIP { } message FightMatch3DataCsReq { - int32 NMGNOHPOJOP = 14; + int32 player_data = 14; } message FightMatch3DataScRsp { @@ -8736,7 +8736,7 @@ message MatchThreeGetDataCsReq { } message FNJFGLPKKIJ { - uint32 DGEJMCKIFJB = 15; + uint32 level_id = 15; uint32 KIFPFCDEAAE = 11; } @@ -8764,13 +8764,13 @@ message MatchThreeLevelEndCsReq { repeated uint32 MHPCLHBGCDC = 11; string NIEPAOBBFJF = 6; uint32 MBFKOHNGMPJ = 1; - uint32 DGEJMCKIFJB = 5; + uint32 level_id = 5; uint32 KIFPFCDEAAE = 2; map ACBMBACFCCN = 15; } message MatchThreeLevelEndScRsp { - uint32 DGEJMCKIFJB = 7; + uint32 level_id = 7; uint32 retcode = 12; uint32 KIFPFCDEAAE = 10; } @@ -10216,7 +10216,7 @@ message MultiplayerFightGameStateScRsp { } message MultiplayerGetFightGateCsReq { - uint32 NMGNOHPOJOP = 8; + uint32 player_data = 8; } message MultiplayerGetFightGateScRsp { @@ -10612,77 +10612,78 @@ enum FMMPPGLCOAL { STATUS_OPEN = 1; } -message HEKPICHLMEN { - uint32 DGEJMCKIFJB = 5; - uint32 AEEMPPOFGBN = 13; +message MusicRhythmLevel { + uint32 unlock_level = 13; + bool is_full_combo = 8; + uint32 level_id = 5; } -message MDHHFJGOJNG { - uint32 JGPGJJCEFGG = 10; +message MusicRhythmGroup { + uint32 music_group_phase = 10; repeated uint32 MPCFOJALNHN = 3; repeated uint32 OALLJLKBIOJ = 6; - uint32 IDLOLPIICMA = 5; + uint32 music_group_id = 5; } message MusicRhythmDataCsReq { - uint32 NMGNOHPOJOP = 6; + uint32 player_data = 6; } message MusicRhythmDataScRsp { - repeated uint32 GBMLNHOCJMO = 15; - uint32 PEFCBMODPOI = 2; - repeated uint32 OPFOILFDBKG = 8; - repeated uint32 FEAHHAMLDFB = 5; - bool FCLINCKMILK = 6; - repeated MDHHFJGOJNG MEHKJJFJAPK = 1; - repeated HEKPICHLMEN MFIFEBCDIMM = 13; - uint32 BMJGCIILHCA = 10; + repeated uint32 unlock_song_list = 15; + uint32 cur_song_id = 2; + repeated uint32 unlock_track_list = 8; + repeated uint32 unlock_phase_list = 5; + bool show_hint = 6; + repeated MusicRhythmGroup music_group = 1; + repeated MusicRhythmLevel music_level = 13; + uint32 cur_level_id = 10; uint32 retcode = 12; } message MusicRhythmStartLevelCsReq { - uint32 DGEJMCKIFJB = 3; + uint32 level_id = 3; } message MusicRhythmStartLevelScRsp { uint32 retcode = 6; - uint32 DGEJMCKIFJB = 3; + uint32 level_id = 3; string NJOONPFKHGE = 8; } message MusicRhythmFinishLevelCsReq { uint32 score_id = 12; - uint32 MAIL_TYPE_STAR = 11; + uint32 finish_level = 11; } message MusicRhythmFinishLevelScRsp { uint32 retcode = 9; - uint32 DGEJMCKIFJB = 4; + uint32 level_id = 4; } message MusicRhythmUnlockTrackScNotify { - repeated uint32 NDNCEKFILDC = 14; + repeated uint32 track_unlock_list = 14; } message MusicRhythmSaveSongConfigDataCsReq { - MDHHFJGOJNG COAAHHCMIGA = 5; + MusicRhythmGroup COAAHHCMIGA = 5; } message MusicRhythmSaveSongConfigDataScRsp { uint32 ALCHNKEFMEN = 1; uint32 retcode = 15; - uint32 PEFCBMODPOI = 5; + uint32 cur_song_id = 5; } message MusicRhythmUnlockSongNotify { - repeated uint32 LIGFCGAEEPF = 7; + repeated uint32 music_unlock_list = 7; } message MusicRhythmMaxDifficultyLevelsUnlockNotify { } message MusicRhythmUnlockSongSfxScNotify { - repeated uint32 LIGFCGAEEPF = 14; + repeated uint32 music_unlock_list = 14; } enum CmdOfferingType {