sync 4.0 v1 (66b3744)

proto/ACCKLIOPBHN.proto

@@ -0,0 +1,23 @@
+// https://github.com/SlushinPS/beach-simulator
+// Copyright (C) 2023 Slushy Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// CmdId: 205
+message ACCKLIOPBHN {
+	uint32 close_time = 1;
+	int32 retcode = 11;
+}

proto/ACDCLDJFDFK.proto

@@ -0,0 +1,22 @@
+// 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: 26672
+message ACDCLDJFDFK {
+	uint32 PPLHKCKDHEC = 13;
+}

proto/ACJJIIHAEMA.proto

@@ -16,8 +16,8 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-import "PEMPCNLGIJF.proto";
-// CmdId: 23731
-message AEGNJEKFGPI {
-	PEMPCNLGIJF reason = 6;
+enum ACJJIIHAEMA {
+	ACJJIIHAEMA_None = 0;
+	ACJJIIHAEMA_Dungeon = 1;
+	ACJJIIHAEMA_Room = 2;
 }

proto/ACOPFPFIJHN.proto

@@ -16,8 +16,8 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 23142
-message PIEKABPNAEJ {
+// CmdId: 6465
+message ACOPFPFIJHN {
+	bool is_success = 9;
 	uint32 level_id = 10;
-	bool GEFPKPGFGIG = 8;
 }

proto/ADBHDNAANMF.proto

@@ -0,0 +1,28 @@
+// 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";
+enum ADBHDNAANMF {
+	ADBHDNAANMF_None = 0;
+	ADBHDNAANMF_StarredDungeon = 1;
+	ADBHDNAANMF_StarredRoom = 2;
+	ADBHDNAANMF_Owner = 3;
+	ADBHDNAANMF_History = 4;
+	ADBHDNAANMF_Search = 5;
+	ADBHDNAANMF_Official = 6;
+	ADBHDNAANMF_Template = 7;
+}

proto/ADHOJAAOLNO.proto

@@ -0,0 +1,23 @@
+// https://github.com/SlushinPS/beach-simulator
+// Copyright (C) 2023 Slushy Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+enum ADHOJAAOLNO {
+	ADHOJAAOLNO_DungeonCandidateAvatarTypeNone = 0;
+	ADHOJAAOLNO_DungeonCandidateAvatarTypeFormal = 1;
+	ADHOJAAOLNO_DungeonCandidateAvatarTypeUgc = 2;
+}

proto/AEFBJDINKAJ.proto

@@ -1,31 +0,0 @@
-// 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 "LCCKNACMGAA.proto";
-import "LJKDBILCDCB.proto";
-// CmdId: 24908
-message AEFBJDINKAJ {
-	uint32 LGOHGFDGMGO = 3;
-	uint32 IBGHNDBACGP = 7;
-	uint32 cost_time = 12;
-	uint32 AKADDABPGDE = 15;
-	uint32 level_id = 8;
-	bool is_success = 11;
-	repeated LCCKNACMGAA KCBGCANCBNA = 13;
-	repeated LJKDBILCDCB HNKFGHEJMJO = 5;
-}

proto/AEHOGBMFIDK.proto

@@ -16,6 +16,6 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 22961
-message BHJFLKGMNKJ {
+// CmdId: 21196
+message AEHOGBMFIDK {
 }

proto/AEIMLNONEAP.proto

@@ -1,27 +0,0 @@
-// 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";
-enum AEIMLNONEAP {
-	AEIMLNONEAP_PacmanDungeonStopNone = 0;
-	AEIMLNONEAP_PacmanDungeonStopSuccess = 1;
-	AEIMLNONEAP_PacmanDungeonStopTimeup = 2;
-	AEIMLNONEAP_PacmanDungeonStopClientInterrupt = 3;
-	AEIMLNONEAP_PacmanDungeonStopCancel = 4;
-	AEIMLNONEAP_PacmanDungeonStopActivityClosed = 5;
-	AEIMLNONEAP_PacmanDungeonStopFail = 6;
-}

proto/AFCLGCNDDBH.proto

@@ -1,31 +0,0 @@
-// 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 "LKCJKONCEDO.proto";
-message AFCLGCNDDBH {
-	uint32 CIAJCGKICOP = 14;
-	uint32 HNMFMCAMKAB = 4;
-	uint32 IPBIDJOGIIA = 3;
-	LKCJKONCEDO OHCEPJLFJCE = 7;
-	uint32 target_score = 15;
-	uint32 OHPDNBDDBBG = 12;
-	uint32 JGALLAMOEDL = 1;
-	repeated uint32 HHMMEBCFNMN = 2;
-	repeated uint32 KLCCADMLNHJ = 8;
-	bool AOKAKNMHIBJ = 6;
-}

proto/AGBOEIBCIHC.proto

@@ -0,0 +1,24 @@
+// 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: 1992
+message AGBOEIBCIHC {
+	repeated uint32 tag_list = 5;
+	uint64 guid = 13;
+	bool OHMBBPAHCED = 11;
+}

proto/AGDBMIBGBFF.proto

@@ -0,0 +1,23 @@
+// https://github.com/SlushinPS/beach-simulator
+// Copyright (C) 2023 Slushy Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// CmdId: 20407
+message AGDBMIBGBFF {
+	bool HJMAPBBEKMD = 4;
+	bool IHGOBANMPLI = 7;
+}

proto/AGMCPLHHDMM.proto

@@ -1,22 +0,0 @@
-// 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";
-message AGMCPLHHDMM {
-	repeated uint32 FBPPPIBPMDO = 2;
-	repeated uint32 OEFJFKKOBJC = 10;
-}

proto/AHACINLIOCD.proto

@@ -0,0 +1,22 @@
+// 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: 28469
+message AHACINLIOCD {
+	uint32 schedule_id = 12;
+}

proto/AHEBDJGHKFN.proto

@@ -16,11 +16,11 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+import "AMFJCMGLNAJ.proto";
 import "DungeonCandidateTeamPlayerState.proto";
-import "MBJAJACPKIA.proto";
-message NMOMOHFFNPB {
-	DungeonCandidateTeamPlayerState OMMKENHCBLH = 9;
-	uint32 uid = 2;
-	repeated MBJAJACPKIA FPJFJBIBHNE = 1;
-	repeated MBJAJACPKIA JHMBANGCKHK = 11;
+message AHEBDJGHKFN {
+	repeated AMFJCMGLNAJ ADKAEDEJEPE = 13;
+	repeated AMFJCMGLNAJ CKEEDGHGPPL = 5;
+	uint32 uid = 14;
+	DungeonCandidateTeamPlayerState AIDKGEOMNKG = 9;
 }

proto/AHIGPCDFIHL.proto

@@ -0,0 +1,21 @@
+// 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";
+message AHIGPCDFIHL {
+	uint32 apply_entity_id = 13;
+}

proto/AIIMGHGLPJE.proto

@@ -16,6 +16,6 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 7104
-message AFKHBKBKGIG {
+// CmdId: 8390
+message AIIMGHGLPJE {
 }

proto/AIMKBAPHFFH.proto

@@ -17,7 +17,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "Uint32Pair.proto";
-message FJEAPIAJJPB {
-	repeated Uint32Pair BBHFCIBLJBL = 15;
-	uint32 DJKPOIHMCDA = 5;
+message AIMKBAPHFFH {
+	uint32 BFAOHCLAJKE = 9;
+	repeated Uint32Pair KBOGCJPDDHJ = 2;
 }

proto/AINHOPNFINJ.proto

@@ -0,0 +1,21 @@
+// 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";
+message AINHOPNFINJ {
+	bool PKPICGNHOGB = 1;
+}

proto/AISnapshotEntityData.proto

@@ -17,18 +17,18 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AISnapshotEntitySkillCycle.proto";
-// Obf: NJIBEBILPBB
+// Obf: NJBGLLKFBPP
 message AISnapshotEntityData {
-	uint32 attack_target_id = 2;
-	float CEOENMEAEDG = 5;
-	repeated AISnapshotEntitySkillCycle finished_skill_cycles = 4;
-	float LFMMACBLFAB = 3;
-	float AIGOPDJPEPO = 13;
-	uint32 MFMNONHPLGD = 12;
-	float AAAOLEGAMIK = 8;
-	uint32 LCFLEGHABMP = 7;
-	uint32 NKICKCLEJKF = 9;
-	uint32 entity_id = 11;
-	map<uint32, uint32> hitting_avatars = 1;
-	uint32 FCPDGFADJGP = 6;
+	uint32 entity_id = 4;
+	uint32 MONLECHIPDH = 10;
+	uint32 CFEJHIOCIDN = 8;
+	float CPOCCODHHND = 5;
+	float IGNJPGLNHPI = 12;
+	repeated AISnapshotEntitySkillCycle finished_skill_cycles = 13;
+	map<uint32, uint32> hitting_avatars = 11;
+	float HFFKLJAFLNJ = 3;
+	float MPNEAAFEJIJ = 6;
+	uint32 LCFPBOOCMNP = 9;
+	uint32 LMKIMJLALNM = 15;
+	uint32 attack_target_id = 7;
 }

proto/AISnapshotEntitySkillCycle.proto

@@ -16,11 +16,11 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: MGDEKEBNMGP
+// Obf: PKECKJELEOK
 message AISnapshotEntitySkillCycle {
-	bool OHDGIGLHKPL = 8;
-	uint32 skill_id = 11;
-	bool HADJNPKLEOG = 14;
-	bool EEMBPJGDNOI = 10;
-	bool DGABAHCOHDC = 9;
+	bool AOPLIONFLEF = 6;
+	uint32 skill_id = 8;
+	bool KCOIOILFEJG = 2;
+	bool OMHCFDIDJPC = 3;
+	bool OIOLEBJAMEH = 13;
 }

proto/AISnapshotInfo.proto

@@ -17,6 +17,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AISnapshotEntityData.proto";
+// Obf: NILDKOGFAPD
 message AISnapshotInfo {
-	repeated AISnapshotEntityData ACFKMPMENHK = 3;
+	repeated AISnapshotEntityData ai_snapshots = 15;
 }

proto/AJKGAIPCFPB.proto

@@ -1,24 +0,0 @@
-// 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: 6052
-message AJKGAIPCFPB {
-	repeated uint32 ENNIJLCIBGH = 13;
-	uint32 EDDCGLBMNLB = 2;
-	int32 retcode = 1;
-}

proto/AJKHEOFNGBA.proto

@@ -0,0 +1,22 @@
+// 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: 24314
+message AJKHEOFNGBA {
+	uint32 level_id = 14;
+}

proto/AKEBNLHDNPG.proto

@@ -1,22 +0,0 @@
-// 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 "HPFPNKNJIOD.proto";
-message AKEBNLHDNPG {
-	repeated HPFPNKNJIOD level_info_list = 1;
-}

proto/AKEKAPHAIPN.proto

@@ -16,6 +16,6 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 7335
-message DCONHKKIBNF {
+// CmdId: 1219
+message AKEKAPHAIPN {
 }

proto/AKLNFEHGPCP.proto

@@ -16,6 +16,6 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 23537
-message CDFDONMECFJ {
+// CmdId: 20716
+message AKLNFEHGPCP {
 }

proto/AKMKFIJBAHI.proto

@@ -16,7 +16,7 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 9218
-message NACHJCMOHCE {
+// CmdId: 22326
+message AKMKFIJBAHI {
 	uint64 guid = 2;
 }

proto/ALAGLLEJCFL.proto

@@ -16,8 +16,8 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 7571
-message GCOHOLPDLDG {
+// CmdId: 9519
+message ALAGLLEJCFL {
 	int32 retcode = 5;
-	repeated uint32 DHCMGPFOEON = 11;
+	uint32 offering_id = 6;
 }

proto/ALAPJGFCPGL.proto

@@ -0,0 +1,25 @@
+// 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: 4160
+message ALAPJGFCPGL {
+	uint32 template_id = 8;
+	uint32 point_id = 14;
+	uint32 IFFAGNNKDOB = 15;
+	float speed = 6;
+}

proto/ALLEHIBHLDI.proto

@@ -1,26 +0,0 @@
-// 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 "NMOMOHFFNPB.proto";
-import "NBMLPCGCIEG.proto";
-// CmdId: 24100
-message ALLEHIBHLDI {
-	repeated NMOMOHFFNPB player_info_list = 6;
-	NBMLPCGCIEG CKALODBAPLN = 5;
-	uint32 round = 4;
-}

proto/AMDBBLLFLHG.proto

@@ -16,6 +16,6 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 7850
-message AIEGMNDKMGN {
+// CmdId: 1441
+message AMDBBLLFLHG {
 }

proto/AMFJCMGLNAJ.proto

@@ -16,9 +16,8 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 9180
-message GEJCBBEOCGA {
-	uint32 result = 10;
+message AMFJCMGLNAJ {
 	uint64 guid = 11;
-	bool HMEABIJPPJL = 7;
+	uint32 avatar_id = 4;
+	uint32 costume_id = 13;
 }

proto/AMLDIHDFJHN.proto

@@ -16,7 +16,7 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 24987
-message JEAPGNOHBOI {
+// CmdId: 23339
+message AMLDIHDFJHN {
 	int32 retcode = 4;
 }

proto/AMMBHMNGBIH.proto

@@ -16,9 +16,24 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 21199
-message GFEIPJFIGJM {
-	uint32 music_basic_id = 4;
+// CmdId: 20828
+message AMMBHMNGBIH {
+	bool MAMHOPGFOKD = 510;
+	uint32 combo = 5;
+	uint32 MECALGKAKJK = 4;
+	uint32 NMPPJPOJFDC = 10;
+	uint32 FCFNKIDLDHJ = 487;
+	repeated uint32 OEAHADEGEOA = 1789;
+	uint32 max_combo = 6;
+	bool is_save_score = 14;
+	bool BPNLLFDJJOL = 1659;
+	uint32 music_basic_id = 1;
+	uint32 score = 15;
 	uint64 ugc_guid = 8;
-	bool is_save_score = 12;
+	uint32 KDAOEDCLEFG = 1960;
+	uint32 GDOMKIHOKCC = 1346;
+	uint32 NGALDEAEBHG = 13;
+	repeated uint32 KPPICEDHMPN = 3;
+	uint32 correct_hit = 12;
+	float speed = 1929;
 }

proto/ANAEEOOIDJJ.proto

@@ -1,22 +0,0 @@
-// 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";
-message ANAEEOOIDJJ {
-	uint32 item_id = 1;
-	uint32 item_num = 10;
-}

proto/ANDPNJDKHNM.proto

@@ -16,7 +16,7 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-message LGADMDJLBFE {
+message ANDPNJDKHNM {
 	uint64 dungeon_guid = 1;
 	uint32 room_id = 2;
 }

proto/ANKMHOAHDAI.proto

@@ -1,23 +0,0 @@
-// 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: 893
-message ANKMHOAHDAI {
-	map<uint32, uint32> gadget_chain_level_map = 2;
-	bool MJDIKJBCDFI = 3;
-}

proto/ANKONNPBGJC.proto

@@ -16,6 +16,6 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 9146
-message DFNBCIPFAKB {
+// CmdId: 6619
+message ANKONNPBGJC {
 }

proto/AOJPBFBPDNB.proto

@@ -16,8 +16,8 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-import "OEHLKBGHEDC.proto";
-message ACKNNJIEGEK {
-	OEHLKBGHEDC HKBHEOKLEFK = 12;
+// CmdId: 25158
+message AOJPBFBPDNB {
+	uint32 JKECDJGBEEF = 6;
 	uint32 level_id = 7;
 }

proto/APPJMEJEKKG.proto

@@ -16,7 +16,7 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 6546
-message ACGAFODFNLP {
-	uint32 end_time = 15;
+// CmdId: 3898
+message APPJMEJEKKG {
+	uint32 entity_id = 7;
 }

proto/AbilityActionCreateGadget.proto

@@ -17,9 +17,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "Vector.proto";
-// Obf: OPDCPCFOLIE
+// Obf: BAFEPPHIOGH
 message AbilityActionCreateGadget {
-	Vector rot = 8;
-	uint32 room_id = 6;
-	Vector pos = 13;
+	Vector pos = 10;
+	Vector rot = 12;
+	uint32 room_id = 7;
 }

proto/AbilityActionGenerateElemBall.proto

@@ -17,9 +17,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "Vector.proto";
-// Obf: BEHNKFHKEMD
+// Obf: OBEOLIIBNAF
 message AbilityActionGenerateElemBall {
 	Vector pos = 4;
-	uint32 room_id = 7;
-	Vector rot = 15;
+	uint32 room_id = 6;
+	Vector rot = 9;
 }

proto/AbilityActionServerMonsterLog.proto

@@ -16,6 +16,7 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+// Obf: HNHMBILKIDF
 message AbilityActionServerMonsterLog {
-	repeated int32 param_list = 4;
+	repeated int32 param_list = 2;
 }

proto/AbilityActionSetCrashDamage.proto

@@ -17,8 +17,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "Vector.proto";
-// Obf: ICJEFJLIABP
+// Obf: DHBNJILLKFA
 message AbilityActionSetCrashDamage {
-	float damage = 5;
-	Vector hit_pos = 9;
+	Vector hit_pos = 4;
+	float damage = 8;
 }

proto/AbilityAppliedAbility.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AbilityString.proto";
 import "AbilityScalarValueEntry.proto";
-// Obf: GBOIHEDHOGC
+// Obf: NKCDMLBKHGI
 message AbilityAppliedAbility {
 	AbilityString ability_name = 1;
 	AbilityString ability_override = 2;

proto/AbilityAppliedModifier.proto

@@ -19,7 +19,7 @@ option java_package = "emu.grasscutter.net.proto";
 import "AbilityString.proto";
 import "AbilityAttachedModifier.proto";
 import "ModifierDurability.proto";
-// Obf: DCPBFOKKPFJ
+// Obf: OAHPGFENJJK
 message AbilityAppliedModifier {
 	int32 modifier_local_id = 1;
 	uint32 parent_ability_entity_id = 2;
@@ -30,7 +30,7 @@ message AbilityAppliedModifier {
 	float exist_duration = 7;
 	AbilityAttachedModifier attached_instanced_modifier = 8;
 	uint32 apply_entity_id = 9;
-	bool DLOLFHNNEKI = 10;
+	bool is_attached_parent_ability = 10;
 	ModifierDurability modifier_durability = 11;
 	uint32 sbuff_uid = 12;
 	bool is_serverbuff_modifier = 13;

proto/AbilityAttachedModifier.proto

@@ -16,7 +16,7 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: KLMOHHKFHDB
+// Obf: COGFLLLFFFC
 message AbilityAttachedModifier {
 	bool is_invalid = 1;
 	uint32 owner_entity_id = 2;

proto/AbilityBornType.proto

@@ -17,9 +17,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "Vector.proto";
-// Obf: BAHALCKDAKF
+// Obf: AJIIAKCDDHA
 message AbilityBornType {
+	Vector pos = 3;
+	Vector move_dir = 4;
 	Vector rot = 11;
-	Vector pos = 15;
-	Vector move_dir = 10;
 }

proto/AbilityChangeNotify.proto

@@ -17,9 +17,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AbilityControlBlock.proto";
-// CmdId: 1184
-// Obf: PLMKKNIJMEC
+// CmdId: 300
+// Obf: GEMMGPJKGAF
 message AbilityChangeNotify {
-	uint32 entity_id = 10;
-	AbilityControlBlock ability_control_block = 2;
+	AbilityControlBlock ability_control_block = 12;
+	uint32 entity_id = 8;
 }

proto/AbilityControlBlock.proto

@@ -17,7 +17,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AbilityEmbryo.proto";
-// Obf: OLBGGLMLEBL
+// Obf: GGPHMELJCOL
 message AbilityControlBlock {
 	repeated AbilityEmbryo ability_embryo_list = 1;
 }

proto/AbilityEmbryo.proto

@@ -16,7 +16,7 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: JAODNDBPGJA
+// Obf: PLELJEGMEOD
 message AbilityEmbryo {
 	uint32 ability_id = 1;
 	fixed32 ability_name_hash = 2;

proto/AbilityFireworkBornType.proto

@@ -17,10 +17,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "Vector.proto";
-// Obf: IEELHDCPPBO
+// Obf: KNMNMIBIHEK
 message AbilityFireworkBornType {
-	Vector move_dir = 4;
-	uint32 effect_index = 7;
-	Vector pos = 2;
-	Vector rot = 6;
+	uint32 effect_index = 14;
+	Vector rot = 5;
+	Vector pos = 12;
+	Vector move_dir = 15;
 }

proto/AbilityGadgetInfo.proto

@@ -16,7 +16,7 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: AELEICAJLLG
+// Obf: AHHOEHNNEIN
 message AbilityGadgetInfo {
 	uint32 camp_id = 1;
 	uint32 camp_target_type = 2;

proto/AbilityIdentifier.proto

@@ -16,12 +16,12 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: PIEGLPACNBP
+// Obf: JJPHDINFFJI
 message AbilityIdentifier {
-	uint32 instanced_modifier_id = 11;
-	int32 local_id = 2;
-	bool is_serverbuff_modifier = 14;
-	uint32 modifier_owner_id = 1;
-	uint32 ability_caster_id = 15;
-	uint32 instanced_ability_id = 9;
+	int32 local_id = 5;
+	uint32 instanced_ability_id = 11;
+	bool is_serverbuff_modifier = 2;
+	uint32 instanced_modifier_id = 12;
+	uint32 MDEDDJNNKOI = 6;
+	uint32 BKJOIGAMEAM = 10;
 }

proto/AbilityInvocationFailNotify.proto

@@ -17,10 +17,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AbilityInvokeEntry.proto";
-// CmdId: 1155
-// Obf: CMJMPJAFMGK
+// CmdId: 26730
+// Obf: PKAPLLHEELP
 message AbilityInvocationFailNotify {
-	uint32 entity_id = 1;
-	AbilityInvokeEntry invoke = 12;
-	string reason = 2;
+	AbilityInvokeEntry invoke = 6;
+	uint32 entity_id = 9;
+	string reason = 1;
 }

proto/AbilityInvocationFixedNotify.proto

@@ -17,13 +17,13 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AbilityInvokeEntry.proto";
-// CmdId: 1175
-// Obf: BPBEBFMHGNL
+// CmdId: 4864
+// Obf: OHCPCJBLDIN
 message AbilityInvocationFixedNotify {
-	AbilityInvokeEntry DLABNBJEFGF = 13;
-	AbilityInvokeEntry PIBKJHBGEHJ = 2;
-	AbilityInvokeEntry EINJCADCDFP = 12;
-	AbilityInvokeEntry DDLBMHEONMO = 11;
-	AbilityInvokeEntry KHNKKDJIDIF = 15;
-	AbilityInvokeEntry LGLHDKBGJDB = 3;
+	AbilityInvokeEntry GDJLCBBPFHF = 1;
+	AbilityInvokeEntry CMBLCNNPIKH = 12;
+	AbilityInvokeEntry OFJIPJDJDJF = 6;
+	AbilityInvokeEntry DDFBNNBICCH = 15;
+	AbilityInvokeEntry OEONLMEPEBK = 10;
+	AbilityInvokeEntry IGACLGPDICN = 7;
 }

proto/AbilityInvocationsNotify.proto

@@ -17,8 +17,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AbilityInvokeEntry.proto";
-// CmdId: 1196
-// Obf: PJFLGALPCNO
+// CmdId: 26313
+// Obf: IFAKFDEJFLI
 message AbilityInvocationsNotify {
-	repeated AbilityInvokeEntry invokes = 1;
+	repeated AbilityInvokeEntry invokes = 15;
 }

proto/AbilityInvokeArgument.proto

@@ -16,7 +16,7 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: IEGANFCMCNJ
+// Obf: LBKBGBCCGMA
 enum AbilityInvokeArgument {
 	ABILITY_INVOKE_ARGUMENT_NONE = 0;
 	ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE = 1;
@@ -41,6 +41,7 @@ enum AbilityInvokeArgument {
 	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_META_TRIGGER_ARKHE_REACTION = 23;
 	ABILITY_INVOKE_ARGUMENT_ACTION_TRIGGER_ABILITY = 50;
 	ABILITY_INVOKE_ARGUMENT_ACTION_SET_CRASH_DAMAGE = 51;
 	ABILITY_INVOKE_ARGUMENT_ACTION_EFFECT = 52;
@@ -58,6 +59,7 @@ enum AbilityInvokeArgument {
 	ABILITY_INVOKE_ARGUMENT_ACTION_HIT_EFFECT = 64;
 	ABILITY_INVOKE_ARGUMENT_ACTION_SET_BULLET_TRACK_TARGET = 65;
 	ABILITY_INVOKE_ARGUMENT_ACTION_FIREWORK_EFFECT = 66;
+	ABILITY_INVOKE_ARGUMENT_ACTION_LEVEL_BANK_ADD_STUFF = 67;
 	ABILITY_INVOKE_ARGUMENT_MIXIN_AVATAR_STEER_BY_CAMERA = 100;
 	ABILITY_INVOKE_ARGUMENT_MIXIN_MONSTER_DEFEND = 101;
 	ABILITY_INVOKE_ARGUMENT_MIXIN_WIND_ZONE = 102;
@@ -71,7 +73,7 @@ enum AbilityInvokeArgument {
 	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_INVOKE_ARGUMENT_RATIO = 113;
+	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;
@@ -84,5 +86,8 @@ enum AbilityInvokeArgument {
 	ABILITY_INVOKE_ARGUMENT_MIXIN_DAMAGE_LOAN = 123;
 	ABILITY_INVOKE_ARGUMENT_MIXIN_BROADCAST_GV = 124;
 	ABILITY_INVOKE_ARGUMENT_MIXIN_RECEIVE_GV = 125;
+	ABILITY_INVOKE_ARGUMENT_MIXIN_RAYCAST_SELECT_TARGET = 126;
 	ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET = 127;
+	ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA = 128;
+	ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129;
 }

proto/AbilityInvokeEntry.proto

@@ -16,18 +16,18 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-import "AbilityInvokeEntryHead.proto";
 import "AbilityInvokeArgument.proto";
 import "ForwardType.proto";
-// Obf: ELGIBELOGKF
+import "AbilityInvokeEntryHead.proto";
+// Obf: BNCFAGLEKAM
 message AbilityInvokeEntry {
-	uint32 event_id = 8;
-	uint32 entity_id = 10;
-	AbilityInvokeEntryHead head = 14;
-	bool is_ignore_auth = 2;
-	uint32 forward_peer = 3;
-	AbilityInvokeArgument argument_type = 1;
-	ForwardType forward_type = 11;
-	bytes ability_data = 12;
-	double total_tick_time = 4;
+	AbilityInvokeArgument argument_type = 7;
+	bytes ability_data = 2;
+	uint32 entity_id = 9;
+	ForwardType forward_type = 14;
+	double total_tick_time = 5;
+	uint32 forward_peer = 12;
+	uint32 event_id = 1;
+	bool is_ignore_auth = 13;
+	AbilityInvokeEntryHead head = 8;
 }

proto/AbilityInvokeEntryHead.proto

@@ -16,13 +16,13 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: DPEDKHLIFHF
+// Obf: JOJGDABCHAP
 message AbilityInvokeEntryHead {
-	int32 modifier_config_local_id = 8;
-	uint32 target_id = 13;
-	uint32 instanced_ability_id = 9;
-	uint32 server_buff_uid = 2;
-	int32 local_id = 4;
+	uint32 instanced_ability_id = 5;
+	int32 modifier_config_local_id = 4;
+	int32 local_id = 9;
+	uint32 server_buff_uid = 7;
+	uint32 instanced_modifier_id = 11;
 	bool is_serverbuff_modifier = 12;
-	uint32 instanced_modifier_id = 15;
+	uint32 target_id = 8;
 }

proto/AbilityMetaAddAbility.proto

@@ -17,7 +17,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AbilityAppliedAbility.proto";
-// Obf: KGNBOGPLLAM
+// Obf: GOIHMEADCCK
 message AbilityMetaAddAbility {
-	AbilityAppliedAbility ability = 2;
+	AbilityAppliedAbility ability = 9;
 }

proto/AbilityMetaModifierChange.proto

@@ -16,21 +16,21 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+import "AbilityAttachedModifier.proto";
 import "ModifierProperty.proto";
 import "ModifierAction.proto";
 import "AbilityString.proto";
-import "AbilityAttachedModifier.proto";
-// Obf: NANLJHBMAGF
+// Obf: FFBMKELHDNF
 message AbilityMetaModifierChange {
-	repeated ModifierProperty properties = 14;
-	ModifierAction action = 4;
-	uint32 apply_entity_id = 2;
-	bool is_mute_remote = 15;
-	bool JGGDMDGLJOP = 8;
-	AbilityString parent_ability_name = 1;
-	uint32 server_buff_uid = 7;
-	AbilityString parent_ability_override = 10;
-	AbilityAttachedModifier attached_instanced_modifier = 3;
-	bool DLOLFHNNEKI = 12;
-	int32 modifier_local_id = 5;
+	AbilityAttachedModifier attached_instanced_modifier = 15;
+	uint32 server_buff_uid = 5;
+	repeated ModifierProperty properties = 6;
+	bool BNMCKEBPDGI = 11;
+	bool is_attached_parent_ability = 2;
+	uint32 apply_entity_id = 9;
+	ModifierAction action = 1;
+	bool HEDGMMNKADC = 10;
+	AbilityString parent_ability_name = 7;
+	AbilityString parent_ability_override = 8;
+	int32 modifier_local_id = 14;
 }

proto/AbilityMetaModifierDurabilityChange.proto

@@ -0,0 +1,23 @@
+// https://github.com/SlushinPS/beach-simulator
+// Copyright (C) 2023 Slushy Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// Obf: AKLNDGMDIHP
+message AbilityMetaModifierDurabilityChange {
+	float FOLHDMMHCIG = 6;
+	float FHDBNIPEBBO = 9;
+}

proto/AbilityMetaReInitOverrideMap.proto

@@ -17,7 +17,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AbilityScalarValueEntry.proto";
-// Obf: EDIDAGDNOLP
+// Obf: DKNHIBDBJDH
 message AbilityMetaReInitOverrideMap {
-	repeated AbilityScalarValueEntry override_map = 2;
+	repeated AbilityScalarValueEntry override_map = 10;
 }

proto/AbilityMetaSetPoseParameter.proto

@@ -17,7 +17,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AnimatorParameterValueInfoPair.proto";
-// Obf: FOHAAJOMMPL
+// Obf: AFDPLNIIALH
 message AbilityMetaSetPoseParameter {
-	AnimatorParameterValueInfoPair value = 15;
+	AnimatorParameterValueInfoPair value = 1;
 }

proto/AbilityMetaTriggerElementReaction.proto

@@ -16,11 +16,11 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: ODBBPNOOEOI
+// Obf: CGLLCIMMIMJ
 message AbilityMetaTriggerElementReaction {
-	uint32 element_reactor_type = 2;
-	uint32 element_reaction_type = 14;
+	uint32 IPMHLABHJOI = 5;
+	uint32 trigger_entity_id = 2;
+	uint32 JOGAEKDGFBH = 12;
+	uint32 AFGOOBDJBGK = 6;
 	int32 hit_index = 3;
-	uint32 trigger_entity_id = 1;
-	uint32 element_source_type = 4;
 }

proto/AbilityMetaUpdateBaseReactionDamage.proto

@@ -17,10 +17,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AbilityString.proto";
-// Obf: NGEKKGKDJED
+// Obf: HGBOKEDCLOO
 message AbilityMetaUpdateBaseReactionDamage {
-	uint32 reaction_type = 1;
-	AbilityString global_value_key = 4;
-	uint32 source_caster_id = 15;
-	AbilityString ability_name = 3;
+	AbilityString ability_name = 4;
+	AbilityString global_value_key = 8;
+	uint32 EJOIOADINHE = 5;
+	uint32 EJHCLCMJIMM = 12;
 }

proto/AbilityMixinBreakout.proto

@@ -21,9 +21,9 @@ import "BreakoutSyncPing.proto";
 import "BreakoutSyncFinishGame.proto";
 import "BreakoutSyncSnapShot.proto";
 import "BreakoutSyncAction.proto";
-// Obf: PKJJKBLLIGJ
+// Obf: KOPLDLJGNEO
 message AbilityMixinBreakout {
-	// Obf: IJFMHDDKKMJ
+	// Obf: IMAGJJCOADH
 	enum SyncType {
 		SYNC_TYPE_NONE = 0;
 		SYNC_TYPE_CREATE_CONNECT = 1;
@@ -34,13 +34,13 @@ message AbilityMixinBreakout {
 		SYNC_TYPE_ACTION = 6;
 	}
 	
-	int32 retcode = 2;
-	SyncType sync_type = 4;
+	SyncType sync_type = 14;
+	int32 retcode = 8;
 	oneof sync {
-		BreakoutSyncCreateConnect sync_create_connect = 6;
+		BreakoutSyncCreateConnect sync_create_connect = 12;
 		BreakoutSyncPing sync_ping = 9;
-		BreakoutSyncFinishGame sync_finish_game = 13;
-		BreakoutSyncSnapShot sync_snap_shot = 5;
-		BreakoutSyncAction sync_action = 15;
+		BreakoutSyncFinishGame sync_finish_game = 4;
+		BreakoutSyncSnapShot sync_snap_shot = 2;
+		BreakoutSyncAction sync_action = 6;
 	}
 }

proto/AbilityMixinCostStamina.proto

@@ -1,24 +0,0 @@
-// Proto has been converted from Sorapointa to Grasscutter format
-// Sorapointa - A server software re-implementation for a certain anime game, and avoid sorapointa.
-// Copyright (C) 2022  Sorapointa 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";
-
-message AbilityMixinCostStamina {
-  bool is_swim = 7;
-}

proto/AbilityMixinElementShield.proto

@@ -16,11 +16,12 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+// Obf: HLPPHMDAIKF
 message AbilityMixinElementShield {
-	float sub_shield = 4;
-	float max_shield = 11;
-	bool is_shield_broken = 7;
-	uint32 absorb_type = 14;
-	float shield = 10;
-	uint32 player_num = 15;
-}
+	bool is_shield_broken = 5;
+	float FIEFKGHCBBO = 4;
+	float AFHOPKKJCJF = 9;
+	uint32 GCAEMIGCBAK = 7;
+	float FFMBPIKIJAP = 3;
+	uint32 player_num = 6;
+}

proto/AbilityMixinEraseBrickActivity.proto

@@ -16,6 +16,7 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-message JLFKECJAKLK {
+// Obf: DCMFEAOECBO
+message AbilityMixinEraseBrickActivity {
 	repeated uint32 data = 6;
 }

proto/AbilityMixinFireworksLauncher.proto

@@ -16,11 +16,12 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+// Obf: LLOPCMMCDGK
 message AbilityMixinFireworksLauncher {
-	uint32 HNGKHBALOLP = 6;
-	uint32 phase = 13;
-	uint32 BIHDGIPJMGC = 12;
-	uint32 FNDEEPLICMM = 9;
-	uint32 HMJEPKDPGAP = 2;
-	repeated uint32 HHPNADNCEOK = 4;
+	uint32 BNNOMFAPDCM = 3;
+	uint32 phase = 7;
+	uint32 JAHKJNPKHIF = 10;
+	uint32 IFFFLOOIEGN = 5;
+	uint32 EIHEIBJOMKA = 6;
+	repeated uint32 fireworks_config = 15;
 }

proto/AbilityMixinGlobalShield.proto

@@ -16,11 +16,12 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+// Obf: NMBEIFBPELC
 message AbilityMixinGlobalShield {
-	bool is_create_effect = 8;
-	float sub_shield = 3;
-	uint32 avatar_id = 12;
-	string shield_effect_name = 13;
-	float height_offset = 4;
-	float shield = 6;
+	float FIEFKGHCBBO = 9;
+	string shield_effect_name = 8;
+	float APBPKKMCPIA = 7;
+	bool is_create_effect = 6;
+	float AFHOPKKJCJF = 14;
+	uint32 avatar_id = 11;
 }

proto/AbilityMixinRecoverInfo.proto

@@ -18,15 +18,15 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "MassivePropSyncInfo.proto";
 import "BreakoutSnapShot.proto";
-// Obf: PEBNHOCGDFE
+// Obf: NNBAGDGFEKA
 message AbilityMixinRecoverInfo {
+	oneof Source {
+		uint32 instanced_ability_id = 1;
+		uint32 instanced_modifier_id = 2;
+	}
 	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;
-	}
 }

proto/AbilityMixinScenePropSync.proto

@@ -17,9 +17,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "MassivePropSyncInfo.proto";
-// Obf: CMGBBPPHNGC
+// Obf: KEKBDPCNHFK
 message AbilityMixinScenePropSync {
-	bool is_clear_all = 9;
-	repeated MassivePropSyncInfo massive_prop_list = 2;
-	repeated int64 delete_id_list = 6;
+	bool is_clear_all = 6;
+	repeated MassivePropSyncInfo massive_prop_list = 8;
+	repeated int64 delete_id_list = 5;
 }

proto/AbilityMixinShieldBar.proto

@@ -16,9 +16,10 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+// Obf: FIIOICNBIAJ
 message AbilityMixinShieldBar {
-	float max_shield = 5;
-	uint32 element_type = 8;
-	uint32 player_num = 10;
-	float shield = 7;
-}
+	uint32 element_type = 7;
+	float FFMBPIKIJAP = 5;
+	float FIEFKGHCBBO = 8;
+	uint32 player_num = 1;
+}

proto/AbilityMixinShootFromCamera.proto

@@ -17,8 +17,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "Vector.proto";
-// Obf: EOEKNCGNPGB
+// Obf: KMDKCMLECGB
 message AbilityMixinShootFromCamera {
-	Vector InitPos = 5;
-	Vector forward = 4;
+	Vector InitPos = 4;
+	Vector forward = 11;
 }

proto/AbilityMixinUGCTimeControl.proto

@@ -0,0 +1,23 @@
+// https://github.com/SlushinPS/beach-simulator
+// Copyright (C) 2023 Slushy Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// Obf: EPBAICGAHIL
+message AbilityMixinUGCTimeControl {
+	uint32 start_move_time = 3;
+	uint64 start_move_time_ms = 11;
+}

proto/AbilityMixinWindSeedSpawner.proto

@@ -17,25 +17,25 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "Vector.proto";
-// Obf: ECIPFNGJAIF
+// Obf: GODBLNPFIIG
 message AbilityMixinWindSeedSpawner {
-	// Obf: EKDJLLIPACM
+	// Obf: KOLEALFBLKF
 	message AddSignal {
 	}
 	
-	// Obf: FLOPFNIHOIO
+	// Obf: PKIEIPCDKJN
 	message RefreshSeed {
-		repeated Vector pos_list = 1;
+		repeated Vector pos_list = 9;
 	}
 	
-	// Obf: LEOLCCAAAPG
+	// Obf: CMGICLJOGAM
 	message CatchSeed {
-		uint32 entity_id = 1;
+		uint32 entity_id = 9;
 	}
 	
 	oneof cmd {
-		AddSignal add_signal = 13;
-		RefreshSeed refresh_seed = 11;
-		CatchSeed catch_seed = 4;
+		AddSignal add_signal = 2;
+		RefreshSeed refresh_seed = 8;
+		CatchSeed catch_seed = 15;
 	}
 }

proto/AbilityMixinWindZone.proto

@@ -0,0 +1,23 @@
+// https://github.com/SlushinPS/beach-simulator
+// Copyright (C) 2023 Slushy Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// Obf: LHDGHFOILLH
+message AbilityMixinWindZone {
+	repeated uint32 OOMECOLCCFO = 1;
+	repeated uint32 IJMOCHLFJGC = 14;
+}

proto/AbilityScalarType.proto

@@ -16,7 +16,7 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: EBCOKIIELIE
+// Obf: HOIECOCMCMI
 enum AbilityScalarType {
 	ABILITY_SCALAR_TYPE_UNKNOW = 0;
 	ABILITY_SCALAR_TYPE_FLOAT = 1;

proto/AbilityScalarValueEntry.proto

@@ -18,7 +18,7 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "AbilityString.proto";
 import "AbilityScalarType.proto";
-// Obf: ELHFFNHJCPD
+// Obf: DAEKOPFKPMK
 message AbilityScalarValueEntry {
 	AbilityString key = 1;
 	AbilityScalarType value_type = 2;

proto/AbilityString.proto

@@ -16,7 +16,7 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: KHIKIFCBPKH
+// Obf: PPIBJBLBJDL
 message AbilityString {
 	oneof type {
 		string str = 1;

proto/AbilitySyncStateInfo.proto

@@ -20,7 +20,7 @@ import "AbilityScalarValueEntry.proto";
 import "AbilityAppliedAbility.proto";
 import "AbilityAppliedModifier.proto";
 import "AbilityMixinRecoverInfo.proto";
-// Obf: LKMIECILJCL
+// Obf: JDIFMANDKLC
 message AbilitySyncStateInfo {
 	bool is_inited = 1;
 	repeated AbilityScalarValueEntry dynamic_value_map = 2;

proto/AcceptCityReputationRequestReq.proto

@@ -16,9 +16,9 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 2835
-// Obf: CIJLDKDCPEO
+// CmdId: 6832
+// Obf: IDPFBCKMKLE
 message AcceptCityReputationRequestReq {
-	uint32 city_id = 12;
-	uint32 request_id = 9;
+	uint32 city_id = 5;
+	uint32 request_id = 10;
 }

proto/AcceptCityReputationRequestRsp.proto

@@ -16,10 +16,10 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 2887
-// Obf: GPBALMDFDCI
+// CmdId: 7825
+// Obf: GLPNFBBJODP
 message AcceptCityReputationRequestRsp {
-	uint32 city_id = 6;
-	int32 retcode = 13;
-	uint32 request_id = 7;
+	int32 retcode = 2;
+	uint32 request_id = 1;
+	uint32 city_id = 5;
 }

proto/Achievement.proto

@@ -16,18 +16,18 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: LPAPJAKPDJO
+// Obf: NJOHADFBICH
 message Achievement {
-	enum OHCJGBIOHNI {
+	enum KNKEIELCCDB {
 		OPFLKOJMOIG_Invalid = 0;
 		OPFLKOJMOIG_Unfinished = 1;
 		OPFLKOJMOIG_Finished = 2;
 		OPFLKOJMOIG_RewardTaken = 3;
 	}
 	
-	uint32 id = 3;
-	OHCJGBIOHNI status = 10;
-	uint32 total_progress = 14;
 	uint32 finish_timestamp = 15;
-	uint32 cur_progress = 5;
+	KNKEIELCCDB status = 10;
+	uint32 total_progress = 4;
+	uint32 cur_progress = 14;
+	uint32 id = 5;
 }

proto/AchievementAllDataNotify.proto

@@ -17,9 +17,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "Achievement.proto";
-// CmdId: 2678
-// Obf: JGJDJMAOIMP
+// CmdId: 27422
+// Obf: BMJFIOKJEMJ
 message AchievementAllDataNotify {
-	repeated uint32 reward_taken_goal_id_list = 10;
-	repeated Achievement achievement_list = 4;
+	repeated uint32 reward_taken_goal_id_list = 4;
+	repeated Achievement achievement_list = 9;
 }

proto/AchievementUpdateNotify.proto

@@ -17,8 +17,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "Achievement.proto";
-// CmdId: 2658
-// Obf: CHOHAAMOIKE
+// CmdId: 4460
+// Obf: IDGAPFJMLNJ
 message AchievementUpdateNotify {
-	repeated Achievement achievement_list = 2;
+	repeated Achievement achievement_list = 15;
 }

proto/ActiveGadget.proto

@@ -0,0 +1,22 @@
+// https://github.com/SlushinPS/beach-simulator
+// Copyright (C) 2023 Slushy Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// Obf: HPDKEAJKIKE
+message ActiveGadget {
+	uint32 ABGKFCBNDIE = 9;
+}

proto/ActiveMonsterGroup.proto

@@ -0,0 +1,22 @@
+// https://github.com/SlushinPS/beach-simulator
+// Copyright (C) 2023 Slushy Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// Obf: DIJGJHMPADN
+message ActiveMonsterGroup {
+	uint32 BGJGDPDJCJI = 14;
+}

proto/ActiveMonsterWave.proto

@@ -0,0 +1,22 @@
+// https://github.com/SlushinPS/beach-simulator
+// Copyright (C) 2023 Slushy Team
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// Obf: OLLGHMNBHFF
+message ActiveMonsterWave {
+	uint32 GLJDIOCLDMP = 13;
+}

proto/ActivityAcceptAllGiveGiftReq.proto

@@ -16,8 +16,8 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 8507
-// Obf: ONKFBHGPPNL
+// CmdId: 26297
+// Obf: KOKMEDHANGC
 message ActivityAcceptAllGiveGiftReq {
 	uint32 schedule_id = 2;
 }

proto/ActivityAcceptAllGiveGiftRsp.proto

@@ -17,10 +17,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "ActivityAcceptGiftResultInfo.proto";
-// CmdId: 8947
-// Obf: NGOENBHPBMD
+// CmdId: 26260
+// Obf: PDAIDPJNHEE
 message ActivityAcceptAllGiveGiftRsp {
-	repeated ActivityAcceptGiftResultInfo accept_gift_result_info_list = 4;
-	uint32 schedule_id = 13;
-	int32 retcode = 5;
+	repeated ActivityAcceptGiftResultInfo accept_gift_result_info_list = 2;
+	int32 retcode = 8;
+	uint32 schedule_id = 1;
 }

proto/ActivityAcceptGiftResultInfo.proto

@@ -16,9 +16,9 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// Obf: EJKDFCMJLEE
+// Obf: MGAPJIJBGGJ
 message ActivityAcceptGiftResultInfo {
-	map<uint32, uint32> BLNMJKEKMKN = 1;
-	map<uint32, uint32> DCNCHKBMNOA = 5;
-	uint32 uid = 14;
+	uint32 uid = 11;
+	map<uint32, uint32> IJCFDJFGMPP = 12;
+	map<uint32, uint32> PKBLFFNAILJ = 4;
 }

proto/ActivityAcceptGiveGiftReq.proto

@@ -16,9 +16,9 @@
 
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 8313
-// Obf: DKKHNAGFGPB
+// CmdId: 25362
+// Obf: DDEKGJEIGAN
 message ActivityAcceptGiveGiftReq {
-	uint32 uid = 3;
-	uint32 schedule_id = 6;
+	uint32 uid = 2;
+	uint32 schedule_id = 9;
 }

proto/ActivityAcceptGiveGiftRsp.proto

@@ -17,10 +17,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "ActivityAcceptGiftResultInfo.proto";
-// CmdId: 8567
-// Obf: LOLBOBPPOOL
+// CmdId: 20446
+// Obf: MDPMPEHJFDE
 message ActivityAcceptGiveGiftRsp {
-	ActivityAcceptGiftResultInfo accept_gift_result_info = 2;
-	uint32 schedule_id = 6;
-	int32 retcode = 9;
+	ActivityAcceptGiftResultInfo accept_gift_result_info = 12;
+	int32 retcode = 4;
+	uint32 schedule_id = 1;
 }