tes coop mode p1

deobf.proto

@@ -4276,7 +4276,7 @@ message MAEJLKLFNKP {
 	uint32 OIFFDDFEHLH = 5;
 	MatchType KIFBAKINPCD = 6;
 	int32 retcode = 9;
-	bool OMGIHMMEJNF = 14;
+	bool is_agreed = 14;
 }
 
 // CmdId: 29202
@@ -8058,9 +8058,9 @@ message NFMGEAKGHBA {
 // CmdId: 4853
 message IDCJGOPNCKJ {
 	int32 retcode = 1;
-	uint32 PCJIFEJGIGB = 4;
+	uint32 apply_uid = 4;
 	uint32 param = 7;
-	bool OMGIHMMEJNF = 10;
+	bool is_agreed = 10;
 }
 
 message AbilityMetaUpdateBaseReactionDamage {
@@ -8352,7 +8352,7 @@ message OLMKFJAKOLK {
 
 // CmdId: 7178
 message JCIKCICNGNE {
-	bool OMGIHMMEJNF = 3;
+	bool is_agreed = 3;
 	MatchType KIFBAKINPCD = 7;
 	uint32 OIFFDDFEHLH = 9;
 	int32 retcode = 14;
@@ -18664,7 +18664,7 @@ message BPINAIKKBEL {
 	}
 
 	uint32 target_uid = 1;
-	bool OMGIHMMEJNF = 4;
+	bool is_agreed = 4;
 	BOFFGBAMBLK reason = 6;
 	string BJIGPDACBAB = 8;
 }
@@ -19280,7 +19280,7 @@ message HNAFDDBJHDN {
 
 // CmdId: 22310
 message DFOFOFDFIJA {
-	bool OMGIHMMEJNF = 3;
+	bool is_agreed = 3;
 	MatchType KIFBAKINPCD = 9;
 }
 
@@ -20420,7 +20420,7 @@ message MGDJNOGCOIB {
 
 // CmdId: 7415
 message MIADKLGDIJL {
-	bool OMGIHMMEJNF = 10;
+	bool is_agreed = 10;
 }
 
 // CmdId: 25470
@@ -20893,10 +20893,10 @@ message AHCNAEHDANG {
 
 // CmdId: 5031
 message FBBGCFMILEK {
-	bool OMGIHMMEJNF = 9;
+	bool is_agreed = 9;
 	int32 retcode = 10;
 	uint32 param = 11;
-	uint32 PCJIFEJGIGB = 14;
+	uint32 apply_uid = 14;
 }
 
 // CmdId: 21813
@@ -21219,8 +21219,8 @@ message ONFMAHEGKEO {
 
 // CmdId: 24116
 message BPHHDKKFFEF {
-	bool OMGIHMMEJNF = 4;
-	uint32 PCJIFEJGIGB = 13;
+	bool is_agreed = 4;
+	uint32 apply_uid = 13;
 }
 
 // CmdId: 26662
@@ -22369,7 +22369,7 @@ message BFHAGEOJCPG {
 	}
 
 	uint32 target_uid = 1;
-	bool OMGIHMMEJNF = 2;
+	bool is_agreed = 2;
 	EOMOBGIDFLA reason = 10;
 	string BJIGPDACBAB = 11;
 }
@@ -22805,8 +22805,8 @@ message IMCFPLIGOEM {
 
 // CmdId: 20266
 message KBDEKIOILLE {
-	bool OMGIHMMEJNF = 3;
-	uint32 PCJIFEJGIGB = 8;
+	bool is_agreed = 3;
+	uint32 apply_uid = 8;
 }
 
 // CmdId: 26612
@@ -25946,7 +25946,7 @@ message FFHBLEMBMHJ {
 }
 
 message ILJMBKJKACN {
-	bool OMGIHMMEJNF = 6;
+	bool is_agreed = 6;
 	OnlinePlayerInfo BEOHBLAOIAK = 15;
 }
 
@@ -30511,7 +30511,7 @@ message FONFIEEBGHG {
 // CmdId: 21920
 message ENHFLMGGMAM {
 	MatchType KIFBAKINPCD = 10;
-	bool OMGIHMMEJNF = 12;
+	bool is_agreed = 12;
 }
 
 // CmdId: 9963
@@ -30987,7 +30987,7 @@ message HGCHLALDLNA {
 	string BJIGPDACBAB = 3;
 	CPAHFOGPJJB reason = 4;
 	uint32 target_uid = 8;
-	bool OMGIHMMEJNF = 13;
+	bool is_agreed = 13;
 }
 
 // CmdId: 4761
@@ -31321,9 +31321,9 @@ message IMFDOHKHPFN {
 
 // CmdId: 24058
 message BPODJPBECDN {
-	uint32 PCJIFEJGIGB = 4;
+	uint32 apply_uid = 4;
 	int32 retcode = 6;
-	bool OMGIHMMEJNF = 13;
+	bool is_agreed = 13;
 }
 
 // CmdId: 9825
@@ -31430,8 +31430,8 @@ message KDCIGJLHAEI {
 
 // CmdId: 26285
 message HHNBHGACADH {
-	bool OMGIHMMEJNF = 1;
-	uint32 PCJIFEJGIGB = 15;
+	bool is_agreed = 1;
+	uint32 apply_uid = 15;
 }
 
 message NLECDJBBCDO {

op.js

@@ -993,7 +993,7 @@ function cmdid_json_to_csv() {
 // get_cmdid_json();  // 2. get last cmdid.csv to json
 // now we have cmdid_gc.json and cmdid.json
 // update_cmdid_gc(); // 3. update gc cmdid (mode by id)
-// cmdid_to_op(); // 4. update op
+ cmdid_to_op(); // 4. update op
 // npx prettier --write PacketOpcodes.java
 // scan_gc(); // 5. scan gc
 // clean_proto_event(); // 6. clean event, need manual

proto/GetOnlinePlayerListReq.proto

@@ -1,22 +1,6 @@
-// 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: 27587
-// Obf: IGNGJNHHJBM
+// CmdId: 22525 (4.7.0)
+// Obf: DBNCNMAKDMK
 message GetOnlinePlayerListReq {
 }

proto/GetOnlinePlayerListRsp.proto

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

proto/PlayerApplyEnterHomeNotify.proto

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

proto/PlayerApplyEnterMpNotify.proto

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

proto/PlayerApplyEnterMpReq.proto

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

proto/PlayerApplyEnterMpResultNotify.proto

@@ -1,25 +1,9 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 3467
-// Obf: EIIOBJEBLEH
-message PlayerApplyEnterMpResultNotify {
-	// Obf: DLBJOMOJCKD
+// CmdId: 27203 (4.7.0)
+// Obf: BPINAIKKBEL
+message PlayerApplyEnterMpResultNotify {	
+
 	enum Reason {
 		REASON_PLAYER_JUDGE = 0;
 		REASON_SCENE_CANNOT_ENTER = 1;
@@ -37,8 +21,8 @@ message PlayerApplyEnterMpResultNotify {
 		REASON_MAX_PLAYER = 13;
 	}
 	
-	Reason reason = 10;
-	string target_nickname = 14;
-	uint32 target_uid = 3;
-	bool is_agreed = 2;
+	Reason reason = 6;
+	string target_nickname = 8;
+	uint32 target_uid = 1;
+	bool is_agreed = 4;
 }

proto/PlayerApplyEnterMpResultReq.proto

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

proto/PlayerApplyEnterMpResultRsp.proto

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

proto/PlayerApplyEnterMpRsp.proto

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

proto/PlayerEnterDungeonReq.proto

@@ -4,10 +4,11 @@ option java_package = "emu.grasscutter.net.proto";
 
 import "DungeonEnterPosInfo.proto";
 
-// 4.6.0
-// CmdId: 2254
+// 4.7.0
+// CmdId: 21509
+// AFNMCKAGOLH
 message PlayerEnterDungeonReq {
-	uint32 dungeon_id = 1;
+	uint32 dungeon_id = 2;
 	uint32 point_id = 11;
-	DungeonEnterPosInfo enter_pos_info = 12;
+	DungeonEnterPosInfo enter_pos_info = 9;
 }

proto/PlayerQuitDungeonReq.proto

@@ -2,9 +2,10 @@ syntax = "proto3";
 
 option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
-// CmdId: 9001
+// 4.7.0
+// CmdId: 4653
+// GLKCKLJODKO
 message PlayerQuitDungeonReq {
-	uint32 point_id = 13;
-	bool is_quit_immediately = 14;
+	uint32 point_id = 12;
+	bool is_quit_immediately = 7;
 }

proto/TowerAllDataReq.proto

@@ -2,8 +2,9 @@ syntax = "proto3";
 
 option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
-// CmdId: 6852
+// 4.7.0
+// CmdId: 611
+// AOPOGBADJHN
 message TowerAllDataReq {
 	bool is_interact = 9;
 }