sync

proto/Achievement.proto

@@ -1,23 +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";
-// Obf: NJOHADFBICH
+
 message Achievement {
     enum Status {
         STATUS_INVALID = 0;
@@ -26,9 +9,9 @@ message Achievement {
         STATUS_REWARD_TAKEN = 3;
     }
 
-	uint32 finish_timestamp = 15;
+    uint32 id = 1;
-	Status status = 10;
+    Status status = 2;
-	uint32 total_progress = 4;
+    uint32 cur_progress = 6;
-	uint32 cur_progress = 14;
+    uint32 total_progress = 9;
-	uint32 id = 5;
+    uint32 finish_timestamp = 13;
 }

proto/AchievementAllDataNotify.proto

@@ -1,25 +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 "Achievement.proto";
-// CmdId: 27422
+
-// Obf: BMJFIOKJEMJ
+// 4.6.0
+// CmdId: 1655
 message AchievementAllDataNotify {
-	repeated uint32 reward_taken_goal_id_list = 4;
+    repeated uint32 reward_taken_goal_id_list = 8;
-	repeated Achievement achievement_list = 9;
+    repeated Achievement achievement_list = 11;
 }

proto/AchievementUpdateNotify.proto

@@ -1,24 +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 "Achievement.proto";
-// CmdId: 4460
+
-// Obf: IDGAPFJMLNJ
+// 4.6.0
+// CmdId: 6011
 message AchievementUpdateNotify {
-	repeated Achievement achievement_list = 15;
+    repeated Achievement achievement_list = 14;
 }

proto/AvatarChangeCostumeNotify.proto

@@ -1,7 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "SceneEntityInfo.proto";
 
+// 4.6.0
+// CmdId: 5930
 message AvatarChangeCostumeNotify {
-	SceneEntityInfo entity_info = 14;
+	SceneEntityInfo entity_info = 1;
 }

proto/AvatarChangeCostumeReq.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
+// CmdId: 27094
 message AvatarChangeCostumeReq {
-	uint64 avatar_guid = 6;
+	uint64 avatar_guid = 2;
-	uint32 costume_id = 10;
+	uint32 costume_id = 6;
 }

proto/AvatarChangeCostumeRsp.proto

@@ -1,8 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
+// CmdId: 657
 message AvatarChangeCostumeRsp {
-	uint64 avatar_guid = 5;
+	uint32 costume_id = 1;
-	int32 retcode = 8;
+	int32 retcode = 13;
-	uint32 costume_id = 3;
+	uint64 avatar_guid = 15;
 }

proto/GadgetInteractReq.proto

@@ -1,13 +1,16 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-import "ResinCostType.proto";
-import "InterOpType.proto";
 
+import "InterOpType.proto";
+import "ResinCostType.proto";
+
+// 4.6.0
+// CmdId: 9529
 message GadgetInteractReq {
-  uint32 ui_interact_id = 13;
+	InterOpType op_type = 3;
-  uint32 gadget_entity_id = 1;
+	uint32 gadget_id = 4;
-  ResinCostType resin_cost_type = 5;
+	uint32 gadget_entity_id = 5;
-  InterOpType op_type = 7;
+	bool is_use_condense_resin = 6;
-  uint32 gadget_id = 2;
+	ResinCostType resin_cost_type = 12;
-  bool is_use_condense_resin = 4;
+	uint32 LPLOBCLLOMD = 15;
 }

proto/GadgetInteractRsp.proto

@@ -1,12 +1,15 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-import "InterOpType.proto";
-import "InteractType.proto";
 
+import "InteractType.proto";
+import "InterOpType.proto";
+
+// 4.6.0
+// CmdId: 20933
 message GadgetInteractRsp {
-  InteractType interact_type = 6;
+	int32 retcode = 1;
-  int32 retcode = 12;
+	uint32 gadget_id = 4;
-  InterOpType op_type = 7;
+	InteractType interact_type = 11;
-  uint32 gadget_id = 2;
+	uint32 gadget_entity_id = 12;
-  uint32 gadget_entity_id = 4;
+	InterOpType op_type = 13;
 }

proto/InterOpType.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: BGICOOCNDKD
+
+// 4.6.0
 enum InterOpType {
 	INTER_OP_TYPE_FINISH = 0;
 	INTER_OP_TYPE_START = 1;

proto/InteractType.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: MMHNBMOLJBI
+
+// 4.6.0
 enum InteractType {
 	INTERACT_TYPE_NONE = 0;
 	INTERACT_TYPE_PICK_ITEM = 1;

proto/ItemAddHintNotify.proto

@@ -1,15 +1,18 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "ItemHint.proto";
 import "Vector.proto";
 
+// 4.6.0
+// CmdId: 7983
 message ItemAddHintNotify {
-  Vector position = 4;
+	uint32 quest_id = 2;
-  repeated ItemHint item_list = 9;
+	bool LANOGHMNMGK = 6;
-  repeated ItemHint overflow_transformed_item_list = 6;
+	bool NGMABKAOMOA = 7;
-  uint32 quest_id = 5;
+	repeated ItemHint overflow_transformed_item_list = 8;
-  bool PFNLIOENALO = 1;
+	Vector position = 9;
-  bool ABOOBGNEPOC = 3;
+	uint32 reason = 12;
-  bool FPLAKFLGHPL = 12;
+	repeated ItemHint item_list = 14;
-  uint32 reason = 8;
+	bool FBGIFDMHBNO = 15;
 }

proto/ItemHint.proto

@@ -1,9 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
 message ItemHint {
-  uint32 item_id = 11;
+	uint32 count = 3;
-  bool is_new = 2;
+	uint32 item_id = 4;
-  uint64 guid = 7;
+	uint64 guid = 6;
-  uint32 count = 10;
+	bool is_new = 14;
 }

proto/ResinCostType.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: CJJHKGNDKMK
+
+// 4.6.0
 enum ResinCostType {
 	RESIN_COST_TYPE_NONE = 0;
 	RESIN_COST_TYPE_NORMAL = 1;

proto/TakeAchievementGoalRewardReq.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: 249
+
-// Obf: FILFJFONHAK
+// 4.6.0
+// CmdId: 2692
 message TakeAchievementGoalRewardReq {
-	repeated uint32 id_list = 8;
+    repeated uint32 id_list = 12;
 }

proto/TakeAchievementGoalRewardRsp.proto

@@ -1,26 +1,12 @@
-// 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 "ItemParam.proto";
-// CmdId: 20302
+
-// Obf: LHEEBEDENLA
+// 4.6.0
+// CmdId: 23787
 message TakeAchievementGoalRewardRsp {
-	repeated uint32 id_list = 14;
+    repeated ItemParam item_list = 4;
-	int32 retcode = 10;
+    repeated uint32 id_list = 12;
-	repeated ItemParam item_list = 6;
+    int32 retcode = 13;
 }

proto/TakeAchievementRewardReq.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: 20624
+
-// Obf: DPBGALMPEBD
+// 4.6.0
+// CmdId: 8646
 message TakeAchievementRewardReq {
-	repeated uint32 id_list = 15;
+    repeated uint32 id_list = 9;
 }

proto/TakeAchievementRewardRsp.proto

@@ -1,26 +1,12 @@
-// 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 "ItemParam.proto";
-// CmdId: 23696
+
-// Obf: GMEJLKDLEEA
+// 4.6.0
+// CmdId: 24805
 message TakeAchievementRewardRsp {
-	repeated ItemParam item_list = 14;
+    int32 retcode = 3;
+    repeated ItemParam item_list = 4;
     repeated uint32 id_list = 13;
-	int32 retcode = 2;
 }