sync

2025-07-31 17:44:11 +03:00 · 2024-05-30 15:23:06 +08:00
parent 4d2b5e00c1
commit 90f21122fe
35 changed files with 467 additions and 545 deletions
--- a/proto/BartenderCompleteOrderRsp.proto
+++ b/proto/BartenderCompleteOrderRsp.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+// CmdId: 8981
+// Version: 4.6.0
+// Obfs: DOFHDNANHEF
+message BartenderCompleteOrderRsp {
+	repeated uint32 affix_list = 2;
+	bool is_new = 8;
+	uint32 quest_id = 10;
+	int32 retcode = 12;
+	uint32 formula_id = 14;
+	uint32 finish_order_id = 15;
+}
--- a/proto/BartenderGetFormulaRsp.proto
+++ b/proto/BartenderGetFormulaRsp.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+// CmdId: 4187
+// Version: 4.6.0
+// Obfs: HKBBICBHNPO
+message BartenderGetFormulaRsp {
+	bool is_new = 6;
+	int32 retcode = 9;
+	repeated uint32 affix_list = 10;
+	uint32 formula_id = 11;
+}
--- a/proto/BartenderStartLevelRsp.proto
+++ b/proto/BartenderStartLevelRsp.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+// CmdId: 8981
+// Version: 4.6.0
+// Obfs: FFOAILEBFAD
+message BartenderStartLevelRsp {
+	uint32 time = 1;
+	int32 retcode = 4;
+	repeated uint32 order_list = 7;
+	uint32 level_id = 11;
+}
--- a/proto/BatchBuyGoodsReq.proto
+++ b/proto/BatchBuyGoodsReq.proto
@@ -1,25 +1,13 @@
-// 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 "BuyGoodsParam.proto";
-// CmdId: 6294
-// Obf: PEJMOLIKOOG
+
+// CmdId: 6661
+// Version: 4.6.0
+// Obfs: MGHFKOEEGKD
 message BatchBuyGoodsReq {
-	repeated BuyGoodsParam buy_goods_list = 12;
-	uint32 shop_type = 11;
+	uint32 shop_type = 10;
+	repeated BuyGoodsParam buy_goods_list = 11;
 }
--- a/proto/BatchBuyGoodsRsp.proto
+++ b/proto/BatchBuyGoodsRsp.proto
@@ -1,28 +1,16 @@
-// 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 "BuyGoodsParam.proto";
 import "ShopGoods.proto";
-// CmdId: 29700
-// Obf: DLIGMKDIKKM
+
+// CmdId: 23001
+// Version: 4.6.0
+// Obfs: PHGJENGMPOE
 message BatchBuyGoodsRsp {
-	repeated BuyGoodsParam buy_goods_list = 12;
-	repeated ShopGoods goods_list = 9;
-	uint32 shop_type = 3;
-	int32 retcode = 6;
+	repeated ShopGoods goods_list = 1;
+	repeated BuyGoodsParam buy_goods_list = 2;
+	int32 retcode = 5;
+	uint32 shop_type = 11;
 }
--- a/proto/BossChestActivateNotify.proto
+++ b/proto/BossChestActivateNotify.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+// CmdId: 21714
+// Version: 4.6.0
+// Obfs: CMHNHAHLPNM
+message BossChestActivateNotify {
+	uint32 entity_id = 2;
+	repeated uint32 qualify_uid_list = 9;
+}
--- a/proto/BrickBreakerSelectAvatarRsp.proto
+++ b/proto/BrickBreakerSelectAvatarRsp.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+// CmdId: 21969
+// Version: 4.6.0
+// Obfs: LCDPHKOCFMK
+message BrickBreakerSelectAvatarRsp {
+	repeated uint32 avatar_id = 2;
+	int32 retcode = 11;
+}
--- a/proto/BuyGoodsParam.proto
+++ b/proto/BuyGoodsParam.proto
@@ -1,24 +1,12 @@
-// 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 "ShopGoods.proto";
-// Obf: FNALFHKDPMN
+
+// Version: 4.6.0
+// Obfs: KHNAGEGDMIJ
 message BuyGoodsParam {
-	uint32 buy_count = 15;
-	ShopGoods goods = 1;
+	uint32 buy_count = 6;
+	ShopGoods goods = 10;
 }
--- a/proto/BuyGoodsReq.proto
+++ b/proto/BuyGoodsReq.proto
@@ -1,26 +1,14 @@
-// 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 "ShopGoods.proto";
-// CmdId: 8034
-// Obf: MKAEIILDGBN
+
+// CmdId: 28819
+// Version: 4.6.0
+// Obfs: OGHIMOFAHII
 message BuyGoodsReq {
-	uint32 shop_type = 13;
-	uint32 buy_count = 15;
-	ShopGoods goods = 12;
+	uint32 buy_count = 4;
+	uint32 shop_type = 8;
+	ShopGoods goods = 15;
 }
--- a/proto/BuyGoodsRsp.proto
+++ b/proto/BuyGoodsRsp.proto
@@ -1,28 +1,16 @@
-// 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 "ShopGoods.proto";
-// CmdId: 611
-// Obf: ODFCPEHCGFK
+
+// CmdId: 8
+// Version: 4.6.0
+// Obfs: ALLGKCIALEP
 message BuyGoodsRsp {
-	uint32 buy_count = 3;
-	int32 retcode = 1;
+	repeated ShopGoods goods_list = 1;
+	int32 retcode = 4;
 	ShopGoods goods = 9;
-	uint32 shop_type = 4;
-	repeated ShopGoods goods_list = 15;
+	uint32 buy_count = 12;
+	uint32 shop_type = 14;
 }
--- a/proto/ChangeMailStarNotify.proto
+++ b/proto/ChangeMailStarNotify.proto
@@ -1,24 +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";
-// CmdId: 2285
-// Obf: BNOGMFJDHHL
+
+// CmdId: 23996
+// Version: 4.6.0
+// Obfs: BOJJIDKEMOJ
 message ChangeMailStarNotify {
-	bool is_star = 13;
-	repeated uint32 mail_id_list = 15;
-}
+	bool is_star = 1;
+	repeated uint32 mail_id_list = 5;
+}
--- a/proto/DelMailReq.proto
+++ b/proto/DelMailReq.proto
@@ -1,23 +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";
-// CmdId: 9893
-// Obf: GCJNHCHGLEL
+
+// CmdId: 3779
+// Version: 4.6.0
+// Obfs: MLNPMOILLJI
 message DelMailReq {
-	repeated uint32 mail_id_list = 8;
+	repeated uint32 mail_id_list = 13;
 }
+
--- a/proto/DelMailRsp.proto
+++ b/proto/DelMailRsp.proto
@@ -1,24 +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";
-// CmdId: 8328
-// Obf: EJOGFBHOJKI
+
+// CmdId: 29251
+// Version: 4.6.0
+// Obfs: KEFLFPLHJOB
 message DelMailRsp {
-	repeated uint32 mail_id_list = 13;
-	int32 retcode = 8;
+	int32 retcode = 1;
+	repeated uint32 mail_id_list = 14;
 }
--- a/proto/DungeonWayPointNotify.proto
+++ b/proto/DungeonWayPointNotify.proto
@@ -1,7 +1,11 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";

+// CmdId: 26318
+// Version: 4.6.0
+// Obfs: KHEPLNGHMBP
 message DungeonWayPointNotify {
-  repeated uint32 active_way_point_list = 7;
-  bool is_add = 13;
+	bool is_add = 6;
+	repeated uint32 active_way_point_list = 14;
 }
--- a/proto/EnterTransPointRegionNotify.proto
+++ b/proto/EnterTransPointRegionNotify.proto
@@ -1,24 +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 <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 22064
-// Obf: ECDCICGGBDA
+
+// CmdId: 7189
 message EnterTransPointRegionNotify {
-	uint32 point_id = 5;
-	uint32 scene_id = 12;
+    uint32 point_id = 11;
+    uint32 scene_id = 15;
 }
--- a/proto/EvtEntityRenderersChangedNotify.proto
+++ b/proto/EvtEntityRenderersChangedNotify.proto
@@ -1,11 +1,13 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "EntityRendererChangedInfo.proto";
 import "ForwardType.proto";

+// CmdId: 5936
 message EvtEntityRenderersChangedNotify {
-  EntityRendererChangedInfo renderer_changed_info = 14;
-  ForwardType forward_type = 13;
-  bool is_server_cache = 2;
-  uint32 entity_id = 11;
+    bool is_server_cache = 2;
+    uint32 entity_id = 5;
+    EntityRendererChangedInfo renderer_changed_info = 6;
+    ForwardType forward_type = 7;
 }
--- a/proto/ExitTransPointRegionNotify.proto
+++ b/proto/ExitTransPointRegionNotify.proto
@@ -1,24 +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 <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 2696
-// Obf: BBGPGHPCHGN
+
+// CmdId: 6413
 message ExitTransPointRegionNotify {
-	uint32 point_id = 8;
-	uint32 scene_id = 12;
+    uint32 point_id = 2;
+    uint32 scene_id = 9;
 }
--- a/proto/GachaInfo.proto
+++ b/proto/GachaInfo.proto
@@ -9,31 +9,31 @@ import "GachaUpInfo.proto";
 // RN fill order frm 3.2.0
 // 3 is wish_item_id wish_max_progress wish_progress
 message GachaInfo {
-	uint32 left_gacha_times = 1;                       // found 2 HNFPBJIEGHD (uint32 limit)
-	uint32 ten_cost_item_id = 2;                       // found 2 BCDOOPICEMD (2, 11)
-	uint32 end_time = 3;                               // OK
-	string gacha_preview_prefab_path = 4;              // single LCNMHLJCLIK OK
-	string gacha_record_url = 5;                       // single HIOKPEGNPLK (5, 1354)
-	uint32 ten_cost_item_num = 6;                      // found 2 EMKBGHENNEL OK
-	uint32 gachaType = 7;                              // OK
-	uint32 gacha_times_limit = 8;                      // found 2 NABJFPLLGGM (uint32 limit)
-	uint32 schedule_id = 9;                            // OK
-	string gacha_prob_url = 10;                        // single FCPIKKHIDDO (10, 448)
-	uint32 cost_item_id = 11;                          // found 2 KINBJAPMIJD (2, 11)
-	uint32 gacha_sort_id = 12;                         // single EKKEPHGDAKB OK
-	uint32 cost_item_num = 13;                         // found 2 POEJPPCFPNG OK
-	string gacha_prefab_path = 14;                     // single ICOEPLJMDCK OK
-	uint32 begin_time = 15;                            // OK
-	bool is_new_wish = 298;                            // JLNOHJBDNJN OK
-	string gacha_prob_url_oversea = 448;               // single ELOGPDHLPAI (10, 448)
-	repeated GachaUpInfo gacha_up_info_list = 535;     // OK
-	string title_textmap = 667;                        // single JPBNAMGLKEC OK
-	repeated uint32 display_up4_item_list = 707;       // single KIEKPNDHGGJ OK
-	uint32 wish_item_id = 794;                         // found 3 NFGOJJOMFCA OK
-	uint32 cur_schedule_daily_gacha_times = 1233;      // found 2 MJCGMHMPKOE sus
-	string gacha_record_url_oversea = 1354;            // single GGCMMKLOJMN (5, 1354)
-	repeated uint32 display_up5_item_list = 1621;      // single OAJAMCHOPFJ (1621, 1921)
-	uint32 wish_max_progress = 1757;                   // found 3 BHBCHFFGHHE OK
-	uint32 wish_progress = 1799;                       // found 3 EOFACNPOJBN OK
-	repeated uint32 DHONBCHNPJD = 1921;                // single DHONBCHNPJD (1621, 1921)
+	uint32 left_gacha_times = 1;                         // found 2 HNFPBJIEGHD (uint32 limit)
+	uint32 ten_cost_item_id = 2;                         // found 2 BCDOOPICEMD (2, 11)
+	uint32 end_time = 3;                                 // OK
+	string gacha_preview_prefab_path = 4;                // single LCNMHLJCLIK OK
+	string gacha_record_url = 5;                         // single HIOKPEGNPLK (5, 1354)
+	uint32 ten_cost_item_num = 6;                        // found 2 EMKBGHENNEL OK
+	uint32 gachaType = 7;                                // OK
+	uint32 gacha_times_limit = 8;                        // found 2 NABJFPLLGGM (uint32 limit)
+	uint32 schedule_id = 9;                              // OK
+	string gacha_prob_url = 10;                          // single FCPIKKHIDDO (10, 448)
+	uint32 cost_item_id = 11;                            // found 2 KINBJAPMIJD (2, 11)
+	uint32 gacha_sort_id = 12;                           // single EKKEPHGDAKB OK
+	uint32 cost_item_num = 13;                           // found 2 POEJPPCFPNG OK
+	string gacha_prefab_path = 14;                       // single ICOEPLJMDCK OK
+	uint32 begin_time = 15;                              // OK
+	bool is_new_wish = 298;                              // JLNOHJBDNJN OK
+	string gacha_prob_url_oversea = 448;                 // single ELOGPDHLPAI (10, 448)
+	repeated GachaUpInfo gacha_up_info_list = 535;       // OK
+	string title_textmap = 667;                          // single JPBNAMGLKEC OK
+	repeated uint32 display_up4_item_list = 707;         // single KIEKPNDHGGJ OK
+	uint32 wish_item_id = 794;                           // found 3 NFGOJJOMFCA OK
+	uint32 cur_schedule_daily_gacha_times = 1233;        // found 2 MJCGMHMPKOE sus
+	string gacha_record_url_oversea = 1354;              // single GGCMMKLOJMN (5, 1354)
+	repeated uint32 display_up5_item_list = 1621;        // single OAJAMCHOPFJ (1621, 1921)
+	uint32 wish_max_progress = 1757;                     // found 3 BHBCHFFGHHE OK
+	uint32 wish_progress = 1799;                         // found 3 EOFACNPOJBN OK
+	repeated uint32 display_chronicle5_item_list = 1921; // single DHONBCHNPJD (1621, 1921)
 }
--- a/proto/GachaOpenWishNotify.proto
+++ b/proto/GachaOpenWishNotify.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+// CmdId: 3594
+// Version: 4.6.0
+// Obfs: ???
+message GachaOpenWishNotify {
+	uint32 gachaType = 3;
+	uint32 gachaScheduleId = 4;
+}
--- a/proto/GachaWishReq.proto
+++ b/proto/GachaWishReq.proto
@@ -1,25 +1,12 @@
-// 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";
-// CmdId: 23244
-// Obf: HPILINGFDBP
+
+// CmdId: 22716
+// Version: 4.6.0
+// Obfs: ???
 message GachaWishReq {
-	uint32 gachaType = 12;
-	uint32 item_id = 7;
-	uint32 gachaScheduleId = 10;
+	uint32 gachaType = 10;
+	uint32 item_id = 11;
+	uint32 gachaScheduleId = 14;
 }
--- a/proto/GachaWishRsp.proto
+++ b/proto/GachaWishRsp.proto
@@ -1,28 +1,15 @@
-// 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";
-// CmdId: 9333
-// Obf: NLENODLFFAC
+
+// CmdId: 384
+// Version: 4.6.0
+// Obfs: ???
 message GachaWishRsp {
-	uint32 wishItemId = 11;
-	uint32 gachaScheduleId = 7;
-	uint32 gachaType = 1;
-	int32 retcode = 9;
-	uint32 wishMaxProgress = 5;
-	uint32 wishProgress = 15;
+	uint32 wish_item_id = 4;
+	uint32 gachaScheduleId = 5;
+	uint32 wish_max_progress = 7;
+	uint32 wish_progress = 8;
+	uint32 gachaType = 13;
+	int32 retcode = 14;
 }
--- a/proto/GetShopmallDataReq.proto
+++ b/proto/GetShopmallDataReq.proto
@@ -1,22 +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";
-// CmdId: 2616
-// Obf: GKCCFCPCHAK
+
+// CmdId: 9573
+// Version: 4.6.0
+// Obfs: HPDHEEIPNLP
 message GetShopmallDataReq {
-}
+}
--- a/proto/GetShopmallDataRsp.proto
+++ b/proto/GetShopmallDataRsp.proto
@@ -1,24 +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";
-// CmdId: 1087
-// Obf: PJGBDGNCIEN
+
+// CmdId: 6481
+// Version: 4.6.0
+// Obfs: PCJNNNMBMFG
 message GetShopmallDataRsp {
-	int32 retcode = 11;
-	repeated uint32 shop_type_list = 7;
-}
+	repeated uint32 shop_type_list = 12;
+	int32 retcode = 13;
+}
--- a/proto/ObstacleInfo.proto
+++ b/proto/ObstacleInfo.proto
@@ -1,17 +1,22 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
-import "MathQuaternion.proto";
-import "Vector3Int.proto";
-import "Vector.proto";

+option java_package = "emu.grasscutter.net.proto";
+
+import "MathQuaternion.proto";
+import "Vector.proto";
+import "Vector3Int.proto";
+
+// Version: 4.6.0
+// Obfs: IHNFCMNILEG
 message ObstacleInfo {
-  enum ShapeType {
+	enum ShapeType {
 		OBSTACLE_SHAPE_CAPSULE = 0;
-		OBSTACLE_SHAPE_BOX = 1;
+	  OBSTACLE_SHAPE_BOX = 1;
 	}
-  MathQuaternion rotation = 7;
-  Vector3Int extents = 5;
-  Vector center = 14;
-  ShapeType shape = 3;
-  int32 obstacle_id = 8;
+
+	ShapeType shape = 1;
+	int32 obstacle_id = 4;
+	Vector3Int extents = 8;
+	MathQuaternion rotation = 11;
+	Vector center = 12;
 }
--- a/proto/PathfindingEnterSceneReq.proto
+++ b/proto/PathfindingEnterSceneReq.proto
@@ -1,13 +1,18 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "ObstacleInfo.proto";

+// CmdId: 2311
+// Version: 4.6.0
+// Obfs: BEHJKJMHJCG
 message PathfindingEnterSceneReq {
-  repeated ObstacleInfo obstacles = 15;
-  repeated int32 ANPDICMMDML = 11;
-  uint32 IOAHLKGMDFA = 12;
-  uint32 scene_id = 2;
-  bool is_editor = 10;
-  uint32 PMHKCPDCGPK = 6;
-  uint32 version = 13;
-}
+	bool is_editor = 1;
+	uint32 ECNGACHMEKA = 5;
+	uint32 version = 6;
+	repeated int32 BBMACCGKECH = 7;
+	uint32 scene_id = 9;
+	repeated ObstacleInfo obstacles = 10;
+	uint32 JHINLHMPHGA = 12;
+}
--- a/proto/ReadMailNotify.proto
+++ b/proto/ReadMailNotify.proto
@@ -1,23 +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";
-// CmdId: 6739
-// Obf: EHONJGBBFEG
+
+// CmdId: 27308
+// Version: 4.6.0
+// Obfs: NBIHDBGBMMA
 message ReadMailNotify {
-	repeated uint32 mail_id_list = 2;
+	repeated uint32 mail_id_list = 14;
 }
--- a/proto/RefreshRogueDiaryCardRsp.proto
+++ b/proto/RefreshRogueDiaryCardRsp.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+// CmdId: 28587
+// Version: 4.6.0
+// Obfs: KBCGJCGOPNI
+message RefreshRogueDiaryCardRsp {
+	int32 retcode = 3;
+	repeated uint32 rand_card_list = 12;
+}
--- a/proto/SetEntityClientDataNotify.proto
+++ b/proto/SetEntityClientDataNotify.proto
@@ -1,8 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "EntityClientData.proto";

+// CmdId: 7008
 message SetEntityClientDataNotify {
-  EntityClientData entity_client_data = 2;
-  uint32 entity_id = 4;
+    EntityClientData entity_client_data = 6;
+    uint32 entity_id = 10;
 }
--- a/proto/ShopGoods.proto
+++ b/proto/ShopGoods.proto
@@ -1,29 +1,31 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "ItemParam.proto";

-// Obf: OBABFCEJLGK
+// Version: 4.6.0
+// Obf: ???
 message ShopGoods {
-	uint32 hcoin = 15; // primogem
-	uint32 scoin = 7; // mora
-    uint32 mcoin = 11; // crystals
-    uint32 goods_id = 8;
-    repeated ItemParam cost_item_list = 3;
-	uint32 buy_limit = 4;
-    uint32 max_level = 1690;
-	uint32 min_level = 1946;
-    uint32 bought_num = 14;    
-    uint32 secondary_sheet_id = 1950;
-    repeated uint32 preGoodsIdList = 5;	    
-    ItemParam goods_item = 1;    
-    uint32 single_limit = 2;
-	uint32 discount_id = 10;
-	uint32 discount_end_time = 923;
-    uint32 discount_begin_time = 898;
-
-	uint32 begin_time = 13;
-    
-    uint32 end_time = 6;    
-    uint32 next_refresh_time = 9;
-	
+	uint32 min_level = 1;                   // FOIGNDFHDOJ OK
+	uint32 bought_num = 2;                  // OK
+	uint32 goods_id = 3;                    // FEOJKIHDKCE OK
+	uint32 disable_type = 4;                // GHLKAFLLBJN (infer from HomeLimitedShopGoods)
+	repeated uint32 pre_goods_id_list = 5;  // NBKABHDDAFC (infer as only repeated uint32)
+	uint32 end_time = 6;                    // OK
+	uint32 mcoin = 7;                       // HBMJLIGEEKG OK
+	uint32 scoin = 8;                       // NDLDBEJMHNB OK
+	uint32 hcoin = 9;                       // JPLKFKJCLBH OK
+	uint32 next_refresh_time = 10;          // OK
+	uint32 buy_limit = 11;                  // HHBOIKPMLMO OK
+	uint32 begin_time = 12;                 // OK
+	uint32 max_level = 13;                  // DNLPCAEGBGN OK
+	repeated ItemParam cost_item_list = 14; // OAAFLOFLELI OK
+	ItemParam goods_item = 15;              // JHFIBIBJCHL OK
+	uint32 discount_id = 462;               // EBODOLJJCJP (sus)
+	uint32 discount_begin_time = 492;       // ECDBKMBMALF (sus)
+	uint32 discount_end_time = 994;         // MJAFPOBKHJP (sus)
+	bool EFHKENODDBF = 1040;                // EFHKENODDBF
+	uint32 single_limit = 1153;             // ACMNLOCEHOD (sus)
+	uint32 secondary_sheet_id = 1800;       // FNPCKDKEGIJ (sus)	
 }
--- a/proto/SkipPlayerGameTimeReq.proto
+++ b/proto/SkipPlayerGameTimeReq.proto
@@ -1,25 +1,12 @@
-// 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";
-// CmdId: 22076
-// Obf: DEFBFNOLMID
+
+// CmdId: 26429
+// Version: 4.6.0
+// Obfs: CANKELPJFLD
 message SkipPlayerGameTimeReq {
-	uint32 game_time = 12;
-	bool is_force_set = 1;
-	uint32 client_game_time = 7;
+	uint32 client_game_time = 5;
+	uint32 game_time = 8;
+	bool is_force_set = 12;
 }
--- a/proto/SkipPlayerGameTimeRsp.proto
+++ b/proto/SkipPlayerGameTimeRsp.proto
@@ -1,25 +1,12 @@
-// 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";
-// CmdId: 24529
-// Obf: PFBBCGKLBFC
+
+// CmdId: 22783
+// Version: 4.6.0
+// Obfs: ???
 message SkipPlayerGameTimeRsp {
-	uint32 client_game_time = 2;
-	int32 retcode = 9;
-	uint32 game_time = 13;
+	uint32 client_game_time = 1;
+	int32 retcode = 7;
+	uint32 game_time = 8;
 }
--- a/proto/ToTheMoonEnterSceneReq.proto
+++ b/proto/ToTheMoonEnterSceneReq.proto
@@ -1,25 +1,13 @@
-// 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";
-// CmdId: 6144
-// Obf: DGDIOJLNEPG
+
+// CmdId: 6106
+// Version: 4.6.0
+// Obfs: ILIJECBDCIM
 message ToTheMoonEnterSceneReq {
+	uint32 version = 1;
+	uint32 ECNGACHMEKA = 4;
+	uint32 JHINLHMPHGA = 6;
 	uint32 scene_id = 7;
-	uint32 version = 4;
-	uint32 KJJLLFIJKNA = 10;
 }
--- a/proto/Vector3Int.proto
+++ b/proto/Vector3Int.proto
@@ -2,9 +2,10 @@ syntax = "proto3";

 option java_package = "emu.grasscutter.net.proto";

-
+// Version: 4.6.0
+// Obfs: IPDNLGHMCNH
 message Vector3Int {
-  int32 x = 1;
-  int32 y = 2;
-  int32 z = 3;
-}
+	int32 x = 1;
+	int32 y = 2;
+	int32 z = 3;
+}