fix some proto p1

proto/ClientLockGameTimeNotify.proto

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

proto/CustomGadgetTreeInfo.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "CustomCommonNodeInfo.proto";
-// Obf: POAIMCJGABA
+// 4.7.0
+// Obf: ?
 message CustomGadgetTreeInfo {
 	repeated CustomCommonNodeInfo node_list = 1;
 }

proto/DelTeamEntityNotify.proto

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

proto/DungeonEntryBlockReason.proto

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

proto/DungeonEntryCond.proto

@@ -1,8 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "DungeonEntryBlockReason.proto";
-
+// 4.7.0
+// HFNABBHGPAC
 message DungeonEntryCond {
-  DungeonEntryBlockReason cond_reason = 2;
+  DungeonEntryBlockReason cond_reason = 15;
-  uint32 param1 = 14;
+  uint32 param1 = 13;
 }

proto/GetDungeonEntryExploreConditionReq.proto

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

proto/GetDungeonEntryExploreConditionRsp.proto

@@ -1,8 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "DungeonEntryCond.proto";
-
+// 4.7.0
+// CmdId: 26570
+// OECPJMAIIEA
 message GetDungeonEntryExploreConditionRsp {
-  DungeonEntryCond dungeon_entry_cond = 4;
+  DungeonEntryCond dungeon_entry_cond = 3;
-  int32 retcode = 12;
+  int32 retcode = 2;
 }

proto/MaterialDeleteReturnNotify.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 "MaterialDeleteReturnType.proto";
-// CmdId: 6719
+// 4.7.0
-// Obf: KLNDAJDJPNC
+// CmdId: 4352
+// Obf: FGGPLOEFCJF
 message MaterialDeleteReturnNotify {
-	MaterialDeleteReturnType type = 12;
+	MaterialDeleteReturnType type = 11;
-	map<uint32, uint32> JICOKOIADLN = 11;
+	map<uint32, uint32> uk1 = 9;
-	map<uint32, uint32> AJFNGKJPABI = 3;
+	map<uint32, uint32> uk2 = 13;
 }

proto/MaterialDeleteReturnType.proto

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

proto/QuickUseWidgetReq.proto

@@ -0,0 +1,19 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+import "WidgetCreateLocationInfo.proto";
+import "WidgetCameraInfo.proto";
+import "WidgetCreatorInfo.proto";
+import "WidgetThunderBirdFeatherInfo.proto";
+import "WidgetSorushInfo.proto";
+// CmdId: 1372
+// Obf: EEBHMEMHHFM
+message QuickUseWidgetReq {
+	oneof param {
+		WidgetCreateLocationInfo location_info = 615;
+		WidgetCameraInfo camera_info = 564;
+		WidgetCreatorInfo creator_info = 777;
+		WidgetThunderBirdFeatherInfo thunder_bird_feather_info = 320;
+		WidgetSorushInfo sorush_info = 141;
+	}
+	bool EEJNPDEBBIK = 806;
+}

proto/SceneDataNotify.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+import "MapLayerInfo.proto";
+
+// 4.7.0
+// CmdId: 23591
+message SceneDataNotify {
+	repeated string level_config_name_list = 2;
+	MapLayerInfo map_layer_info = 8;
+	repeated uint32 scene_tag_id_list = 14;
+}

proto/SetBattlePassViewedReq.proto

@@ -1,10 +1,8 @@
 syntax = "proto3";
-
 option java_package = "emu.grasscutter.net.proto";
-
+// CmdId: 4006
-// CmdId: 26945
+// Version: 4.7.0
-// Version: 4.6.0
+// Obfs: ?
-// Obfs: EPMDACBNEMP
 message SetBattlePassViewedReq {
-	uint32 schedule_id = 5;
+	uint32 schedule_id = 3;
 }

proto/TakeMaterialDeleteReturnReq.proto

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

proto/WeekendDjinnInfo.proto

@@ -1,10 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "Vector.proto";
-
+// 4.7.0
-//obf: NPLBBAJDIOM
+//obf: GNPAHMGJEHJ
 message WeekendDjinnInfo {
-	Vector rot = 13;
+	Vector rot = 2;
-	Vector pos = 14;
+	Vector pos = 1;
 }

proto/WidgetCameraInfo.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// Obf: OGFGBMPOGDD
+message WidgetCameraInfo {
+	uint32 target_entity_id = 11;
+}

proto/WidgetSorushInfo.proto

@@ -0,0 +1,13 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+import "Vector.proto";
+// 4.7.0
+// Obf: PIDEINKCANN
+message WidgetSorushInfo {
+	uint32 slot = 5;	
+	Vector rot = 1;	
+	Vector pos = 6;
+	bool MHMHPPJKAHM = 11;
+	bool JMOJHHHKHEL = 14;
+	bool EOFNCKAMIKB = 15;
+}

proto/WidgetThunderBirdFeatherInfo.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+// 4.7.0
+// Obf: KNJBADPIGFN
+message WidgetThunderBirdFeatherInfo {
+	repeated uint32 entity_id_list = 8;
+}