diff --git a/proto/AddBackupAvatarTeamReq.proto b/proto/AddBackupAvatarTeamReq.proto
index f76f4d84..34e3e895 100644
--- a/proto/AddBackupAvatarTeamReq.proto
+++ b/proto/AddBackupAvatarTeamReq.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";
-// CmdId: 22083
-// Obf: PDKOLMGNNBP
+// 4.7.0
+// CmdId: 22689
+// Obf: IOBLPIFEACE
 message AddBackupAvatarTeamReq {
 }
diff --git a/proto/AskAddFriendNotify.proto b/proto/AskAddFriendNotify.proto
index 23ed6974..d60ab301 100644
--- a/proto/AskAddFriendNotify.proto
+++ b/proto/AskAddFriendNotify.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 "FriendBrief.proto";
-// CmdId: 27323
-// Obf: NADOGBCLNJI
+// 4.7.0
+// CmdId: 27545?,147
+// Obf: GGACHDHALAE
 message AskAddFriendNotify {
-	uint32 target_uid = 3;
-	FriendBrief target_friend_brief = 7;
+	uint32 target_uid = 12;
+	FriendBrief target_friend_brief = 9;
 }
diff --git a/proto/AskAddFriendReq.proto b/proto/AskAddFriendReq.proto
index 18ca338c..84cea6c9 100644
--- a/proto/AskAddFriendReq.proto
+++ b/proto/AskAddFriendReq.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: 9257
-// Obf: DHLNDCPMCPG
+// 4.7.0
+// CmdId: 4872
+// Obf: BDGPNIDOEIB
 message AskAddFriendReq {
-	uint32 target_uid = 8;
+	uint32 target_uid = 11;
 }
diff --git a/proto/AskAddFriendRsp.proto b/proto/AskAddFriendRsp.proto
index 5458d855..20ca056d 100644
--- a/proto/AskAddFriendRsp.proto
+++ b/proto/AskAddFriendRsp.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: 1146
-// Obf: DGNBHNPCBNC
+// 4.7.0
+// CmdId: 3297
+// Obf: ?
 message AskAddFriendRsp {
-	uint32 target_uid = 3;
-	int32 retcode = 15;
-	uint32 param = 7;
+	uint32 target_uid = 14;
+	int32 retcode = 15; // OK
+	uint32 param = 13;
 }
diff --git a/proto/ChangeHpDebts.proto b/proto/ChangeHpDebts.proto
index ec64be56..44cbf7a8 100644
--- a/proto/ChangeHpDebts.proto
+++ b/proto/ChangeHpDebts.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
-// 4.6.0
+// 4.7.0
 enum ChangeHpDebts {
-	CHANGE_HP_DEBTS_NONE = 0;
-	CHANGE_HP_DEBTS_PAY = 1;
-	CHANGE_HP_DEBTS_PAYFINISH = 2;
-	CHANGE_HP_DEBTS_CLEAR = 21;
-	CHANGE_HP_DEBTS_ADDABILiTY = 51;
+  CHANGE_HP_DEBTS_NONE = 0;
+  CHANGE_HP_DEBTS_PAY = 1;
+  CHANGE_HP_DEBTS_PAY_FINISH = 2;
+  CHANGE_HP_DEBTS_CLEAR = 21;
+  CHANGE_HP_DEBTS_REDUCE_ABILITY = 41;
+  CHANGE_HP_DEBTS_ADD_ABILITY = 51;
 }
diff --git a/proto/ChangeHpReason.proto b/proto/ChangeHpReason.proto
index 41d16c18..154e9824 100644
--- a/proto/ChangeHpReason.proto
+++ b/proto/ChangeHpReason.proto
@@ -1,41 +1,41 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
-//obf: MKHKMLCFAAJ
+// 4.7.0
 enum ChangeHpReason {
-	CHANGE_HP_REASON_NONE = 0;
-	CHANGE_HP_REASON_SUB_AVATAR = 1;
-	CHANGE_HP_REASON_SUB_MONSTER = 2;
-	CHANGE_HP_REASON_SUB_GEAR = 3;
-	CHANGE_HP_REASON_SUB_ENVIR = 4;
-	CHANGE_HP_REASON_SUB_FALL = 5;
-	CHANGE_HP_REASON_SUB_DRAWN = 6;
-	CHANGE_HP_REASON_SUB_ABYSS = 7;
-	CHANGE_HP_REASON_SUB_ABILITY = 8;
-	CHANGE_HP_REASON_SUB_SUMMON = 9;
-	CHANGE_HP_REASON_SUB_SCRIPT = 10;
-	CHANGE_HP_REASON_SUB_GM = 11;
-	CHANGE_HP_REASON_SUB_KILL_SELF = 12;
-	CHANGE_HP_REASON_SUB_CLIMATE_COLD = 13;
-	CHANGE_HP_REASON_SUB_STORM_LIGHTNING = 14;
-	CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET = 15;
-	CHANGE_HP_REASON_SUB_REPLACE = 16;
-	CHANGE_HP_REASON_SUB_PLAYER_LEAVE = 17;
-	CHANGE_HP_REASON_ATTACK_BY_ENERGY = 18;
-	CHANGE_HP_REASON_ATTACK_BY_RECYCLE = 19;
-	CHANGE_HP_REASON_SUB_PLAYER_BACK = 20;
-	CHANGE_HP_REASON_SUB_UGC = 21;
-	CHANGE_HP_REASON_SUB_DIRTY_WATER_EROSION = 22;
-	CHANGE_HP_REASON_SUB_DESTROY_SELF = 23;
-	CHANGE_HP_REASON_BY_LUA = 51;
-	CHANGE_HP_REASON_ADD_ABILITY = 101;
-	CHANGE_HP_REASON_ADD_ITEM = 102;
-	CHANGE_HP_REASON_ADD_REVIVE = 103;
-	CHANGE_HP_REASON_ADD_UPGRADE = 104;
-	CHANGE_HP_REASON_ADD_STATUE = 105;
-	CHANGE_HP_REASON_ADD_BACKGROUND = 106;
-	CHANGE_HP_REASON_ADD_GM = 107;
-	CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY = 108;
-	CHANGE_HP_REASON_ADD_ROUGUELIKE_SPRING = 109;
-	CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V5 = 110;
-}
+  CHANGE_HP_REASON_NONE = 0;
+  CHANGE_HP_REASON_SUB_AVATAR = 1;
+  CHANGE_HP_REASON_SUB_MONSTER = 2;
+  CHANGE_HP_REASON_SUB_GEAR = 3;
+  CHANGE_HP_REASON_SUB_ENVIR = 4;
+  CHANGE_HP_REASON_SUB_FALL = 5;
+  CHANGE_HP_REASON_SUB_DRAWN = 6;
+  CHANGE_HP_REASON_SUB_ABYSS = 7;
+  CHANGE_HP_REASON_SUB_ABILITY = 8;
+  CHANGE_HP_REASON_SUB_SUMMON = 9;
+  CHANGE_HP_REASON_SUB_SCRIPT = 10;
+  CHANGE_HP_REASON_SUB_GM = 11;
+  CHANGE_HP_REASON_SUB_KILL_SELF = 12;
+  CHANGE_HP_REASON_SUB_CLIMATE_COLD = 13;
+  CHANGE_HP_REASON_SUB_STORM_LIGHTNING = 14;
+  CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET = 15;
+  CHANGE_HP_REASON_SUB_REPLACE = 16;
+  CHANGE_HP_REASON_SUB_PLAYER_LEAVE = 17;
+  CHANGE_HP_REASON_ATTACK_BY_ENERGY = 18;
+  CHANGE_HP_REASON_ATTACK_BY_RECYCLE = 19;
+  CHANGE_HP_REASON_SUB_PLAYER_BACK = 20;
+  CHANGE_HP_REASON_SUB_UGC = 21;
+  CHANGE_HP_REASON_SUB_DIRTY_WATER_EROSION = 22;
+  CHANGE_HP_REASON_SUB_DESTROY_SELF = 23;
+  CHANGE_HP_REASON_BY_LUA = 51;
+  CHANGE_HP_REASON_ADD_ABILITY = 101;
+  CHANGE_HP_REASON_ADD_ITEM = 102;
+  CHANGE_HP_REASON_ADD_REVIVE = 103;
+  CHANGE_HP_REASON_ADD_UPGRADE = 104;
+  CHANGE_HP_REASON_ADD_STATUE = 105;
+  CHANGE_HP_REASON_ADD_BACKGROUND = 106;
+  CHANGE_HP_REASON_ADD_GM = 107;
+  CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY = 108;
+  CHANGE_HP_REASON_ADD_ROUGUELIKE_SPRING = 109;
+  CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V5 = 110;
+}
\ No newline at end of file
diff --git a/proto/ChangeMpTeamAvatarReq.proto b/proto/ChangeMpTeamAvatarReq.proto
index f0e9b051..cc0b4a0d 100644
--- a/proto/ChangeMpTeamAvatarReq.proto
+++ b/proto/ChangeMpTeamAvatarReq.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: 29260
-// Obf: GIEGGDAJFBE
+// 4.7.0
+// CmdId: 26305
+// Obf: MOANBPAGANO
 message ChangeMpTeamAvatarReq {
-	uint64 cur_avatar_guid = 2;
-	repeated uint64 avatar_guid_list = 12;
+	uint64 cur_avatar_guid = 2; // OK
+	repeated uint64 avatar_guid_list = 11;
 }
diff --git a/proto/ChangeMpTeamAvatarRsp.proto b/proto/ChangeMpTeamAvatarRsp.proto
index c0e655e7..c1a2ac80 100644
--- a/proto/ChangeMpTeamAvatarRsp.proto
+++ b/proto/ChangeMpTeamAvatarRsp.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: 352
-// Obf: LFHCFAFFODE
+// 4.7.0
+// CmdId: 23226
+// Obf: GJEGHGGGHDN
 message ChangeMpTeamAvatarRsp {
-	repeated uint64 avatar_guid_list = 10;
-	uint64 cur_avatar_guid = 13;
-	int32 retcode = 9;
+	repeated uint64 avatar_guid_list = 4;
+	uint64 cur_avatar_guid = 3;
+	int32 retcode = 14;
 }
diff --git a/proto/ClientLoadingCostumeVerificationNotify.proto b/proto/ClientLoadingCostumeVerificationNotify.proto
index c433d0fb..64362dc0 100644
--- a/proto/ClientLoadingCostumeVerificationNotify.proto
+++ b/proto/ClientLoadingCostumeVerificationNotify.proto
@@ -1,12 +1,10 @@
 syntax = "proto3";
-
 option java_package = "emu.grasscutter.net.proto";
-
-// CmdId: 9147
-// Version: 4.6.0
-// Obfs: LOCACCFEBLN
+// CmdId: 22940
+// Version: 4.7.0
+// Obfs: DAJOOCKKLLJ ?
 message ClientLoadingCostumeVerificationNotify {
-	uint64 prefab_hash = 2;
-	uint32 costume_id = 4;
-	uint64 guid = 6;
+	uint64 prefab_hash = 15;
+	uint32 costume_id = 2;
+	uint64 guid = 10;
 }
diff --git a/proto/ClientScriptEventNotify.proto b/proto/ClientScriptEventNotify.proto
index 9c4b6253..51d1fb48 100644
--- a/proto/ClientScriptEventNotify.proto
+++ b/proto/ClientScriptEventNotify.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";
-// CmdId: 3165
-// Obf: KPKNHHAMCOG
+// 4.7.0
+// CmdId: 1503
+// Obf: ?
 message ClientScriptEventNotify {
-	uint32 source_entity_id = 14;
-	uint32 target_entity_id = 1;
-	uint32 event_type = 4;
-	repeated int32 param_list = 2;
+	uint32 source_entity_id = 5;
+	uint32 target_entity_id = 2;
+	uint32 event_type = 10;
+	repeated int32 param_list = 4;
 }
diff --git a/proto/DealAddFriendReq.proto b/proto/DealAddFriendReq.proto
index 1ca1fa0a..f39f80b3 100644
--- a/proto/DealAddFriendReq.proto
+++ b/proto/DealAddFriendReq.proto
@@ -1,25 +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 "DealAddFriendResultType.proto";
-// CmdId: 25212
-// Obf: FAIFBJNFCAG
+// CmdId: 1458
+// Obf: MDIDNIHDCCK
 message DealAddFriendReq {
-	DealAddFriendResultType deal_add_friend_result = 11;
-	uint32 target_uid = 1;
+	DealAddFriendResultType deal_add_friend_result = 1;
+	uint32 target_uid = 7;
 }
diff --git a/proto/DealAddFriendRsp.proto b/proto/DealAddFriendRsp.proto
index 3cfa045f..13d7db51 100644
--- a/proto/DealAddFriendRsp.proto
+++ b/proto/DealAddFriendRsp.proto
@@ -1,26 +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 "DealAddFriendResultType.proto";
-// CmdId: 9178
-// Obf: BCEPNMLPFLB
+// CmdId: 29333
+// Obf: BPBCKIEJHOO
 message DealAddFriendRsp {
-	int32 retcode = 6;
-	uint32 target_uid = 12;
-	DealAddFriendResultType deal_add_friend_result = 7;
+	int32 retcode = 3;
+	uint32 target_uid = 8;
+	DealAddFriendResultType deal_add_friend_result = 4;
 }
diff --git a/proto/DelBackupAvatarTeamReq.proto b/proto/DelBackupAvatarTeamReq.proto
index 6daada51..49c1278e 100644
--- a/proto/DelBackupAvatarTeamReq.proto
+++ b/proto/DelBackupAvatarTeamReq.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: 9455
-// Obf: KIFNLHMNCMM
+// 4.7.0
+// CmdId: 20273
+// Obf: GIMKMOAJCLA
 message DelBackupAvatarTeamReq {
-	uint32 backup_avatar_team_id = 10;
+	uint32 backup_avatar_team_id = 9;
 }
diff --git a/proto/DelBackupAvatarTeamRsp.proto b/proto/DelBackupAvatarTeamRsp.proto
index a4d87acf..daf952a8 100644
--- a/proto/DelBackupAvatarTeamRsp.proto
+++ b/proto/DelBackupAvatarTeamRsp.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: 3661
-// Obf: FFNGPJOGGAC
+// 4.7.0
+// CmdId: 5780
+// Obf: PIDEENPNKFG
 message DelBackupAvatarTeamRsp {
-	int32 retcode = 6;
-	uint32 backup_avatar_team_id = 14;
+	int32 retcode = 1;
+	uint32 backup_avatar_team_id = 15;
 }
diff --git a/proto/DeleteFriendReq.proto b/proto/DeleteFriendReq.proto
index b0368221..1b5aeddf 100644
--- a/proto/DeleteFriendReq.proto
+++ b/proto/DeleteFriendReq.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: 3037
-// Obf: PALNPHNIHDF
+// CmdId: 26120
+// Obf: BPDICGMOACG
 message DeleteFriendReq {
-	uint32 target_uid = 11;
+	uint32 target_uid = 4;
 }
diff --git a/proto/EntityMoveInfo.proto b/proto/EntityMoveInfo.proto
index efd3353a..fe6898b7 100644
--- a/proto/EntityMoveInfo.proto
+++ b/proto/EntityMoveInfo.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";
 import "MotionInfo.proto";
-// Obf: LHBMDEAGHFD
+// 4.7.0 ?
+// Obf: ?
 message EntityMoveInfo {
 	uint32 entity_id = 1;
 	MotionInfo motion_info = 2;
diff --git a/proto/EvtBulletHitNotify.proto b/proto/EvtBulletHitNotify.proto
index 4b6ee106..d0811b7f 100644
--- a/proto/EvtBulletHitNotify.proto
+++ b/proto/EvtBulletHitNotify.proto
@@ -1,34 +1,19 @@
-// 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 "HitColliderType.proto";
 import "Vector.proto";
-// CmdId: 23746
-// Obf: LAFKEDKPKIM
+// 4.7.0
+// CmdId: 5735
+// Obf: ?
 message EvtBulletHitNotify {
-	ForwardType forward_type = 3;
-	HitColliderType hit_collider_type = 5;
-	uint32 KDBDDHAOOME = 6;
-	Vector hit_point = 1;
-	uint32 HNMABCLIAMB = 7;
-	Vector hit_normal = 4;
-	uint32 entity_id = 9;
-	int32 hit_box_index = 12;
-	uint32 forward_peer = 8;
+  ForwardType forward_type = 1;
+  HitColliderType hit_collider_type = 7;
+  Vector hit_point = 5; // sus
+  Vector hit_normal = 11; // sus
+  uint32 entity_id = 6;
+  int32 hit_box_index = 14;
+  uint32 forward_peer = 9;
+  uint32 uk1 = 8;
+  uint32 uk2 = 15;
 }
diff --git a/proto/GetOnlinePlayerInfoReq.proto b/proto/GetOnlinePlayerInfoReq.proto
index ae6720d9..17ed9f13 100644
--- a/proto/GetOnlinePlayerInfoReq.proto
+++ b/proto/GetOnlinePlayerInfoReq.proto
@@ -1,28 +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: 21665
-// Obf: DNNMIGPCKOH
+// 4.7.0
+// CmdId: 4777
+// Obf: ?
 message GetOnlinePlayerInfoReq {
-	bool is_online_id = 7;
+	bool is_online_id = 9;
 	oneof player_id {
-		uint32 target_uid = 3;
-		string online_id = 11;
-		string psn_id = 4;
+		uint32 target_uid = 10;
+		string online_id = 8;
+		string psn_id = 3;
 	}
 }
diff --git a/proto/GetOnlinePlayerInfoRsp.proto b/proto/GetOnlinePlayerInfoRsp.proto
index 5377a891..e20c27b3 100644
--- a/proto/GetOnlinePlayerInfoRsp.proto
+++ b/proto/GetOnlinePlayerInfoRsp.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 "OnlinePlayerInfo.proto";
-// CmdId: 8759
-// Obf: LDNOEIHGGKN
+// 4.7.0
+// CmdId: 1490
+// Obf: ACFKBEAGCNK
 message GetOnlinePlayerInfoRsp {
-	uint32 target_uid = 2;
-	OnlinePlayerInfo target_player_info = 14;
-	uint32 param = 5;
-	int32 retcode = 6;
+	uint32 target_uid = 2; // OK
+	OnlinePlayerInfo target_player_info = 12;
+	uint32 param = 7;
+	int32 retcode = 13;
 }
diff --git a/proto/GetPlayerAskFriendListReq.proto b/proto/GetPlayerAskFriendListReq.proto
index 6a6ead07..09be3404 100644
--- a/proto/GetPlayerAskFriendListReq.proto
+++ b/proto/GetPlayerAskFriendListReq.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";
-// CmdId: 3520
-// Obf: FHNBEAINLJA
+// 4.7.0
+// CmdId: 23308
+// Obf: ?
 message GetPlayerAskFriendListReq {
 }
diff --git a/proto/GetPlayerAskFriendListRsp.proto b/proto/GetPlayerAskFriendListRsp.proto
index 20a4813c..45f353f4 100644
--- a/proto/GetPlayerAskFriendListRsp.proto
+++ b/proto/GetPlayerAskFriendListRsp.proto
@@ -1,25 +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 "FriendBrief.proto";
-// CmdId: 20085
-// Obf: JGLDEDHOMNL
+// CmdId: 8429
+// Obf: ?
 message GetPlayerAskFriendListRsp {
-	repeated FriendBrief ask_friend_list = 12;
-	int32 retcode = 13;
+	repeated FriendBrief ask_friend_list = 6;
+	int32 retcode = 12;
 }
diff --git a/proto/GetPlayerFriendListReq.proto b/proto/GetPlayerFriendListReq.proto
index 3fb2b6c7..dca7dd1d 100644
--- a/proto/GetPlayerFriendListReq.proto
+++ b/proto/GetPlayerFriendListReq.proto
@@ -1,6 +1,5 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
-// 4.6.0
+// 4.7.0 ?
 message GetPlayerFriendListReq {
 }
\ No newline at end of file
diff --git a/proto/GetPlayerFriendListRsp.proto b/proto/GetPlayerFriendListRsp.proto
index 77b6dce6..9d364cc3 100644
--- a/proto/GetPlayerFriendListRsp.proto
+++ b/proto/GetPlayerFriendListRsp.proto
@@ -1,8 +1,6 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "FriendBrief.proto";
-
 // 4.7.0
 message GetPlayerFriendListRsp {
   repeated FriendBrief friend_list = 1;
diff --git a/proto/PlayerApplyEnterMpNotify.proto b/proto/PlayerApplyEnterMpNotify.proto
index cea13200..e8e955a7 100644
--- a/proto/PlayerApplyEnterMpNotify.proto
+++ b/proto/PlayerApplyEnterMpNotify.proto
@@ -4,7 +4,7 @@ import "OnlinePlayerInfo.proto";
 // CmdId: 7182 ? (4.7.0)
 // Obf: HKDJLHPMDFP
 message PlayerApplyEnterMpNotify {
-	uint32 src_app_id = 15;
-	uint32 src_thread_index = 9;
+	uint32 src_app_id = 9;
+	uint32 src_thread_index = 15;
 	OnlinePlayerInfo src_player_info = 14;
 }
diff --git a/proto/PlayerApplyEnterMpResultNotify.proto b/proto/PlayerApplyEnterMpResultNotify.proto
index 5df383f3..9b169f46 100644
--- a/proto/PlayerApplyEnterMpResultNotify.proto
+++ b/proto/PlayerApplyEnterMpResultNotify.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 1143 (4.7.0)
-// Obf: BFHAGEOJCPG
+// CmdId: 27203 (4.7.0)
+// Obf: BPINAIKKBEL
 message PlayerApplyEnterMpResultNotify {	
 
 	enum Reason {
diff --git a/proto/PlayerChatNotify.proto b/proto/PlayerChatNotify.proto
index 3690db4e..6b6ed312 100644
--- a/proto/PlayerChatNotify.proto
+++ b/proto/PlayerChatNotify.proto
@@ -1,11 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "ChatInfo.proto";
-
-// 4.6.0
-// CmdId: 9695
+// 4.7.0
+// CmdId: 1772
+// OJDDKJJMMKK
 message PlayerChatNotify {
-	ChatInfo chat_info = 9;
-	uint32 channel_id = 12;
+	ChatInfo chat_info = 6;
+	uint32 channel_id = 2;
 }
\ No newline at end of file
diff --git a/proto/PlayerChatReq.proto b/proto/PlayerChatReq.proto
index 1e9c76f0..f954d5d8 100644
--- a/proto/PlayerChatReq.proto
+++ b/proto/PlayerChatReq.proto
@@ -1,11 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "ChatInfo.proto";
-
-// 4.6.0
-// CmdId: 26464
+// 4.7.0
+// CmdId: 5171?
 message PlayerChatReq {
-	uint32 channel_id = 9;
-	ChatInfo chat_info = 10;
+	uint32 channel_id = 1;
+	ChatInfo chat_info = 9;
 }
\ No newline at end of file
diff --git a/proto/PlayerEnterSceneNotify.proto b/proto/PlayerEnterSceneNotify.proto
index 985ec20d..5021dcc6 100644
--- a/proto/PlayerEnterSceneNotify.proto
+++ b/proto/PlayerEnterSceneNotify.proto
@@ -7,23 +7,23 @@ import "MapLayerInfo.proto";
 
 // 4.7.0
 message PlayerEnterSceneNotify {
-  uint32 target_uid = 7;
-  uint64 scene_begin_time = 6;
-  uint32 scene_id = 13;
-  uint32 enter_scene_token = 15;
-  string scene_transaction = 607;
-  repeated uint32 scene_tag_id_list = 9;
-  Vector pos = 10;
-  EnterType type = 1;
-  uint32 create_player_uid = 1749;
-  MapLayerInfo map_layer_info = 1413;
+  uint32 target_uid = 7; // OK
+  uint64 scene_begin_time = 6; // OK
+  uint32 scene_id = 13; // OK
+  uint32 enter_scene_token = 15; // OK
+  string scene_transaction = 607; // OK
+  repeated uint32 scene_tag_id_list = 9; // OK
+  Vector pos = 10; // OK
+  EnterType type = 1; // OK
+  uint32 create_player_uid = 1749; // OK
+  MapLayerInfo map_layer_info = 1413; // OK
   bool is_skip_ui = 237;
   bool is_first_login_enter_scene = 289;
   Vector prev_pos = 1414;
   uint32 prev_scene_id = 81;
   uint32 world_type = 1327;
   uint32 enter_reason = 670;
-  uint32 LAJGLCIFKCP = 1820;
+  // uint32 LAJGLCIFKCP = 1820;
   uint32 world_level = 5;
   uint32 dungeon_id = 11;
 }
\ No newline at end of file
diff --git a/proto/PlayerPreEnterMpNotify.proto b/proto/PlayerPreEnterMpNotify.proto
index dd9c3a67..e81b2a8f 100644
--- a/proto/PlayerPreEnterMpNotify.proto
+++ b/proto/PlayerPreEnterMpNotify.proto
@@ -1,32 +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: 23905
-// Obf: ONELCJDDCIP
+// 4.7.0
+// CmdId: 22149
+// Obf: GPMDAELMECF
 message PlayerPreEnterMpNotify {
-	// Obf: CIAEAJLPCDG
 	enum State {
 		INVALID = 0;
 		START = 1;
 		TIMEOUT = 2;
-	}
-	
-	State state = 11;
-	string nickname = 10;
-	uint32 uid = 5;
+	}	
+	State state = 7;
+	string nickname = 2;
+	uint32 uid = 3;
 }
diff --git a/proto/PrivateChatNotify.proto b/proto/PrivateChatNotify.proto
index 82273f0f..2fd98023 100644
--- a/proto/PrivateChatNotify.proto
+++ b/proto/PrivateChatNotify.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "ChatInfo.proto";
-
 // 4.7.0
+// CmdId: 7936
+// ?
 message PrivateChatNotify {
   ChatInfo chat_info = 14;
 }
\ No newline at end of file
diff --git a/proto/PullPrivateChatRsp.proto b/proto/PullPrivateChatRsp.proto
index dcfde29f..65b6d7d1 100644
--- a/proto/PullPrivateChatRsp.proto
+++ b/proto/PullPrivateChatRsp.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "ChatInfo.proto";
-
 // 4.7.0
+// CmdId: 23154
+// ?
 message PullPrivateChatRsp {
   repeated ChatInfo chat_info = 1;
   int32 retcode = 9;
diff --git a/proto/PullRecentChatRsp.proto b/proto/PullRecentChatRsp.proto
index 775e28fd..4da8479d 100644
--- a/proto/PullRecentChatRsp.proto
+++ b/proto/PullRecentChatRsp.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "ChatInfo.proto";
-
 // 4.7.0
+// CmdId: 523
+// ?
 message PullRecentChatRsp {
   repeated ChatInfo chat_info = 9;
   int32 retcode = 14;
diff --git a/proto/SceneEntityMoveNotify.proto b/proto/SceneEntityMoveNotify.proto
index 570fc34b..99361269 100644
--- a/proto/SceneEntityMoveNotify.proto
+++ b/proto/SceneEntityMoveNotify.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "MotionInfo.proto";
 // 4.7.0
-// CmdId: 6446
+// CmdId: 28352, 6446X
 // Obf: CNFNMBHLHEK
 message SceneEntityMoveNotify {
-	MotionInfo motion_info = 3;
-	uint32 entity_id = 15;
-	uint32 reliable_seq = 12;
-	uint32 scene_time = 8;
+	MotionInfo motion_info = 1;
+	uint32 entity_id = 15; // OK
+	uint32 reliable_seq = 3;
+	uint32 scene_time = 4;
 }