Melon 3.5

2025-07-31 09:34:12 +03:00 · 2023-02-28 09:12:44 +08:00
parent 5d7ca8d079
commit fae00a4f6d
3975 changed files with 26831 additions and 77729 deletions
--- a/proto/AAAOLHAKGIO.proto
+++ b/proto/AAAOLHAKGIO.proto
@@ -1,14 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-
-message AAAOLHAKGIO {
-	int32 lgcfopjlbmb = 5;
-	uint32 aeinmdecjbh = 6;
-	uint32 kopcjfaeegb = 11;
-	uint32 triggerEntityId = 10;
-	uint32 mfpmgbedfid = 15;
-}
--- a/proto/AAFAJFPLBMI.proto
+++ b/proto/AAFAJFPLBMI.proto
@@ -3,8 +3,8 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-enum AGGICDIEHNL {
-	APOHFKNGIIJ = 0;
-	FCCAGMOBPJI = 1;
+// Name: AAFAJFPLBMI
+// CmdId: 7944
+message AAFAJFPLBMI {
 }
+
--- a/proto/AAJAAOKIJHF.proto
+++ b/proto/AAJAAOKIJHF.proto
@@ -1,16 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-
-message AAJAAOKIJHF {
-	string shareCode = 1;
-	uint32 ownerUid = 2;
-	uint32 moduleId = 3;
-	uint32 sceneId = 4;
-	uint32 blockId = 5;
-	bool isAllowCopy = 6;
-	uint32 createTime = 7;
-}
--- a/proto/ABAMJKJOMHJ.proto
+++ b/proto/ABAMJKJOMHJ.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "PENJFODAGGI.proto";
+
+// Name: ABAMJKJOMHJ
+// CmdId: 7765
+message ABAMJKJOMHJ {
+    repeated uint32 MFJPHFOJKEF = 8;
+    repeated PENJFODAGGI GGGHONFOAKP = 13;
+}
+
--- a/proto/ABBBKIDODLJ.proto
+++ b/proto/ABBBKIDODLJ.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+// Name: ABBBKIDODLJ
+// CmdId: 21566
+message ABBBKIDODLJ {
+    uint32 pos_id = 7;
+    int32 retcode = 13;
+}
+
--- a/proto/ABLOFNDBMFD.proto
+++ b/proto/ABLOFNDBMFD.proto
@@ -1,12 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-import "AAJAAOKIJHF.proto";
-
-message ABLOFNDBMFD {
-	repeated AAJAAOKIJHF briefList = 1;
-	repeated string mohcaffojgh = 2;
-}
--- a/proto/ACBDKPGMCNH.proto
+++ b/proto/ACBDKPGMCNH.proto
@@ -1,14 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-import "CLMDHLAENEJ.proto";
-import "IDOELHBANCP.proto";
-
-message ACBDKPGMCNH {
-	bool aicefchaici = 33;
-	CLMDHLAENEJ jllpcjcimge = 34;
-	repeated IDOELHBANCP kcllbppiboo = 999;
-}
--- a/proto/ACNFCMOJFAB.proto
+++ b/proto/ACNFCMOJFAB.proto
@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-import "BOIPHJCFLBK.proto";
-
-message ACNFCMOJFAB {
-	repeated BOIPHJCFLBK ecpfngapbhc = 14;
-}
--- a/proto/ADEECIJFDOE.proto
+++ b/proto/ADEECIJFDOE.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+// Name: ADEECIJFDOE
+message ADEECIJFDOE {
+    bool DLEFDHEAMHL = 12;
+}
+
--- a/proto/ADLNAMCMMNP.proto
+++ b/proto/ADLNAMCMMNP.proto
@@ -0,0 +1,27 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "FPFHGDCLELH.proto";
+import "LBLHMLGIBNF.proto";
+import "LENANMKPLCA.proto";
+import "LNADMHGILKF.proto";
+import "NONFHLFEHGG.proto";
+import "OLFCEKMONGF.proto";
+
+// Name: ADLNAMCMMNP
+message ADLNAMCMMNP {
+    string name = 1;
+    string CJCCAHLDCMA = 2;
+    repeated string MNPIDJHOIJG = 3;
+    repeated int32 OMJEIEHMHGA = 10;
+    repeated int32 OMEKHKLJLJM = 11;
+    repeated LBLHMLGIBNF JAJPGIAEDPK = 4;
+    repeated OLFCEKMONGF KIJIBDEIJHJ = 5;
+    repeated FPFHGDCLELH IKACEKMFPMJ = 6;
+    repeated LNADMHGILKF KPIDEAGBAPN = 7;
+    LENANMKPLCA PNFIHGPGNKD = 8;
+    NONFHLFEHGG OONNEONDIPI = 9;
+    string FFDAHCPMGAI = 12;
+}
+
--- a/proto/ADMIOIMGPLK.proto
+++ b/proto/ADMIOIMGPLK.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+// Name: ADMIOIMGPLK
+message ADMIOIMGPLK {
+    uint32 difficulty = 12;
+}
+
--- a/proto/AEEFNFKPHED.proto
+++ b/proto/AEEFNFKPHED.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+// Name: AEEFNFKPHED
+// CmdId: 7794
+message AEEFNFKPHED {
+}
+
--- a/proto/AEEKABMMKNE.proto
+++ b/proto/AEEKABMMKNE.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+// Name: AEEKABMMKNE
+message AEEKABMMKNE {
+    uint32 PAPGIKKLGJH = 10;
+    uint32 card_id = 5;
+}
+
--- a/proto/AFKACLJCCHI.proto
+++ b/proto/AFKACLJCCHI.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "EALBKFBILFO.proto";
+
+// Name: AFKACLJCCHI
+message AFKACLJCCHI {
+    repeated EALBKFBILFO level_info_list = 4;
+}
+
--- a/proto/AFLCCHIGHFC.proto
+++ b/proto/AFLCCHIGHFC.proto
@@ -1,15 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-import "KIEHIGCKOHO.proto";
-
-message AFLCCHIGHFC {
-	int32 fekdaediiel = 1;
-	int32 ocjodgafcna = 2;
-	int32 paamjmeflfp = 3;
-	int32 lolngckkkek = 4;
-	repeated KIEHIGCKOHO nkifjffiglb = 5;
-}
--- a/proto/AGBDLCMHIPB.proto
+++ b/proto/AGBDLCMHIPB.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "HBEFCJKDDIN.proto";
+
+// Name: AGBDLCMHIPB
+message AGBDLCMHIPB {
+    repeated uint32 NANIIOABNOG = 10;
+    repeated uint32 PIEMKNGALPB = 3;
+    repeated HBEFCJKDDIN FALMAMOMDAG = 7;
+}
+
--- a/proto/AGFJDCJANKA.proto
+++ b/proto/AGFJDCJANKA.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "ElectroherculesBattleLevelInfo.proto";
+
+// Name: AGFJDCJANKA
+message AGFJDCJANKA {
+    repeated ElectroherculesBattleLevelInfo level_info_list = 15;
+    uint32 stage_id = 8;
+    bool LFEIIEEMDOM = 11;
+}
+
--- a/proto/AGNLMOPPIFH.proto
+++ b/proto/AGNLMOPPIFH.proto
@@ -1,30 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-import "GGLAOFMEGGK.proto";
-import "IDOELHBANCP.proto";
-
-message AGNLMOPPIFH {
-	string nmfofegamme = 1;
-	string hfjgecdoafe = 8;
-	bool elaipjlejji = 10;
-	bool knilnhpcmgi = 20;
-	bool lbkfdecnakj = 27;
-	GGLAOFMEGGK nnlmlfgoiii = 9;
-	string hocldjnpeib = 11;
-	bool cbinhdjifao = 16;
-	bool dhdndgbmaee = 17;
-	bool ipehnienipn = 18;
-	bool ehppkpbjbbi = 42;
-	bool aicefchaici = 23;
-	bool odnagkoinfk = 31;
-	string jngoobcimbd = 36;
-	string ihmcfgapoin = 37;
-	string lmnfjldcfjn = 39;
-	string fkigjalgefl = 40;
-	string njpddpidinm = 41;
-	repeated IDOELHBANCP kcllbppiboo = 999;
-}
--- a/proto/AHGODAFKPIM.proto
+++ b/proto/AHGODAFKPIM.proto
@@ -0,0 +1,30 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "AEEKABMMKNE.proto";
+import "DIGLBMAEMML.proto";
+import "HHKFLCHIBJJ.proto";
+import "PENJFODAGGI.proto";
+
+// Name: AHGODAFKPIM
+message AHGODAFKPIM {
+    uint32 ONKDMOMNGBG = 824;
+    repeated PENJFODAGGI GGGHONFOAKP = 1;
+    uint32 IGMNOEBOCJP = 3;
+    repeated HHKFLCHIBJJ AICAJEFEHLF = 1540;
+    repeated AEEKABMMKNE PLPMEJFNDKA = 12;
+    bool is_passed = 10;
+    uint32 AJFMMFEEDFF = 14;
+    uint32 IAEJLGAILAK = 2;
+    uint32 AGPFPMEDGKI = 9;
+    DIGLBMAEMML KOIGNIFNCMI = 7;
+    DIGLBMAEMML HBCOFFFLNAI = 5;
+    DIGLBMAEMML JLPLPDNEFJA = 15;
+    DIGLBMAEMML DIFHGPIAFNK = 13;
+    map<uint32, DIGLBMAEMML> JFAINLBMGJP = 8;
+    DIGLBMAEMML CGBIBGGMGEF = 11;
+    uint32 controller_id = 4;
+    uint32 NKNMAGGJMFP = 6;
+}
+
--- a/proto/AHJAHOLPBLK.proto
+++ b/proto/AHJAHOLPBLK.proto
@@ -1,6 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-message AHJAHOLPBLK {
-}
--- a/proto/AHMNLAOFJBB.proto
+++ b/proto/AHMNLAOFJBB.proto
@@ -0,0 +1,23 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "MAABOGBOJFC.proto";
+import "RegionInfo.proto";
+import "StopServerInfo.proto";
+
+// Name: AHMNLAOFJBB
+message AHMNLAOFJBB {
+    int32 retcode = 1;
+    string msg = 2;
+    RegionInfo region_info = 3;
+    bytes ODHGCKGDENJ = 11;
+    bytes OEJHLDFBBKA = 12;
+    bytes NHNKFFPCOJI = 13;
+    string HHDIBBJDLAN = 14;
+    oneof detail {
+        MAABOGBOJFC force_udpate = 4;
+        StopServerInfo stop_server = 5;
+    }
+}
+
--- a/proto/AIGHOMHDNIL.proto
+++ b/proto/AIGHOMHDNIL.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "ChannellerSlabAssistInfo.proto";
+import "OHCIIIAJMBL.proto";
+
+// Name: AIGHOMHDNIL
+message AIGHOMHDNIL {
+    repeated ChannellerSlabAssistInfo assist_info_list = 13;
+    repeated uint32 buff_id_list = 3;
+    OHCIIIAJMBL BCKIOAIABPE = 14;
+    OHCIIIAJMBL MNGBLEJJNIB = 2;
+}
+
--- a/proto/AIHKOACHDJH.proto
+++ b/proto/AIHKOACHDJH.proto
@@ -1,28 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-import "ExhibitionDisplayInfo.proto";
-import "IELKGAMFOLN.proto";
-
-message AIHKOACHDJH {
-	//enum BMIDNGEDLLF {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 6566;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	repeated ExhibitionDisplayInfo scoreList = 14;
-	uint32 duration = 10;
-	uint32 beginTime = 11;
-	uint32 stageType = 5;
-	repeated uint32 ggihgakpekk = 9;
-	uint32 playIndex = 12;
-	bool mdpgfcplekf = 13;
-	repeated IELKGAMFOLN settleInfoList = 7;
-	bool pdminbppnje = 3;
-}
--- a/proto/AIOCEOMJKII.proto
+++ b/proto/AIOCEOMJKII.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "ItemParam.proto";
+
+// Name: AIOCEOMJKII
+message AIOCEOMJKII {
+    repeated uint32 OIIEOJDNKJG = 11;
+    repeated ItemParam KHFBDFLDPKM = 4;
+}
+
--- a/proto/AJCFJJFJJMB.proto
+++ b/proto/AJCFJJFJJMB.proto
@@ -0,0 +1,23 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "AGBDLCMHIPB.proto";
+import "CKLBEJHMHKG.proto";
+import "IBIFMMLDGMG.proto";
+import "LCHKFOGFJNP.proto";
+import "MBBEKGNLKBH.proto";
+import "PFFLOCNKNOG.proto";
+
+// Name: AJCFJJFJJMB
+message AJCFJJFJJMB {
+    LCHKFOGFJNP MAPECFPDPAF = 1;
+    map<uint32, IBIFMMLDGMG> LDHLIPECEPC = 4;
+    repeated PFFLOCNKNOG FLOCMMAMMMO = 3;
+    map<uint32, MBBEKGNLKBH> BNHENPGEEJP = 8;
+    repeated CKLBEJHMHKG LOFONBHFNAF = 14;
+    repeated CKLBEJHMHKG NFHNEHOCOEF = 12;
+    uint32 skill_id = 15;
+    map<uint32, AGBDLCMHIPB> AMIIKICEDLK = 7;
+}
+
--- a/proto/AJKKNJIKCJA.proto
+++ b/proto/AJKKNJIKCJA.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+// Name: AJKKNJIKCJA
+enum AJKKNJIKCJA {
+    AJKKNJIKCJA_LDHDOKHDOEK = 0;
+    AJKKNJIKCJA_CFPKGKDFOFK = 1;
+    AJKKNJIKCJA_GJEHMJNAFAN = 2;
+    AJKKNJIKCJA_EKPDPBFLHOD = 3;
+}
+
--- a/proto/ALAMJIMOCOP.proto
+++ b/proto/ALAMJIMOCOP.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+// Name: ALAMJIMOCOP
+message ALAMJIMOCOP {
+    uint32 open_time = 6;
+    bool is_open = 2;
+    uint32 BHLDOAAKIGA = 13;
+    bool is_finished = 8;
+    uint32 FELIKNNDJDG = 3;
+    uint32 level_id = 11;
+}
+
--- a/proto/ALCDEAAGBLC.proto
+++ b/proto/ALCDEAAGBLC.proto
@@ -1,11 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-
-message ALCDEAAGBLC {
-	int64 ckgefmkgkhh = 1;
-	int32 cmhoaideaep = 2;
-}
--- a/proto/ALCGBNPJBHL.proto
+++ b/proto/ALCGBNPJBHL.proto
@@ -1,13 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-import "MassivePropSyncInfo.proto";
-
-message ALCGBNPJBHL {
-	bool isClearAll = 2;
-	repeated MassivePropSyncInfo massivePropList = 11;
-	repeated int64 amopeajfamd = 10;
-}
--- a/proto/AMFOFAPEHGM.proto
+++ b/proto/AMFOFAPEHGM.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "GHNDMCFNLHN.proto";
+
+// Name: AMFOFAPEHGM
+message AMFOFAPEHGM {
+    repeated GHNDMCFNLHN level_data_list = 9;
+}
+
--- a/proto/ANIHIBEGDJC.proto
+++ b/proto/ANIHIBEGDJC.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+// Name: ANIHIBEGDJC
+enum ANIHIBEGDJC {
+    ANIHIBEGDJC_OKHMBACGIDI = 0;
+    ANIHIBEGDJC_HMNPIKMJBAB = 1;
+    ANIHIBEGDJC_LOPFCNNIOOD = 2;
+    ANIHIBEGDJC_EAAAMEMNHHJ = 3;
+}
+
--- a/proto/ANOKFBLCGGM.proto
+++ b/proto/ANOKFBLCGGM.proto
@@ -1,14 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-import "PDOPJIGDNPF.proto";
-
-message ANOKFBLCGGM {
-	uint32 moduleId = 1;
-	uint32 sceneId = 2;
-	bool hoogfkfbckk = 3;
-	repeated PDOPJIGDNPF lpjicbgaldo = 4;
-}
--- a/proto/AOHAOPDNHFG.proto
+++ b/proto/AOHAOPDNHFG.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+
+// Name: AOHAOPDNHFG
+message AOHAOPDNHFG {
+    bool GMAJNGGAJAI = 4;
+}
+
--- a/proto/AOHEFFCPELI.proto
+++ b/proto/AOHEFFCPELI.proto
@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "DOINBFHLBHP.proto";
+
+// Name: AOHEFFCPELI
+message AOHEFFCPELI {
+    uint32 controller_id = 11;
+    uint64 begin_time = 5;
+    uint64 OAKPHGNDJLO = 12;
+    DOINBFHLBHP JFFMMIKBICI = 14;
+}
+
--- a/proto/AOMHEMBIHNE.proto
+++ b/proto/AOMHEMBIHNE.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "NIHOOOAICMD.proto";
+
+// Name: AOMHEMBIHNE
+// CmdId: 7271
+message AOMHEMBIHNE {
+    uint32 HCKIILHKKBE = 8;
+    repeated NIHOOOAICMD ABBIFONKPDJ = 1;
+}
+
--- a/proto/APHNJHLAANL.proto
+++ b/proto/APHNJHLAANL.proto
@@ -1,19 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-
-message APHNJHLAANL {
-	//enum FAKNJNGOBKG {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 109;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	int32 retcode = 12;
-	repeated uint32 pbahnigkopb = 11;
-}
--- a/proto/AStarMethod.proto
+++ b/proto/AStarMethod.proto
@@ -1,12 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-enum AStarMethod {
-	A_STAR_METHOD_CLASSIC = 0;
-	A_STAR_METHOD_TENDENCY = 1;
-	A_STAR_METHOD_ADAPTIVE = 2;
-	A_STAR_METHOD_INFLECTION = 3;
-}
--- a/proto/AbilityAppliedAbility.proto
+++ b/proto/AbilityAppliedAbility.proto
@@ -2,14 +2,14 @@ syntax = "proto3";

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

-
-
-import "AbilityString.proto";
 import "AbilityScalarValueEntry.proto";
+import "AbilityString.proto";

+// Name: JOMDPHKGKJO
 message AbilityAppliedAbility {
-	AbilityString abilityName = 1;
-	AbilityString abilityOverride = 2;
-	repeated AbilityScalarValueEntry overrideMap = 3;
-	uint32 instancedAbilityId = 4;
+    AbilityString ability_name = 1;
+    AbilityString ability_override = 2;
+    repeated AbilityScalarValueEntry override_map = 3;
+    uint32 instanced_ability_id = 4;
 }
+
--- a/proto/AbilityAppliedModifier.proto
+++ b/proto/AbilityAppliedModifier.proto
@@ -2,24 +2,24 @@ syntax = "proto3";

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

-
-
-import "AbilityString.proto";
 import "AbilityAttachedModifier.proto";
+import "AbilityString.proto";
 import "ModifierDurability.proto";

+// Name: PAECICKHAKH
 message AbilityAppliedModifier {
-	int32 modifierLocalId = 1;
-	uint32 parentAbilityEntityId = 2;
-	AbilityString parentAbilityName = 3;
-	AbilityString parentAbilityOverride = 4;
-	uint32 instancedAbilityId = 5;
-	uint32 instancedModifierId = 6;
-	float existDuration = 7;
-	AbilityAttachedModifier attachedInstancedModifier = 8;
-	uint32 applyEntityId = 9;
-	bool isAttachedParentAbility = 10;
-	ModifierDurability modifierDurability = 11;
-	uint32 sbuffUid = 12;
-	bool isServerbuffModifier = 13;
+    int32 modifier_local_id = 1;
+    uint32 parent_ability_entity_id = 2;
+    AbilityString parent_ability_name = 3;
+    AbilityString parent_ability_override = 4;
+    uint32 instanced_ability_id = 5;
+    uint32 instanced_modifier_id = 6;
+    float exist_duration = 7;
+    AbilityAttachedModifier attached_instanced_modifier = 8;
+    uint32 apply_entity_id = 9;
+    bool is_attached_parent_ability = 10;
+    ModifierDurability modifier_durability = 11;
+    uint32 sbuff_uid = 12;
+    bool is_serverbuff_modifier = 13;
 }
+
--- a/proto/AbilityArgument.proto
+++ b/proto/AbilityArgument.proto
@@ -1,14 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-
-message AbilityArgument {
-	oneof arg {
-		uint32 int_arg = 11;
-		float float_arg = 2;
-		string str_arg = 8;
-	}
-}
--- a/proto/AbilityAttachedModifier.proto
+++ b/proto/AbilityAttachedModifier.proto
@@ -3,12 +3,12 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: JFHLNEBEOAA
 message AbilityAttachedModifier {
-	bool isInvalid = 1;
-	uint32 ownerEntityId = 2;
-	uint32 instancedModifierId = 3;
-	bool isServerbuffModifier = 4;
-	int32 attachNameHash = 5;
+    bool is_invalid = 1;
+    uint32 owner_entity_id = 2;
+    uint32 instanced_modifier_id = 3;
+    bool is_serverbuff_modifier = 4;
+    int32 attach_name_hash = 5;
 }
+
--- a/proto/AbilityBornType.proto
+++ b/proto/AbilityBornType.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "Vector.proto";
+
+// Name: JFHEKJHNIEE
+message AbilityBornType {
+    Vector move_dir = 13;
+    Vector pos = 15;
+    Vector rot = 14;
+}
+
--- a/proto/AbilityChangeNotify.proto
+++ b/proto/AbilityChangeNotify.proto
@@ -2,19 +2,12 @@ syntax = "proto3";

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

-
-
 import "AbilityControlBlock.proto";

+// Name: FGNFEPLECFC
+// CmdId: 1159
 message AbilityChangeNotify {
-	//enum KEAFGMDBMGG {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 1124;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	AbilityControlBlock abilityControlBlock = 10;
-	uint32 entityId = 7;
+    AbilityControlBlock ability_control_block = 12;
+    uint32 entity_id = 2;
 }
+
--- a/proto/AbilityControlBlock.proto
+++ b/proto/AbilityControlBlock.proto
@@ -4,6 +4,8 @@ option java_package = "emu.grasscutter.net.proto";

 import "AbilityEmbryo.proto";

+// Name: KDMMAILHMCH
 message AbilityControlBlock {
-	repeated AbilityEmbryo abilityEmbryoList = 1;
+    repeated AbilityEmbryo ability_embryo_list = 1;
 }
+
--- a/proto/AbilityEmbryo.proto
+++ b/proto/AbilityEmbryo.proto
@@ -2,8 +2,11 @@ syntax = "proto3";

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

+
+// Name: FDIGHNLIKGA
 message AbilityEmbryo {
-	uint32 abilityId = 1;
-	fixed32 abilityNameHash = 2;
-	fixed32 abilityOverrideNameHash = 3;
+    uint32 ability_id = 1;
+    fixed32 ability_name_hash = 2;
+    fixed32 ability_override_name_hash = 3;
 }
+
--- a/proto/AbilityGadget.proto
+++ b/proto/AbilityGadget.proto
@@ -1,12 +0,0 @@
-syntax = "proto3";
-
-option java_package = "emu.grasscutter.net.proto";
-
-
-
-
-message AbilityGadget {
-	uint32 campId = 1;
-	uint32 olefgkameoj = 2;
-	uint32 targetEntityId = 3;
-}
--- a/proto/AbilityGadgetInfo.proto
+++ b/proto/AbilityGadgetInfo.proto
@@ -2,8 +2,11 @@ syntax = "proto3";

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

+
+// Name: PDONEGKNDKM
 message AbilityGadgetInfo {
-  	uint32 camp_id = 1;
-  	uint32 camp_target_type = 2;
-  	uint32 target_entity_id = 3;
+    uint32 camp_id = 1;
+    uint32 camp_target_type = 2;
+    uint32 target_entity_id = 3;
 }
+
--- a/proto/AbilityIdentifier.proto
+++ b/proto/AbilityIdentifier.proto
@@ -3,13 +3,13 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: FBHPFOJEMEK
 message AbilityIdentifier {
-	uint32 modifierOwnerId = 3;
-	uint32 abilityCasterId = 10;
-	uint32 instancedAbilityId = 5;
-	bool isServerbuffModifier = 4;
-	int32 localId = 8;
-	uint32 instancedModifierId = 11;
+    bool is_serverbuff_modifier = 2;
+    uint32 CKGECLBFOCP = 9;
+    int32 local_id = 12;
+    uint32 instanced_modifier_id = 14;
+    uint32 instanced_ability_id = 7;
+    uint32 NJNNPGIMJEN = 13;
 }
+
--- a/proto/AbilityInvocationFailNotify.proto
+++ b/proto/AbilityInvocationFailNotify.proto
@@ -2,20 +2,13 @@ syntax = "proto3";

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

-
-
 import "AbilityInvokeEntry.proto";

+// Name: FEOKKPIAIJF
+// CmdId: 1114
 message AbilityInvocationFailNotify {
-	//enum PIEICCOCBLN {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 1120;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	string reason = 4;
-	uint32 entityId = 13;
-	AbilityInvokeEntry invoke = 14;
+    uint32 entity_id = 12;
+    string reason = 3;
+    AbilityInvokeEntry invoke = 8;
 }
+
--- a/proto/AbilityInvocationFixedNotify.proto
+++ b/proto/AbilityInvocationFixedNotify.proto
@@ -2,24 +2,16 @@ syntax = "proto3";

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

-
-
 import "AbilityInvokeEntry.proto";

+// Name: NDELNMOBIJO
+// CmdId: 1167
 message AbilityInvocationFixedNotify {
-	//enum LAPNALALFPP {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 1105;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	AbilityInvokeEntry Unk3300_LDIAOMFIBPL = 3;
-	AbilityInvokeEntry Unk3300_AHDFHHFHEFM = 6;
-	AbilityInvokeEntry Unk3300_ONGNOHLIIBO = 8;
-	AbilityInvokeEntry Unk3300_EMGKKHKLIEG = 5;
-	AbilityInvokeEntry Unk3300_KFMHLLHECCJ = 15;
-	AbilityInvokeEntry Unk3300_GAFFBFFKDIC = 1;
+    AbilityInvokeEntry JHGOOOAKDKF = 10;
+    AbilityInvokeEntry IPKLDHAPACC = 8;
+    AbilityInvokeEntry LFJKNMKCNMP = 4;
+    AbilityInvokeEntry HLNLPLLLAKN = 13;
+    AbilityInvokeEntry MDFGHEGMPMF = 1;
+    AbilityInvokeEntry MLOIJCEODAD = 12;
 }
+
--- a/proto/AbilityInvocationsNotify.proto
+++ b/proto/AbilityInvocationsNotify.proto
@@ -2,19 +2,11 @@ syntax = "proto3";

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

-
-
 import "AbilityInvokeEntry.proto";

+// Name: KPHEJCEMNIM
+// CmdId: 1175
 message AbilityInvocationsNotify {
-	//enum IJAPFFICMAM {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 1155;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	repeated AbilityInvokeEntry invokes = 11;
+    repeated AbilityInvokeEntry invokes = 12;
 }
+
--- a/proto/AbilityInvokeArgument.proto
+++ b/proto/AbilityInvokeArgument.proto
@@ -3,71 +3,73 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
+// Name: FNGBAFLMEDH
 enum AbilityInvokeArgument {
-	ABILITY_INVOKE_ARGUMENT_NONE = 0;
-	ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE = 1;
-	ABILITY_INVOKE_ARGUMENT_META_COMMAND_MODIFIER_CHANGE_REQUEST = 2;
-	ABILITY_INVOKE_ARGUMENT_META_SPECIAL_FLOAT_ARGUMENT = 3;
-	ABILITY_INVOKE_ARGUMENT_META_OVERRIDE_PARAM = 4;
-	ABILITY_INVOKE_ARGUMENT_META_CLEAR_OVERRIDE_PARAM = 5;
-	ABILITY_INVOKE_ARGUMENT_META_REINIT_OVERRIDEMAP = 6;
-	ABILITY_INVOKE_ARGUMENT_META_GLOBAL_FLOAT_VALUE = 7;
-	ABILITY_INVOKE_ARGUMENT_META_CLEAR_GLOBAL_FLOAT_VALUE = 8;
-	ABILITY_INVOKE_ARGUMENT_META_ABILITY_ELEMENT_STRENGTH = 9;
-	ABILITY_INVOKE_ARGUMENT_META_ADD_OR_GET_ABILITY_AND_TRIGGER = 10;
-	ABILITY_INVOKE_ARGUMENT_META_SET_KILLED_STATE = 11;
-	ABILITY_INVOKE_ARGUMENT_META_SET_ABILITY_TRIGGER = 12;
-	ABILITY_INVOKE_ARGUMENT_META_ADD_NEW_ABILITY = 13;
-	ABILITY_INVOKE_ARGUMENT_META_REMOVE_ABILITY = 14;
-	ABILITY_INVOKE_ARGUMENT_META_SET_MODIFIER_APPLY_ENTITY = 15;
-	ABILITY_INVOKE_ARGUMENT_META_MODIFIER_DURABILITY_CHANGE = 16;
-	ABILITY_INVOKE_ARGUMENT_META_ELEMENT_REACTION_VISUAL = 17;
-	ABILITY_INVOKE_ARGUMENT_META_SET_POSE_PARAMETER = 18;
-	ABILITY_INVOKE_ARGUMENT_META_UPDATE_BASE_REACTION_DAMAGE = 19;
-	ABILITY_INVOKE_ARGUMENT_META_TRIGGER_ELEMENT_REACTION = 20;
-	ABILITY_INVOKE_ARGUMENT_META_LOSE_HP = 21;
-	ABILITY_INVOKE_ARGUMENT_META_DURABILITY_IS_ZERO = 22;
-	ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY = 50;
-	ABILITY_INVOKE_ARGUMENT_ACTION_SET_CRASH_DAMAGE = 51;
-	ABILITY_INVOKE_ARGUMENT_ACTION_EFFECT = 52;
-	ABILITY_INVOKE_ARGUMENT_ACTION_SUMMON = 53;
-	ABILITY_INVOKE_ARGUMENT_ACTION_BLINK = 54;
-	ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_GADGET = 55;
-	ABILITY_INVOKE_ARGUMENT_ACTION_APPLY_LEVEL_MODIFIER = 56;
-	ABILITY_INVOKE_ARGUMENT_ACTION_GENERATE_ELEM_BALL = 57;
-	ABILITY_INVOKE_ARGUMENT_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE = 58;
-	ABILITY_INVOKE_ARGUMENT_ACTION_SERVER_MONSTER_LOG = 59;
-	ABILITY_INVOKE_ARGUMENT_ACTION_CREATE_TILE = 60;
-	ABILITY_INVOKE_ARGUMENT_ACTION_DESTROY_TILE = 61;
-	ABILITY_INVOKE_ARGUMENT_ACTION_FIRE_AFTER_IMAGE = 62;
-	ABILITY_INVOKE_ARGUMENT_ACTION_DEDUCT_STAMINA = 63;
-	ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT = 64;
-	ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET = 65;
-	Unk3400_GHKNBDBFGLN = 66;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA = 100;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DEFEND = 101;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_ZONE = 102;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_COST_STAMINA = 103;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_ELITE_SHIELD = 104;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_ELEMENT_SHIELD = 105;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_GLOBAL_SHIELD = 106;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_SHIELD_BAR = 107;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_SEED_SPAWNER = 108;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_ELEMENT_REACTION = 109;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_FIELD_ENTITY_COUNT_CHANGE = 110;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_SCENE_PROP_SYNC = 111;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_WIDGET_MP_SUPPORT = 112;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_RATIO = 113;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_FIREWORKS_LAUNCHER = 114;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_ATTACK_RESULT_CREATE_COUNT = 115;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_UGC_TIME_CONTROL = 116;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_COMBAT = 117;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN = 118;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_UI_INTERACT = 119;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_SHOOT_FROM_CAMERA = 120;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_ERASE_BRICK_ACTIVITY = 121;
-	ABILITY_INVOKE_ARGUMENT_MIXIN_BREAKOUT = 122;
-	Unk3400_BFBGAADHEJC = 123;
-	Unk3400_HGOJHAPAJLD = 124;
+    ABILITY_NONE = 0;
+    ABILITY_META_MODIFIER_CHANGE = 1;
+    ABILITY_META_COMMAND_MODIFIER_CHANGE_REQUEST = 2;
+    ABILITY_META_SPECIAL_FLOAT_ARGUMENT = 3;
+    ABILITY_META_OVERRIDE_PARAM = 4;
+    ABILITY_META_CLEAR_OVERRIDE_PARAM = 5;
+    ABILITY_META_REINIT_OVERRIDEMAP = 6;
+    ABILITY_META_GLOBAL_FLOAT_VALUE = 7;
+    ABILITY_META_CLEAR_GLOBAL_FLOAT_VALUE = 8;
+    ABILITY_META_ABILITY_ELEMENT_STRENGTH = 9;
+    ABILITY_META_ADD_OR_GET_ABILITY_AND_TRIGGER = 10;
+    ABILITY_META_SET_KILLED_SETATE = 11;
+    ABILITY_META_SET_ABILITY_TRIGGER = 12;
+    ABILITY_META_ADD_NEW_ABILITY = 13;
+    ABILITY_META_REMOVE_ABILITY = 14;
+    ABILITY_META_SET_MODIFIER_APPLY_ENTITY = 15;
+    ABILITY_META_MODIFIER_DURABILITY_CHANGE = 16;
+    ABILITY_META_ELEMENT_REACTION_VISUAL = 17;
+    ABILITY_META_SET_POSE_PARAMETER = 18;
+    ABILITY_META_UPDATE_BASE_REACTION_DAMAGE = 19;
+    ABILITY_META_TRIGGER_ELEMENT_REACTION = 20;
+    ABILITY_META_LOSE_HP = 21;
+    ABILITY_META_DURABILITY_IS_ZERO = 22;
+    ABILITY_ACTION_TRIGGER_ABILITY = 50;
+    ABILITY_ACTION_SET_CRASH_DAMAGE = 51;
+    ABILITY_ACTION_EFFECT = 52;
+    ABILITY_ACTION_SUMMON = 53;
+    ABILITY_ACTION_BLINK = 54;
+    ABILITY_ACTION_CREATE_GADGET = 55;
+    ABILITY_ACTION_APPLY_LEVEL_MODIFIER = 56;
+    ABILITY_ACTION_GENERATE_ELEM_BALL = 57;
+    ABILITY_ACTION_SET_RANDOM_OVERRIDE_MAP_VALUE = 58;
+    ABILITY_ACTION_SERVER_MONSTER_LOG = 59;
+    ABILITY_ACTION_CREATE_TILE = 60;
+    ABILITY_ACTION_DESTROY_TILE = 61;
+    ABILITY_ACTION_FIRE_AFTER_IMAGE = 62;
+    ABILITY_ACTION_DEDUCT_STAMINA = 63;
+    ABILITY_ACTION_HIT_EFFECT = 64;
+    ABILITY_ACTION_SET_BULLET_TRACK_TARGET = 65;
+    ABILITY_INVOKE_ARGUMENT_ICLAKMCJNIO = 66;
+    ABILITY_MIXIN_AVATAR_STEER_BY_CAMERA = 100;
+    ABILITY_MIXIN_MONSTER_DEFEND = 101;
+    ABILITY_MIXIN_WIND_ZONE = 102;
+    ABILITY_MIXIN_COST_STAMINA = 103;
+    ABILITY_MIXIN_ELITE_SHIELD = 104;
+    ABILITY_MIXIN_ELEMENT_SHIELD = 105;
+    ABILITY_MIXIN_GLOBAL_SHIELD = 106;
+    ABILITY_MIXIN_SHIELD_BAR = 107;
+    ABILITY_MIXIN_WIND_SEED_SPAWNER = 108;
+    ABILITY_MIXIN_DO_ACTION_BY_ELEMENT_REACTION = 109;
+    ABILITY_MIXIN_FIELD_ENTITY_COUNT_CHANGE = 110;
+    ABILITY_MIXIN_SCENE_PROP_SYNC = 111;
+    ABILITY_MIXIN_WIDGET_MP_SUPPORT = 112;
+    ABILITY_MIXIN_DO_ACTION_BY_SELF_MODIFIER_ELEMENT_DURABILITY_RATIO = 113;
+    ABILITY_MIXIN_FIREWORKS_LAUNCHER = 114;
+    ABILITY_MIXIN_ATTACK_RESULT_CREATE_COUNT = 115;
+    ABILITY_MIXIN_UGC_TIME_CONTROL = 116;
+    ABILITY_MIXIN_AVATAR_COMBAT = 117;
+    ABILITY_MIXIN_DEATH_ZONE_REGIONAL_PLAY_MIXIN = 118;
+    ABILITY_MIXIN_UI_INTERACT = 119;
+    ABILITY_MIXIN_SHOOT_FROM_CAMERA = 120;
+    ABILITY_MIXIN_ERASE_BRICK_ACTIVITY = 121;
+    ABILITY_MIXIN_BREAKOUT = 122;
+    ABILITY_INVOKE_ARGUMENT_LCBKCPPPPOF = 123;
+    ABILITY_INVOKE_ARGUMENT_JBJPJJEGLOM = 124;
+    ABILITY_INVOKE_ARGUMENT_BCIODCIMFBK = 125;
 }
+
--- a/proto/AbilityInvokeEntry.proto
+++ b/proto/AbilityInvokeEntry.proto
@@ -2,21 +2,20 @@ syntax = "proto3";

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

-
-
+import "AbilityInvokeArgument.proto";
 import "AbilityInvokeEntryHead.proto";
 import "ForwardType.proto";
-import "AbilityInvokeArgument.proto";
-import "bytes.proto";

+// Name: KBLDACDEINJ
 message AbilityInvokeEntry {
-	AbilityInvokeEntryHead head = 13;
-	ForwardType forwardType = 15;
-	AbilityInvokeArgument argumentType = 12;
-	uint32 forwardPeer = 10;
-	bytes abilityData = 4;
-	uint32 eventId = 8;
-	uint32 entityId = 11;
-	double totalTickTime = 14;
-	bool isIgnoreAuth = 6;
+    AbilityInvokeArgument argument_type = 6;
+    uint32 event_id = 7;
+    bool is_ignore_auth = 5;
+    uint32 forward_peer = 1;
+    AbilityInvokeEntryHead head = 2;
+    ForwardType forward_type = 4;
+    double total_tick_time = 9;
+    bytes ability_data = 3;
+    uint32 entity_id = 11;
 }
+
--- a/proto/AbilityInvokeEntryHead.proto
+++ b/proto/AbilityInvokeEntryHead.proto
@@ -3,14 +3,14 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: DPAJKOIMAOF
 message AbilityInvokeEntryHead {
-	int32 localId = 7;
-	uint32 serverBuffUid = 15;
-	uint32 targetId = 5;
-	uint32 instancedAbilityId = 2;
-	uint32 instancedModifierId = 9;
-	bool isServerbuffModifier = 10;
-	int32 modifierConfigLocalId = 8;
+    uint32 server_buff_uid = 10;
+    uint32 target_id = 2;
+    int32 modifier_config_local_id = 5;
+    uint32 instanced_ability_id = 3;
+    bool is_serverbuff_modifier = 12;
+    int32 local_id = 13;
+    uint32 instanced_modifier_id = 14;
 }
+
--- a/proto/AbilityMetaReInitOverrideMap.proto
+++ b/proto/AbilityMetaReInitOverrideMap.proto
@@ -2,10 +2,10 @@ syntax = "proto3";

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

-
-
 import "AbilityScalarValueEntry.proto";

-message PIDDMANONBK {
-	repeated AbilityScalarValueEntry overrideMap = 2;
+// Name: EEACBNFBEHI
+message AbilityMetaReInitOverrideMap {
+    repeated AbilityScalarValueEntry override_map = 9;
 }
+
--- a/proto/AbilityMixinRecoverInfo.proto
+++ b/proto/AbilityMixinRecoverInfo.proto
@@ -5,14 +5,16 @@ option java_package = "emu.grasscutter.net.proto";
 import "BreakoutSnapShot.proto";
 import "MassivePropSyncInfo.proto";

+// Name: LMMFGNIDKME
 message AbilityMixinRecoverInfo {
-	oneof source {
-		uint32 instanced_ability_id = 1;
-		uint32 instanced_modifier_id = 2;
-	}
-	uint32 localId = 3;
-	repeated uint32 dataList = 4;
-	bool isServerbuffModifier = 5;
-	repeated MassivePropSyncInfo massivePropList = 6;
-	BreakoutSnapShot breakoutSnapShot = 7;
+    uint32 local_id = 3;
+    repeated uint32 data_list = 4;
+    bool is_serverbuff_modifier = 5;
+    repeated MassivePropSyncInfo massive_prop_list = 6;
+    BreakoutSnapShot breakout_snap_shot = 7;
+    oneof source {
+        uint32 instanced_ability_id = 1;
+        uint32 instanced_modifier_id = 2;
+    }
 }
+
--- a/proto/AbilityMixinWindSeedSpawner.proto
+++ b/proto/AbilityMixinWindSeedSpawner.proto
@@ -2,23 +2,28 @@ syntax = "proto3";

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

-
-
 import "Vector.proto";

+// Name: AEAIOCLFFDH
 message AbilityMixinWindSeedSpawner {
-	message AddSignal {
-	}
-	message RefreshSeed {
-		repeated Vector lfglcalgdac = 1;
-	}
-	message CatchSeed {
-		uint32 entityId = 5;
-	}
+    // Name: DDMMEHCNOMB
+    message AddSignal {
+    }

-	oneof EMKLHFDNJMA {
-		AddSignal add_signal = 13;
-		RefreshSeed refresh_seed = 3;
-		CatchSeed catch_seed = 4;
-	}
+    // Name: KNKFILHLMBC
+    message RefreshSeed {
+        repeated Vector pos_list = 3;
+    }
+
+    // Name: LPGDOODMMFB
+    message CatchSeed {
+        uint32 entity_id = 2;
+    }
+
+    oneof cmd {
+        AddSignal add_signal = 13;
+        RefreshSeed refresh_seed = 5;
+        CatchSeed catch_seed = 4;
+    }
 }
+
--- a/proto/AbilityScalarType.proto
+++ b/proto/AbilityScalarType.proto
@@ -3,13 +3,14 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
+// Name: MLNEEGJPBCO
 enum AbilityScalarType {
-	ABILITY_SCALAR_TYPE_UNKNOWN = 0;
-	ABILITY_SCALAR_TYPE_FLOAT = 1;
-	ABILITY_SCALAR_TYPE_INT = 2;
-	ABILITY_SCALAR_TYPE_BOOL = 3;
-	ABILITY_SCALAR_TYPE_TRIGGER = 4;
-	ABILITY_SCALAR_TYPE_STRING = 5;
-	ABILITY_SCALAR_TYPE_UINT = 6;
+    ABILITY_SCALAR_TYPE_UNKNOW = 0;
+    ABILITY_SCALAR_TYPE_FLOAT = 1;
+    ABILITY_SCALAR_TYPE_INT = 2;
+    ABILITY_SCALAR_TYPE_BOOL = 3;
+    ABILITY_SCALAR_TYPE_TRIGGER = 4;
+    ABILITY_SCALAR_TYPE_STRING = 5;
+    ABILITY_SCALAR_TYPE_UINT = 6;
 }
+
--- a/proto/AbilityScalarValueEntry.proto
+++ b/proto/AbilityScalarValueEntry.proto
@@ -2,18 +2,18 @@ syntax = "proto3";

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

-
-
-import "AbilityString.proto";
 import "AbilityScalarType.proto";
+import "AbilityString.proto";

+// Name: JHJPOIJGPEB
 message AbilityScalarValueEntry {
-	AbilityString key = 1;
-	AbilityScalarType valueType = 2;
-	oneof value {
-		float float_value = 3;
-		string string_value = 4;
-		int32 int_value = 5;
-		uint32 uint_value = 6;
-	}
+    AbilityString key = 1;
+    AbilityScalarType value_type = 2;
+    oneof value {
+        float float_value = 3;
+        string string_value = 4;
+        int32 int_value = 5;
+        uint32 uint_value = 6;
+    }
 }
+
--- a/proto/AbilityString.proto
+++ b/proto/AbilityString.proto
@@ -3,11 +3,11 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: ALGGELGLCLJ
 message AbilityString {
-	oneof type {
-		string str = 1;
-		uint32 hash = 2;
-	}
+    oneof type {
+        string str = 1;
+        uint32 hash = 2;
+    }
 }
+
--- a/proto/AbilitySyncStateInfo.proto
+++ b/proto/AbilitySyncStateInfo.proto
@@ -2,18 +2,18 @@ syntax = "proto3";

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

-
-
-import "AbilityScalarValueEntry.proto";
 import "AbilityAppliedAbility.proto";
 import "AbilityAppliedModifier.proto";
 import "AbilityMixinRecoverInfo.proto";
+import "AbilityScalarValueEntry.proto";

+// Name: ONHDINIKADE
 message AbilitySyncStateInfo {
-	bool isInited = 1;
-	repeated AbilityScalarValueEntry dynamicValueMap = 2;
-	repeated AbilityAppliedAbility appliedAbilities = 3;
-	repeated AbilityAppliedModifier appliedModifiers = 4;
-	repeated AbilityMixinRecoverInfo mixinRecoverInfos = 5;
-	repeated AbilityScalarValueEntry sgvDynamicValueMap = 6;
+    bool is_inited = 1;
+    repeated AbilityScalarValueEntry dynamic_value_map = 2;
+    repeated AbilityAppliedAbility applied_abilities = 3;
+    repeated AbilityAppliedModifier applied_modifiers = 4;
+    repeated AbilityMixinRecoverInfo mixin_recover_infos = 5;
+    repeated AbilityScalarValueEntry sgv_dynamic_value_map = 6;
 }
+
--- a/proto/AcceptCityReputationRequestReq.proto
+++ b/proto/AcceptCityReputationRequestReq.proto
@@ -3,18 +3,10 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: AEBBMJFFLPD
+// CmdId: 2882
 message AcceptCityReputationRequestReq {
-	//enum GIJDOCIHNGK {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2870;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	uint32 cityId = 2;
-	uint32 requestId = 12;
+    uint32 city_id = 1;
+    uint32 request_id = 3;
 }
+
--- a/proto/AcceptCityReputationRequestRsp.proto
+++ b/proto/AcceptCityReputationRequestRsp.proto
@@ -3,18 +3,11 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: GKKMJBDDEIP
+// CmdId: 2865
 message AcceptCityReputationRequestRsp {
-	//enum AMELOFGEGPF {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2862;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	uint32 cityId = 5;
-	int32 retcode = 3;
-	uint32 requestId = 9;
+    uint32 city_id = 6;
+    uint32 request_id = 1;
+    int32 retcode = 5;
 }
+
--- a/proto/Achievement.proto
+++ b/proto/Achievement.proto
@@ -2,12 +2,21 @@ syntax = "proto3";

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

-import "Status.proto";

+// Name: IMEFDIKAJBD
 message Achievement {
-	uint32 curProgress = 10;
-	uint32 id = 13;
-	uint32 totalProgress = 14;
-	Status status = 5;
-	uint32 finishTimestamp = 6;
+    // Name: JPGOFPINCMO
+    enum Status {
+        INVALID = 0;
+        UNFINISHED = 1;
+        FINISHED = 2;
+        REWARD_TAKEN = 3;
+    }
+
+    uint32 cur_progress = 2;
+    uint32 finish_timestamp = 13;
+    Status status = 6;
+    uint32 total_progress = 5;
+    uint32 id = 9;
 }
+
--- a/proto/AchievementAllDataNotify.proto
+++ b/proto/AchievementAllDataNotify.proto
@@ -2,19 +2,12 @@ syntax = "proto3";

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

-
-
 import "Achievement.proto";

+// Name: IHGEAOHBLMH
+// CmdId: 2698
 message AchievementAllDataNotify {
-	//enum BPPEPMJFOPO {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2688;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	repeated uint32 rewardTakenGoalIdList = 8;
-	repeated Achievement achievementList = 4;
+    repeated Achievement achievement_list = 15;
+    repeated uint32 reward_taken_goal_id_list = 4;
 }
+
--- a/proto/AchievementUpdateNotify.proto
+++ b/proto/AchievementUpdateNotify.proto
@@ -2,18 +2,11 @@ syntax = "proto3";

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

-
-
 import "Achievement.proto";

+// Name: PFKCLOLEDDE
+// CmdId: 2693
 message AchievementUpdateNotify {
-	//enum LKDGLEKOFGN {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2695;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	repeated Achievement achievementList = 4;
+    repeated Achievement achievement_list = 2;
 }
+
--- a/proto/ActivityAcceptAllGiveGiftReq.proto
+++ b/proto/ActivityAcceptAllGiveGiftReq.proto
@@ -3,17 +3,9 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: AIFAHKAGCKI
+// CmdId: 8394
 message ActivityAcceptAllGiveGiftReq {
-	//enum ILOFGDOHANL {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8116;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	uint32 scheduleId = 10;
+    uint32 schedule_id = 2;
 }
+
--- a/proto/ActivityAcceptAllGiveGiftRsp.proto
+++ b/proto/ActivityAcceptAllGiveGiftRsp.proto
@@ -2,20 +2,13 @@ syntax = "proto3";

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

-
-
 import "ActivityAcceptGiftResultInfo.proto";

+// Name: NBBDONJDCNE
+// CmdId: 8241
 message ActivityAcceptAllGiveGiftRsp {
-	//enum NFEIACOAPGB {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8316;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	uint32 scheduleId = 15;
-	int32 retcode = 11;
-	repeated ActivityAcceptGiftResultInfo acceptGiftResultInfoList = 14;
+    repeated ActivityAcceptGiftResultInfo accept_gift_result_info_list = 6;
+    int32 retcode = 1;
+    uint32 schedule_id = 14;
 }
+
--- a/proto/ActivityAcceptGiftResultInfo.proto
+++ b/proto/ActivityAcceptGiftResultInfo.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: JENKCFOKNFE
 message ActivityAcceptGiftResultInfo {
-	map<uint32, uint32> Unk3300_JFHLEBLOFMA = 14;
-	uint32 uid = 11;
-	map<uint32, uint32> Unk3300_COCFNBJCFGP = 4;
+    map<uint32, uint32> KBOHLJAEOGO = 13;
+    uint32 uid = 12;
+    map<uint32, uint32> DJPMCNLFJEO = 15;
 }
+
--- a/proto/ActivityAcceptGiveGiftReq.proto
+++ b/proto/ActivityAcceptGiveGiftReq.proto
@@ -3,18 +3,10 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: KFFHICGECBJ
+// CmdId: 8303
 message ActivityAcceptGiveGiftReq {
-	//enum PFFEKBBHEBG {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8679;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	uint32 scheduleId = 2;
-	uint32 uid = 7;
+    uint32 schedule_id = 10;
+    uint32 uid = 3;
 }
+
--- a/proto/ActivityAcceptGiveGiftRsp.proto
+++ b/proto/ActivityAcceptGiveGiftRsp.proto
@@ -2,20 +2,13 @@ syntax = "proto3";

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

-
-
 import "ActivityAcceptGiftResultInfo.proto";

+// Name: KDOBINHBPOF
+// CmdId: 8915
 message ActivityAcceptGiveGiftRsp {
-	//enum CKELMMOFJBG {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8235;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	uint32 scheduleId = 4;
-	ActivityAcceptGiftResultInfo acceptGiftResultInfo = 9;
-	int32 retcode = 6;
+    int32 retcode = 3;
+    uint32 schedule_id = 10;
+    ActivityAcceptGiftResultInfo accept_gift_result_info = 13;
 }
+
--- a/proto/ActivityBannerClearReq.proto
+++ b/proto/ActivityBannerClearReq.proto
@@ -3,18 +3,10 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: HAAFDEFFOPM
+// CmdId: 2114
 message ActivityBannerClearReq {
-	//enum GJAJOIDANAN {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2198;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	uint32 scheduleId = 6;
-	uint32 activityId = 3;
+    uint32 schedule_id = 9;
+    uint32 activity_id = 6;
 }
+
--- a/proto/ActivityBannerClearRsp.proto
+++ b/proto/ActivityBannerClearRsp.proto
@@ -3,18 +3,11 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: EGDIIGHFPJB
+// CmdId: 2037
 message ActivityBannerClearRsp {
-	//enum CCNNOICPILH {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2143;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	uint32 activityId = 14;
-	uint32 scheduleId = 1;
-	int32 retcode = 2;
+    uint32 activity_id = 8;
+    int32 retcode = 12;
+    uint32 schedule_id = 11;
 }
+
--- a/proto/ActivityBannerNotify.proto
+++ b/proto/ActivityBannerNotify.proto
@@ -3,17 +3,10 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: FMNLOMEOFMG
+// CmdId: 2018
 message ActivityBannerNotify {
-	//enum PGPJDNLAFNJ {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2005;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	uint32 scheduleId = 11;
-	uint32 activityId = 6;
+    uint32 activity_id = 12;
+    uint32 schedule_id = 3;
 }
+
--- a/proto/ActivityCoinInfoNotify.proto
+++ b/proto/ActivityCoinInfoNotify.proto
@@ -3,18 +3,11 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: IGGIJGMINHM
+// CmdId: 2189
 message ActivityCoinInfoNotify {
-	//enum IILGOILMBMC {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2055;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	uint32 activityId = 7;
-	map<uint32, uint32> activityCoinMap = 14;
-	uint32 scheduleId = 15;
+    uint32 activity_id = 2;
+    map<uint32, uint32> activity_coin_map = 13;
+    uint32 schedule_id = 3;
 }
+
--- a/proto/ActivityCondStateChangeNotify.proto
+++ b/proto/ActivityCondStateChangeNotify.proto
@@ -2,23 +2,16 @@ syntax = "proto3";

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

-
-
 import "Uint32Pair.proto";

+// Name: JHOFJAELEEG
+// CmdId: 2012
 message ActivityCondStateChangeNotify {
-	//enum ACEKBANJHLJ {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2089;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	repeated uint32 expireCondList = 2;
-	repeated uint32 activatedSaleIdList = 1;
-	uint32 scheduleId = 15;
-	uint32 activityId = 3;
-	repeated Uint32Pair disableTransferPointInteractionList = 8;
-	repeated uint32 meetCondList = 13;
+    uint32 activity_id = 10;
+    repeated Uint32Pair disable_transfer_point_interaction_list = 7;
+    repeated uint32 PAGIONJOCJN = 13;
+    repeated uint32 activated_sale_id_list = 6;
+    repeated uint32 LGCJBENHFOB = 9;
+    uint32 schedule_id = 12;
 }
+
--- a/proto/ActivityDisableTransferPointInteractionNotify.proto
+++ b/proto/ActivityDisableTransferPointInteractionNotify.proto
@@ -2,19 +2,12 @@ syntax = "proto3";

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

-
-
 import "Uint32Pair.proto";

+// Name: MEHJOJBNMME
+// CmdId: 8969
 message ActivityDisableTransferPointInteractionNotify {
-	//enum CDGCBPNNOMC {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8440;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	bool isDisable = 15;
-	Uint32Pair scenePointPair = 8;
+    bool is_disable = 14;
+    Uint32Pair scene_point_pair = 15;
 }
+
--- a/proto/ActivityDungeonAvatar.proto
+++ b/proto/ActivityDungeonAvatar.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: IPJNBCPPEAC
 message ActivityDungeonAvatar {
-	uint32 avatarId = 1;
-	bool isTrial = 2;
-	uint32 costumeId = 3;
+    uint32 avatar_id = 1;
+    bool is_trial = 2;
+    uint32 costume_id = 3;
 }
+
--- a/proto/ActivityFriendGiftWishData.proto
+++ b/proto/ActivityFriendGiftWishData.proto
@@ -2,14 +2,14 @@ syntax = "proto3";

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

-
-
 import "ProfilePicture.proto";

+// Name: MJONLMACPAH
 message ActivityFriendGiftWishData {
-	uint32 uid = 4;
-	map<uint32, uint32> giftNumMap = 1;
-	string remarkName = 2;
-	string nickname = 9;
-	ProfilePicture profilePicture = 3;
+    map<uint32, uint32> gift_num_map = 8;
+    uint32 uid = 5;
+    string nickname = 1;
+    ProfilePicture profile_picture = 11;
+    string remark_name = 12;
 }
+
--- a/proto/ActivityGetCanGiveFriendGiftReq.proto
+++ b/proto/ActivityGetCanGiveFriendGiftReq.proto
@@ -3,17 +3,9 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: PLOKAKEIEFA
+// CmdId: 8934
 message ActivityGetCanGiveFriendGiftReq {
-	//enum PEELJEBIGBJ {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8383;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	uint32 scheduleId = 8;
+    uint32 schedule_id = 8;
 }
+
--- a/proto/ActivityGetCanGiveFriendGiftRsp.proto
+++ b/proto/ActivityGetCanGiveFriendGiftRsp.proto
@@ -3,18 +3,11 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: GALOOENJOIK
+// CmdId: 8186
 message ActivityGetCanGiveFriendGiftRsp {
-	//enum MJMDIEGOJPJ {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8965;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	uint32 scheduleId = 10;
-	map<uint32, uint32> giftNumMap = 4;
-	int32 retcode = 12;
+    uint32 schedule_id = 7;
+    map<uint32, uint32> gift_num_map = 9;
+    int32 retcode = 11;
 }
+
--- a/proto/ActivityGetFriendGiftWishListReq.proto
+++ b/proto/ActivityGetFriendGiftWishListReq.proto
@@ -3,17 +3,9 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: FJCECJGCHJP
+// CmdId: 8091
 message ActivityGetFriendGiftWishListReq {
-	//enum BCIOGIDBNAF {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8246;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	uint32 scheduleId = 11;
+    uint32 schedule_id = 9;
 }
+
--- a/proto/ActivityGetFriendGiftWishListRsp.proto
+++ b/proto/ActivityGetFriendGiftWishListRsp.proto
@@ -2,20 +2,13 @@ syntax = "proto3";

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

-
-
 import "ActivityFriendGiftWishData.proto";

+// Name: BNJPGACCJCH
+// CmdId: 8777
 message ActivityGetFriendGiftWishListRsp {
-	//enum CAALHDHHDIH {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8145;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	uint32 scheduleId = 8;
-	repeated ActivityFriendGiftWishData friendGiftWishList = 13;
-	int32 retcode = 15;
+    uint32 schedule_id = 14;
+    int32 retcode = 4;
+    repeated ActivityFriendGiftWishData friend_gift_wish_list = 6;
 }
+
--- a/proto/ActivityGetRecvGiftListReq.proto
+++ b/proto/ActivityGetRecvGiftListReq.proto
@@ -3,17 +3,9 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: DBMLBHBKCOF
+// CmdId: 8973
 message ActivityGetRecvGiftListReq {
-	//enum DMCDNLPJHKJ {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8622;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	uint32 scheduleId = 5;
+    uint32 schedule_id = 12;
 }
+
--- a/proto/ActivityGetRecvGiftListRsp.proto
+++ b/proto/ActivityGetRecvGiftListRsp.proto
@@ -2,20 +2,13 @@ syntax = "proto3";

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

-
-
 import "ActivityRecvGiftData.proto";

+// Name: BLNBFKLGKJA
+// CmdId: 8791
 message ActivityGetRecvGiftListRsp {
-	//enum KHCFDOOIHOM {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8705;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	int32 retcode = 15;
-	repeated ActivityRecvGiftData recvGiftList = 7;
-	uint32 scheduleId = 10;
+    repeated ActivityRecvGiftData recv_gift_list = 8;
+    uint32 schedule_id = 1;
+    int32 retcode = 9;
 }
+
--- a/proto/ActivityGiveFriendGiftReq.proto
+++ b/proto/ActivityGiveFriendGiftReq.proto
@@ -3,19 +3,11 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: FINKLKAKGID
+// CmdId: 8763
 message ActivityGiveFriendGiftReq {
-	//enum FFJGCFPIEIE {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8919;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	uint32 uid = 15;
-	map<uint32, uint32> giftNumMap = 9;
-	uint32 scheduleId = 13;
+    map<uint32, uint32> gift_num_map = 13;
+    uint32 schedule_id = 6;
+    uint32 uid = 8;
 }
+
--- a/proto/ActivityGiveFriendGiftRsp.proto
+++ b/proto/ActivityGiveFriendGiftRsp.proto
@@ -3,18 +3,11 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: PHKLPGDPGOB
+// CmdId: 8524
 message ActivityGiveFriendGiftRsp {
-	//enum JNEDHBGDFJJ {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8707;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	repeated uint32 limitGiftList = 2;
-	int32 retcode = 3;
-	uint32 scheduleId = 13;
+    uint32 schedule_id = 12;
+    int32 retcode = 9;
+    repeated uint32 limit_gift_list = 6;
 }
+
--- a/proto/ActivityHaveRecvGiftNotify.proto
+++ b/proto/ActivityHaveRecvGiftNotify.proto
@@ -3,16 +3,9 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: EDENPNNADMI
+// CmdId: 8350
 message ActivityHaveRecvGiftNotify {
-	//enum NKCGFPNKJOE {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8600;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	uint32 scheduleId = 10;
+    uint32 schedule_id = 7;
 }
+
--- a/proto/ActivityInfo.proto
+++ b/proto/ActivityInfo.proto
@@ -2,172 +2,176 @@ syntax = "proto3";

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

-
-
-import "SamLampInfo.proto";
-import "CrucibleInfo.proto";
-import "SalesmanInfo.proto";
-import "TrialAvatarInfo.proto";
-import "DeliveryInfo.proto";
-import "AsterInfo.proto";
-import "FlightInfo.proto";
-import "DragonSpineInfo.proto";
-import "EffigyInfo.proto";
-import "TreasureMapInfo.proto";
-import "BlessingInfo.proto";
-import "SeaLampInfo.proto";
-import "ExpeditionInfo.proto";
-import "ArenaChallengeInfo.proto";
-import "FleurFairInfo.proto";
-import "WaterSpiritInfo.proto";
-import "ChallnelerSlabInfo.proto";
-import "MistTrialActivityInfo.proto";
-import "HideAndSeekInfo.proto";
-import "FindHilichurlInfo.proto";
-import "SummerTimeInfo.proto";
-import "BuoyantCombatInfo.proto";
-import "EchoShellInfo.proto";
-import "BounceConjuringInfo.proto";
-import "BlitzRushInfo.proto";
-import "ChessInfo.proto";
-import "SumoInfo.proto";
-import "MoonfinTrialInfo.proto";
-import "LunaRiteInfo.proto";
-import "PlantFlowerInfo.proto";
-import "MusicGameActivityDetailInfo.proto";
-import "RoguelikeDungoenInfo.proto";
-import "DigInfo.proto";
-import "HachiInfo.proto";
-import "WinterCampInfo.proto";
-import "PotionInfo.proto";
-import "TanukiTravelActivityInfo.proto";
-import "LanternRiteActivityInfo.proto";
-import "MichiaeMatsuriInfo.proto";
-import "BartenderInfo.proto";
-import "UgcInfo.proto";
-import "CrystalLinkInfo.proto";
-import "IrodoriInfo.proto";
-import "PhotoInfo.proto";
-import "SpiceInfo.proto";
-import "GachaInfo.proto";
-import "LuminanceStoneChallengeInfo.proto";
-import "RogueDiaryInfo.proto";
-import "SummerTimeV2Info.proto";
-import "IslandPartyInfo.proto";
-import "GearInfo.proto";
-import "GravenInnocenceInfo.proto";
-import "InstableSprayInfo.proto";
-import "MuqadasPotionInfo.proto";
-import "TreasureSeelieInfo.proto";
-import "RockBoardExploreInfo.proto";
-import "VintageInfo.proto";
-import "WindFieldInfo.proto";
-import "FungusFighterInfo.proto";
-import "CharAmusementInfo.proto";
-import "EffigyChallengeInfo.proto";
-import "CoinCollectInfo.proto";
-import "BrickBreakerInfo.proto";
-import "DuelHeartInfo.proto";
-import "SeaLampV3Info.proto";
-import "TeamChainInfo.proto";
-import "ElectroherculesBattleInfo.proto";
-import "GcgFestivalInfo.proto";
 import "ActivityPushTipsData.proto";
 import "ActivityWatcherInfo.proto";
+import "AMFOFAPEHGM.proto";
+import "ArenaChallengeActivityDetailInfo.proto";
+import "AsterActivityDetailInfo.proto";
+import "BartenderActivityDetailInfo.proto";
+import "BlessingActivityDetailInfo.proto";
+import "BlitzRushActivityDetailInfo.proto";
+import "BounceConjuringActivityDetailInfo.proto";
+import "BrickBreakerDetailInfo.proto";
+import "BuoyantCombatDetailInfo.proto";
+import "ChannelerSlabActivityDetailInfo.proto";
+import "CharAmusementDetailInfo.proto";
+import "ChessActivityDetailInfo.proto";
+import "CoinCollectDetailInfo.proto";
+import "CrucibleActivityDetailInfo.proto";
+import "CrystalLinkActivityDetailInfo.proto";
+import "DeliveryActivityDetailInfo.proto";
+import "DigActivityDetailInfo.proto";
+import "DragonSpineActivityDetailInfo.proto";
+import "DuelHeartDetailInfo.proto";
+import "EchoShellDetailInfo.proto";
+import "EffigyActivityDetailInfo.proto";
+import "EffigyChallengeV2DetailInfo.proto";
+import "ExpeditionActivityDetailInfo.proto";
+import "FHPFPENBEIB.proto";
+import "FindHilichurlDetailInfo.proto";
+import "FleurFairActivityDetailInfo.proto";
+import "FlightActivityDetailInfo.proto";
+import "FungusFighterDetailInfo.proto";
+import "GachaActivityDetailInfo.proto";
+import "GearActivityDetailInfo.proto";
+import "GravenInnocenceDetailInfo.proto";
+import "HachiActivityDetailInfo.proto";
+import "HideAndSeekActivityDetailInfo.proto";
+import "InstableSprayDetailInfo.proto";
+import "IrodoriActivityDetailInfo.proto";
+import "IslandPartyDetailInfo.proto";
+import "LanternRiteActivityDetailInfo.proto";
+import "LHPBALCGMJH.proto";
+import "LuminanceStoneChallengeActivityDetailInfo.proto";
+import "LunaRiteDetailInfo.proto";
+import "MichiaeMatsuriActivityDetailInfo.proto";
+import "MistTrialActivityDetailInfo.proto";
+import "MoonfinTrialActivityDetailInfo.proto";
+import "MuqadasPotionActivityDetailInfo.proto";
+import "MusicGameActivityDetailInfo.proto";
+import "NFHMNCKJOEI.proto";
+import "PhotoActivityDetailInfo.proto";
+import "PlantFlowerActivityDetailInfo.proto";
+import "PotionActivityDetailInfo.proto";
+import "RockBoardExploreDetailInfo.proto";
+import "RogueDiaryActivityDetailInfo.proto";
+import "RoguelikeDungeonActivityDetailInfo.proto";
+import "SalesmanActivityDetailInfo.proto";
+import "SeaLampActivityDetailInfo.proto";
+import "SeaLampActivityInfo.proto";
+import "SeaLampV3DetailInfo.proto";
+import "SpiceActivityDetailInfo.proto";
+import "SummerTimeDetailInfo.proto";
+import "SummerTimeV2DetailInfo.proto";
+import "SumoActivityDetailInfo.proto";
+import "TanukiTravelActivityDetailInfo.proto";
+import "TeamChainDetailInfo.proto";
+import "TreasureMapActivityDetailInfo.proto";
+import "TreasureSeelieActivityDetailInfo.proto";
+import "TrialAvatarActivityDetailInfo.proto";
+import "UgcActivityDetailInfo.proto";
+import "VintageActivityDetailInfo.proto";
+import "WaterSpiritActivityDetailInfo.proto";
+import "WindFieldDetailInfo.proto";
+import "WinterCampActivityDetailInfo.proto";

+// Name: EIPLHBCKIIO
 message ActivityInfo {
-	map<uint32, uint32> activityCoinMap = 406;
-	uint32 scoreLimit = 1497;
-	repeated uint32 takenRewardList = 644;
-	bool Unk3300_MDBDPIBEGGH = 7;
-	bool Unk3300_MJNPGEKLOCG = 754;
-	uint32 endTime = 12;
-	uint32 activityType = 10;
-	uint32 selectedAvatarRewardId = 519;
-	repeated uint32 meetCondList = 2;
-	uint32 activityId = 15;
-	bool Unk3300_ABJKLALKLDG = 537;
-	bool isFinished = 3;
-	repeated ActivityPushTipsData activityPushTipsDataList = 336;
-	repeated ActivityWatcherInfo watcherInfoList = 14;
-	bool Unk3300_CBCEHLJJOGI = 1126;
-	uint32 scheduleId = 6;
-	repeated uint32 expireCondList = 9;
-	repeated uint32 fdjefldhela = 2021;
-	bool Unk3300_ICNJJKDHPCH = 11;
-	uint32 firstDayStartTime = 598;
-	uint32 curScore = 396;
-	map<uint32, uint32> wishGiftNumMap = 1052;
-	bool Unk3300_NEPKLLBJFKK = 1637;
-	uint32 beginTime = 5;
-	oneof detail {
-		SamLampInfo sam_lamp_info = 4;
-		CrucibleInfo crucible_info = 13;
-		SalesmanInfo salesman_info = 1;
-		TrialAvatarInfo trial_avatar_info = 8;
-		DeliveryInfo delivery_info = 32;
-		AsterInfo aster_info = 1808;
-		FlightInfo flight_info = 1062;
-		DragonSpineInfo dragon_spine_info = 378;
-		EffigyInfo effigy_info = 1991;
-		TreasureMapInfo treasure_map_info = 546;
-		BlessingInfo blessing_info = 1198;
-		SeaLampInfo sea_lamp_info = 578;
-		ExpeditionInfo expedition_info = 930;
-		ArenaChallengeInfo arena_challenge_info = 699;
-		FleurFairInfo fleur_fair_info = 1116;
-		WaterSpiritInfo water_spirit_info = 1651;
-		ChallnelerSlabInfo challneler_slab_info = 1135;
-		MistTrialActivityInfo mist_trial_activity_info = 1320;
-		HideAndSeekInfo hide_and_seek_info = 1077;
-		FindHilichurlInfo find_hilichurl_info = 417;
-		SummerTimeInfo summer_time_info = 1477;
-		BuoyantCombatInfo buoyant_combat_info = 1277;
-		EchoShellInfo echo_shell_info = 1172;
-		BounceConjuringInfo bounce_conjuring_info = 278;
-		BlitzRushInfo blitz_rush_info = 192;
-		ChessInfo chess_info = 1797;
-		SumoInfo sumo_info = 1379;
-		MoonfinTrialInfo moonfin_trial_info = 1122;
-		LunaRiteInfo luna_rite_info = 82;
-		PlantFlowerInfo plant_flower_info = 1864;
-		MusicGameActivityDetailInfo music_game_info = 1220;
-		RoguelikeDungoenInfo roguelike_dungoen_info = 1817;
-		DigInfo dig_info = 168;
-		HachiInfo hachi_info = 1663;
-		WinterCampInfo winter_camp_info = 114;
-		PotionInfo potion_info = 1552;
-		TanukiTravelActivityInfo tanuki_travel_activity_info = 1453;
-		LanternRiteActivityInfo lantern_rite_activity_info = 1372;
-		MichiaeMatsuriInfo michiae_matsuri_info = 428;
-		BartenderInfo bartender_info = 35;
-		UgcInfo ugc_info = 589;
-		CrystalLinkInfo crystal_link_info = 1375;
-		IrodoriInfo irodori_info = 1014;
-		PhotoInfo photo_info = 309;
-		SpiceInfo spice_info = 1446;
-		GachaInfo gacha_info = 1177;
-		LuminanceStoneChallengeInfo luminance_stone_challenge_info = 142;
-		RogueDiaryInfo rogue_diary_info = 397;
-		SummerTimeV2Info summer_time_v2info = 951;
-		IslandPartyInfo island_party_info = 1631;
-		GearInfo gear_info = 1801;
-		GravenInnocenceInfo graven_innocence_info = 1173;
-		InstableSprayInfo instable_spray_info = 944;
-		MuqadasPotionInfo muqadas_potion_info = 1350;
-		TreasureSeelieInfo treasure_seelie_info = 1142;
-		RockBoardExploreInfo rock_board_explore_info = 1273;
-		VintageInfo vintage_info = 1316;
-		WindFieldInfo wind_field_info = 2029;
-		FungusFighterInfo fungus_fighter_info = 1543;
-		CharAmusementInfo char_amusement_info = 504;
-		EffigyChallengeInfo effigy_challenge_info = 1144;
-		CoinCollectInfo coin_collect_info = 559;
-		BrickBreakerInfo brick_breaker_info = 1275;
-		DuelHeartInfo duel_heart_info = 221;
-		SeaLampV3Info sea_lamp_v3info = 1080;
-		TeamChainInfo team_chain_info = 144;
-		ElectroherculesBattleInfo electrohercules_battle_info = 172;
-		GcgFestivalInfo gcg_festival_info = 71;
-	}
+    uint32 ANGGLPJEBLE = 438;
+    uint32 schedule_id = 14;
+    bool FLFGIDFALEK = 15;
+    uint32 LPOCNCICJHM = 485;
+    map<uint32, uint32> activity_coin_map = 703;
+    repeated uint32 PAGIONJOCJN = 2;
+    uint32 end_time = 4;
+    bool GLOONPBGOHM = 1331;
+    repeated ActivityPushTipsData activity_push_tips_data_list = 1827;
+    repeated uint32 LGCJBENHFOB = 13;
+    bool is_finished = 6;
+    repeated uint32 EOPFKDBBOII = 894;
+    repeated ActivityWatcherInfo watcher_info_list = 8;
+    uint32 KMOFHMKLGHD = 5;
+    uint32 activity_id = 7;
+    bool CJDFLBKBNPL = 10;
+    map<uint32, uint32> wish_gift_num_map = 1459;
+    bool OEBHLKFBCOG = 696;
+    bool LGKOJCGDGBH = 1736;
+    uint32 begin_time = 9;
+    repeated uint32 DDBJAKPEPLC = 778;
+    uint32 first_day_start_time = 1677;
+    uint32 cur_score = 1005;
+    bool EFJOLIOFLBG = 514;
+    oneof detail {
+        SeaLampActivityDetailInfo sam_lamp_info = 1;
+        CrucibleActivityDetailInfo crucible_info = 11;
+        SalesmanActivityDetailInfo salesman_info = 3;
+        TrialAvatarActivityDetailInfo trial_avatar_info = 12;
+        DeliveryActivityDetailInfo delivery_info = 1972;
+        AsterActivityDetailInfo aster_info = 306;
+        FlightActivityDetailInfo flight_info = 1872;
+        DragonSpineActivityDetailInfo dragon_spine_info = 593;
+        EffigyActivityDetailInfo effigy_info = 2044;
+        TreasureMapActivityDetailInfo treasure_map_info = 876;
+        BlessingActivityDetailInfo blessing_info = 742;
+        SeaLampActivityInfo sea_lamp_info = 1685;
+        ExpeditionActivityDetailInfo expedition_info = 1399;
+        ArenaChallengeActivityDetailInfo arena_challenge_info = 1235;
+        FleurFairActivityDetailInfo fleur_fair_info = 581;
+        WaterSpiritActivityDetailInfo water_spirit_info = 1127;
+        ChannelerSlabActivityDetailInfo challneler_slab_info = 599;
+        MistTrialActivityDetailInfo mist_trial_activity_info = 645;
+        HideAndSeekActivityDetailInfo hide_and_seek_info = 794;
+        FindHilichurlDetailInfo find_hilichurl_info = 1344;
+        SummerTimeDetailInfo summer_time_info = 1058;
+        BuoyantCombatDetailInfo buoyant_combat_info = 771;
+        EchoShellDetailInfo echo_shell_info = 1632;
+        BounceConjuringActivityDetailInfo bounce_conjuring_info = 1554;
+        BlitzRushActivityDetailInfo blitz_rush_info = 1341;
+        ChessActivityDetailInfo chess_info = 664;
+        SumoActivityDetailInfo sumo_info = 1666;
+        MoonfinTrialActivityDetailInfo moonfin_trial_info = 333;
+        LunaRiteDetailInfo luna_rite_info = 119;
+        PlantFlowerActivityDetailInfo plant_flower_info = 349;
+        MusicGameActivityDetailInfo music_game_info = 1966;
+        RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 2034;
+        DigActivityDetailInfo dig_info = 1410;
+        HachiActivityDetailInfo hachi_info = 1603;
+        WinterCampActivityDetailInfo winter_camp_info = 1225;
+        PotionActivityDetailInfo potion_info = 1447;
+        TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 1327;
+        LanternRiteActivityDetailInfo lantern_rite_activity_info = 1662;
+        MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 1451;
+        BartenderActivityDetailInfo bartender_info = 2037;
+        UgcActivityDetailInfo ugc_info = 1207;
+        CrystalLinkActivityDetailInfo crystal_link_info = 1163;
+        IrodoriActivityDetailInfo irodori_info = 839;
+        PhotoActivityDetailInfo photo_info = 1500;
+        SpiceActivityDetailInfo spice_info = 1583;
+        GachaActivityDetailInfo gacha_info = 579;
+        LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 1523;
+        RogueDiaryActivityDetailInfo rogue_diary_info = 1180;
+        SummerTimeV2DetailInfo summer_time_v2_info = 1764;
+        IslandPartyDetailInfo island_party_info = 185;
+        GearActivityDetailInfo gear_info = 1537;
+        GravenInnocenceDetailInfo graven_innocence_info = 2019;
+        InstableSprayDetailInfo instable_spray_info = 1876;
+        MuqadasPotionActivityDetailInfo muqadas_potion_info = 1402;
+        TreasureSeelieActivityDetailInfo treasure_seelie_info = 1443;
+        RockBoardExploreDetailInfo rock_board_explore_info = 154;
+        VintageActivityDetailInfo vintage_info = 236;
+        WindFieldDetailInfo wind_field_info = 620;
+        FungusFighterDetailInfo fungus_fighter_info = 1477;
+        CharAmusementDetailInfo char_amusement_info = 1356;
+        EffigyChallengeV2DetailInfo effigy_challenge_info = 261;
+        CoinCollectDetailInfo coin_collect_info = 1411;
+        BrickBreakerDetailInfo brick_breaker_info = 846;
+        DuelHeartDetailInfo duel_heart_info = 127;
+        SeaLampV3DetailInfo sea_lamp_v3_info = 738;
+        TeamChainDetailInfo team_chain_info = 686;
+        FHPFPENBEIB electrohercules_battle_info = 540;
+        LHPBALCGMJH gcg_festival_info = 1645;
+        NFHMNCKJOEI fleur_fair_v2_info = 97;
+        AMFOFAPEHGM fungus_fighter_v2_info = 549;
+    }
 }
+
--- a/proto/ActivityInfoNotify.proto
+++ b/proto/ActivityInfoNotify.proto
@@ -2,19 +2,11 @@ syntax = "proto3";

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

-
-
 import "ActivityInfo.proto";

+// Name: BKCOKLBOIIF
+// CmdId: 2134
 message ActivityInfoNotify {
-	//enum KBFOADCMONG {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2136;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	ActivityInfo activityInfo = 3;
+    ActivityInfo activity_info = 9;
 }
+
--- a/proto/ActivityPlayOpenAnimNotify.proto
+++ b/proto/ActivityPlayOpenAnimNotify.proto
@@ -3,17 +3,9 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: MEAKCDAMKNJ
+// CmdId: 2136
 message ActivityPlayOpenAnimNotify {
-	//enum BOFOPFKDLEN {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2178;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	uint32 activityId = 15;
+    uint32 activity_id = 6;
 }
+
--- a/proto/ActivityPushTipsData.proto
+++ b/proto/ActivityPushTipsData.proto
@@ -2,11 +2,11 @@ syntax = "proto3";

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

-
-
 import "ActivityPushTipsState.proto";

+// Name: CBEGBPBBDMB
 message ActivityPushTipsData {
-	ActivityPushTipsState state = 12;
-	uint32 activityPushTipsId = 11;
-}
+    uint32 activity_push_tips_id = 12;
+    ActivityPushTipsState state = 3;
+}
+
--- a/proto/ActivityPushTipsInfoNotify.proto
+++ b/proto/ActivityPushTipsInfoNotify.proto
@@ -2,20 +2,13 @@ syntax = "proto3";

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

-
-
 import "ActivityPushTipsData.proto";

+// Name: ANKBGAFHFKI
+// CmdId: 8419
 message ActivityPushTipsInfoNotify {
-	//enum EGCLPKNLNMG {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8527;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	uint32 scheduleId = 6;
-	repeated ActivityPushTipsData activityPushTipsDataList = 7;
-	uint32 activityId = 9;
+    repeated ActivityPushTipsData activity_push_tips_data_list = 10;
+    uint32 activity_id = 7;
+    uint32 schedule_id = 1;
 }
+
--- a/proto/ActivityPushTipsState.proto
+++ b/proto/ActivityPushTipsState.proto
@@ -2,8 +2,11 @@ syntax = "proto3";

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

+
+// Name: POKOFBAJMFO
 enum ActivityPushTipsState {
-	ACTIVITY_PUSH_TIPS_STATE_NONE = 0;
-	ACTIVITY_PUSH_TIPS_STATE_START = 1;
-	ACTIVITY_PUSH_TIPS_STATE_READ = 2;
+    ACTIVITY_PUSH_TIPS_STATE_NONE = 0;
+    ACTIVITY_PUSH_TIPS_STATE_START = 1;
+    ACTIVITY_PUSH_TIPS_STATE_READ = 2;
 }
+
--- a/proto/ActivityReadPushTipsReq.proto
+++ b/proto/ActivityReadPushTipsReq.proto
@@ -3,18 +3,10 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: HBCAKJGNMIK
+// CmdId: 8285
 message ActivityReadPushTipsReq {
-	//enum DLNMIJEFDKL {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8896;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	repeated uint32 activityPushTipsIdList = 11;
-	uint32 activityId = 14;
+    uint32 activity_id = 4;
+    repeated uint32 activity_push_tips_id_list = 9;
 }
+
--- a/proto/ActivityReadPushTipsRsp.proto
+++ b/proto/ActivityReadPushTipsRsp.proto
@@ -3,16 +3,9 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: LEILOFMJCIF
+// CmdId: 8119
 message ActivityReadPushTipsRsp {
-	//enum GOBCODACHJA {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 8938;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	int32 retcode = 8;
+    int32 retcode = 8;
 }
+
--- a/proto/ActivityRecvGiftData.proto
+++ b/proto/ActivityRecvGiftData.proto
@@ -2,14 +2,14 @@ syntax = "proto3";

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

-
-
 import "ProfilePicture.proto";

+// Name: CFHNBMHCAAN
 message ActivityRecvGiftData {
-	string remarkName = 15;
-	string nickname = 10;
-	uint32 uid = 2;
-	map<uint32, uint32> giftNumMap = 8;
-	ProfilePicture profilePicture = 5;
+    string nickname = 7;
+    string remark_name = 12;
+    uint32 uid = 14;
+    map<uint32, uint32> gift_num_map = 10;
+    ProfilePicture profile_picture = 13;
 }
+
--- a/proto/ActivitySaleChangeNotify.proto
+++ b/proto/ActivitySaleChangeNotify.proto
@@ -3,17 +3,10 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: MMCKMPPBHND
+// CmdId: 2034
 message ActivitySaleChangeNotify {
-	//enum DDCDJICOFHA {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2058;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//}
-
-	uint32 saleId = 2;
-	bool isClose = 8;
+    bool is_close = 6;
+    uint32 sale_id = 9;
 }
+
--- a/proto/ActivityScheduleInfo.proto
+++ b/proto/ActivityScheduleInfo.proto
@@ -3,12 +3,12 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";


-
-
+// Name: NIFNHCLOBPA
 message ActivityScheduleInfo {
-	uint32 activityId = 12;
-	uint32 scheduleId = 13;
-	uint32 beginTime = 2;
-	uint32 endTime = 9;
-	bool isOpen = 7;
+    uint32 schedule_id = 8;
+    bool is_open = 1;
+    uint32 begin_time = 10;
+    uint32 end_time = 6;
+    uint32 activity_id = 14;
 }
+
--- a/proto/ActivityScheduleInfoNotify.proto
+++ b/proto/ActivityScheduleInfoNotify.proto
@@ -2,20 +2,12 @@ syntax = "proto3";

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

-
-
 import "ActivityScheduleInfo.proto";

+// Name: KEDKIAAFGKO
+// CmdId: 2068
 message ActivityScheduleInfoNotify {
-	//enum GMLKEAPFFKO {
-	//	option allow_alias= true;
-	//	NONE = 0;
-	//	PEPPOHPHJOJ = 2047;
-	//	DCDNILFDFLB = 0;
-	//	NNBKOLMPOEA = 1;
-	//	EAJIABGAOCI = 1;
-	//}
-
-	repeated ActivityScheduleInfo activityScheduleList = 5;
-	uint32 remainFlySeaLampNum = 11;
+    uint32 remain_fly_sea_lamp_num = 12;
+    repeated ActivityScheduleInfo activity_schedule_list = 11;
 }
+
--- a/Show More
+++ b/Show More