From 1a50d29a9ed2ba9b7473730551b8f6535bcfe57d Mon Sep 17 00:00:00 2001 From: Yuuki <6851027-yukiz@users.noreply.gitlab.com> Date: Wed, 3 Jul 2024 21:09:24 +0800 Subject: [PATCH] Announce,AntiAddict,Mail (idk), Shop (idk) --- proto/AnnounceData.proto | 18 ++++++++++-------- proto/AntiAddictNotify.proto | 27 ++++++--------------------- proto/ChangeMailStarNotify.proto | 10 +++++----- proto/GetAllMailNotify.proto | 8 ++++---- proto/GetAllMailReq.proto | 23 ++++------------------- proto/GetAllMailResultNotify.proto | 16 ++++++++-------- proto/GetAllMailRsp.proto | 28 ++++++---------------------- proto/GetMailItemRsp.proto | 12 ++++++------ proto/GetShopmallDataReq.proto | 6 +++--- proto/GetShopmallDataRsp.proto | 8 ++++---- proto/MailChangeNotify.proto | 6 ++++-- proto/ServerAnnounceNotify.proto | 6 +++++- 12 files changed, 65 insertions(+), 103 deletions(-) diff --git a/proto/AnnounceData.proto b/proto/AnnounceData.proto index a93f51c5..fb104d3e 100644 --- a/proto/AnnounceData.proto +++ b/proto/AnnounceData.proto @@ -1,14 +1,16 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.7.0 +// KNODJMAAMPD message AnnounceData { - string center_system_text = 5; - string count_down_text = 3; + string center_system_text = 14; // we need this (2x13 wrong, 14x13 ok) + string count_down_text = 2; string dungeon_confirm_text = 15; - uint32 end_time = 12; - uint32 count_down_frequency = 9; - uint32 config_id = 13; - uint32 begin_time = 2; - bool is_center_system_last_5_every_minutes = 6; - uint32 center_system_frequency = 1; + uint32 end_time = 3; + uint32 count_down_frequency = 8; // ? + uint32 config_id = 7; + uint32 begin_time = 12; + bool is_center_system_last_5_every_minutes = 5; + uint32 center_system_frequency = 13; // ? } diff --git a/proto/AntiAddictNotify.proto b/proto/AntiAddictNotify.proto index fb8b8f91..027088b8 100644 --- a/proto/AntiAddictNotify.proto +++ b/proto/AntiAddictNotify.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"; -// CmdId: 23699 -// Obf: EOHKJFLKHHF +// 4.7.0 +// CmdId: 243 +// Obf: GFKFHIJALJD message AntiAddictNotify { - string level = 7; - int32 msg_type = 6; - string msg = 12; + string level = 3; + int32 msg_type = 11; + string msg = 1; } diff --git a/proto/ChangeMailStarNotify.proto b/proto/ChangeMailStarNotify.proto index d55f0cc7..a796b7c8 100644 --- a/proto/ChangeMailStarNotify.proto +++ b/proto/ChangeMailStarNotify.proto @@ -2,10 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 23996 -// Version: 4.6.0 -// Obfs: BOJJIDKEMOJ +// CmdId: 22223 +// Version: 4.7.0 +// Obfs: ? message ChangeMailStarNotify { - bool is_star = 1; - repeated uint32 mail_id_list = 5; + bool is_star = 11; + repeated uint32 mail_id_list = 4; } \ No newline at end of file diff --git a/proto/GetAllMailNotify.proto b/proto/GetAllMailNotify.proto index efd4abc8..8c47fddd 100644 --- a/proto/GetAllMailNotify.proto +++ b/proto/GetAllMailNotify.proto @@ -2,9 +2,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 20077 -// Version: 4.6.0 -// Obfs: PANJGIHEJFO +// CmdId: 8385 +// Version: 4.7.0 +// Obfs: ? message GetAllMailNotify { - bool is_collected = 4; + bool is_collected = 1; } diff --git a/proto/GetAllMailReq.proto b/proto/GetAllMailReq.proto index 4947c644..04037246 100644 --- a/proto/GetAllMailReq.proto +++ b/proto/GetAllMailReq.proto @@ -1,23 +1,8 @@ -// 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: 29228 -// Obf: OCHDJHKDENA +// 4.7.0 +// CmdId: 27885 +// Obf: ? message GetAllMailReq { - bool is_collected = 2; + bool is_collected = 4; } diff --git a/proto/GetAllMailResultNotify.proto b/proto/GetAllMailResultNotify.proto index af845cdc..545312fd 100644 --- a/proto/GetAllMailResultNotify.proto +++ b/proto/GetAllMailResultNotify.proto @@ -4,14 +4,14 @@ option java_package = "emu.grasscutter.net.proto"; import "MailData.proto"; -// CmdId: 29484 -// Version: 4.6.0 -// Obfs: MPLFKHHMJKP +// CmdId: 20380 +// Version: 4.7.0 +// Obfs: ? message GetAllMailResultNotify { - int32 retcode = 1; - repeated MailData mail_list = 3; + int32 retcode = 12; + repeated MailData mail_list = 2; string transaction = 7; - uint32 packet_num = 9; - bool is_collected = 12; - uint32 packet_be_sent_num = 15; + uint32 packet_num = 6; + bool is_collected = 3; + uint32 packet_be_sent_num = 14; } diff --git a/proto/GetAllMailRsp.proto b/proto/GetAllMailRsp.proto index 4b01595e..02e7ba85 100644 --- a/proto/GetAllMailRsp.proto +++ b/proto/GetAllMailRsp.proto @@ -1,27 +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 "MailData.proto"; -// CmdId: 9526 -// Obf: FMMMCILNFIA +// CmdId: 565 +// Obf: ? message GetAllMailRsp { - int32 retcode = 6; - bool is_collected = 12; - repeated MailData mail_list = 1; - bool is_truncated = 11; + int32 retcode = 7; + bool is_collected = 15; + repeated MailData mail_list = 8; + bool is_truncated = 4; } diff --git a/proto/GetMailItemRsp.proto b/proto/GetMailItemRsp.proto index c3252ec5..cb5ffdc1 100644 --- a/proto/GetMailItemRsp.proto +++ b/proto/GetMailItemRsp.proto @@ -4,11 +4,11 @@ option java_package = "emu.grasscutter.net.proto"; import "EquipParam.proto"; -// CmdId: 6607 -// Version: 4.6.0 -// Obfs: IMOHHNPKKDF +// CmdId: 940 +// Version: 4.7.0 +// Obfs: ? message GetMailItemRsp { - int32 retcode = 3; - repeated uint32 mail_id_list = 6; - repeated EquipParam item_list = 14; + int32 retcode = 6; + repeated uint32 mail_id_list = 4; + repeated EquipParam item_list = 15; } diff --git a/proto/GetShopmallDataReq.proto b/proto/GetShopmallDataReq.proto index 2454af08..23a80e18 100644 --- a/proto/GetShopmallDataReq.proto +++ b/proto/GetShopmallDataReq.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 9573 -// Version: 4.6.0 -// Obfs: HPDHEEIPNLP +// CmdId: 20724 ? +// Version: 4.7.0 +// Obfs: KFGIJGBNIGG (in menu, but not work???) message GetShopmallDataReq { } \ No newline at end of file diff --git a/proto/GetShopmallDataRsp.proto b/proto/GetShopmallDataRsp.proto index dea8b9ff..ce6af01b 100644 --- a/proto/GetShopmallDataRsp.proto +++ b/proto/GetShopmallDataRsp.proto @@ -2,10 +2,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 6481 -// Version: 4.6.0 -// Obfs: PCJNNNMBMFG +// CmdId: 8699 ? +// Version: 4.7.0 +// Obfs: NAFKHLBNBPO message GetShopmallDataRsp { - repeated uint32 shop_type_list = 12; + repeated uint32 shop_type_list = 10; int32 retcode = 13; } \ No newline at end of file diff --git a/proto/MailChangeNotify.proto b/proto/MailChangeNotify.proto index 09b92600..8f7873e5 100644 --- a/proto/MailChangeNotify.proto +++ b/proto/MailChangeNotify.proto @@ -3,7 +3,9 @@ option java_package = "emu.grasscutter.net.proto"; import "MailData.proto"; +// 4.7.0 +// cmdid: 29033 ? message MailChangeNotify { - repeated uint32 del_mail_id_list = 1; - repeated MailData mail_list = 9; + repeated uint32 del_mail_id_list = 6; + repeated MailData mail_list = 14; } diff --git a/proto/ServerAnnounceNotify.proto b/proto/ServerAnnounceNotify.proto index 970e93dc..c07d975c 100644 --- a/proto/ServerAnnounceNotify.proto +++ b/proto/ServerAnnounceNotify.proto @@ -1,6 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "AnnounceData.proto"; + +// 4.7.0 +// cmdid: 1758 +// NIICMKOCDDN message ServerAnnounceNotify { - repeated AnnounceData announce_data_list = 2; + repeated AnnounceData announce_data_list = 10; }