small update proto p4

proto/AbilityActionGenerateElemBall.proto

@@ -1,8 +1,6 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "Vector.proto";
-
 // 4.7.0
 // LNFNHFNNCOP (lock)
 message AbilityActionGenerateElemBall {

proto/AvatarChangeAnimHashReq.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// CmdId: 29050
+// Obf: PCBLKNOGPEC
+message AvatarChangeAnimHashReq {
+	uint64 avatar_guid = 6;
+	uint32 anim_hash = 7;
+}

proto/AvatarEnterElementViewNotify.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// CmdId: 912
+// Obf: NANIENKHCOJ
+message AvatarEnterElementViewNotify {
+	bool is_triggerd = 12;
+	uint32 avatar_entity_id = 1;
+}

proto/AvatarFetterLevelRewardReq.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 1484
-// CmdId: 4220
+// CMNOAMPAIKP
 message AvatarFetterLevelRewardReq {
-	uint32 fetter_level = 9;
+	uint32 fetter_level = 1;
-	uint64 avatar_guid = 14;
+	uint64 avatar_guid = 9;
 }

proto/AvatarFetterLevelRewardRsp.proto

@@ -1,11 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 9717
-// CmdId: 27738
 message AvatarFetterLevelRewardRsp {
-	uint32 fetter_level = 6;
+	uint32 fetter_level = 8;
-	uint32 reward_id = 7;
+	uint32 reward_id = 14;
-	int32 retcode = 10;
+	int32 retcode = 4;
-	uint64 avatar_guid = 14;
+	uint64 avatar_guid = 6;
 }

proto/BattlePassRewardTakeOption.proto

@@ -1,9 +1,6 @@
 syntax = "proto3";
-
 option java_package = "emu.grasscutter.net.proto";
-
 import "BattlePassRewardTag.proto";
-
 // Version: 4.7.0
 // Obfs: FIMEPLBAJMH
 message BattlePassRewardTakeOption {

proto/ChatEmojiCollectionData.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: GFDAHNLKKNG
+// 4.7.0
+// Obf: ?
 message ChatEmojiCollectionData {
 	repeated uint32 emoji_id_list = 1;
 }

proto/ClientTriggerEventNotify.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+import "EventTriggerType.proto";
+// 4.7.0
+// CmdId: 8634
+// Obf: BDEGOOGHAMA
+message ClientTriggerEventNotify {
+	uint32 force_id = 12;
+	EventTriggerType event_type = 14;
+}

proto/CreateVehicleReq.proto

@@ -1,27 +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 "Vector.proto";
-// CmdId: 29875
+// 4.7.0
-// Obf: FJIDLNFEHBG
+// CmdId: 26744
+// Obf: LMCAJLPNBAC
 message CreateVehicleReq {
-	uint32 scene_point_id = 4;
+	uint32 scene_point_id = 8;
-	Vector pos = 10;
+	Vector pos = 3;
-	uint32 vehicle_id = 11;
+	uint32 vehicle_id = 1;
-	Vector rot = 5;
+	Vector rot = 11;
 }

proto/CreateVehicleRsp.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";
-// CmdId: 958
+// 4.7.0
-// Obf: PGCCKGDHLME
+// CmdId: 4740
+// Obf: NKPJDHIBIEA
 message CreateVehicleRsp {
-	uint32 vehicle_id = 9;
+	uint32 vehicle_id = 5;
-	uint32 entity_id = 11;
+	uint32 entity_id = 2;
-	int32 retcode = 2;
+	int32 retcode = 3;
 }

proto/DeleteFriendRsp.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: 9786
+// CmdId: 9192,23108,5432,4789,29028,23875,22728?
-// Obf: BDBANFKGEEN
+// Obf: ?
 message DeleteFriendRsp {
-	uint32 target_uid = 14;
+	uint32 target_uid = 13;
-	int32 retcode = 13;
+	int32 retcode = 12;
 }

proto/DropItemReq.proto

@@ -1,14 +1,13 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "Vector.proto";
 import "StoreType.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 9675
-// CmdId: 23960
+// ?
 message DropItemReq {
 	uint64 guid = 3;
-	Vector pos = 6;
+	Vector pos = 1;
-	uint32 count = 12;
+	uint32 count = 11;
 	StoreType store_type = 13;
 }

proto/DropItemRsp.proto

@@ -1,12 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "StoreType.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 4117
-// CmdId: 26504
+// ?
 message DropItemRsp {
 	uint64 guid = 2;
-	int32 retcode = 3;
+	int32 retcode = 8;
-	StoreType store_type = 12;
+	StoreType store_type = 6;
 }

proto/DungeonCandidateTeamCreateReq.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// CmdId: 1126
+// Obf: IKFJEKLIEAO
+message DungeonCandidateTeamCreateReq {
+	uint32 dungeon_id = 2;
+	uint32 point_id = 5;
+}

proto/EntityAiKillSelfNotify.proto

@@ -1,8 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// Obf: KCBLONBAAEL
+// Obf: KENDFFHKAEL?
-// CmdId: 29500
+// CmdId: 4703
 message EntityAiKillSelfNotify {
-    uint32 entity_id = 9;
+    uint32 entity_id = 15;
 }

proto/EventTriggerType.proto

@@ -0,0 +1,23 @@
+// 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: NCBNIKIODKP
+enum EventTriggerType {
+	EVENT_TRIGGER_NONE = 0;
+	EVENT_TRIGGER_ENTER_FORCE = 1;
+}

proto/EvtAvatarSitDownNotify.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 <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "Vector.proto";
-// CmdId: 23010
+// CmdId: 26530
-// Obf: EGKACDGMPPG
+// Obf: ?
 message EvtAvatarSitDownNotify {
-	uint64 chair_id = 6;
+	uint64 chair_id = 12;
-	int32 direction = 8;
+	int32 direction = 8; // OK
-	Vector position = 9;
+	Vector position = 3;
-	uint32 entity_id = 4;
+	uint32 entity_id = 13;
 }

proto/EvtBulletDeactiveNotify.proto

@@ -1,27 +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 "ForwardType.proto";
 import "Vector.proto";
-// CmdId: 26348
+// 4.7.0
-// Obf: FJJAANMLOOB
+// CmdId: 28844 sus
+// Obf: OIFFIANHCNK
 message EvtBulletDeactiveNotify {
-	ForwardType forward_type = 1;
+	ForwardType forward_type = 14;
-	uint32 entity_id = 14;
+	uint32 entity_id = 5;
-	Vector disappear_pos = 8;
+	Vector disappear_pos = 12;
 }

proto/EvtBulletMoveNotify.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 <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "Vector.proto";
 import "ForwardType.proto";
-// CmdId: 8672
+// CmdId: 24809
-// Obf: PJHHOALDCDN
+// Obf: BKFCEHKJCCA
 message EvtBulletMoveNotify {
-	uint32 entity_id = 6;
+	uint32 entity_id = 10;
-	Vector cur_pos = 13;
+	Vector cur_pos = 14;
-	ForwardType forward_type = 15;
+	ForwardType forward_type = 2;
 }

proto/EvtEntityStartDieEndNotify.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+import "ForwardType.proto";
+// 4.7.0
+// CmdId: 485
+// Obf: ???
+message EvtEntityStartDieEndNotify {
+	uint32 die_state_flag = 4;
+	uint32 entity_id = 12;
+	bool immediately = 10;
+	ForwardType forward_type = 13;
+}

proto/FireworksReformData.proto

@@ -1,24 +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 "FireworksReformParam.proto";
-// Obf: PNMCPOPPKJL
+// 4.7.0
+// Obf: EKFIOHFEPOH
 message FireworksReformData {
-	repeated FireworksReformParam reform_param_list = 9;
+	repeated FireworksReformParam reform_param_list = 13;
-	uint32 id = 4;
+	repeated uint32 uk1 = 15;
+	uint32 id = 2;
 }

proto/FireworksReformDataNotify.proto

@@ -1,24 +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 "FireworksReformData.proto";
-// CmdId: 7551
+// 4.7.0
-// Obf: OFPJGJACJBD
+// CmdId: 23329
+// Obf: MFHAPJMFPON
 message FireworksReformDataNotify {
-	repeated FireworksReformData fireworks_reform_data_list = 4;
+	uint32 uk1 = 7;
+	repeated FireworksReformData fireworks_reform_data_list = 10;
 }

proto/FireworksReformParam.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 "FireworksReformParamType.proto";
-// Obf: PMAIMKODBLA
+// 4.7.0
+// Obf: HEGNJFOAJKM
 message FireworksReformParam {
-	FireworksReformParamType type = 2;
+	FireworksReformParamType type = 14;
-	int32 value = 3;
+	int32 value = 4;
 }

proto/FocusAvatarReq.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// CmdId: 27317
+// Obf: ?
+message FocusAvatarReq {
+	bool is_focus = 3;
+	uint64 avatar_guid = 2;
+}

proto/GCGTavernNpcInfo.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// Obf: IOMHEAFIGGJ
+message GCGTavernNpcInfo {
+	uint32 id = 13;
+	uint32 level_id = 12;
+	uint32 scene_point_id = 1;
+}

proto/GachaOpenWishNotify.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// CmdId: 9144
+// Obf: JDGGEKLLNAK
+message GachaOpenWishNotify {
+	uint32 gacha_schedule_id = 6;
+	uint32 gacha_type = 9;
+}

proto/GetAreaExplorePointReq.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// CmdId: 533
+// Obf: ?
+message GetAreaExplorePointReq {
+	repeated uint32 area_id_list = 13;
+}

proto/GetBattlePassProductReq.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// CmdId: 27468
+// Obf: LNHMAMCNDGJ
+message GetBattlePassProductReq {
+	uint32 battle_pass_product_play_type = 4;
+}

proto/GetBattlePassProductRsp.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// CmdId: 9981?
+// Obf: NNBFBPPCIPE
+message GetBattlePassProductRsp {
+	int32 retcode = 12;
+	string price_tier = 14;
+	string product_id = 6;
+	uint32 cur_schedule_id = 4;
+	uint32 battle_pass_product_play_type = 1;
+}

proto/GetChatEmojiCollectionRsp.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 "ChatEmojiCollectionData.proto";
-// CmdId: 21858
+// 4.7.0
-// Obf: NOLCBIPMJDJ
+// CmdId: 26849
+// Obf: ?
 message GetChatEmojiCollectionRsp {
-	ChatEmojiCollectionData chat_emoji_collection_data = 1;
+	ChatEmojiCollectionData chat_emoji_collection_data = 3;
 	int32 retcode = 14;
 }

proto/GetFriendShowAvatarInfoReq.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 <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 3887
+// 4.7.0
-// Obf: HPFMOEEPOGI
+// CmdId: 22460
+// Obf: HCLGHFLOHPN
 message GetFriendShowAvatarInfoReq {
-	uint32 uid = 1;
+	uint32 uid = 8;
 }

proto/GetOnlinePlayerInfoReq.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 // 4.7.0
 // CmdId: 4777
-// Obf: ?
+// Obf: ???
 message GetOnlinePlayerInfoReq {
 	bool is_online_id = 9;
 	oneof player_id {

proto/GetParentQuestVideoKeyReq.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 <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 28598
+// 4.7.0
-// Obf: IDDDDFEJCNE
+// CmdId: 28109,25153,21386,4473,8018
+// Obf: ?
 message GetParentQuestVideoKeyReq {
-	uint32 parent_quest_id = 14;
+	uint32 parent_quest_id = 13;
 }

proto/HitClientTrivialNotify.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+import "Vector.proto";
+// 4.7.0
+// CmdId: 5424
+// Obf: KJAGDKJPKJD
+message HitClientTrivialNotify {
+	uint32 owner_entity_id = 15;
+	Vector position = 9;
+}

proto/HomeBlueprintInfoNotify.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// CmdId: 24913
+// Obf: LOJKBCEKOFC
+message HomeBlueprintInfoNotify {
+	bool uk1 = 1;
+	bool uk2 = 5;
+}

proto/HomeSearchBlueprintReq.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// CmdId: 8091
+// Obf: PAJDGEEFIHJ
+message HomeSearchBlueprintReq {
+	string share_code = 9;
+}

proto/MarkNewNotify.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 5979
-// CmdId: 5948
+// CMJDIHAKIHN
 message MarkNewNotify {
-	repeated uint32 id_list = 1;
+	repeated uint32 id_list = 13;
-	uint32 mark_new_type = 2;
+	uint32 mark_new_type = 7;
 }

proto/MarkTargetInvestigationMonsterNotify.proto

@@ -1,15 +1,11 @@
 syntax = "proto3";
-
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-import "DeshretObeliskChestInfo.proto";
-
 // CmdId: 4072
-// Version: 4.7.0
+// Obf: BNJPANBFBDL
-// Obfs: BNJPANBFBDL
 message MarkTargetInvestigationMonsterNotify {
-	uint32 investigation_monster_id = 1;
 	uint32 scene_id = 6;
-	uint32 group_id = 12;
 	uint32 monster_id = 3;
+	uint32 investigation_monster_id = 1;
+	uint32 group_id = 12;
 }

proto/MatchType.proto

@@ -0,0 +1,27 @@
+// 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: DAHBJFKJLHG
+enum MatchType {
+	MATCH_TYPE_NONE = 0;
+	MATCH_TYPE_DUNGEON = 1;
+	MATCH_TYPE_MP_PLAY = 2;
+	MATCH_TYPE_MECHANICUS = 3;
+	MATCH_TYPE_GENERAL = 4;
+	MATCH_TYPE_GCG = 5;
+}

proto/MeetNpcReq.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// CmdId: 5374
+// Obf: CBGKMDOIFEO
+message MeetNpcReq {
+	uint32 npc_id = 10;
+}

proto/PlayerApplyEnterHomeNotify.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "OnlinePlayerInfo.proto";
-// CmdId: 5247 ? (4.7.0)
+// CmdId: 5247? OR 23074 ? (4.7.0)
 // Obf: BDPJPLOMCHE
 message PlayerApplyEnterHomeNotify {
 	OnlinePlayerInfo src_player_info = 2;

proto/PlayerCompoundMaterialReq.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";
-// CmdId: 7541
+// 4.7.0
-// Obf: AILEMFGGGHN
+// CmdId: 26870
+// Obf: PAMALPJFMAF
 message PlayerCompoundMaterialReq {
-	uint32 compound_id = 2;
+	uint32 compound_id = 4;
-	uint32 count = 11;
+	uint32 count = 2;
 }

proto/PlayerStartMatchReq.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+import "MatchType.proto";
+// 4.7.0
+// CmdId: 28139
+// Obf: JGKMFLFKLBK
+message PlayerStartMatchReq {
+	uint32 mp_play_id = 13; // OK
+	uint32 mechanicus_difficult_level = 14;
+	MatchType match_type = 8; // OK
+	uint32 match_id = 9; // OK
+	repeated uint32 match_param_list = 5; // OK
+	uint32 dungeon_id = 11; // OK
+}

proto/ReadPrivateChatReq.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 <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 5538
+// 4.7.0 ?
-// Obf: BMBHFJMPFKB
+// CmdId: 24013
+// Obf: MEEPMDHNAND
 message ReadPrivateChatReq {
-	uint32 target_uid = 4;
+	uint32 target_uid = 11;
 }

proto/ReformFireworksReq.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";
 import "FireworksReformData.proto";
-// CmdId: 28941
+// CmdId: 3254
-// Obf: PICLGFMPPAN
+// Obf: CIOAPOACPEE
 message ReformFireworksReq {
-	FireworksReformData fireworks_reform_data = 10;
+	FireworksReformData fireworks_reform_data = 1;
 }

proto/ReliquaryDecomposeReq.proto

@@ -1,10 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 25206
-// CmdId: 23132
+// NMBAPILLLFN
 message ReliquaryDecomposeReq {
-	uint32 target_count = 4;
+	uint32 target_count = 12;
-	repeated uint64 guid_list = 5;
+	repeated uint64 guid_list = 7;
-	uint32 config_id = 6;
+	uint32 config_id = 1;
 }

proto/ReliquaryDecomposeRsp.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 8148
-// CmdId: 22479
+// HCLMCPMJLHA
 message ReliquaryDecomposeRsp {
-	repeated uint64 guid_list = 14;
+	repeated uint64 guid_list = 2;
-	int32 retcode = 15;
+	int32 retcode = 15; // ok
 }

proto/ReliquaryFilterStateSaveNotify.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 <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 4815
+// CmdId: 28625
-// Obf: ECBLOLDIABL
+// Obf: ?
 message ReliquaryFilterStateSaveNotify {
-	map<uint32, uint32> reliquary_filter_state_map = 4;
+	map<uint32, uint32> reliquary_filter_state_map = 6;
 }

proto/ReliquaryUpgradeReq.proto

@@ -1,12 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "ItemParam.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 9142
-// CmdId: 20208
+// ?
 message ReliquaryUpgradeReq {
-	repeated ItemParam item_param_list = 1;
+	repeated ItemParam item_param_list = 5;
-	repeated uint64 food_reliquary_guid_list = 8;
+	repeated uint64 food_reliquary_guid_list = 6;
-	uint64 target_reliquary_guid = 11;
+	uint64 target_reliquary_guid = 3;
 }

proto/ReliquaryUpgradeRsp.proto

@@ -1,14 +1,15 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 5692
-// CmdId: 336
+// ?
 message ReliquaryUpgradeRsp {
-	uint64 target_reliquary_guid = 2;
+	uint64 target_reliquary_guid = 12;
-	int32 retcode = 3;
+	int32 retcode = 5;
-	uint32 power_up_rate = 5;
+	uint32 power_up_rate = 11;
-	uint32 cur_level = 6;
+	uint32 cur_level = 7;
-	uint32 old_level = 7;
+	uint32 old_level = 14;
-	repeated uint32 cur_append_prop_list = 9; //old_append_prop_list or cur_append_prop_list
+	// sus
-	repeated uint32 old_append_prop_list = 10; //old_append_prop_list or cur_append_prop_list
+	repeated uint32 cur_append_prop_list = 1;
+	repeated uint32 old_append_prop_list = 8;
 }

proto/SceneAudioNotify.proto

@@ -1,27 +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: 4490
+// 4.7.0
-// Obf: KJPABKOEPJN
+// CmdId: 7184
+// Obf: DDCKECBDELH
 message SceneAudioNotify {
-	repeated string param3 = 11;
+	repeated string param3 = 10;
-	repeated float param2 = 6;
+	repeated float param2 = 8;
-	uint32 source_uid = 2;
+	uint32 source_uid = 6;
-	repeated uint32 param1 = 4;
+	repeated uint32 param1 = 1;
-	int32 type = 12;
+	int32 type = 4;
 }

proto/SceneAvatarStaminaStepReq.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 "Vector.proto";
-// CmdId: 543
+// 4.7.0
-// Obf: OALKNGKGAJL
+// CmdId: 27101
+// Obf: ALBFMCCECLE
 message SceneAvatarStaminaStepReq {
-	Vector rot = 5;
+	Vector rot = 15;
 	bool use_client_rot = 8;
 }

proto/SceneAvatarStaminaStepRsp.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+import "Vector.proto";
+// 4.7.0
+// CmdId: 29213
+// Obf: HPHCIAAOGKJ
+message SceneAvatarStaminaStepRsp {
+	Vector rot = 3;
+	bool use_client_rot = 13;
+	int32 retcode = 1;
+}

proto/SceneKickPlayerReq.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 <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 29095
+// CmdId: 182 ???
-// Obf: HMIBDCFKKBC
+// Obf: ???
 message SceneKickPlayerReq {
-	uint32 target_uid = 4;
+	uint32 target_uid = 3;
 }

proto/SetChatEmojiCollectionReq.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 "ChatEmojiCollectionData.proto";
-// CmdId: 21632
+// 4.7.0
-// Obf: CAOLNHCCHFO
+// CmdId: 1123
+// Obf: EACENNKMOFN
 message SetChatEmojiCollectionReq {
-	ChatEmojiCollectionData chat_emoji_collection_data = 10;
+	ChatEmojiCollectionData chat_emoji_collection_data = 4;
 }

proto/SetFriendEnterHomeOptionReq.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 "FriendEnterHomeOption.proto";
-// CmdId: 26896
+// 4.7.0
-// Obf: GFLDPKKAAKP
+// CmdId: 27828
+// Obf: EGCPPBGPKEM
 message SetFriendEnterHomeOptionReq {
-	FriendEnterHomeOption option = 6;
+	FriendEnterHomeOption option = 9;
 }

proto/TakeAchievementGoalRewardReq.proto

@@ -1,8 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 6501 (or TakeAchievementRewardReq)
-// CmdId: 2692
+// EOIFNDPMMHC
 message TakeAchievementGoalRewardReq {
-	repeated uint32 id_list = 12;
+	repeated uint32 id_list = 7;
 }

proto/TakeAchievementGoalRewardRsp.proto

@@ -1,12 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "ItemParam.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 8945
-// CmdId: 23787
+// NNIPPHOMNAE
 message TakeAchievementGoalRewardRsp {
-	repeated ItemParam item_list = 4;
+	repeated ItemParam item_list = 15;
-	repeated uint32 id_list = 12;
+	repeated uint32 id_list = 2;
-	int32 retcode = 13;
+	int32 retcode = 5;
 }

proto/TakeAchievementRewardReq.proto

@@ -1,8 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 29798
-// CmdId: 8646
+// FMJKPBJPKLP
 message TakeAchievementRewardReq {
-	repeated uint32 id_list = 9;
+	repeated uint32 id_list = 5;
 }

proto/TakeAchievementRewardRsp.proto

@@ -1,12 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "ItemParam.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 8024
-// CmdId: 24805
+// AAMGNJNLNPJ
 message TakeAchievementRewardRsp {
-	int32 retcode = 3;
+	int32 retcode = 9;
-	repeated ItemParam item_list = 4;
+	repeated ItemParam item_list = 14;
-	repeated uint32 id_list = 13;
+	repeated uint32 id_list = 5;
 }

proto/TakeBattlePassRewardReq.proto

@@ -1,12 +1,9 @@
 syntax = "proto3";
-
 option java_package = "emu.grasscutter.net.proto";
-
 import "BattlePassRewardTakeOption.proto";
-
+// CmdId: 27855
-// CmdId: 28683
+// Version: 4.7.0
-// Version: 4.6.0
+// Obfs: ?
-// Obfs: IMCLHEMCFIC
 message TakeBattlePassRewardReq {
-	repeated BattlePassRewardTakeOption take_option_list = 1;
+	repeated BattlePassRewardTakeOption take_option_list = 8;
 }

proto/TakeBattlePassRewardRsp.proto

@@ -1,15 +1,12 @@
 syntax = "proto3";
-
 option java_package = "emu.grasscutter.net.proto";
-
 import "BattlePassRewardTakeOption.proto";
 import "ItemParam.proto";
-
+// CmdId: 3069
-// CmdId: 1049
+// Version: 4.7.0
-// Version: 4.6.0
+// Obfs: ?
-// Obfs: PCPEJDNJIAD
 message TakeBattlePassRewardRsp {
-	repeated ItemParam item_list = 3;
+	repeated ItemParam item_list = 14;
 	repeated BattlePassRewardTakeOption take_option_list = 4;
-	int32 retcode = 14;
+	int32 retcode = 9;
 }

proto/TakePlayerLevelRewardReq.proto

@@ -2,8 +2,8 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
 // 4.7.0
-// cmdid: 20108 (lock) or 23531 or 8505
+// cmdid: 20108x or 23531(OK) or 8505
-// NOFJHPDHIEK ?
+// HELMFFAEDBN
 message TakePlayerLevelRewardReq {
-  uint32 level = 2;
+  uint32 level = 10;
 }

proto/TowerGetFloorStarRewardReq.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// CmdId: 23282
+// Obf: FILMDKJGMHF
+message TowerGetFloorStarRewardReq {
+	uint32 floor_id = 10;
+}

proto/UpdateAbilityCreatedMovingPlatformNotify.proto

@@ -1,15 +1,14 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// 4.6.0
+// CmdId: 6778
-// CmdId: 3822
+// ?
 message UpdateAbilityCreatedMovingPlatformNotify {
 	enum OpType {
 		OP_TYPE_NONE = 0;
 		OP_TYPE_ACTIVATE = 1;
 		OP_TYPE_DEACTIVATE = 2;
 	}
-
+	uint32 entity_id = 5;
-	uint32 entity_id = 7;
 	OpType op_type = 12;
 }

proto/UseMiracleRingReq.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+import "Vector.proto";
+// 4.7.0
+// CmdId: 24421
+// Obf: NPPAHHLALEN
+message UseMiracleRingReq {
+	Vector pos = 7;
+	uint32 miracle_ring_op_type = 3;
+	Vector rot = 22;
+}

proto/VehicleInteractReq.proto

@@ -1,27 +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 "VehicleInteractType.proto";
-// CmdId: 28312
+// 4.7.0
-// Obf: BPOCDLCHOCO
+// CmdId: 5099
+// Obf: ?
 message VehicleInteractReq {
-	uint32 entity_id = 10;
+	uint32 entity_id = 1;
-	uint32 pos = 7;
+	uint32 pos = 2;
-	VehicleInteractType interact_type = 9;
+	VehicleInteractType interact_type = 14;
-	bool EPCIACIPLAN = 15;
+	bool uk1 = 4;
 }

proto/VehicleInteractRsp.proto

@@ -9,10 +9,10 @@ import "VehicleInteractType.proto";
 message VehicleInteractRsp {
 	int32 retcode = 1;
 	VehicleMember member = 6;
-	//Vector KKDFCJENDNI = 4;
+	Vector uk1 = 2;
 	uint32 entity_id = 13;
 	VehicleInteractType interact_type = 5;
 	uint32 gadget_id = 8;
-	//Vector JGOGBMEKOPP = 1;
+	Vector uk2 = 15;
-	//uint32 CJIMMADJKHD = 10;
+	uint32 uk3 = 12;
 }

proto/ViewCodexReq.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+import "CodexTypeData.proto";
+// 4.7.0
+// CmdId: 4291
+// Obf: ?
+message ViewCodexReq {
+	repeated CodexTypeData type_data_list = 8;
+}