From 24b46c2e9b9a1468ba0cabd8f3d2d0ce2ff5fda9 Mon Sep 17 00:00:00 2001 From: Yuuki Date: Wed, 31 May 2023 17:47:07 +0800 Subject: [PATCH] Update: ab1146d > d918b9a thx tamilpp25,azzu0,akioukun --- proto/AbilityIdentifier.proto | 4 ++-- proto/AttackResult.proto | 14 ++++++------ proto/ChapterStateNotify.proto | 10 +++++---- proto/DoGachaRsp.proto | 4 ++-- proto/ForgeQueueData.proto | 10 ++++----- proto/GachaInfo.proto | 4 ++-- proto/GachaWishRsp.proto | 2 +- proto/LockedPersonallineData.proto | 9 ++++---- proto/MusicGameActivityDetailInfo.proto | 29 +++++++++++++++++++------ proto/MusicGameRecord.proto | 25 ++++++++++++++++----- proto/MusicGameSettleReq.proto | 21 +++++++++--------- proto/MusicGameSettleRsp.proto | 1 + proto/MusicGameStartReq.proto | 1 + proto/MusicGameStartRsp.proto | 1 + proto/PlayerLoginRsp.proto | 4 ++-- 15 files changed, 88 insertions(+), 51 deletions(-) diff --git a/proto/AbilityIdentifier.proto b/proto/AbilityIdentifier.proto index 0127cfec..1377991f 100644 --- a/proto/AbilityIdentifier.proto +++ b/proto/AbilityIdentifier.proto @@ -24,7 +24,7 @@ message AbilityIdentifier { uint32 instanced_modifier_id = 11; int32 local_id = 2; bool is_serverbuff_modifier = 14; - uint32 PLEOONAACJI = 1; - uint32 DJPMGPMOPIN = 15; + uint32 modifier_owner_id = 1; + uint32 ability_caster_id = 15; uint32 instanced_ability_id = 9; } diff --git a/proto/AttackResult.proto b/proto/AttackResult.proto index 0151a8d4..ef9d0da9 100644 --- a/proto/AttackResult.proto +++ b/proto/AttackResult.proto @@ -27,7 +27,7 @@ import "AbilityIdentifier.proto"; message AttackResult { uint32 GNHFHCDDDBA = 1198; uint32 BHAPFDKHNPD = 82; - uint32 PJJEEPKBHIM = 1624; + uint32 hashed_anim_event_id = 1624; uint32 KDBNEJKOKDB = 6; float HKDJFJDCKBI = 2018; uint32 LADOHMHIICA = 1640; @@ -35,10 +35,10 @@ message AttackResult { AttackHitEffectResult hit_eff_result = 15; uint32 HAGEIJIIBAE = 1178; float GGPOMBNHHCA = 804; - bool KBKKCNLMPHE = 7; + bool is_crit = 7; uint32 element_type = 8; - uint32 CNCOJEJPNAH = 1597; - uint32 KDBJJLGHGBD = 1235; + bool attack_timestamp_ms = 1597; + uint32 amplify_reaction_type = 1235; bool IFHLFNMODNC = 78; uint32 BIIDCDNCFPH = 1; uint32 AFPDNEPONHN = 158; @@ -48,11 +48,11 @@ message AttackResult { float damage = 11; HitCollision hit_collision = 2; bool PFEKJJINPCE = 1765; - uint32 BNONIMILAAH = 1772; + uint32 addhurt_reaction_type = 1772; Vector resolved_dir = 3; uint32 OJPOIAJBPCN = 316; - float EAGHFGPNGHD = 979; + float element_durability_attenuation = 979; AbilityIdentifier ability_identifier = 12; bool GMKBKKOFIPN = 309; - float CBBCOOIFNCP = 1660; + float damage_shield = 1660; } diff --git a/proto/ChapterStateNotify.proto b/proto/ChapterStateNotify.proto index 2da3fb8b..a359ff0e 100644 --- a/proto/ChapterStateNotify.proto +++ b/proto/ChapterStateNotify.proto @@ -23,18 +23,20 @@ import "ChapterState.proto"; // CmdId: 416 // Obf: CLNHLPJKIHO message ChapterStateNotify { - message NNBEJPGCIMD { + // Obf: NNBEJPGCIMD + message NeedPlayerLevel { bool is_limit = 8; uint32 configNeedPlayerLevel = 1; } - message HDPCHNPCKLP { + // Obf: HDPCHNPCKLP + message NeedBeginTime { uint32 configNeedBeginTime = 4; bool is_limit = 7; } uint32 chapter_id = 9; - HDPCHNPCKLP need_begin_time = 13; - NNBEJPGCIMD need_player_level = 1; + NeedBeginTime need_begin_time = 13; + NeedPlayerLevel need_player_level = 1; ChapterState chapter_state = 14; } diff --git a/proto/DoGachaRsp.proto b/proto/DoGachaRsp.proto index 50557575..d26d9caa 100644 --- a/proto/DoGachaRsp.proto +++ b/proto/DoGachaRsp.proto @@ -36,10 +36,10 @@ message DoGachaRsp { uint32 leftGachaTimes = 6; uint32 gachaTimes = 10; uint32 tenCostItemNum = 1; - uint32 tenCostItemId = 2; + uint32 wishItemId = 2; uint32 costItemNum = 5; bool KIHLEFLGKAD = 888; - uint32 wishItemId = 7; + uint32 tenCostItemId = 7; uint32 costItemId = 9; bool PLBFOACGPII = 125; } diff --git a/proto/ForgeQueueData.proto b/proto/ForgeQueueData.proto index 8926a077..3b04c40b 100644 --- a/proto/ForgeQueueData.proto +++ b/proto/ForgeQueueData.proto @@ -22,10 +22,10 @@ option java_package = "emu.grasscutter.net.proto"; // Obf: PDINDMONLDB message ForgeQueueData { uint32 avatar_id = 14; - uint32 unfinish_count = 15; - uint32 next_finish_timestamp = 13; - uint32 finish_count = 4; + uint32 finish_count = 15; + uint32 total_finish_timestamp = 13; + uint32 queue_id = 4; uint32 forge_id = 1; - uint32 total_finish_timestamp = 8; - uint32 queue_id = 9; + uint32 next_finish_timestamp = 8; + uint32 unfinish_count = 9; } diff --git a/proto/GachaInfo.proto b/proto/GachaInfo.proto index 18355fdc..b51ad598 100644 --- a/proto/GachaInfo.proto +++ b/proto/GachaInfo.proto @@ -31,7 +31,7 @@ message GachaInfo { repeated uint32 displayUp4ItemList = 21; string gachaProbUrl = 1; uint32 curScheduleDailyGachaTimes = 1818; - uint32 tenCostItemId = 1593; + uint32 wishItemId = 1593; string gachaRecordUrlOversea = 1379; uint32 schedule_id = 10; uint32 wishProgress = 1219; @@ -40,7 +40,7 @@ message GachaInfo { uint32 gachaSortId = 15; repeated GachaUpInfo gacha_up_info_list = 1530; uint32 end_time = 9; - uint32 wishItemId = 8; + uint32 tenCostItemId = 8; uint32 costItemId = 2; uint32 gachaType = 6; uint32 begin_time = 12; diff --git a/proto/GachaWishRsp.proto b/proto/GachaWishRsp.proto index 9d609899..5536bae6 100644 --- a/proto/GachaWishRsp.proto +++ b/proto/GachaWishRsp.proto @@ -24,7 +24,7 @@ option java_package = "emu.grasscutter.net.proto"; message GachaWishRsp { int32 retcode = 9; uint32 gachaType = 10; - uint32 tenCostItemId = 1; + uint32 wishItemId = 1; uint32 wishMaxProgress = 13; uint32 wishProgress = 2; uint32 gachaScheduleId = 4; diff --git a/proto/LockedPersonallineData.proto b/proto/LockedPersonallineData.proto index 12fe60e5..836c7d50 100644 --- a/proto/LockedPersonallineData.proto +++ b/proto/LockedPersonallineData.proto @@ -21,9 +21,10 @@ option java_package = "emu.grasscutter.net.proto"; // Obf: LPPGEMGIIIC message LockedPersonallineData { - enum JEMKDFPLHKI { - JEMKDFPLHKI_Level = 0; - JEMKDFPLHKI_Quest = 1; + // Obf: JEMKDFPLHKI + enum LockReason { + LEVEL = 0; + QUEST = 1; } message MKKLIJOGAKA { @@ -31,7 +32,7 @@ message LockedPersonallineData { uint32 chapter_id = 3; } - JEMKDFPLHKI lock_reason = 13; + LockReason lock_reason = 13; uint32 personal_line_id = 14; oneof param { uint32 chapter_id = 6; diff --git a/proto/MusicGameActivityDetailInfo.proto b/proto/MusicGameActivityDetailInfo.proto index f9561eb8..d9d0c687 100644 --- a/proto/MusicGameActivityDetailInfo.proto +++ b/proto/MusicGameActivityDetailInfo.proto @@ -1,14 +1,29 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "MusicGameRecord.proto"; + import "UgcMusicBriefInfo.proto"; - -// Name: GNBPOJNPKCA +import "MusicGameRecord.proto"; +// Obf: BJIFBHFFOLH message MusicGameActivityDetailInfo { - repeated UgcMusicBriefInfo AKDNFEAGLCO = 2; - map music_game_record_map = 14; - repeated UgcMusicBriefInfo JIDGICBBLBG = 1; + repeated UgcMusicBriefInfo NLNCBALMLML = 5; + repeated UgcMusicBriefInfo IKPPPFNHMEG = 9; + map music_game_record_map = 2; } - diff --git a/proto/MusicGameRecord.proto b/proto/MusicGameRecord.proto index 83bafaec..d63d0d70 100644 --- a/proto/MusicGameRecord.proto +++ b/proto/MusicGameRecord.proto @@ -1,12 +1,27 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Name: OHBLLAGJHLI +// Obf: PCJOIEMEFPK message MusicGameRecord { - bool is_unlock = 9; - uint32 max_score = 6; - uint32 max_combo = 5; + uint32 max_score = 9; + bool is_unlock = 8; + uint32 max_combo = 7; } - diff --git a/proto/MusicGameSettleReq.proto b/proto/MusicGameSettleReq.proto index 9de635ce..0b5e983d 100644 --- a/proto/MusicGameSettleReq.proto +++ b/proto/MusicGameSettleReq.proto @@ -20,23 +20,24 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8397 +// Obf: PLCOHKGFGLK message MusicGameSettleReq { - uint32 MKAJACKJCDE = 3; - bool EOGBJKAHKNA = 1878; - repeated uint32 PBPNJBNGAOA = 1; + uint32 JHFIMHMILJG = 3; + bool ONEIFPCDHFM = 1878; + repeated uint32 FEHHLANOBJP = 1; uint32 correct_hit = 8; - uint32 MDFJBIKMEEB = 10; - uint32 CGECLHEBIOM = 1831; + uint32 OBBNAPAKNCM = 10; + uint32 OOIOKGHACML = 1831; uint32 max_combo = 12; - uint32 CNMBAENHICA = 626; + uint32 CCIAKNJMMBI = 626; uint32 music_basic_id = 15; uint32 score = 11; - uint32 CMONEEOMEAI = 2026; + uint32 GDFLBOFAANF = 2026; bool is_save_score = 7; - uint32 KILJMNLCPFO = 6; + uint32 POEMOFFOAEN = 6; float speed = 963; - bool DDBODOCLEFG = 961; + bool LFLFFIKPDAA = 961; uint32 combo = 2; - repeated uint32 DKACHMHAAOK = 814; + repeated uint32 PECJLBDKHCO = 814; uint64 ugc_guid = 13; } diff --git a/proto/MusicGameSettleRsp.proto b/proto/MusicGameSettleRsp.proto index c6891626..90aa9e63 100644 --- a/proto/MusicGameSettleRsp.proto +++ b/proto/MusicGameSettleRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8828 +// Obf: LNJBNJPOIOP message MusicGameSettleRsp { int32 retcode = 7; bool is_new_record = 14; diff --git a/proto/MusicGameStartReq.proto b/proto/MusicGameStartReq.proto index 3b732335..29336ca6 100644 --- a/proto/MusicGameStartReq.proto +++ b/proto/MusicGameStartReq.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8583 +// Obf: APIHLPKFBGN message MusicGameStartReq { uint32 music_basic_id = 9; bool is_save_score = 11; diff --git a/proto/MusicGameStartRsp.proto b/proto/MusicGameStartRsp.proto index 64960e5d..e152ecd4 100644 --- a/proto/MusicGameStartRsp.proto +++ b/proto/MusicGameStartRsp.proto @@ -20,6 +20,7 @@ option java_package = "emu.grasscutter.net.proto"; // CmdId: 8290 +// Obf: DEEDIBPLJLB message MusicGameStartRsp { int32 retcode = 1; uint32 music_basic_id = 13; diff --git a/proto/PlayerLoginRsp.proto b/proto/PlayerLoginRsp.proto index 9f400867..33b37c16 100644 --- a/proto/PlayerLoginRsp.proto +++ b/proto/PlayerLoginRsp.proto @@ -31,7 +31,7 @@ message PlayerLoginRsp { int32 ability_hash_code = 14; string client_version_suffix = 1903; bool NENMBLFJAMC = 7; - bytes playerData = 136; + bytes sc_info = 136; string client_md5 = 715; string game_biz = 10; repeated FeatureBlockInfo feature_block_info_list = 114; @@ -57,7 +57,7 @@ message PlayerLoginRsp { double total_tick_time = 903; string country_code = 1280; uint32 client_data_version = 4; - bytes scInfo = 3; + bytes player_data = 3; bool GPMHJGJLAFH = 13; uint32 client_silence_data_version = 6; uint32 player_data_version = 2;