From b760ebc859536e8561df132cac834226514c133a Mon Sep 17 00:00:00 2001 From: Yuuki <6851027-yukiz@users.noreply.gitlab.com> Date: Tue, 9 Jul 2024 06:10:10 +0800 Subject: [PATCH] Update Activity, but still not working --- proto/ActivityInfo.proto | 42 +++++++++---------------- proto/ActivityPushTipsData.proto | 23 +++----------- proto/ActivityPushTipsState.proto | 19 ++--------- proto/ActivityScheduleInfo.proto | 2 +- proto/ActivityUpdateWatcherNotify.proto | 25 +++------------ proto/GetActivityInfoRsp.proto | 1 + proto/MusicGameActivityDetailInfo.proto | 27 ++++------------ proto/MusicGameRecord.proto | 25 +++------------ 8 files changed, 39 insertions(+), 125 deletions(-) diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto index 1c30c701..a147ecff 100644 --- a/proto/ActivityInfo.proto +++ b/proto/ActivityInfo.proto @@ -7,33 +7,21 @@ import "MusicGameActivityDetailInfo.proto"; // 4.7.0 // Obf: ? -message ActivityInfo { - uint32 activity_id = 3; - //repeated uint32 DNMOEAFCDGC = 1736; - repeated ActivityWatcherInfo watcher_info_list = 9; - bool is_finished = 14; - //repeated uint32 LJLDCLMAMNL = 482; - //bool PJJKJGALLGD = 16; - uint32 activity_type = 1; - uint32 schedule_id = 5; - map activity_coin_map = 1562; - repeated uint32 meet_cond_list = 12; - //bool DKJDABCNGBP = 13; - uint32 begin_time = 2; - //uint32 INGFNLLCDOL = 733; - //bool ENNDKMJIMHN = 15; - uint32 cur_score = 1555; - //bool BKJNDLLNAML = 1818; - uint32 first_day_start_time = 978; - //bool ABMOPKOIMPA = 525; - //uint32 FGFGECAAKJM = 1703; - //bool GFEMIEBKKKL = 1117; - //uint32 CEFIPNKPEKA = 621; - uint32 end_time = 11; - map wish_gift_num_map = 924; - //repeated uint32 PHCOMIFAIJD = 4; - repeated ActivityPushTipsData activity_push_tips_data_list = 643; +message ActivityInfo { + uint32 schedule_id = 2; // OK + uint32 activity_id = 11; // OK + uint32 activity_type = 5; // SUS + uint32 begin_time = 12; // OK + uint32 end_time = 6; // OK + bool is_finished = 9; // OK + repeated ActivityWatcherInfo watcher_info_list = 1; // OK + map activity_coin_map = 578; // sus or 800 + repeated uint32 meet_cond_list = 4; // sus 4,13.676,2020 + uint32 cur_score = 738; // OK + uint32 first_day_start_time = 1414; // sus + map wish_gift_num_map = 800; // sus + repeated ActivityPushTipsData activity_push_tips_data_list = 1223; // OK oneof detail { - MusicGameActivityDetailInfo music_game_info = 1847; + MusicGameActivityDetailInfo music_game_info = 780; // ? } } diff --git a/proto/ActivityPushTipsData.proto b/proto/ActivityPushTipsData.proto index a4998a03..4b9391a0 100644 --- a/proto/ActivityPushTipsData.proto +++ b/proto/ActivityPushTipsData.proto @@ -1,24 +1,9 @@ -// 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 "ActivityPushTipsState.proto"; -// Obf: IBNKKJGBKML +// Obf: NGGPLOGCGMF +// 4.7.0 message ActivityPushTipsData { - uint32 activity_push_tips_id = 13; - ActivityPushTipsState state = 6; + uint32 activity_push_tips_id = 10; + ActivityPushTipsState state = 8; } diff --git a/proto/ActivityPushTipsState.proto b/proto/ActivityPushTipsState.proto index a89480bb..1365186a 100644 --- a/proto/ActivityPushTipsState.proto +++ b/proto/ActivityPushTipsState.proto @@ -1,22 +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"; -// Obf: DKHCNPIKCHO +// Obf: BJBGIBKCEEM +// 4.7.0 enum ActivityPushTipsState { ACTIVITY_PUSH_TIPS_STATE_NONE = 0; ACTIVITY_PUSH_TIPS_STATE_START = 1; diff --git a/proto/ActivityScheduleInfo.proto b/proto/ActivityScheduleInfo.proto index 5d33f795..ba6670c0 100644 --- a/proto/ActivityScheduleInfo.proto +++ b/proto/ActivityScheduleInfo.proto @@ -7,5 +7,5 @@ message ActivityScheduleInfo { uint32 begin_time = 13; uint32 end_time = 6; uint32 schedule_id = 5; - uint32 activity_id = 1; + uint32 activity_id = 14; } diff --git a/proto/ActivityUpdateWatcherNotify.proto b/proto/ActivityUpdateWatcherNotify.proto index 6ecde1e0..1a66220d 100644 --- a/proto/ActivityUpdateWatcherNotify.proto +++ b/proto/ActivityUpdateWatcherNotify.proto @@ -1,25 +1,10 @@ -// 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 "ActivityWatcherInfo.proto"; -// CmdId: 20400 -// Obf: AIJCCDDEFAD +// 4.7.0 +// CmdId: 9907 or 29904(?) +// Obf: FFPBEIJNKNK message ActivityUpdateWatcherNotify { - ActivityWatcherInfo watcher_info = 6; - uint32 activity_id = 10; + ActivityWatcherInfo watcher_info = 14; + uint32 activity_id = 4; } diff --git a/proto/GetActivityInfoRsp.proto b/proto/GetActivityInfoRsp.proto index c35c8c58..fe4ab7ce 100644 --- a/proto/GetActivityInfoRsp.proto +++ b/proto/GetActivityInfoRsp.proto @@ -4,6 +4,7 @@ import "ActivityInfo.proto"; import "Uint32Pair.proto"; // 4.7.0 +// cmdid: 27972 message GetActivityInfoRsp { int32 retcode = 2; repeated ActivityInfo activity_info_list = 7; diff --git a/proto/MusicGameActivityDetailInfo.proto b/proto/MusicGameActivityDetailInfo.proto index f38384a1..8b505105 100644 --- a/proto/MusicGameActivityDetailInfo.proto +++ b/proto/MusicGameActivityDetailInfo.proto @@ -1,26 +1,11 @@ -// 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 "UgcMusicBriefInfo.proto"; +//import "UgcMusicBriefInfo.proto"; import "MusicGameRecord.proto"; -// Obf: OEHHDNDMFHH +// Obf: ECKKFMLEKKM +// 4.7.0 message MusicGameActivityDetailInfo { - repeated UgcMusicBriefInfo LDBACGEPLLE = 9; - map music_game_record_map = 4; - repeated UgcMusicBriefInfo OHEAGJIPKGF = 14; + //repeated UgcMusicBriefInfo LDBACGEPLLE = 9; + map music_game_record_map = 15; + //repeated UgcMusicBriefInfo OHEAGJIPKGF = 14; } diff --git a/proto/MusicGameRecord.proto b/proto/MusicGameRecord.proto index 6717acec..c7d74285 100644 --- a/proto/MusicGameRecord.proto +++ b/proto/MusicGameRecord.proto @@ -1,24 +1,9 @@ -// 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"; -// Obf: GEKMKNGAIHD +// Obf: KIEBBGGBOEJ +// 4.7.0 message MusicGameRecord { - uint32 max_combo = 5; - bool is_unlock = 8; - uint32 max_score = 1; + uint32 max_combo = 15; + bool is_unlock = 7; + uint32 max_score = 4; }