Update Activity, but still not working

proto/ActivityInfo.proto

@@ -7,33 +7,21 @@ import "MusicGameActivityDetailInfo.proto";
 
 // 4.7.0
 // Obf: ?
-message ActivityInfo {
+message ActivityInfo {	
-	uint32 activity_id = 3;
+	uint32 schedule_id = 2; // OK
-	//repeated uint32 DNMOEAFCDGC = 1736;
+	uint32 activity_id = 11; // OK
-	repeated ActivityWatcherInfo watcher_info_list = 9;
+	uint32 activity_type = 5; // SUS
-	bool is_finished = 14;
+	uint32 begin_time = 12; // OK
-	//repeated uint32 LJLDCLMAMNL = 482;
+	uint32 end_time = 6; // OK
-	//bool PJJKJGALLGD = 16;
+	bool is_finished = 9; // OK
-	uint32 activity_type = 1;
+	repeated ActivityWatcherInfo watcher_info_list = 1; // OK
-	uint32 schedule_id = 5;
+	map<uint32, uint32> activity_coin_map = 578; // sus or 800
-	map<uint32, uint32> activity_coin_map = 1562;
+	repeated uint32 meet_cond_list = 4; // sus 4,13.676,2020
-	repeated uint32 meet_cond_list = 12;
+	uint32 cur_score = 738; // OK
-	//bool DKJDABCNGBP = 13;
+	uint32 first_day_start_time = 1414; // sus	
-	uint32 begin_time = 2;
+	map<uint32, uint32> wish_gift_num_map = 800; // sus
-	//uint32 INGFNLLCDOL = 733;
+	repeated ActivityPushTipsData activity_push_tips_data_list = 1223; // OK
-	//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<uint32, uint32> wish_gift_num_map = 924;
-	//repeated uint32 PHCOMIFAIJD = 4;
-	repeated ActivityPushTipsData activity_push_tips_data_list = 643;
 	oneof detail {
-		MusicGameActivityDetailInfo music_game_info = 1847;
+		MusicGameActivityDetailInfo music_game_info = 780; // ?
 	}
 }

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 <https://www.gnu.org/licenses/>.
-
 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;
+	uint32 activity_push_tips_id = 10;
-	ActivityPushTipsState state = 6;
+	ActivityPushTipsState state = 8;
 }

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 <https://www.gnu.org/licenses/>.
-
 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;

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;
 }

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 <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "ActivityWatcherInfo.proto";
-// CmdId: 20400
+// 4.7.0
-// Obf: AIJCCDDEFAD
+// CmdId: 9907 or 29904(?)
+// Obf: FFPBEIJNKNK
 message ActivityUpdateWatcherNotify {
-	ActivityWatcherInfo watcher_info = 6;
+	ActivityWatcherInfo watcher_info = 14;
-	uint32 activity_id = 10;
+	uint32 activity_id = 4;
 }

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;

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 <https://www.gnu.org/licenses/>.
-
 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;
+	//repeated UgcMusicBriefInfo LDBACGEPLLE = 9;
-	map<uint32, MusicGameRecord> music_game_record_map = 4;
+	map<uint32, MusicGameRecord> music_game_record_map = 15;
-	repeated UgcMusicBriefInfo OHEAGJIPKGF = 14;
+	//repeated UgcMusicBriefInfo OHEAGJIPKGF = 14;
 }

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 <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: GEKMKNGAIHD
+// Obf: KIEBBGGBOEJ
+// 4.7.0
 message MusicGameRecord {
-	uint32 max_combo = 5;
+	uint32 max_combo = 15;
-	bool is_unlock = 8;
+	bool is_unlock = 7;
-	uint32 max_score = 1;
+	uint32 max_score = 4;
 }