just sync proto

proto/AbilityAppliedAbility.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 "AbilityString.proto";
 import "AbilityScalarValueEntry.proto";
-// Obf: NKCDMLBKHGI
+
+// 4.6.0
 message AbilityAppliedAbility {
 	AbilityString ability_name = 1;
 	AbilityString ability_override = 2;

proto/AbilityAppliedModifier.proto

@@ -1,25 +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 "AbilityString.proto";
 import "AbilityAttachedModifier.proto";
 import "ModifierDurability.proto";
-// Obf: OAHPGFENJJK
+
+
+// 4.6.0
 message AbilityAppliedModifier {
 	int32 modifier_local_id = 1;
 	uint32 parent_ability_entity_id = 2;
@@ -34,4 +21,5 @@ message AbilityAppliedModifier {
 	ModifierDurability modifier_durability = 11;
 	uint32 sbuff_uid = 12;
 	bool is_serverbuff_modifier = 13;
+	bool IAPDOPJIGFF = 14;
 }

proto/AbilityAttachedModifier.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: COGFLLLFFFC
+
+// 4.6.0
 message AbilityAttachedModifier {
 	bool is_invalid = 1;
 	uint32 owner_entity_id = 2;

proto/AbilityChangeNotify.proto

@@ -1,8 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "AbilityControlBlock.proto";
 
+// 4.6.0
+// CmdId: 516
 message AbilityChangeNotify {
-  AbilityControlBlock ability_control_block = 11;
+	AbilityControlBlock ability_control_block = 5;
-  uint32 entity_id = 15;
+	uint32 entity_id = 9;
 }

proto/AbilityControlBlock.proto

@@ -1,19 +1,3 @@
-// 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 "AbilityEmbryo.proto";

proto/AbilityEmbryo.proto

@@ -1,19 +1,3 @@
-// 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: PLELJEGMEOD

proto/AbilityGadgetInfo.proto

@@ -1,19 +1,3 @@
-// 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: AHHOEHNNEIN

proto/AbilityIdentifier.proto

@@ -1,11 +1,12 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+//obf: PEMAEGMEAAE
 message AbilityIdentifier {
-  uint32 NPHOKNIJMLL = 12;
+    uint32 instanced_ability_id = 6;
-  uint32 instanced_modifier_id = 5;
+    uint32 instanced_modifier_id = 7;
-  bool is_serverbuff_modifier = 11;
+    bool is_serverbuff_modifier = 8;
-  uint32 instanced_ability_id = 10;
+    uint32 EGFPJDNPCAJ = 9;
-  int32 local_id = 8;
+    uint32 OOEBIGKJEBA = 10;
-  uint32 KIHPBNDHOGG = 15;
+    int32 local_id = 13;
 }

proto/AbilityInvocationFailNotify.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+import "AbilityInvokeEntry.proto";
+
+// 4.6.0
+// CmdId: 7473
+message AbilityInvocationFailNotify {
+	string reason = 1;
+	uint32 entity_id = 5;
+	AbilityInvokeEntry invoke = 10;
+}

proto/AbilityInvocationsNotify.proto

@@ -1,7 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "AbilityInvokeEntry.proto";
 
+//obf: KGJLCBEKCFD
+// CmdId: 21569
 message AbilityInvocationsNotify {
-  repeated AbilityInvokeEntry invokes = 2;
+    repeated AbilityInvokeEntry invokes = 5;
 }

proto/AbilityInvokeArgument.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: LBKBGBCCGMA
+
+// 4.6.0
 enum AbilityInvokeArgument {
 	ABILITY_INVOKE_ARGUMENT_NONE = 0;
 	ABILITY_INVOKE_ARGUMENT_META_MODIFIER_CHANGE = 1;
@@ -90,4 +75,7 @@ enum AbilityInvokeArgument {
 	ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET = 127;
 	ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA = 128;
 	ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129;
+	ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME = 130;
+	AABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131;
+	ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER = 133;
 }

proto/AbilityInvokeEntry.proto

@@ -1,17 +1,19 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-import "AbilityInvokeEntryHead.proto";
+
 import "ForwardType.proto";
+import "AbilityInvokeEntryHead.proto";
 import "AbilityInvokeArgument.proto";
 
+// 4.6.0
 message AbilityInvokeEntry {
-  bytes ability_data = 6;
+	double total_tick_time = 3;
-  AbilityInvokeEntryHead head = 13;
+	uint32 forward_peer = 4;
-  uint32 forward_peer = 3;
+	ForwardType forward_type = 6;
-  uint32 entity_id = 10;
+	AbilityInvokeEntryHead head = 7;
-  uint32 event_id = 9;
+	bool is_ignore_auth = 9;
-  ForwardType forward_type = 1;
+	uint32 event_id = 10;
-  AbilityInvokeArgument argument_type = 4;
+	AbilityInvokeArgument argument_type = 12;
-  bool is_ignore_auth = 11;
+	bytes ability_data = 13;
-  double total_tick_time = 7;
+	uint32 entity_id = 14;
 }

proto/AbilityInvokeEntryHead.proto

@@ -1,12 +1,13 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
 message AbilityInvokeEntryHead {
-  uint32 server_buff_uid = 1;
+	uint32 target_id = 3;
-  int32 modifier_config_local_id = 9;
+	uint32 instanced_modifier_id = 4;
-  int32 local_id = 6;
+	int32 modifier_config_local_id = 5;
-  uint32 target_id = 4;
+	bool is_serverbuff_modifier = 6;
-  bool is_serverbuff_modifier = 10;
+	int32 local_id = 7;
-  uint32 instanced_ability_id = 2;
+	uint32 server_buff_uid = 8;
-  uint32 instanced_modifier_id = 5;
+	uint32 instanced_ability_id = 13;
 }

proto/AbilityMetaAddAbility.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";
+
 import "AbilityAppliedAbility.proto";
-// Obf: GOIHMEADCCK
+// 4.6.0
 message AbilityMetaAddAbility {
-	AbilityAppliedAbility ability = 9;
+	AbilityAppliedAbility ability = 12;
 }

proto/AbilityMetaReInitOverrideMap.proto

@@ -1,23 +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 "AbilityScalarValueEntry.proto";
-// Obf: DKNHIBDBJDH
+
+// 4.6.0
 message AbilityMetaReInitOverrideMap {
-	repeated AbilityScalarValueEntry override_map = 10;
+	repeated AbilityScalarValueEntry override_map = 15;
 }

proto/AbilityMixinRecoverInfo.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 "MassivePropSyncInfo.proto";
 import "BreakoutSnapShot.proto";
-// Obf: NNBAGDGFEKA
+
+// 4.6.0
 message AbilityMixinRecoverInfo {
-	oneof Source {
+	oneof source {
 		uint32 instanced_ability_id = 1;
 		uint32 instanced_modifier_id = 2;
 	}

proto/AbilityScalarType.proto

@@ -1,19 +1,3 @@
-// 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: HOIECOCMCMI

proto/AbilityScalarValueEntry.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 "AbilityString.proto";
 import "AbilityScalarType.proto";
-// Obf: DAEKOPFKPMK
+
+// 4.6.0
 message AbilityScalarValueEntry {
 	AbilityString key = 1;
 	AbilityScalarType value_type = 2;

proto/AbilityString.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: PPIBJBLBJDL
+
+// 4.6.0
 message AbilityString {
 	oneof type {
 		string str = 1;

proto/AbilitySyncStateInfo.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 "AbilityScalarValueEntry.proto";
 import "AbilityAppliedAbility.proto";
 import "AbilityAppliedModifier.proto";
 import "AbilityMixinRecoverInfo.proto";
-// Obf: JDIFMANDKLC
+
 message AbilitySyncStateInfo {
 	bool is_inited = 1;
 	repeated AbilityScalarValueEntry dynamic_value_map = 2;

proto/AllMarkPointNotify.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+import "MapMarkPoint.proto";
+
+// 4.6.0
+// CmdId: 4620
+message AllMarkPointNotify {
+	repeated MapMarkPoint mark_list = 12;
+}

proto/AnimatorParameterValueInfo.proto

@@ -1,19 +1,3 @@
-// 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: IGGDJDFNMAG

proto/AnimatorParameterValueInfoPair.proto

@@ -1,19 +1,3 @@
-// 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 "AnimatorParameterValueInfo.proto";

proto/AttackHitEffectResult.proto

@@ -1,11 +1,12 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+//obf: EHHIGNCAHDN
 message AttackHitEffectResult {
-  float JECAAMHEFJM = 2;
+    uint32 CODNNLGEFAB = 2;
-  uint32 PPEOKDKPKKD = 9;
+    float BGGGOCDMEIJ = 7;
-  uint32 NPKGMCHJMFK = 7;
+    float PFHMCODCDOG = 9;
-  float MPEDEOJOHGC = 1;
+    uint32 INHHAFPAGMM = 11;
-  float BDGNPKFNBKD = 14;
+    float ILBDIPJINIH = 14;
-  float FJLPLOBFPMJ = 5;
+    float DPOCKHHOAPH = 15;
 }

proto/AttackResult.proto

@@ -1,40 +1,42 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-import "AttackHitEffectResult.proto";
-import "AbilityIdentifier.proto";
-import "Vector.proto";
-import "HitCollision.proto";
 
+import "Vector.proto";
+import "AbilityIdentifier.proto";
+import "HitCollision.proto";
+import "AttackHitEffectResult.proto";
+
+//obf: PBNJFKKLHNG
 message AttackResult {
-  AbilityIdentifier ability_identifier = 12;
+    int32 hit_retreat_angle_compat = 2;
-  AttackHitEffectResult hit_eff_result = 13;
+    HitCollision hit_collision = 3;
-  Vector resolved_dir = 1;
+    float damage = 4;
-  string anim_event_id = 10;
+    Vector resolved_dir = 5;
-  HitCollision hit_collision = 5;
+    uint32 element_type = 6;
-  uint32 PFNFFFBGAJC = 1550;
+    AttackHitEffectResult hit_eff_result = 7;
-  uint32 FMCPDPLJAAN = 1702;
+    uint32 defense_id = 8;
-  uint32 element_type = 3;
+    uint32 HLDPABLDFMA = 9;
-  uint32 CMOBNDKEOCC = 1687;
+    AbilityIdentifier ability_identifier = 11;
-  uint32 MEFEFBDBIOL = 8;
+    uint32 attacker_id = 12;
-  uint32 ENMIJOBILNF = 1000;
+    uint32 PBAOKLLNEKH = 13;
-  int32 hit_retreat_angle_compat = 4;
+    string anim_event_id = 14;
-  float HHKHPNCNOAD = 799;
+    bool DOOAHLOJHFI = 15;
-  float damage = 6;
+    bool MMGHNAGCMKI = 101;
-  uint32 NOIGACLGIAB = 936;
+    uint32 ANCLENEDEFP = 368;
-  bool AKJOLKPMMBE = 1229;
+    float KIBCOOHDGGC = 395;
-  bool JMLDBBLHGKP = 15;
+    float KOHHKJHBPGC = 434;
-  bool NAIPMCEHNNG = 1911;
+    bool OLBMHKAKCAO = 686;
-  bool AGGNNHOPMJE = 299;
+    uint32 GKEECIACCJL = 792;
-  float CNGHDEILALO = 1203;
+    float JAMLOHCLJGO = 844;
-  float IFNABDLPMDM = 974;
+    uint32 IKBJOJCMIDD = 966;
-  uint32 PLHKLAJCLEK = 14;
+    uint32 JHGMKBBHGKK = 1152;
-  uint32 attacker_id = 11;
+    float IBDIPOKNGND = 1178;
-  uint32 defense_id = 2;
+    uint32 ADAPJNAPCFM = 1195;
-  uint32 BCACGPADAGP = 651;
+    uint32 HEGHHBKOGPM = 1400;
-  float HIFPGEPONKP = 1611;
+    uint32 GONCKDKHCCD = 1579;
-  uint32 LJKFFLIBFOD = 1022;
+    uint32 IPHOJADNMPG = 1582;
-  uint32 CKNHGBBFMJL = 730;
+    bool ECOJPMMOFGO = 1638;
-  uint32 DBHCJCOPDFG = 1032;
+    uint32 LINKMJIJDAI = 1649;
-  uint32 LMPNEJEIOFA = 1835;
+    uint32 GBFOLNPHPFC = 1744;
-  uint32 FMJNLIKDMJJ = 1618;
+    uint32 PMCGHDEGGGO = 2023;
 }

proto/AvatarAddNotify.proto

@@ -1,8 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "AvatarInfo.proto";
 
 message AvatarAddNotify {
-  AvatarInfo avatar = 5;
+    bool is_in_team = 2;
-  bool is_in_team = 4;
+    AvatarInfo avatar = 12;
 }

proto/AvatarChangeAnimHashReq.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+// 4.6.0
+// CmdId: 27660
+message AvatarChangeAnimHashReq {
+	uint64 avatar_guid = 10;
+	uint32 anim_hash = 14;
+}

proto/AvatarChangeAnimHashRsp.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+// 4.6.0
+// CmdId: 416
+message AvatarChangeAnimHashRsp {
+	uint32 anim_hash = 5;
+	uint64 avatar_guid = 11;
+	int32 retcode = 15;
+}

proto/AvatarDataNotify.proto

@@ -1,17 +1,20 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "AvatarInfo.proto";
 import "AvatarTeam.proto";
 import "AvatarRenameInfo.proto";
 
+// 4.6.0
+// CmdId: 24452
 message AvatarDataNotify {
-  repeated AvatarInfo avatar_list = 14;
+	//repeated uint32 owned_flycloak_list = 13;//sus
-  uint32 cur_avatar_team_id = 7;
+	repeated AvatarRenameInfo avatar_rename_list = 10;
-  uint64 choose_avatar_guid = 3;
+	repeated AvatarInfo avatar_list = 5;
-  map<uint32, AvatarTeam> avatar_team_map = 12;
+	map<uint32, AvatarTeam> avatar_team_map = 15;
-  repeated uint32 owned_costume_list = 13;
+	//repeated uint32 backup_avatar_team_order_list = 9;//sus
-  repeated uint32 owned_flycloak_list = 15;
+	//repeated uint32 owned_costume_list = 2;//sus
-  repeated uint64 temp_avatar_guid_list = 1;
+	//repeated uint64 temp_avatar_guid_list = 999;//Wrong
-  repeated AvatarRenameInfo avatar_rename_list = 11;
+	uint32 cur_avatar_team_id = 1;
-  repeated uint32 backup_avatar_team_order_list = 4;
+	uint64 choose_avatar_guid = 11;
 }

proto/AvatarDieAnimationEndReq.proto

@@ -1,9 +1,12 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "Vector.proto";
 
+// 4.6.0
+// CmdId: 44
 message AvatarDieAnimationEndReq {
+	uint32 skill_id = 6;
 	Vector reborn_pos = 7;
-  uint64 die_guid = 3;
+	uint64 die_guid= 13;
-  uint32 skill_id = 13;
 }

proto/AvatarDieAnimationEndRsp.proto

@@ -1,8 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
+// CmdId: 1020
 message AvatarDieAnimationEndRsp {
-  uint64 die_guid = 6;
+	int32 retcode = 6;
-  uint32 skill_id = 12;
+	uint64 die_guid= 11;
-  int32 retcode = 7;
+	uint32 skill_id = 13;
 }

proto/AvatarEnterSceneInfo.proto

@@ -1,15 +1,17 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-import "AbilitySyncStateInfo.proto";
-import "ServerBuff.proto";
 
+import "ServerBuff.proto";
+import "AbilitySyncStateInfo.proto";
+
+// 4.6.0
 message AvatarEnterSceneInfo {
-	AbilitySyncStateInfo avatar_ability_info = 11;
+	uint32 avatar_entity_id = 4;
-	uint64 weapon_guid = 1;
+	repeated ServerBuff server_buff_list = 5;
-	uint32 avatar_entity_id = 14;
+	repeated uint32 buff_id_list = 8;
-	repeated uint32 buff_id_list = 15;
+	AbilitySyncStateInfo avatar_ability_info = 10;//sus 10 or14
-	uint32 weapon_entity_id = 10;
+	uint64 weapon_guid = 11;
-	uint64 avatar_guid = 4;
+	uint32 weapon_entity_id = 12;
-	repeated ServerBuff server_buff_list = 9;
+	AbilitySyncStateInfo weapon_ability_info = 14;//sus 10 or14
-	AbilitySyncStateInfo weapon_ability_info = 6;
+	uint64 avatar_guid = 15;
 }

proto/AvatarEquipAffixInfo.proto

@@ -1,19 +1,3 @@
-// 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: CFINPAOKBJN

proto/AvatarEquipChangeNotify.proto

@@ -1,13 +1,16 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "SceneWeaponInfo.proto";
 import "SceneReliquaryInfo.proto";
 
+// 4.6.0
+// CmdId: 24844
 message AvatarEquipChangeNotify {
-  SceneReliquaryInfo reliquary = 14;
+	uint32 equip_type = 1;
-  SceneWeaponInfo weapon = 13;
+	SceneWeaponInfo weapon = 2;
-  uint64 equip_guid = 15;
+	uint64 avatar_guid = 5;
-  uint64 avatar_guid = 2;
+	uint32 item_id = 7;
-  uint32 equip_type = 11;
+	uint64 equip_guid = 9;
-  uint32 item_id = 4;
+	SceneReliquaryInfo reliquary = 15;
 }

proto/AvatarExcelInfo.proto

@@ -1,19 +1,3 @@
-// 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: HGHGOIMIAMF

proto/AvatarExpeditionState.proto

@@ -1,19 +1,3 @@
-// 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: OJBIHADNECN

proto/AvatarFetterInfo.proto

@@ -1,19 +1,3 @@
-// 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 "FetterData.proto";

proto/AvatarFightPropNotify.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+//obf: MPDFJECBFKM
+// CmdId: 9531
 message AvatarFightPropNotify {
-  map<uint32, float> fight_prop_map = 3;
+    uint64 avatar_guid = 5;
-  uint64 avatar_guid = 11;
+    map<uint32, float> fight_prop_map = 10;
 }

proto/AvatarFightPropUpdateNotify.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+//obf: JHPCPJAFGMI
+// CmdId: 21817
 message AvatarFightPropUpdateNotify {
-  map<uint32, float> fight_prop_map = 1;
+    uint64 avatar_guid = 3;
-  uint64 avatar_guid = 13;
+    map<uint32, float> fight_prop_map = 5;
 }

proto/AvatarInfo.proto

@@ -7,8 +7,7 @@ import "AvatarFetterInfo.proto";
 import "AvatarExpeditionState.proto";
 import "AvatarEquipAffixInfo.proto";
 import "AvatarExcelInfo.proto";
-import "PFEBKNGNFPH.proto";
+//import "JCDPOCOOGCI.proto";
-
 message AvatarInfo {
 	uint32 avatar_id = 1;
 	uint64 guid = 2;
@@ -36,7 +35,6 @@ message AvatarInfo {
 	uint32 costume_id = 25;
 	AvatarExcelInfo excel_info = 26;
 	uint32 anim_hash = 27;
-	PFEBKNGNFPH DBGFEJECPJG = 28;
+	//JCDPOCOOGCI PDGKJIIEPIO = 28;
-	uint32 EFFGKHEPHCF = 29;
+	uint32 GJFKDCJENJE = 29;
-	uint32 EPIPMINFOLP = 30;
 }

proto/AvatarLifeStateChangeNotify.proto

@@ -1,14 +1,17 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-import "ServerBuff.proto";
-import "PlayerDieType.proto";
 
+import "PlayerDieType.proto";
+import "ServerBuff.proto";
+
+// 4.6.0
+// CmdId: 28742
 message AvatarLifeStateChangeNotify {
-  string attack_tag = 13;
+	uint32 life_state = 1;
-  repeated ServerBuff server_buff_list = 8;
+	uint64 avatar_guid = 2;
-  PlayerDieType die_type = 4;
+	PlayerDieType die_type = 3;
-  uint32 life_state = 3;
+	string attack_tag = 5;
-  uint32 move_reliable_seq = 10;
+	uint32 move_reliable_seq = 9;
-  uint32 source_entity_id = 12;
+	uint32 source_entity_id = 11;
-  uint64 avatar_guid = 5;
+	repeated ServerBuff server_buff_list = 13;
 }

proto/AvatarRenameInfo.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";
-// Obf: NNBEINLIFPB
+
+// 4.6.0
 message AvatarRenameInfo {
-	string avatar_name = 1;
+	uint32 avatar_id = 5;
-	uint32 avatar_id = 13;
+	string avatar_name = 12;
 }

proto/AvatarRenameInfoNotify.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+import "AvatarRenameInfo.proto";
+
+// 4.6.0
+// CmdId: 24403
+message AvatarRenameInfoNotify {
+	repeated AvatarRenameInfo avatar_rename_list = 8;
+}

proto/AvatarSkillInfo.proto

@@ -1,19 +1,3 @@
-// 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: FKBNODHMBMG

proto/AvatarSkillInfoNotify.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 "AvatarSkillInfo.proto";
-// CmdId: 29066
+
-// Obf: NHOMLJLJGFL
+// 4.6.0
+// CmdId: 28799
 message AvatarSkillInfoNotify {
-	map<uint32, AvatarSkillInfo> skill_map = 11;
+	map<uint32, AvatarSkillInfo> skill_map = 2;
-	uint64 guid = 13;
+	uint64 guid = 4;
 }

proto/AvatarTeam.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
 message AvatarTeam {
-	string team_name = 6;
+	repeated uint64 avatar_guid_list = 10;
-	repeated uint64 avatar_guid_list = 14;
+	string team_name = 12;
 }

proto/AvatarTeamAllDataNotify.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 "AvatarTeam.proto";
-// CmdId: 9854
+
-// Obf: HHLJIKIGMOG
+// 4.6.0
+// CmdId: 3135
 message AvatarTeamAllDataNotify {
-	map<uint32, AvatarTeam> avatar_team_map = 2;
+	map<uint32, AvatarTeam> avatar_team_map = 5;
+	repeated uint64 temp_avatar_guid_list = 12;
 	repeated uint32 backup_avatar_team_order_list = 13;
-	repeated uint64 temp_avatar_guid_list = 8;
 }

proto/AvatarTeamUpdateNotify.proto

@@ -1,8 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "AvatarTeam.proto";
 
+// 4.6.0
+// CmdId: 26704
 message AvatarTeamUpdateNotify {
 	repeated uint64 temp_avatar_guid_list = 7;
-	map<uint32, AvatarTeam> avatar_team_map = 9;
+	map<uint32, AvatarTeam> avatar_team_map = 10;
 }

proto/AvatarUnlockTalentNotify.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";
-// CmdId: 1805
+
-// Obf: KNLJFLHONOK
+// 4.6.0
+// CmdId: 23680
 message AvatarUnlockTalentNotify {
-	uint32 talent_id = 3;
+	uint64 avatar_guid = 4;
-	uint64 avatar_guid = 9;
+	uint32 skill_depot_id = 5;
-	uint32 skill_depot_id = 8;
+	uint32 entity_id = 10;
-	uint32 entity_id = 1;
+	uint32 talent_id = 15;
 }

proto/Birthday.proto

@@ -1,19 +1,3 @@
-// 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: PJENMAMNPEI

proto/BlossomChestInfo.proto

@@ -1,19 +1,3 @@
-// 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: OGDABNFHACL

proto/BossChestInfo.proto

@@ -1,19 +1,3 @@
-// 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 "WeeklyBossResinDiscountInfo.proto";

proto/BreakoutAction.proto

@@ -1,19 +1,3 @@
-// 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 "BreakoutVector2.proto";

proto/BreakoutBrickInfo.proto

@@ -1,19 +1,3 @@
-// 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: DGMFFJIKOKD

proto/BreakoutElementReactionCounter.proto

@@ -1,19 +1,3 @@
-// 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: KGJJJGIPNLE

proto/BreakoutPhysicalObject.proto

@@ -1,19 +1,3 @@
-// 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 "BreakoutVector2.proto";

proto/BreakoutPhysicalObjectModifier.proto

@@ -1,19 +1,3 @@
-// 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: NFKLEIMGKJD

proto/BreakoutSnapShot.proto

@@ -1,19 +1,3 @@
-// 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 "BreakoutPhysicalObject.proto";

proto/BreakoutSpawnPoint.proto

@@ -1,19 +1,3 @@
-// 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 "BreakoutPhysicalObject.proto";

proto/BreakoutSyncConnectUidInfo.proto

@@ -1,19 +1,3 @@
-// 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: BKGOLPBLKMN

proto/BreakoutVector2.proto

@@ -1,19 +1,3 @@
-// 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: FIGLCLAIOJM

proto/ChangeAvatarReq.proto

@@ -1,10 +1,14 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "Vector.proto";
 
+// 4.6.0
+// CmdId: 27362
 message ChangeAvatarReq {
-	Vector move_pos = 12;
+	Vector move_pos = 8;
-	uint64 guid = 1;
+	/* protected @ 0x28 */// uint32 skill_id = 65535;
-	bool is_move = 3;
+	/* protected @ 0x2C */// bool BKFBCEPLOLN = 65535;
-	uint32 skill_id = 7;
+	bool is_move = 2;
+	uint64 guid = 7;
 }

proto/ChangeAvatarRsp.proto

@@ -1,8 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
+// CmdId: 26267
 message ChangeAvatarRsp {
-	uint64 cur_guid = 3;
+	uint64 cur_guid = 2;
-	int32 retcode = 4;
+	/* protected @ 0x28 */// int32 retcode = 65535;
-	uint32 skill_id = 9;
+	/* protected @ 0x2C */// uint32 skill_id = 65535;
 }

proto/ChangeEnergyReason.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: OHNCBLIFLLB
+
+//obf: DIBAILDCPJF
 enum ChangeEnergyReason {
     CHANGE_ENERGY_REASON_NONE = 0;
     CHANGE_ENERGY_REASON_SKILL_START = 1;

proto/ChangeHpDebts.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+// 4.6.0
+enum ChangeHpDebts {
+	CHANGE_HP_DEBTS_NONE = 0;
+	CHANGE_HP_DEBTS_PAY = 1;
+	CHANGE_HP_DEBTS_PAYFINISH = 2;
+	CHANGE_HP_DEBTS_CLEAR = 21;
+	CHANGE_HP_DEBTS_ADDABILiTY = 51;
+}

proto/ChangeHpReason.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: HANDEHKHMKN
+
+//obf: MKHKMLCFAAJ
 enum ChangeHpReason {
     CHANGE_HP_REASON_NONE = 0;
     CHANGE_HP_REASON_SUB_AVATAR = 1;
@@ -40,6 +25,8 @@ enum ChangeHpReason {
     CHANGE_HP_REASON_ATTACK_BY_RECYCLE = 19;
     CHANGE_HP_REASON_SUB_PLAYER_BACK = 20;
     CHANGE_HP_REASON_SUB_UGC = 21;
+    CHANGE_HP_REASON_SUB_DIRTY_WATER_EROSION = 22;
+    CHANGE_HP_REASON_SUB_DESTROY_SELF = 23;
     CHANGE_HP_REASON_BY_LUA = 51;
     CHANGE_HP_REASON_ADD_ABILITY = 101;
     CHANGE_HP_REASON_ADD_ITEM = 102;
@@ -49,5 +36,6 @@ enum ChangeHpReason {
     CHANGE_HP_REASON_ADD_BACKGROUND = 106;
     CHANGE_HP_REASON_ADD_GM = 107;
     CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY = 108;
-	CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING = 109;
+    CHANGE_HP_REASON_ADD_ROUGUELIKE_SPRING = 109;
+    CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V5 = 110;
 }

proto/ChangeTeamNameReq.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: 24187
+
-// Obf: PJLNPGJDAIG
+// 4.6.0
+// CmdId: 5863
 message ChangeTeamNameReq {
-	string team_name = 14;
 	int32 team_id = 3;
+	string team_name = 10;
 }

proto/ChangeTeamNameRsp.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: 29496
+
-// Obf: JKAKFOEKEDH
+// 4.6.0
+// CmdId: 1674
 message ChangeTeamNameRsp {
+	int32 team_id = 4;
 	int32 retcode = 5;
-	int32 team_id = 12;
+	string team_name = 12;
-	string team_name = 15;
 }

proto/ChatChannelDataNotify.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+import "ChatChannelInfo.proto";
+
+// 4.6.0
+// CmdId: 4276
+message ChatChannelDataNotify {
+	repeated ChatChannelInfo channel_info_list = 6;
+	repeated uint32 channel_list = 15;
+}

proto/ChatChannelInfo.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+// 4.6.0
+message ChatChannelInfo {
+	uint32 channel_id = 10;
+	bool is_shield = 11;
+}

proto/ChatChannelInfoNotify.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+import "ChatChannelInfo.proto";
+
+// 4.6.0
+// CmdId: 26577
+message ChatChannelInfoNotify {
+	ChatChannelInfo channel_info = 5;
+}

proto/ChatChannelShieldNotify.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+// 4.6.0
+// CmdId: 6815
+message ChatChannelShieldNotify {
+	uint32 channel_id = 6;
+	bool is_shield = 8;
+}

proto/ChatInfo.proto

@@ -1,25 +1,24 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
 message ChatInfo {
-	
+	message SystemHint {
+		uint32 type = 11;
+	}
     enum SystemHintType {
         SYSTEM_HINT_TYPE_CHAT_NONE = 0;
         SYSTEM_HINT_TYPE_CHAT_ENTER_WORLD = 1;
         SYSTEM_HINT_TYPE_CHAT_LEAVE_WORLD = 2;
     }
-	message SystemHint {
+	uint32 time = 1;
-		uint32 type = 10;
+	uint32 uid = 3;
-	}
+	uint32 to_uid = 6;
-	
+	bool is_read = 11;
-	uint32 to_uid = 3;
+	uint32 sequence = 14;
-	uint32 time = 5;
-	uint32 uid = 11;
 	oneof content {
-		string text = 457;
+		string text = 1643;
-		uint32 icon = 1812;
+		uint32 icon = 1290;
-		SystemHint system_hint = 44;
+		SystemHint system_hint = 279;
 	}
-	bool is_read = 8;
-	uint32 sequence = 13;
 }

proto/ChooseCurAvatarTeamReq.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: 9406
+
-// Obf: GFGPACAMELF
+// 4.6.0
+// CmdId: 7877
 message ChooseCurAvatarTeamReq {
 	uint32 team_id = 10;
 }

proto/CityInfo.proto

@@ -1,8 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
 message CityInfo {
-	uint32 level = 12;
+	uint32 level = 8;
-	uint32 crystal_num = 11;
+	uint32 crystal_num = 9;
-	uint32 city_id = 9;
+	uint32 city_id = 13;
 }

proto/ClientAbilitiesInitFinishCombineNotify.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 "EntityAbilityInvokeEntry.proto";
-// CmdId: 7505
+
-// Obf: OLNCFNGPEFG
+//obf: KNDIDFOJEJD
+// CmdId: 22401
 message ClientAbilitiesInitFinishCombineNotify {
-	repeated EntityAbilityInvokeEntry entity_invoke_list = 9;
+    repeated EntityAbilityInvokeEntry entity_invoke_list = 2;
 }

proto/ClientAbilityChangeNotify.proto

@@ -1,9 +1,12 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "AbilityInvokeEntry.proto";
 
+//obf: PHBIGCMGNHM
+// CmdId: 28122
 message ClientAbilityChangeNotify {
-  repeated AbilityInvokeEntry invokes = 15;
+    bool is_init_hash = 6;
-  uint32 entity_id = 11;
+    uint32 entity_id = 8;
-  bool is_init_hash = 5;
+    repeated AbilityInvokeEntry invokes = 9;
 }

proto/ClientAbilityInitFinishNotify.proto

@@ -1,8 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "AbilityInvokeEntry.proto";
 
+//obf: HMICLOFFJGD
+// CmdId: 21190
 message ClientAbilityInitFinishNotify {
-  repeated AbilityInvokeEntry invokes = 13;
+    repeated AbilityInvokeEntry invokes = 3;
-  uint32 entity_id = 7;
+    uint32 entity_id = 14;
 }

proto/ClientGadgetInfo.proto

@@ -1,19 +1,3 @@
-// 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: KCPDCBKPNNL

proto/CoinCollectOperatorInfo.proto

@@ -1,19 +1,3 @@
-// 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: NFEECFHHDLJ

proto/CombatInvocationsNotify.proto

@@ -1,7 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "CombatInvokeEntry.proto";
 
+// 4.6.0
+// CmdId: 7549
 message CombatInvocationsNotify {
-  repeated CombatInvokeEntry invoke_list = 8;
+	repeated CombatInvokeEntry invoke_list = 12;
 }

proto/CombatInvokeEntry.proto

@@ -1,10 +1,12 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-import "ForwardType.proto";
-import "CombatTypeArgument.proto";
 
+import "CombatTypeArgument.proto";
+import "ForwardType.proto";
+
+// 4.6.0
 message CombatInvokeEntry {
-  bytes combat_data = 6;
-  ForwardType forward_type = 1;
 	CombatTypeArgument argument_type = 3;
+	bytes combat_data = 13;
+	ForwardType forward_type = 14;
 }

proto/CombatTypeArgument.proto

@@ -1,6 +1,7 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
 enum CombatTypeArgument {
 	COMBAT_TYPE_ARGUMENT_NONE = 0;
 	COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT = 1;
@@ -23,6 +24,6 @@ enum CombatTypeArgument {
 	COMBAT_TYPE_ARGUMENT_GRAPPLING_HOOK_MOVE = 18;
 	COMBAT_TYPE_ARGUMENT_SPECIAL_MOTION_INFO = 19;
 	COMBAT_TYPE_ARGUMENT_FIXED_AVATAR_FLASH_MOVE = 20;
-  COMBAT_TYPE_ARGUMENT_NULTI_OVERRIDE_ANIM = 21;
+	COMBAT_TYPE_ARGUMENT_MULTI_OVERRIDE_ANIM = 21;
 	COMBAT_TYPE_ARGUMENT_DEBUG_SYNC_MOTION = 22;
 }

proto/CurVehicleInfo.proto

@@ -1,19 +1,3 @@
-// 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 "Vector.proto";

proto/CustomCommonNodeInfo.proto

@@ -1,19 +1,3 @@
-// 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: IGADMBECIDG

proto/CustomGadgetTreeInfo.proto

@@ -1,19 +1,3 @@
-// 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 "CustomCommonNodeInfo.proto";

proto/DeshretObeliskGadgetInfo.proto

@@ -1,19 +1,3 @@
-// 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: HBNLGHJLHNL

proto/DetailAbilityInfo.proto

@@ -0,0 +1,13 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+import "AbilityString.proto";
+
+message DetailAbilityInfo {
+    int32 local_id = 1;
+    AbilityString parent_ability_name = 2;
+    uint32 instanced_ability_id = 4;
+    uint32 instanced_modifier_id = 5;
+    uint32 caster_id = 6;
+    int32 modifier_local_id = 7;
+}

proto/DropItemReq.proto

@@ -1,28 +1,14 @@
-// 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 "StoreType.proto";
+
 import "Vector.proto";
-// CmdId: 28541
+import "StoreType.proto";
-// Obf: ALHJAJDGNDA
+
+// 4.6.0
+// CmdId: 23960
 message DropItemReq {
-	uint32 count = 10;
+	uint64 guid = 3;
-	uint64 guid = 15;
+	Vector pos = 6;
-	StoreType store_type = 8;
+	uint32 count = 12;
-	Vector pos = 1;
+	StoreType store_type = 13;
 }

proto/DropItemRsp.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 "StoreType.proto";
-// CmdId: 25342
+
-// Obf: BFNMHPECFGC
+// 4.6.0
+// CmdId: 26504
 message DropItemRsp {
-	StoreType store_type = 6;
+	uint64 guid = 2;
-	uint64 guid = 12;
+	int32 retcode = 3;
-	int32 retcode = 9;
+	StoreType store_type = 12;
 }

proto/DungeonPlayerDieReq.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 "PlayerDieType.proto";
-// CmdId: 3239
+
-// Obf: KLKMLEAJHNH
+// 4.6.0
+// CmdId: 23739
 message DungeonPlayerDieReq {
-	PlayerDieType die_type = 2;
+	uint32 dungeon_id = 3;
-	uint32 dungeon_id = 1;
+	PlayerDieType die_type = 7;
 }

proto/EchoShellInfo.proto

@@ -1,19 +1,3 @@
-// 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: KCHCJMNANCP

proto/EnterSceneDoneReq.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
+// CmdId: 21776
 message EnterSceneDoneReq {
 	uint32 enter_scene_token = 8;
 }

proto/EnterSceneDoneRsp.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
+// CmdId: 9331
 message EnterSceneDoneRsp {
-	uint32 enter_scene_token = 8;
+	//int32 retcode = ?;
-	int32 retcode = 15;
+	uint32 enter_scene_token = 3;
 }

proto/EnterScenePeerNotify.proto

@@ -1,9 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
+// CmdId: 20243
 message EnterScenePeerNotify {
-	uint32 enter_scene_token = 14;
+	uint32 dest_scene_id = 1;
-	uint32 peer_id = 1;
+	uint32 enter_scene_token = 9;
-	uint32 host_peer_id = 12;
+	uint32 peer_id = 11;//11 or 3
-	uint32 dest_scene_id = 13;
+	uint32 host_peer_id = 3;//11 or 3
 }

proto/EnterSceneReadyReq.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+// 4.6.0
+// CmdId: 9184
 message EnterSceneReadyReq {
-	uint32 enter_scene_token = 1;
+	uint32 enter_scene_token = 7;
 }

proto/EnterSceneReadyRsp.proto

@@ -1,7 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
+
+
+// 4.6.0
+// CmdId: 1104
 message EnterSceneReadyRsp {
-	uint32 enter_scene_token = 5;
+	uint32 enter_scene_token = 10;
-	int32 retcode = 2;
+	int32 retcode = 99;
 }

proto/EnterType.proto

@@ -1,19 +1,3 @@
-// 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: NMCABLGJJEK

proto/EnterWorldAreaReq.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: 29482
+
-// Obf: OLIJIMJGACD
+// 4.6.0
+// CmdId: 28567
 message EnterWorldAreaReq {
-	uint32 area_type = 8;
+	uint32 area_id = 4;
-	uint32 area_id = 15;
+	uint32 area_type = 13;
 }

proto/EnterWorldAreaRsp.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: 21362
+
-// Obf: MIPCODPODKN
+// 4.6.0
+// CmdId: 26630
 message EnterWorldAreaRsp {
-	uint32 area_type = 6;
+	uint32 area_type = 10;
-	int32 retcode = 13;
+	uint32 area_id = 13;
-	uint32 area_id = 9;
+	int32 retcode = 14;
 }