diff --git a/deobf.proto b/deobf.proto
index a1729ec1..f6561308 100644
--- a/deobf.proto
+++ b/deobf.proto
@@ -467,13 +467,13 @@ message NEDBIFNEAAF {
 }
 
 // CmdId: 9268
-message BHMAKOIEFJM {
-	uint32 MKBPBOHGNHI = 1;
-	uint32 DJLNPDLGALE = 3;
+message AvatarSkillChangeNotify {
+	uint32 avatar_skill_id = 1;
+	uint32 old_level = 3;
 	uint64 avatar_guid = 8;
 	uint32 skill_depot_id = 11;
 	uint32 entity_id = 12;
-	uint32 BAOKGCLFNNP = 13;
+	uint32 cur_level = 13;
 }
 
 message HKAMEPMHAHN {
@@ -3879,11 +3879,11 @@ message DICGHBAAJAE {
 
 // CmdId: 3294
 message LHEIDHIFFGK {
-	uint32 BAOKGCLFNNP = 3;
+	uint32 cur_level = 3;
 	uint64 CMFCDHLPBNA = 7;
 	int32 retcode = 12;
 	repeated ItemParam item_param_list = 13;
-	uint32 DJLNPDLGALE = 14;
+	uint32 old_level = 14;
 }
 
 // CmdId: 29151
@@ -7868,7 +7868,7 @@ message BMKAHHPHDGG {
 message KCHDIJBNIDF {
 	uint32 dungeon_id = 1;
 	bool NBCIMAAOBIB = 2;
-	uint32 BAOKGCLFNNP = 3;
+	uint32 cur_level = 3;
 	uint32 MPBKOOBMDBH = 4;
 	float IPGBMMMNOED = 5;
 	uint32 stage_id = 7;
@@ -8291,9 +8291,9 @@ enum EnterCustomDungeonType {
 
 // CmdId: 24717
 message BLLMLEOCFDA {
-	uint32 DJLNPDLGALE = 1;
+	uint32 old_level = 1;
 	uint64 avatar_guid = 2;
-	uint32 BAOKGCLFNNP = 12;
+	uint32 cur_level = 12;
 	int32 retcode = 13;
 }
 
@@ -9700,7 +9700,7 @@ message IFDNEINNGJJ {
 }
 
 // CmdId: 9198
-message LPOHNDHLKFF {
+message AvatarSkillMaxChargeCountNotify {
 	uint64 avatar_guid = 6;
 	uint32 max_charge_count = 11;
 	uint32 skill_id = 12;
@@ -12147,12 +12147,12 @@ message FNKCEPINDBA {
 }
 
 // CmdId: 26538
-message NMPDAEHOGGB {
-	uint32 MKBPBOHGNHI = 8;
-	uint32 BAOKGCLFNNP = 9;
+message AvatarSkillUpgradeRsp {
+	uint32 avatar_skill_id = 8;
+	uint32 cur_level = 9;
 	uint64 avatar_guid = 10;
 	int32 retcode = 11;
-	uint32 DJLNPDLGALE = 13;
+	uint32 old_level = 13;
 }
 
 // CmdId: 2864
@@ -17332,9 +17332,9 @@ message FECDNBANJMH {
 }
 
 // CmdId: 22618
-message CCDGPIJIJGE {
-	uint32 MKBPBOHGNHI = 3;
-	uint32 DJLNPDLGALE = 4;
+message AvatarSkillUpgradeReq {
+	uint32 avatar_skill_id = 3;
+	uint32 old_level = 4;
 	uint64 avatar_guid = 14;
 }
 
@@ -18195,14 +18195,14 @@ message JHHDJDHFNEI {
 }
 
 // CmdId: 568
-message HKHPJBNDJAD {
+message AvatarSkillDepotChangeNotify {
 	map<uint32, uint32> skill_level_map = 1;
 	uint32 skill_depot_id = 3;
 	uint32 core_proud_skill_level = 6;
 	map<uint32, uint32> proud_skill_extra_level_map = 8;
 	repeated uint32 talent_id_list = 9;
 	uint32 entity_id = 11;
-	repeated uint32 IKJKGJEMFHG = 12;
+	repeated uint32 proud_skill_list = 12;
 	uint64 avatar_guid = 13;
 }
 
@@ -21018,7 +21018,7 @@ message FCAKLNIIGGN {
 // CmdId: 28284
 message OOEIHDEOPMD {
 	uint32 NLEODIPFIKM = 3;
-	uint32 BAOKGCLFNNP = 5;
+	uint32 cur_level = 5;
 	int32 retcode = 9;
 }
 
@@ -26021,7 +26021,7 @@ message DHCLJNJBMJG {
 }
 
 message AJPEDHOCLEC {
-	uint32 BAOKGCLFNNP = 2;
+	uint32 cur_level = 2;
 	uint32 BADKDPFPHEN = 3;
 	uint32 FNHOIPGCDBM = 5;
 	uint32 PACDJMOCNOP = 13;
@@ -29087,7 +29087,7 @@ message ProfilePicture {
 message DCBADOHAMHA {
 	map<uint32, EBHDGPKHAKC> OCJJHKPBACJ = 2;
 	bool JGCDNBCKEGN = 4;
-	uint32 BAOKGCLFNNP = 6;
+	uint32 cur_level = 6;
 	uint32 stage_id = 8;
 	bool GGDAKFCHOMB = 11;
 	uint32 FHOADOLHICC = 12;
@@ -29873,7 +29873,7 @@ message RogueStageInfo {
 	RogueShowAvatarTeamInfo avatar_team = 12;
 	bool NBKECAAGDJN = 13;
 	repeated RoguelikeRuneReward rune_record_list = 14;
-	uint32 BAOKGCLFNNP = 15;
+	uint32 cur_level = 15;
 	uint32 MDGLIMINJJI = 720;
 	uint32 DJGJCGHLMEK = 1644;
 }
@@ -30828,11 +30828,11 @@ message NLEAPJMHEJN {
 message OKFBJONFDIJ {
 	repeated uint32 HKHHDKBBEEI = 1;
 	int32 retcode = 5;
-	uint32 BAOKGCLFNNP = 7;
+	uint32 cur_level = 7;
 	repeated uint32 KJHAIEBIGIN = 8;
 	uint32 PALIOJGIDMF = 11;
 	uint64 KIGIBADDGGO = 12;
-	uint32 DJLNPDLGALE = 14;
+	uint32 old_level = 14;
 }
 
 message DFBJAOBKBPJ {
@@ -31744,7 +31744,7 @@ message EHHBKDIBIBP {
 message CKOBPGFNGLL {
 	uint64 avatar_guid = 4;
 	uint32 skill_depot_id = 6;
-	repeated uint32 IKJKGJEMFHG = 11;
+	repeated uint32 proud_skill_list = 11;
 	uint32 entity_id = 15;
 }
 
diff --git a/proto/AvatarSkillChangeNotify.proto b/proto/AvatarSkillChangeNotify.proto
index b7d3ddcb..7cd5a9d6 100644
--- a/proto/AvatarSkillChangeNotify.proto
+++ b/proto/AvatarSkillChangeNotify.proto
@@ -1,13 +1,14 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
-// CmdId: 854
+// 4.7.0
+// CmdId: 9268
+// BHMAKOIEFJM
 message AvatarSkillChangeNotify {
-	uint32 skill_depot_id = 1;
-	uint32 old_level = 2;
-	uint32 avatar_skill_id = 5;
-	uint32 cur_level = 6;
-	uint32 entity_id = 10;
-	uint64 avatar_guid = 11;
+	uint32 skill_depot_id = 11;
+	uint32 old_level = 3;
+	uint32 avatar_skill_id = 1;
+	uint32 cur_level = 13;
+	uint32 entity_id = 12;
+	uint64 avatar_guid = 8;
 }
\ No newline at end of file
diff --git a/proto/AvatarSkillDepotChangeNotify.proto b/proto/AvatarSkillDepotChangeNotify.proto
index b519ae4f..58771d95 100644
--- a/proto/AvatarSkillDepotChangeNotify.proto
+++ b/proto/AvatarSkillDepotChangeNotify.proto
@@ -2,14 +2,16 @@ syntax = "proto3";
 
 option java_package = "emu.grasscutter.net.proto";
 
-// CmdId: 25636
+// 4.7.0
+// CmdId: 568
+// HKHPJBNDJAD
 message AvatarSkillDepotChangeNotify {
-	uint32 entity_id = 3;
-	uint32 core_proud_skill_level = 5;
-	map<uint32, uint32> proud_skill_extra_level_map = 7;
-	uint64 avatar_guid = 8;
-	map<uint32, uint32> skill_level_map = 9;
-	repeated uint32 proud_skill_list = 11;
-	repeated uint32 talent_id_list = 12;
-	uint32 skill_depot_id = 14;
+	uint32 entity_id = 11;
+	uint32 core_proud_skill_level = 6;
+	map<uint32, uint32> proud_skill_extra_level_map = 8;
+	uint64 avatar_guid = 13;
+	map<uint32, uint32> skill_level_map = 1;
+	repeated uint32 proud_skill_list = 12;
+	repeated uint32 talent_id_list = 9;
+	uint32 skill_depot_id = 3;
 }
\ No newline at end of file
diff --git a/proto/AvatarSkillInfoNotify.proto b/proto/AvatarSkillInfoNotify.proto
index cd6dc877..1fc55c18 100644
--- a/proto/AvatarSkillInfoNotify.proto
+++ b/proto/AvatarSkillInfoNotify.proto
@@ -3,9 +3,9 @@ option java_package = "emu.grasscutter.net.proto";
 
 import "AvatarSkillInfo.proto";
 
-// 4.6.0
-// CmdId: 28799
+// 4.7.0
+// CmdId: 28706
 message AvatarSkillInfoNotify {
 	map<uint32, AvatarSkillInfo> skill_map = 2;
-	uint64 guid = 4;
+	uint64 guid = 1;
 }
\ No newline at end of file
diff --git a/proto/AvatarSkillMaxChargeCountNotify.proto b/proto/AvatarSkillMaxChargeCountNotify.proto
index 29360eea..ad7b75bd 100644
--- a/proto/AvatarSkillMaxChargeCountNotify.proto
+++ b/proto/AvatarSkillMaxChargeCountNotify.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: 22843
-// Obf: MIPDHBPHHBA
+// 4.7.0
+// CmdId: 9198
+// Obf: LPOHNDHLKFF
 message AvatarSkillMaxChargeCountNotify {
-	uint32 skill_id = 15;
-	uint32 max_charge_count = 4;
-	uint64 avatar_guid = 7;
+	uint32 skill_id = 12;
+	uint32 max_charge_count = 11;
+	uint64 avatar_guid = 6;
 }
diff --git a/proto/AvatarSkillUpgradeReq.proto b/proto/AvatarSkillUpgradeReq.proto
index 550ec62e..ae499055 100644
--- a/proto/AvatarSkillUpgradeReq.proto
+++ b/proto/AvatarSkillUpgradeReq.proto
@@ -1,10 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
-// CmdId: 3446
+// 4.7.0
+// CmdId: 22618
+// CCDGPIJIJGE
 message AvatarSkillUpgradeReq {
-	uint64 avatar_guid = 5;
-	uint32 old_level = 12;
-	uint32 avatar_skill_id = 14;
+	uint64 avatar_guid = 14;
+	uint32 old_level = 4;
+	uint32 avatar_skill_id = 3;
 }
\ No newline at end of file
diff --git a/proto/AvatarSkillUpgradeRsp.proto b/proto/AvatarSkillUpgradeRsp.proto
index 1d73de17..27728399 100644
--- a/proto/AvatarSkillUpgradeRsp.proto
+++ b/proto/AvatarSkillUpgradeRsp.proto
@@ -1,12 +1,13 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
-// CmdId: 119
+// 4.7.0
+// CmdId: 26538
+// NMPDAEHOGGB
 message AvatarSkillUpgradeRsp {
-	uint32 old_level = 6;
-	uint64 avatar_guid = 8;
-	int32 retcode = 9;
-	uint32 cur_level = 10;
-	uint32 avatar_skill_id = 15;
+	uint32 old_level = 13;
+	uint64 avatar_guid = 10;
+	int32 retcode = 11;
+	uint32 cur_level = 9;
+	uint32 avatar_skill_id = 8;
 }
\ No newline at end of file