diff --git a/deobf.proto b/deobf.proto index 0807b24b..19d0f0af 100644 --- a/deobf.proto +++ b/deobf.proto @@ -339,7 +339,7 @@ message LJCNNFHKPAB { message PIPJHGEIFEC { bool is_finish = 1; - uint32 AFJJPHANFHE = 5; + uint32 max_score = 5; uint32 level_id = 7; bool is_open = 12; } @@ -530,7 +530,7 @@ message JLLCKNHMADJ { uint32 OOHBHGFGMNL = 2; repeated uint32 affix_list = 9; uint32 level_id = 11; - uint32 AFJJPHANFHE = 12; + uint32 max_score = 12; } // CmdId: 2061 @@ -2806,9 +2806,9 @@ message DMJANMGEGKP { } // CmdId: 9907 -message FFPBEIJNKNK { +message ActivityUpdateWatcherNotify { uint32 activity_id = 4; - ActivityWatcherInfo DHFBCIMCMJD = 14; + ActivityWatcherInfo watcher_info = 14; } // CmdId: 20682 @@ -4035,8 +4035,8 @@ message LBHFLDHKCGN { } // CmdId: 8454 -message NGNJHNCPCDG { - repeated uint32 MHFEHMOHFGK = 2; +message DungeonWayPointNotify { + repeated uint32 active_way_point_list = 2; bool is_add = 3; } @@ -4347,10 +4347,10 @@ message LGKGAHBLNKE { repeated uint32 ENGFKKEDONF = 11; } -enum BJBGIBKCEEM { - BJBGIBKCEEM_NONE = 0; - BJBGIBKCEEM_START = 1; - BJBGIBKCEEM_READ = 2; +enum ActivityPushTipsState { + ACTIVITY_PUSH_TIPS_STATE_NONE = 0; + ACTIVITY_PUSH_TIPS_STATE_START = 1; + ACTIVITY_PUSH_TIPS_STATE_READ = 2; } // CmdId: 24628 @@ -4516,7 +4516,7 @@ message BBPFKPLCKGJ { // CmdId: 22358 message FMANOHDPOIA { - uint32 AFJJPHANFHE = 4; + uint32 max_score = 4; uint32 id = 6; } @@ -5280,7 +5280,7 @@ message DAMAOPLEOEM { message HDCBLPCDFBD { bool is_finish = 5; - uint32 AFJJPHANFHE = 7; + uint32 max_score = 7; uint32 id = 8; } @@ -6244,7 +6244,7 @@ message LGEBGMACHCM { bool is_finished = 1; repeated PCNHAIFKPNK HAJLFKGKGGP = 2; uint32 stage_id = 4; - uint32 AFJJPHANFHE = 6; + uint32 max_score = 6; } // CmdId: 2701 @@ -6609,7 +6609,7 @@ message ALKLEBHDEGA { message MGCAOKGOBPM { uint32 level_id = 5; - uint32 AFJJPHANFHE = 12; + uint32 max_score = 12; } // CmdId: 23224 @@ -7060,7 +7060,7 @@ message PPJAEPCOFID { message GHCJDLAIDGO { bool is_open = 2; uint32 level_id = 11; - uint32 AFJJPHANFHE = 12; + uint32 max_score = 12; } message AMFPBDFCMBO { @@ -7203,7 +7203,7 @@ message IFEHOMPKBOB { // CmdId: 23746 message IGNLCELCBAG { - repeated uint32 MHFEHMOHFGK = 8; + repeated uint32 active_way_point_list = 8; } // CmdId: 26749 @@ -7322,8 +7322,8 @@ message PENOIDMPAPJ { } message KIEBBGGBOEJ { - uint32 AFJJPHANFHE = 4; - bool CLKEFNEDBEA = 7; + uint32 max_score = 4; + bool is_unlock = 7; uint32 max_combo = 15; } @@ -8324,8 +8324,8 @@ message BAFPHHFADFK { } message MKIDBCFIHGJ { - bool CLKEFNEDBEA = 2; - uint32 AFJJPHANFHE = 10; + bool is_unlock = 2; + uint32 max_score = 10; uint32 max_combo = 13; } @@ -8645,7 +8645,7 @@ message HHBOGCBMLAK { LHOMNFNDHPO MNFDOCOFMNO = 6; bool BBFELADMDOF = 7; uint32 GIHGPFDLDMN = 8; - uint32 AFJJPHANFHE = 9; + uint32 max_score = 9; uint32 FIFLLKOABAL = 10; uint32 CPBAEKPEFEP = 11; uint32 MNGCBDIBFEN = 12; @@ -10681,9 +10681,9 @@ message LHEMHECMENL { EHJGHHDHGFN FNJAPPHMEED = 15; } -message NGGPLOGCGMF { - BJBGIBKCEEM state = 8; - uint32 BFANDGPIOPF = 10; +message ActivityPushTipsData { + ActivityPushTipsState state = 8; + uint32 activity_push_tips_id = 10; } // CmdId: 1981 @@ -10933,7 +10933,7 @@ message LFNEHFKLIOF { message EIPKALGMFDO { bool is_open = 1; uint32 PLHGOLNFKGP = 2; - uint32 AFJJPHANFHE = 10; + uint32 max_score = 10; uint32 level_id = 15; } @@ -11287,8 +11287,8 @@ message GKCBIEHEENJ { } // CmdId: 20264 -message EBMLNILFGGE { - ActivityInfo EEEJHNOICJO = 4; +message ActivityInfoNotify { + ActivityInfo activity_info = 4; } // CmdId: 4347 @@ -13624,7 +13624,7 @@ message EPGKHJCPJPA { message OEHOHMDBGGJ { bool is_finished = 1; bool KNBCMKHALEH = 5; - uint32 AFJJPHANFHE = 7; + uint32 max_score = 7; uint32 level_id = 10; } @@ -14461,7 +14461,7 @@ message OCCOAPEMEPP { uint32 skill_id = 3; uint32 LANOPEMMCAH = 8; uint32 OCCLJAKNFCC = 9; - bool CLKEFNEDBEA = 11; + bool is_unlock = 11; } // CmdId: 24415 @@ -14769,7 +14769,7 @@ message FLHICNPMEAP { // CmdId: 29904 message DAJABIOEBNF { - GOJBHODKDEB DHFBCIMCMJD = 13; + GOJBHODKDEB watcher_info = 13; uint32 PILEDJAIGKC = 14; } @@ -15115,7 +15115,7 @@ message GJMCGJFDGBE { } message GOMAKDHEGFG { - uint32 AFJJPHANFHE = 3; + uint32 max_score = 3; uint32 FMFGNKBJPKC = 15; } @@ -16974,8 +16974,8 @@ message MJJFOFLLMIP { } // CmdId: 28862 -message OILPFJDPOLB { - uint32 AKDNDFAAAIK = 6; +message DungeonSlipRevivePointActivateReq { + uint32 slip_revive_point_id = 6; } // CmdId: 6557 @@ -16998,7 +16998,7 @@ message LGCOJJLOCJK { message NLHNGEKEIMC { uint32 level_id = 1; - uint32 AFJJPHANFHE = 4; + uint32 max_score = 4; bool is_open = 7; } @@ -17795,7 +17795,7 @@ message AODCCIBIIBJ { } message ECBIGKOCCND { - uint32 AFJJPHANFHE = 1; + uint32 max_score = 1; uint32 IKGMNEJFBEA = 8; uint32 level_id = 10; repeated uint64 NGNBMHADLGI = 15; @@ -18157,7 +18157,7 @@ enum ChangeHpReason { } message KKFFLBALFHC { - uint32 AFJJPHANFHE = 8; + uint32 max_score = 8; uint32 level_id = 13; bool is_open = 14; } @@ -18486,7 +18486,7 @@ message MNMHHIJKPMC { } message NJAADLFBDHG { - bool CLKEFNEDBEA = 1; + bool is_unlock = 1; bool is_finished = 3; bool MHOPNKGJAHC = 6; uint32 level_id = 8; @@ -18965,7 +18965,7 @@ message QuestUpdateQuestVarNotify { } message BGKECOINKOK { - bool CLKEFNEDBEA = 8; + bool is_unlock = 8; uint32 ECEDBNIECOJ = 15; oneof BKFAEGMOHLA { AFOMJOCMHLD bundle_info = 2; @@ -19174,7 +19174,7 @@ message OKDOJDFNCMP { message HEACCMFBOHE { bool is_success = 5; uint32 cur_score = 11; - uint32 AFJJPHANFHE = 12; + uint32 max_score = 12; bool IDBFEDAEPGD = 14; bool is_finish = 15; } @@ -19973,7 +19973,7 @@ message PEOFMNGBFOO { // CmdId: 29162 message IKGDJHNDPJH { - repeated NGGPLOGCGMF GHMEPBPLPKD = 2; + repeated ActivityPushTipsData GHMEPBPLPKD = 2; uint32 activity_id = 12; uint32 schedule_id = 13; } @@ -21875,7 +21875,7 @@ message AiSkillCdInfo { // CmdId: 20656 message CGKGAMPKIHL { - repeated EHFDEDADODA activity_schedule_list = 1; + repeated ActivityScheduleInfo activity_schedule_list = 1; int32 retcode = 6; uint32 remain_fly_sea_lamp_num = 12; } @@ -23312,7 +23312,7 @@ message JIAABDCFGPA { repeated uint32 FOIBCGEDGIL = 5; uint32 level_id = 7; bool is_finish = 9; - uint32 AFJJPHANFHE = 11; + uint32 max_score = 11; uint32 JFNFFNAAFBA = 12; repeated uint64 avatar_guid_list = 13; bool is_open = 14; @@ -24380,7 +24380,7 @@ message APCOJJHJOPM { uint32 stage_id = 4; uint32 JFEMOPGIFHC = 10; repeated MPPOFKJJFMA IOLMFKEHCLK = 11; - uint32 AFJJPHANFHE = 15; + uint32 max_score = 15; } // CmdId: 4049 @@ -24621,7 +24621,7 @@ message OGJNCLEBJEI { } message BKJOIEBOHJC { - uint32 AFJJPHANFHE = 1; + uint32 max_score = 1; bool is_open = 4; bool is_finish = 7; uint32 CHEHLPACEFP = 11; @@ -25142,14 +25142,14 @@ message KHGBPMGPOBE { message PEOADAIIEHP { uint32 id = 3; - uint32 AFJJPHANFHE = 7; + uint32 max_score = 7; Vector pos = 12; uint32 JFEMOPGIFHC = 15; } message IJLJPOGOGLN { uint64 LKBINMHIDJP = 1; - uint32 AFJJPHANFHE = 2; + uint32 max_score = 2; string MJKMOECGLNH = 3; uint32 CPBAEKPEFEP = 4; bool MHOPNKGJAHC = 5; @@ -26249,7 +26249,7 @@ message RemotePlayerWidgetNotify { message HEEDNMIGCAF { int32 retcode = 1; uint32 activity_id = 8; - uint32 BFANDGPIOPF = 13; + uint32 activity_push_tips_id = 13; } message BDPNNNNEDAD { @@ -26379,7 +26379,7 @@ message OINDHAKCKMF { message GNNOIGIOEMJ { bool is_open = 4; bool is_finish = 6; - uint32 AFJJPHANFHE = 8; + uint32 max_score = 8; uint32 level_id = 12; } @@ -26745,8 +26745,8 @@ message GetAllMailRsp { } // CmdId: 24493 -message DLDCLNJJBFG { - Vector LELKLKFDFBK = 12; // 1 +message EvtAvatarExitFocusNotify { + Vector finish_forward = 12; // 1 uint32 entity_id = 14; ForwardType forward_type = 15; } @@ -29159,7 +29159,7 @@ message ActivityInfo { uint32 cur_score = 738; map MCOOFBHHJED = 800; uint64 BJIDCNMNBGF = 872; - repeated NGGPLOGCGMF GHMEPBPLPKD = 1223; + repeated ActivityPushTipsData GHMEPBPLPKD = 1223; bool HEGFGGAHMJO = 1251; uint32 CHONKJLPPCN = 1414; uint32 GHMJGOMOGBF = 1499; @@ -29621,7 +29621,7 @@ message OIOIHILBMDN { bool is_open = 1; uint32 level_id = 3; bool is_finished = 6; - uint32 AFJJPHANFHE = 12; + uint32 max_score = 12; } // CmdId: 27946 @@ -29717,8 +29717,8 @@ message MKMIFLOEELB { } message AHBGALHHNOE { - bool CLKEFNEDBEA = 10; - uint32 AFJJPHANFHE = 11; + bool is_unlock = 10; + uint32 max_score = 11; uint32 OINICBJHPOK = 12; } @@ -29749,7 +29749,7 @@ message SetEntityClientDataNotify { // CmdId: 24900 message GNLLBALEHDA { uint32 activity_id = 1; - uint32 BFANDGPIOPF = 4; + uint32 activity_push_tips_id = 4; } // CmdId: 4517 @@ -30124,7 +30124,7 @@ message LEICKLDPDCH { } message EGDCNADJIII { - bool CLKEFNEDBEA = 1; + bool is_unlock = 1; uint32 id = 9; } @@ -31162,9 +31162,9 @@ message FKPMONEMJGJ { } // CmdId: 24625 -message CGPKIMAAFKD { +message DungeonSlipRevivePointActivateRsp { int32 retcode = 4; - uint32 AKDNDFAAAIK = 15; + uint32 slip_revive_point_id = 15; } message MMCFNKLJGFO { @@ -31272,7 +31272,7 @@ message HPMDAHLHKHJ { message NOJMNJCBHPC { bool is_finish = 5; - uint32 AFJJPHANFHE = 6; + uint32 max_score = 6; repeated uint32 ENGFKKEDONF = 7; bool MPFNBLKBGHD = 8; uint32 level_id = 13; diff --git a/proto/EvtAvatarExitFocusNotify.proto b/proto/EvtAvatarExitFocusNotify.proto index 3fd2c9d4..dda89aca 100644 --- a/proto/EvtAvatarExitFocusNotify.proto +++ b/proto/EvtAvatarExitFocusNotify.proto @@ -2,10 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; import "ForwardType.proto"; -// CmdId: 24809 or 28844? or 24493 -// Obf: OIFFIANHCNK ? +// CmdId: 24809 or 28844x or 24493(lock) +// Obf: DLDCLNJJBFG message EvtAvatarExitFocusNotify { Vector finish_forward = 12; - ForwardType forward_type = 14; - uint32 entity_id = 5; + ForwardType forward_type = 15; + uint32 entity_id = 14; } diff --git a/proto/PlayerLevelRewardUpdateNotify.proto b/proto/PlayerLevelRewardUpdateNotify.proto index f3aed79a..cf58ec7f 100644 --- a/proto/PlayerLevelRewardUpdateNotify.proto +++ b/proto/PlayerLevelRewardUpdateNotify.proto @@ -1,23 +1,7 @@ -// 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"; -// CmdId: 3756 -// Obf: PNADDINCDLE +// CmdId: 2830 ? +// Obf: LHBKHEOECHK message PlayerLevelRewardUpdateNotify { - repeated uint32 level_list = 12; + repeated uint32 level_list = 5; }