diff --git a/proto/AbilityAppliedAbility.proto b/proto/AbilityAppliedAbility.proto index a37fe4ef..21fa5d2e 100644 --- a/proto/AbilityAppliedAbility.proto +++ b/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 . - 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; diff --git a/proto/AbilityAppliedModifier.proto b/proto/AbilityAppliedModifier.proto index b1b5e7ac..1f454c25 100644 --- a/proto/AbilityAppliedModifier.proto +++ b/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 . - 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; +} \ No newline at end of file diff --git a/proto/AbilityAttachedModifier.proto b/proto/AbilityAttachedModifier.proto index 0016fb5b..011ce9b5 100644 --- a/proto/AbilityAttachedModifier.proto +++ b/proto/AbilityAttachedModifier.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 . - 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; uint32 instanced_modifier_id = 3; bool is_serverbuff_modifier = 4; int32 attach_name_hash = 5; -} +} \ No newline at end of file diff --git a/proto/AbilityChangeNotify.proto b/proto/AbilityChangeNotify.proto index 1083734e..50c2ea74 100644 --- a/proto/AbilityChangeNotify.proto +++ b/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; - uint32 entity_id = 15; -} + AbilityControlBlock ability_control_block = 5; + uint32 entity_id = 9; +} \ No newline at end of file diff --git a/proto/AbilityControlBlock.proto b/proto/AbilityControlBlock.proto index 0a05e1c3..5f974ac1 100644 --- a/proto/AbilityControlBlock.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "AbilityEmbryo.proto"; diff --git a/proto/AbilityEmbryo.proto b/proto/AbilityEmbryo.proto index 9f7d26da..52396696 100644 --- a/proto/AbilityEmbryo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: PLELJEGMEOD diff --git a/proto/AbilityGadgetInfo.proto b/proto/AbilityGadgetInfo.proto index b7376469..1d904370 100644 --- a/proto/AbilityGadgetInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: AHHOEHNNEIN diff --git a/proto/AbilityIdentifier.proto b/proto/AbilityIdentifier.proto index 19f1ddd0..a875c525 100644 --- a/proto/AbilityIdentifier.proto +++ b/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_modifier_id = 5; - bool is_serverbuff_modifier = 11; - uint32 instanced_ability_id = 10; - int32 local_id = 8; - uint32 KIHPBNDHOGG = 15; + uint32 instanced_ability_id = 6; + uint32 instanced_modifier_id = 7; + bool is_serverbuff_modifier = 8; + uint32 EGFPJDNPCAJ = 9; + uint32 OOEBIGKJEBA = 10; + int32 local_id = 13; } diff --git a/proto/AbilityInvocationFailNotify.proto b/proto/AbilityInvocationFailNotify.proto new file mode 100644 index 00000000..22acfc5a --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/proto/AbilityInvocationsNotify.proto b/proto/AbilityInvocationsNotify.proto index 0efb0dc3..2e58649d 100644 --- a/proto/AbilityInvocationsNotify.proto +++ b/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; } diff --git a/proto/AbilityInvokeArgument.proto b/proto/AbilityInvokeArgument.proto index 3232a137..1e0853e2 100644 --- a/proto/AbilityInvokeArgument.proto +++ b/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 . - 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; +} \ No newline at end of file diff --git a/proto/AbilityInvokeEntry.proto b/proto/AbilityInvokeEntry.proto index 487616a7..5adaef40 100644 --- a/proto/AbilityInvokeEntry.proto +++ b/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; - AbilityInvokeEntryHead head = 13; - uint32 forward_peer = 3; - uint32 entity_id = 10; - uint32 event_id = 9; - ForwardType forward_type = 1; - AbilityInvokeArgument argument_type = 4; - bool is_ignore_auth = 11; - double total_tick_time = 7; -} + double total_tick_time = 3; + uint32 forward_peer = 4; + ForwardType forward_type = 6; + AbilityInvokeEntryHead head = 7; + bool is_ignore_auth = 9; + uint32 event_id = 10; + AbilityInvokeArgument argument_type = 12; + bytes ability_data = 13; + uint32 entity_id = 14; +} \ No newline at end of file diff --git a/proto/AbilityInvokeEntryHead.proto b/proto/AbilityInvokeEntryHead.proto index eb514d7b..ec59edce 100644 --- a/proto/AbilityInvokeEntryHead.proto +++ b/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; - int32 modifier_config_local_id = 9; - int32 local_id = 6; - uint32 target_id = 4; - bool is_serverbuff_modifier = 10; - uint32 instanced_ability_id = 2; - uint32 instanced_modifier_id = 5; -} + uint32 target_id = 3; + uint32 instanced_modifier_id = 4; + int32 modifier_config_local_id = 5; + bool is_serverbuff_modifier = 6; + int32 local_id = 7; + uint32 server_buff_uid = 8; + uint32 instanced_ability_id = 13; +} \ No newline at end of file diff --git a/proto/AbilityMetaAddAbility.proto b/proto/AbilityMetaAddAbility.proto index 3c499bd5..841bfe62 100644 --- a/proto/AbilityMetaAddAbility.proto +++ b/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 . - 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; +} \ No newline at end of file diff --git a/proto/AbilityMetaReInitOverrideMap.proto b/proto/AbilityMetaReInitOverrideMap.proto index 9555d941..58d12c43 100644 --- a/proto/AbilityMetaReInitOverrideMap.proto +++ b/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 . - 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; +} \ No newline at end of file diff --git a/proto/AbilityMixinRecoverInfo.proto b/proto/AbilityMixinRecoverInfo.proto index d23885a8..e0c56c14 100644 --- a/proto/AbilityMixinRecoverInfo.proto +++ b/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 . - 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; } @@ -29,4 +15,4 @@ message AbilityMixinRecoverInfo { bool is_serverbuff_modifier = 5; repeated MassivePropSyncInfo massive_prop_list = 6; BreakoutSnapShot breakout_snap_shot = 7; -} +} \ No newline at end of file diff --git a/proto/AbilityScalarType.proto b/proto/AbilityScalarType.proto index 0eb93b83..3f991049 100644 --- a/proto/AbilityScalarType.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: HOIECOCMCMI diff --git a/proto/AbilityScalarValueEntry.proto b/proto/AbilityScalarValueEntry.proto index 5db66f3e..7bf02446 100644 --- a/proto/AbilityScalarValueEntry.proto +++ b/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 . - 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; @@ -28,4 +14,4 @@ message AbilityScalarValueEntry { int32 int_value = 5; uint32 uint_value = 6; } -} +} \ No newline at end of file diff --git a/proto/AbilityString.proto b/proto/AbilityString.proto index 8338fbed..8efc890f 100644 --- a/proto/AbilityString.proto +++ b/proto/AbilityString.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: PPIBJBLBJDL + +// 4.6.0 message AbilityString { oneof type { string str = 1; uint32 hash = 2; } -} +} \ No newline at end of file diff --git a/proto/AbilitySyncStateInfo.proto b/proto/AbilitySyncStateInfo.proto index 7ea5dba3..2fab5e3b 100644 --- a/proto/AbilitySyncStateInfo.proto +++ b/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 . - 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; diff --git a/proto/AllMarkPointNotify.proto b/proto/AllMarkPointNotify.proto new file mode 100644 index 00000000..3188e195 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/proto/AnimatorParameterValueInfo.proto b/proto/AnimatorParameterValueInfo.proto index cf6b3d51..06b2e4df 100644 --- a/proto/AnimatorParameterValueInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: IGGDJDFNMAG diff --git a/proto/AnimatorParameterValueInfoPair.proto b/proto/AnimatorParameterValueInfoPair.proto index c42213fd..aeb763c4 100644 --- a/proto/AnimatorParameterValueInfoPair.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "AnimatorParameterValueInfo.proto"; diff --git a/proto/AttackHitEffectResult.proto b/proto/AttackHitEffectResult.proto index 93cfce71..2f3ccb6e 100644 --- a/proto/AttackHitEffectResult.proto +++ b/proto/AttackHitEffectResult.proto @@ -1,11 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +//obf: EHHIGNCAHDN message AttackHitEffectResult { - float JECAAMHEFJM = 2; - uint32 PPEOKDKPKKD = 9; - uint32 NPKGMCHJMFK = 7; - float MPEDEOJOHGC = 1; - float BDGNPKFNBKD = 14; - float FJLPLOBFPMJ = 5; + uint32 CODNNLGEFAB = 2; + float BGGGOCDMEIJ = 7; + float PFHMCODCDOG = 9; + uint32 INHHAFPAGMM = 11; + float ILBDIPJINIH = 14; + float DPOCKHHOAPH = 15; } diff --git a/proto/AttackResult.proto b/proto/AttackResult.proto index eb0a7b3c..8167ef36 100644 --- a/proto/AttackResult.proto +++ b/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; - AttackHitEffectResult hit_eff_result = 13; - Vector resolved_dir = 1; - string anim_event_id = 10; - HitCollision hit_collision = 5; - uint32 PFNFFFBGAJC = 1550; - uint32 FMCPDPLJAAN = 1702; - uint32 element_type = 3; - uint32 CMOBNDKEOCC = 1687; - uint32 MEFEFBDBIOL = 8; - uint32 ENMIJOBILNF = 1000; - int32 hit_retreat_angle_compat = 4; - float HHKHPNCNOAD = 799; - float damage = 6; - uint32 NOIGACLGIAB = 936; - bool AKJOLKPMMBE = 1229; - bool JMLDBBLHGKP = 15; - bool NAIPMCEHNNG = 1911; - bool AGGNNHOPMJE = 299; - float CNGHDEILALO = 1203; - float IFNABDLPMDM = 974; - uint32 PLHKLAJCLEK = 14; - uint32 attacker_id = 11; - uint32 defense_id = 2; - uint32 BCACGPADAGP = 651; - float HIFPGEPONKP = 1611; - uint32 LJKFFLIBFOD = 1022; - uint32 CKNHGBBFMJL = 730; - uint32 DBHCJCOPDFG = 1032; - uint32 LMPNEJEIOFA = 1835; - uint32 FMJNLIKDMJJ = 1618; + int32 hit_retreat_angle_compat = 2; + HitCollision hit_collision = 3; + float damage = 4; + Vector resolved_dir = 5; + uint32 element_type = 6; + AttackHitEffectResult hit_eff_result = 7; + uint32 defense_id = 8; + uint32 HLDPABLDFMA = 9; + AbilityIdentifier ability_identifier = 11; + uint32 attacker_id = 12; + uint32 PBAOKLLNEKH = 13; + string anim_event_id = 14; + bool DOOAHLOJHFI = 15; + bool MMGHNAGCMKI = 101; + uint32 ANCLENEDEFP = 368; + float KIBCOOHDGGC = 395; + float KOHHKJHBPGC = 434; + bool OLBMHKAKCAO = 686; + uint32 GKEECIACCJL = 792; + float JAMLOHCLJGO = 844; + uint32 IKBJOJCMIDD = 966; + uint32 JHGMKBBHGKK = 1152; + float IBDIPOKNGND = 1178; + uint32 ADAPJNAPCFM = 1195; + uint32 HEGHHBKOGPM = 1400; + uint32 GONCKDKHCCD = 1579; + uint32 IPHOJADNMPG = 1582; + bool ECOJPMMOFGO = 1638; + uint32 LINKMJIJDAI = 1649; + uint32 GBFOLNPHPFC = 1744; + uint32 PMCGHDEGGGO = 2023; } diff --git a/proto/AvatarAddNotify.proto b/proto/AvatarAddNotify.proto index c4072bcf..757d6454 100644 --- a/proto/AvatarAddNotify.proto +++ b/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 = 4; + bool is_in_team = 2; + AvatarInfo avatar = 12; } diff --git a/proto/AvatarChangeAnimHashReq.proto b/proto/AvatarChangeAnimHashReq.proto new file mode 100644 index 00000000..27b1abb1 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/proto/AvatarChangeAnimHashRsp.proto b/proto/AvatarChangeAnimHashRsp.proto new file mode 100644 index 00000000..6a708e7f --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/proto/AvatarDataNotify.proto b/proto/AvatarDataNotify.proto index 13159f4f..3b7253ca 100644 --- a/proto/AvatarDataNotify.proto +++ b/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; - uint32 cur_avatar_team_id = 7; - uint64 choose_avatar_guid = 3; - map avatar_team_map = 12; - repeated uint32 owned_costume_list = 13; - repeated uint32 owned_flycloak_list = 15; - repeated uint64 temp_avatar_guid_list = 1; - repeated AvatarRenameInfo avatar_rename_list = 11; - repeated uint32 backup_avatar_team_order_list = 4; -} + //repeated uint32 owned_flycloak_list = 13;//sus + repeated AvatarRenameInfo avatar_rename_list = 10; + repeated AvatarInfo avatar_list = 5; + map avatar_team_map = 15; + //repeated uint32 backup_avatar_team_order_list = 9;//sus + //repeated uint32 owned_costume_list = 2;//sus + //repeated uint64 temp_avatar_guid_list = 999;//Wrong + uint32 cur_avatar_team_id = 1; + uint64 choose_avatar_guid = 11; +} \ No newline at end of file diff --git a/proto/AvatarDieAnimationEndReq.proto b/proto/AvatarDieAnimationEndReq.proto index df053c43..de54cb01 100644 --- a/proto/AvatarDieAnimationEndReq.proto +++ b/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 { - Vector reborn_pos = 7; - uint64 die_guid = 3; - uint32 skill_id = 13; -} + uint32 skill_id = 6; + Vector reborn_pos = 7; + uint64 die_guid= 13; +} \ No newline at end of file diff --git a/proto/AvatarDieAnimationEndRsp.proto b/proto/AvatarDieAnimationEndRsp.proto index 535bd652..a140e2b9 100644 --- a/proto/AvatarDieAnimationEndRsp.proto +++ b/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; - uint32 skill_id = 12; - int32 retcode = 7; -} + int32 retcode = 6; + uint64 die_guid= 11; + uint32 skill_id = 13; +} \ No newline at end of file diff --git a/proto/AvatarEnterSceneInfo.proto b/proto/AvatarEnterSceneInfo.proto index 15bdf5a9..7ecf0556 100644 --- a/proto/AvatarEnterSceneInfo.proto +++ b/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; - uint64 weapon_guid = 1; - uint32 avatar_entity_id = 14; - repeated uint32 buff_id_list = 15; - uint32 weapon_entity_id = 10; - uint64 avatar_guid = 4; - repeated ServerBuff server_buff_list = 9; - AbilitySyncStateInfo weapon_ability_info = 6; -} + uint32 avatar_entity_id = 4; + repeated ServerBuff server_buff_list = 5; + repeated uint32 buff_id_list = 8; + AbilitySyncStateInfo avatar_ability_info = 10;//sus 10 or14 + uint64 weapon_guid = 11; + uint32 weapon_entity_id = 12; + AbilitySyncStateInfo weapon_ability_info = 14;//sus 10 or14 + uint64 avatar_guid = 15; +} \ No newline at end of file diff --git a/proto/AvatarEquipAffixInfo.proto b/proto/AvatarEquipAffixInfo.proto index bf493a79..36b0dc9b 100644 --- a/proto/AvatarEquipAffixInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: CFINPAOKBJN diff --git a/proto/AvatarEquipChangeNotify.proto b/proto/AvatarEquipChangeNotify.proto index 357719f2..0e6ca7ce 100644 --- a/proto/AvatarEquipChangeNotify.proto +++ b/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; - SceneWeaponInfo weapon = 13; - uint64 equip_guid = 15; - uint64 avatar_guid = 2; - uint32 equip_type = 11; - uint32 item_id = 4; -} + uint32 equip_type = 1; + SceneWeaponInfo weapon = 2; + uint64 avatar_guid = 5; + uint32 item_id = 7; + uint64 equip_guid = 9; + SceneReliquaryInfo reliquary = 15; +} \ No newline at end of file diff --git a/proto/AvatarExcelInfo.proto b/proto/AvatarExcelInfo.proto index 13755170..25861091 100644 --- a/proto/AvatarExcelInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: HGHGOIMIAMF diff --git a/proto/AvatarExpeditionState.proto b/proto/AvatarExpeditionState.proto index d750f982..24c9348a 100644 --- a/proto/AvatarExpeditionState.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: OJBIHADNECN diff --git a/proto/AvatarFetterInfo.proto b/proto/AvatarFetterInfo.proto index 0caa348e..59297c5b 100644 --- a/proto/AvatarFetterInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "FetterData.proto"; diff --git a/proto/AvatarFightPropNotify.proto b/proto/AvatarFightPropNotify.proto index 9adec05c..a11ca140 100644 --- a/proto/AvatarFightPropNotify.proto +++ b/proto/AvatarFightPropNotify.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +//obf: MPDFJECBFKM +// CmdId: 9531 message AvatarFightPropNotify { - map fight_prop_map = 3; - uint64 avatar_guid = 11; + uint64 avatar_guid = 5; + map fight_prop_map = 10; } diff --git a/proto/AvatarFightPropUpdateNotify.proto b/proto/AvatarFightPropUpdateNotify.proto index cd2b686c..f79c87fc 100644 --- a/proto/AvatarFightPropUpdateNotify.proto +++ b/proto/AvatarFightPropUpdateNotify.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +//obf: JHPCPJAFGMI +// CmdId: 21817 message AvatarFightPropUpdateNotify { - map fight_prop_map = 1; - uint64 avatar_guid = 13; + uint64 avatar_guid = 3; + map fight_prop_map = 5; } diff --git a/proto/AvatarInfo.proto b/proto/AvatarInfo.proto index b657ffd1..c89e2a1f 100644 --- a/proto/AvatarInfo.proto +++ b/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; - uint32 EFFGKHEPHCF = 29; - uint32 EPIPMINFOLP = 30; + //JCDPOCOOGCI PDGKJIIEPIO = 28; + uint32 GJFKDCJENJE = 29; } diff --git a/proto/AvatarLifeStateChangeNotify.proto b/proto/AvatarLifeStateChangeNotify.proto index d96d15ef..a9310565 100644 --- a/proto/AvatarLifeStateChangeNotify.proto +++ b/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; - repeated ServerBuff server_buff_list = 8; - PlayerDieType die_type = 4; - uint32 life_state = 3; - uint32 move_reliable_seq = 10; - uint32 source_entity_id = 12; - uint64 avatar_guid = 5; -} + uint32 life_state = 1; + uint64 avatar_guid = 2; + PlayerDieType die_type = 3; + string attack_tag = 5; + uint32 move_reliable_seq = 9; + uint32 source_entity_id = 11; + repeated ServerBuff server_buff_list = 13; +} \ No newline at end of file diff --git a/proto/AvatarRenameInfo.proto b/proto/AvatarRenameInfo.proto index 95c866be..00d6c5f9 100644 --- a/proto/AvatarRenameInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: NNBEINLIFPB + +// 4.6.0 message AvatarRenameInfo { - string avatar_name = 1; - uint32 avatar_id = 13; -} + uint32 avatar_id = 5; + string avatar_name = 12; +} \ No newline at end of file diff --git a/proto/AvatarRenameInfoNotify.proto b/proto/AvatarRenameInfoNotify.proto new file mode 100644 index 00000000..8f5a324f --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/proto/AvatarSkillInfo.proto b/proto/AvatarSkillInfo.proto index b40056d6..359bdf09 100644 --- a/proto/AvatarSkillInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: FKBNODHMBMG diff --git a/proto/AvatarSkillInfoNotify.proto b/proto/AvatarSkillInfoNotify.proto index e9fcb442..cd6dc877 100644 --- a/proto/AvatarSkillInfoNotify.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AvatarSkillInfo.proto"; -// CmdId: 29066 -// Obf: NHOMLJLJGFL + +// 4.6.0 +// CmdId: 28799 message AvatarSkillInfoNotify { - map skill_map = 11; - uint64 guid = 13; -} + map skill_map = 2; + uint64 guid = 4; +} \ No newline at end of file diff --git a/proto/AvatarTeam.proto b/proto/AvatarTeam.proto index c8a239c4..3830f7d2 100644 --- a/proto/AvatarTeam.proto +++ b/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 = 14; -} + repeated uint64 avatar_guid_list = 10; + string team_name = 12; +} \ No newline at end of file diff --git a/proto/AvatarTeamAllDataNotify.proto b/proto/AvatarTeamAllDataNotify.proto index ff405629..65cc9dc1 100644 --- a/proto/AvatarTeamAllDataNotify.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AvatarTeam.proto"; -// CmdId: 9854 -// Obf: HHLJIKIGMOG + +// 4.6.0 +// CmdId: 3135 message AvatarTeamAllDataNotify { - map avatar_team_map = 2; + map 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; -} +} \ No newline at end of file diff --git a/proto/AvatarTeamUpdateNotify.proto b/proto/AvatarTeamUpdateNotify.proto index e1773ff5..137c1ffd 100644 --- a/proto/AvatarTeamUpdateNotify.proto +++ b/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 avatar_team_map = 9; -} + map avatar_team_map = 10; +} \ No newline at end of file diff --git a/proto/AvatarUnlockTalentNotify.proto b/proto/AvatarUnlockTalentNotify.proto index d75f854d..70dadea0 100644 --- a/proto/AvatarUnlockTalentNotify.proto +++ b/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 . - 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 = 9; - uint32 skill_depot_id = 8; - uint32 entity_id = 1; -} + uint64 avatar_guid = 4; + uint32 skill_depot_id = 5; + uint32 entity_id = 10; + uint32 talent_id = 15; +} \ No newline at end of file diff --git a/proto/Birthday.proto b/proto/Birthday.proto index 9d442c6e..2c057b53 100644 --- a/proto/Birthday.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: PJENMAMNPEI diff --git a/proto/BlossomChestInfo.proto b/proto/BlossomChestInfo.proto index 7c01401f..ef198ccc 100644 --- a/proto/BlossomChestInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: OGDABNFHACL diff --git a/proto/BossChestInfo.proto b/proto/BossChestInfo.proto index 0a60b323..b5969a19 100644 --- a/proto/BossChestInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "WeeklyBossResinDiscountInfo.proto"; diff --git a/proto/BreakoutAction.proto b/proto/BreakoutAction.proto index ff6c6351..38512d09 100644 --- a/proto/BreakoutAction.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "BreakoutVector2.proto"; diff --git a/proto/BreakoutBrickInfo.proto b/proto/BreakoutBrickInfo.proto index f7079e80..4c3d8915 100644 --- a/proto/BreakoutBrickInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: DGMFFJIKOKD diff --git a/proto/BreakoutElementReactionCounter.proto b/proto/BreakoutElementReactionCounter.proto index 52c097f4..3248fedb 100644 --- a/proto/BreakoutElementReactionCounter.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: KGJJJGIPNLE diff --git a/proto/BreakoutPhysicalObject.proto b/proto/BreakoutPhysicalObject.proto index b79ccf12..6c2481fa 100644 --- a/proto/BreakoutPhysicalObject.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "BreakoutVector2.proto"; diff --git a/proto/BreakoutPhysicalObjectModifier.proto b/proto/BreakoutPhysicalObjectModifier.proto index 32b3b4c0..8b6e9ad5 100644 --- a/proto/BreakoutPhysicalObjectModifier.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: NFKLEIMGKJD diff --git a/proto/BreakoutSnapShot.proto b/proto/BreakoutSnapShot.proto index 0022fa80..88a4669a 100644 --- a/proto/BreakoutSnapShot.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "BreakoutPhysicalObject.proto"; diff --git a/proto/BreakoutSpawnPoint.proto b/proto/BreakoutSpawnPoint.proto index d4241003..e8821c66 100644 --- a/proto/BreakoutSpawnPoint.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "BreakoutPhysicalObject.proto"; diff --git a/proto/BreakoutSyncConnectUidInfo.proto b/proto/BreakoutSyncConnectUidInfo.proto index 044012f1..66e44533 100644 --- a/proto/BreakoutSyncConnectUidInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: BKGOLPBLKMN diff --git a/proto/BreakoutVector2.proto b/proto/BreakoutVector2.proto index 0433eaf7..ffbb0563 100644 --- a/proto/BreakoutVector2.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: FIGLCLAIOJM diff --git a/proto/ChangeAvatarReq.proto b/proto/ChangeAvatarReq.proto index a90320b7..7c55bb81 100644 --- a/proto/ChangeAvatarReq.proto +++ b/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; - uint64 guid = 1; - bool is_move = 3; - uint32 skill_id = 7; -} + Vector move_pos = 8; + /* protected @ 0x28 */// uint32 skill_id = 65535; + /* protected @ 0x2C */// bool BKFBCEPLOLN = 65535; + bool is_move = 2; + uint64 guid = 7; +} \ No newline at end of file diff --git a/proto/ChangeAvatarRsp.proto b/proto/ChangeAvatarRsp.proto index ae7fd280..0bc796bb 100644 --- a/proto/ChangeAvatarRsp.proto +++ b/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; - int32 retcode = 4; - uint32 skill_id = 9; -} + uint64 cur_guid = 2; + /* protected @ 0x28 */// int32 retcode = 65535; + /* protected @ 0x2C */// uint32 skill_id = 65535; +} \ No newline at end of file diff --git a/proto/ChangeEnergyReason.proto b/proto/ChangeEnergyReason.proto index 5c7f2d9e..8f870780 100644 --- a/proto/ChangeEnergyReason.proto +++ b/proto/ChangeEnergyReason.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 . - 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; + CHANGE_ENERGY_REASON_NONE = 0; + CHANGE_ENERGY_REASON_SKILL_START = 1; } diff --git a/proto/ChangeHpDebts.proto b/proto/ChangeHpDebts.proto new file mode 100644 index 00000000..ec64be56 --- /dev/null +++ b/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; +} diff --git a/proto/ChangeHpReason.proto b/proto/ChangeHpReason.proto index 5b360b79..97f07d62 100644 --- a/proto/ChangeHpReason.proto +++ b/proto/ChangeHpReason.proto @@ -1,53 +1,41 @@ -// 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 . - 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; - CHANGE_HP_REASON_SUB_MONSTER = 2; - CHANGE_HP_REASON_SUB_GEAR = 3; - CHANGE_HP_REASON_SUB_ENVIR = 4; - CHANGE_HP_REASON_SUB_FALL = 5; - CHANGE_HP_REASON_SUB_DRAWN = 6; - CHANGE_HP_REASON_SUB_ABYSS = 7; - CHANGE_HP_REASON_SUB_ABILITY = 8; - CHANGE_HP_REASON_SUB_SUMMON = 9; - CHANGE_HP_REASON_SUB_SCRIPT = 10; - CHANGE_HP_REASON_SUB_GM = 11; - CHANGE_HP_REASON_SUB_KILL_SELF = 12; - CHANGE_HP_REASON_SUB_CLIMATE_COLD = 13; - CHANGE_HP_REASON_SUB_STORM_LIGHTNING = 14; - CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET = 15; - CHANGE_HP_REASON_SUB_REPLACE = 16; - CHANGE_HP_REASON_SUB_PLAYER_LEAVE = 17; - CHANGE_HP_REASON_ATTACK_BY_ENERGY = 18; - CHANGE_HP_REASON_ATTACK_BY_RECYCLE = 19; - CHANGE_HP_REASON_SUB_PLAYER_BACK = 20; - CHANGE_HP_REASON_SUB_UGC = 21; - CHANGE_HP_REASON_BY_LUA = 51; - CHANGE_HP_REASON_ADD_ABILITY = 101; - CHANGE_HP_REASON_ADD_ITEM = 102; - CHANGE_HP_REASON_ADD_REVIVE = 103; - CHANGE_HP_REASON_ADD_UPGRADE = 104; - CHANGE_HP_REASON_ADD_STATUE = 105; - 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_NONE = 0; + CHANGE_HP_REASON_SUB_AVATAR = 1; + CHANGE_HP_REASON_SUB_MONSTER = 2; + CHANGE_HP_REASON_SUB_GEAR = 3; + CHANGE_HP_REASON_SUB_ENVIR = 4; + CHANGE_HP_REASON_SUB_FALL = 5; + CHANGE_HP_REASON_SUB_DRAWN = 6; + CHANGE_HP_REASON_SUB_ABYSS = 7; + CHANGE_HP_REASON_SUB_ABILITY = 8; + CHANGE_HP_REASON_SUB_SUMMON = 9; + CHANGE_HP_REASON_SUB_SCRIPT = 10; + CHANGE_HP_REASON_SUB_GM = 11; + CHANGE_HP_REASON_SUB_KILL_SELF = 12; + CHANGE_HP_REASON_SUB_CLIMATE_COLD = 13; + CHANGE_HP_REASON_SUB_STORM_LIGHTNING = 14; + CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET = 15; + CHANGE_HP_REASON_SUB_REPLACE = 16; + CHANGE_HP_REASON_SUB_PLAYER_LEAVE = 17; + CHANGE_HP_REASON_ATTACK_BY_ENERGY = 18; + 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; + CHANGE_HP_REASON_ADD_REVIVE = 103; + CHANGE_HP_REASON_ADD_UPGRADE = 104; + CHANGE_HP_REASON_ADD_STATUE = 105; + CHANGE_HP_REASON_ADD_BACKGROUND = 106; + CHANGE_HP_REASON_ADD_GM = 107; + CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY = 108; + CHANGE_HP_REASON_ADD_ROUGUELIKE_SPRING = 109; + CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V5 = 110; } diff --git a/proto/ChangeTeamNameReq.proto b/proto/ChangeTeamNameReq.proto index 5e05d5b5..29643fae 100644 --- a/proto/ChangeTeamNameReq.proto +++ b/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 . - 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; +} \ No newline at end of file diff --git a/proto/ChangeTeamNameRsp.proto b/proto/ChangeTeamNameRsp.proto index f371442b..e6e7fbac 100644 --- a/proto/ChangeTeamNameRsp.proto +++ b/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 . - 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 = 15; -} + string team_name = 12; +} \ No newline at end of file diff --git a/proto/ChatChannelDataNotify.proto b/proto/ChatChannelDataNotify.proto new file mode 100644 index 00000000..90d47677 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/proto/ChatChannelInfo.proto b/proto/ChatChannelInfo.proto new file mode 100644 index 00000000..cf81ae31 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/proto/ChatChannelInfoNotify.proto b/proto/ChatChannelInfoNotify.proto new file mode 100644 index 00000000..ebf5ec30 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/proto/ChatChannelShieldNotify.proto b/proto/ChatChannelShieldNotify.proto new file mode 100644 index 00000000..52b67b3f --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/proto/ChatInfo.proto b/proto/ChatInfo.proto index 4b54621c..f7772f56 100644 --- a/proto/ChatInfo.proto +++ b/proto/ChatInfo.proto @@ -1,25 +1,24 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 message ChatInfo { - - 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 type = 10; + uint32 type = 11; } - - uint32 to_uid = 3; - uint32 time = 5; - uint32 uid = 11; + enum SystemHintType { + SYSTEM_HINT_TYPE_CHAT_NONE = 0; + SYSTEM_HINT_TYPE_CHAT_ENTER_WORLD = 1; + SYSTEM_HINT_TYPE_CHAT_LEAVE_WORLD = 2; + } + uint32 time = 1; + uint32 uid = 3; + uint32 to_uid = 6; + bool is_read = 11; + uint32 sequence = 14; oneof content { - string text = 457; - uint32 icon = 1812; - SystemHint system_hint = 44; + string text = 1643; + uint32 icon = 1290; + SystemHint system_hint = 279; } - bool is_read = 8; - uint32 sequence = 13; } diff --git a/proto/ChooseCurAvatarTeamReq.proto b/proto/ChooseCurAvatarTeamReq.proto index 4714b78b..291c0754 100644 --- a/proto/ChooseCurAvatarTeamReq.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 9406 -// Obf: GFGPACAMELF + +// 4.6.0 +// CmdId: 7877 message ChooseCurAvatarTeamReq { uint32 team_id = 10; -} +} \ No newline at end of file diff --git a/proto/CityInfo.proto b/proto/CityInfo.proto index d301ee91..0899c900 100644 --- a/proto/CityInfo.proto +++ b/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 crystal_num = 11; - uint32 city_id = 9; -} + uint32 level = 8; + uint32 crystal_num = 9; + uint32 city_id = 13; +} \ No newline at end of file diff --git a/proto/ClientAbilitiesInitFinishCombineNotify.proto b/proto/ClientAbilitiesInitFinishCombineNotify.proto index e98b6363..a1507c58 100644 --- a/proto/ClientAbilitiesInitFinishCombineNotify.proto +++ b/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 . - 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; } diff --git a/proto/ClientAbilityChangeNotify.proto b/proto/ClientAbilityChangeNotify.proto index 7d06b0cf..b47a1a29 100644 --- a/proto/ClientAbilityChangeNotify.proto +++ b/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; - uint32 entity_id = 11; - bool is_init_hash = 5; + bool is_init_hash = 6; + uint32 entity_id = 8; + repeated AbilityInvokeEntry invokes = 9; } diff --git a/proto/ClientAbilityInitFinishNotify.proto b/proto/ClientAbilityInitFinishNotify.proto index 2b51b3bc..2863b875 100644 --- a/proto/ClientAbilityInitFinishNotify.proto +++ b/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; - uint32 entity_id = 7; + repeated AbilityInvokeEntry invokes = 3; + uint32 entity_id = 14; } diff --git a/proto/ClientGadgetInfo.proto b/proto/ClientGadgetInfo.proto index 787d4bbd..95abf36f 100644 --- a/proto/ClientGadgetInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: KCPDCBKPNNL diff --git a/proto/CoinCollectOperatorInfo.proto b/proto/CoinCollectOperatorInfo.proto index 006bc469..190b719a 100644 --- a/proto/CoinCollectOperatorInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: NFEECFHHDLJ diff --git a/proto/CombatInvocationsNotify.proto b/proto/CombatInvocationsNotify.proto index 864efd5b..1a19722a 100644 --- a/proto/CombatInvocationsNotify.proto +++ b/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; +} \ No newline at end of file diff --git a/proto/CombatInvokeEntry.proto b/proto/CombatInvokeEntry.proto index af2aac9d..2e59e06f 100644 --- a/proto/CombatInvokeEntry.proto +++ b/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; -} + CombatTypeArgument argument_type = 3; + bytes combat_data = 13; + ForwardType forward_type = 14; +} \ No newline at end of file diff --git a/proto/CombatTypeArgument.proto b/proto/CombatTypeArgument.proto index a68df466..a5060e3a 100644 --- a/proto/CombatTypeArgument.proto +++ b/proto/CombatTypeArgument.proto @@ -1,28 +1,29 @@ 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; - COMBAT_TYPE_ARGUMENT_ANIMATOR_STATE_CHANGED = 2; - COMBAT_TYPE_ARGUMENT_FACE_TO_DIR = 3; - COMBAT_TYPE_ARGUMENT_SET_ATTACK_TARGET = 4; - COMBAT_TYPE_ARGUMENT_RUSH_MOVE = 5; - COMBAT_TYPE_ARGUMENT_ANIMATOR_PARAMETER_CHANGED = 6; - COMBAT_TYPE_ARGUMENT_ENTITY_MOVE = 7; - COMBAT_TYPE_ARGUMENT_SYNC_ENTITY_POSITION = 8; - COMBAT_TYPE_ARGUMENT_STEER_MOTION_INFO = 9; - COMBAT_TYPE_ARGUMENT_FORCE_SET_POS_INFO = 10; - COMBAT_TYPE_ARGUMENT_COMPENSATE_POS_DIFF = 11; - COMBAT_TYPE_ARGUMENT_MONSTER_DO_BLINK = 12; - COMBAT_TYPE_ARGUMENT_FIXED_RUSH_MOVE = 13; - COMBAT_TYPE_ARGUMENT_SYNC_TRANSFORM = 14; - COMBAT_TYPE_ARGUMENT_LIGHT_CORE_MOVE = 15; - COMBAT_TYPE_ARGUMENT_BEING_HEALED_NTF = 16; - COMBAT_TYPE_ARGUMENT_SKILL_ANCHOR_POSITION_NTF = 17; - 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_DEBUG_SYNC_MOTION = 22; -} + COMBAT_TYPE_ARGUMENT_NONE = 0; + COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT = 1; + COMBAT_TYPE_ARGUMENT_ANIMATOR_STATE_CHANGED = 2; + COMBAT_TYPE_ARGUMENT_FACE_TO_DIR = 3; + COMBAT_TYPE_ARGUMENT_SET_ATTACK_TARGET = 4; + COMBAT_TYPE_ARGUMENT_RUSH_MOVE = 5; + COMBAT_TYPE_ARGUMENT_ANIMATOR_PARAMETER_CHANGED = 6; + COMBAT_TYPE_ARGUMENT_ENTITY_MOVE = 7; + COMBAT_TYPE_ARGUMENT_SYNC_ENTITY_POSITION = 8; + COMBAT_TYPE_ARGUMENT_STEER_MOTION_INFO = 9; + COMBAT_TYPE_ARGUMENT_FORCE_SET_POS_INFO = 10; + COMBAT_TYPE_ARGUMENT_COMPENSATE_POS_DIFF = 11; + COMBAT_TYPE_ARGUMENT_MONSTER_DO_BLINK = 12; + COMBAT_TYPE_ARGUMENT_FIXED_RUSH_MOVE = 13; + COMBAT_TYPE_ARGUMENT_SYNC_TRANSFORM = 14; + COMBAT_TYPE_ARGUMENT_LIGHT_CORE_MOVE = 15; + COMBAT_TYPE_ARGUMENT_BEING_HEALED_NTF = 16; + COMBAT_TYPE_ARGUMENT_SKILL_ANCHOR_POSITION_NTF = 17; + 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_MULTI_OVERRIDE_ANIM = 21; + COMBAT_TYPE_ARGUMENT_DEBUG_SYNC_MOTION = 22; +} \ No newline at end of file diff --git a/proto/CurVehicleInfo.proto b/proto/CurVehicleInfo.proto index 5a05aa44..cbfc72a7 100644 --- a/proto/CurVehicleInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; diff --git a/proto/CustomCommonNodeInfo.proto b/proto/CustomCommonNodeInfo.proto index e3c982ca..262d5cba 100644 --- a/proto/CustomCommonNodeInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: IGADMBECIDG diff --git a/proto/CustomGadgetTreeInfo.proto b/proto/CustomGadgetTreeInfo.proto index cf4e578f..cb2fd012 100644 --- a/proto/CustomGadgetTreeInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "CustomCommonNodeInfo.proto"; diff --git a/proto/DeshretObeliskGadgetInfo.proto b/proto/DeshretObeliskGadgetInfo.proto index 00b1bacb..75439b38 100644 --- a/proto/DeshretObeliskGadgetInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: HBNLGHJLHNL diff --git a/proto/DetailAbilityInfo.proto b/proto/DetailAbilityInfo.proto new file mode 100644 index 00000000..970fe36e --- /dev/null +++ b/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; +} diff --git a/proto/DropItemReq.proto b/proto/DropItemReq.proto index 98b2badb..6a9ff34f 100644 --- a/proto/DropItemReq.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "StoreType.proto"; + import "Vector.proto"; -// CmdId: 28541 -// Obf: ALHJAJDGNDA +import "StoreType.proto"; + +// 4.6.0 +// CmdId: 23960 message DropItemReq { - uint32 count = 10; - uint64 guid = 15; - StoreType store_type = 8; - Vector pos = 1; -} + uint64 guid = 3; + Vector pos = 6; + uint32 count = 12; + StoreType store_type = 13; +} \ No newline at end of file diff --git a/proto/DropItemRsp.proto b/proto/DropItemRsp.proto index 9ee0a231..94dfbd02 100644 --- a/proto/DropItemRsp.proto +++ b/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 . - 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 = 12; - int32 retcode = 9; -} + uint64 guid = 2; + int32 retcode = 3; + StoreType store_type = 12; +} \ No newline at end of file diff --git a/proto/DungeonPlayerDieReq.proto b/proto/DungeonPlayerDieReq.proto index c6c37414..e44d3180 100644 --- a/proto/DungeonPlayerDieReq.proto +++ b/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 . - 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 = 1; -} + uint32 dungeon_id = 3; + PlayerDieType die_type = 7; +} \ No newline at end of file diff --git a/proto/EchoShellInfo.proto b/proto/EchoShellInfo.proto index f16d7323..22deedc4 100644 --- a/proto/EchoShellInfo.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: KCHCJMNANCP diff --git a/proto/EnterSceneDoneReq.proto b/proto/EnterSceneDoneReq.proto index 4829a6d0..50314799 100644 --- a/proto/EnterSceneDoneReq.proto +++ b/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; -} +} \ No newline at end of file diff --git a/proto/EnterSceneDoneRsp.proto b/proto/EnterSceneDoneRsp.proto index ed60c161..2f6d6d04 100644 --- a/proto/EnterSceneDoneRsp.proto +++ b/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 = 15; -} + //int32 retcode = ?; + uint32 enter_scene_token = 3; +} \ No newline at end of file diff --git a/proto/EnterScenePeerNotify.proto b/proto/EnterScenePeerNotify.proto index 3e26fe8c..3b0ee489 100644 --- a/proto/EnterScenePeerNotify.proto +++ b/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 peer_id = 1; - uint32 host_peer_id = 12; - uint32 dest_scene_id = 13; -} + uint32 dest_scene_id = 1; + uint32 enter_scene_token = 9; + uint32 peer_id = 11;//11 or 3 + uint32 host_peer_id = 3;//11 or 3 +} \ No newline at end of file diff --git a/proto/EnterSceneReadyReq.proto b/proto/EnterSceneReadyReq.proto index 4822439a..69338fa4 100644 --- a/proto/EnterSceneReadyReq.proto +++ b/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; +} \ No newline at end of file diff --git a/proto/EnterSceneReadyRsp.proto b/proto/EnterSceneReadyRsp.proto index d0d86b34..38da5261 100644 --- a/proto/EnterSceneReadyRsp.proto +++ b/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; - int32 retcode = 2; -} + uint32 enter_scene_token = 10; + int32 retcode = 99; +} \ No newline at end of file diff --git a/proto/EnterType.proto b/proto/EnterType.proto index c04ad6bb..dd6e0d51 100644 --- a/proto/EnterType.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: NMCABLGJJEK diff --git a/proto/EnterWorldAreaReq.proto b/proto/EnterWorldAreaReq.proto index 13388582..b3dc90b7 100644 --- a/proto/EnterWorldAreaReq.proto +++ b/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 . - 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 = 15; -} + uint32 area_id = 4; + uint32 area_type = 13; +} \ No newline at end of file diff --git a/proto/EnterWorldAreaRsp.proto b/proto/EnterWorldAreaRsp.proto index d049837a..48543d4b 100644 --- a/proto/EnterWorldAreaRsp.proto +++ b/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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 21362 -// Obf: MIPCODPODKN + +// 4.6.0 +// CmdId: 26630 message EnterWorldAreaRsp { - uint32 area_type = 6; - int32 retcode = 13; - uint32 area_id = 9; -} + uint32 area_type = 10; + uint32 area_id = 13; + int32 retcode = 14; +} \ No newline at end of file diff --git a/proto/EntityAbilityInvokeEntry.proto b/proto/EntityAbilityInvokeEntry.proto index c3bc60dd..2e617956 100644 --- a/proto/EntityAbilityInvokeEntry.proto +++ b/proto/EntityAbilityInvokeEntry.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AbilityInvokeEntry.proto"; -// Obf: GMHAEILNEPA + +//obf: PONAMDDLEBN message EntityAbilityInvokeEntry { - repeated AbilityInvokeEntry invokes = 2; - uint32 entity_id = 3; + repeated AbilityInvokeEntry invokes = 10; + uint32 entity_id = 13; } diff --git a/proto/EntityAuthorityInfo.proto b/proto/EntityAuthorityInfo.proto index 11616c07..c61de7e6 100644 --- a/proto/EntityAuthorityInfo.proto +++ b/proto/EntityAuthorityInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "AbilitySyncStateInfo.proto"; diff --git a/proto/EntityClientData.proto b/proto/EntityClientData.proto index 2b5af5eb..e1f0e4be 100644 --- a/proto/EntityClientData.proto +++ b/proto/EntityClientData.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: GCALEOBNFFH diff --git a/proto/EntityClientExtraInfo.proto b/proto/EntityClientExtraInfo.proto index 17d8b153..cb17fc59 100644 --- a/proto/EntityClientExtraInfo.proto +++ b/proto/EntityClientExtraInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; diff --git a/proto/EntityEnvironmentInfo.proto b/proto/EntityEnvironmentInfo.proto index 4096156c..f065979a 100644 --- a/proto/EntityEnvironmentInfo.proto +++ b/proto/EntityEnvironmentInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: FDGMLNKHDKB diff --git a/proto/EntityFightPropChangeReasonNotify.proto b/proto/EntityFightPropChangeReasonNotify.proto index c8370585..ceee9bdd 100644 --- a/proto/EntityFightPropChangeReasonNotify.proto +++ b/proto/EntityFightPropChangeReasonNotify.proto @@ -1,15 +1,23 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "ChangeHpReason.proto"; import "ChangeEnergyReason.proto"; import "PropChangeReason.proto"; +import "ChangeHpDebts.proto"; +import "MGHDLMIEMLI.proto"; +//obf: KNIDFELLKBI +// CmdId: 9207 message EntityFightPropChangeReasonNotify { - repeated uint32 param_list = 9; - PropChangeReason reason = 11; - ChangeHpReason change_hp_reason = 2; - float prop_delta = 5; - ChangeEnergyReason change_energy_reason = 8; - uint32 entity_id = 10; - uint32 prop_type = 13; + uint32 entity_id = 1; + ChangeHpReason changeHpReason = 2; + repeated uint32 param_list = 6; + ChangeHpDebts change_hp_debts = 7; + MGHDLMIEMLI detail_info = 8; + uint32 prop_type = 9; + PropChangeReason reason = 10; + float prop_delta = 13; + ChangeEnergyReason changeEnergyReason = 14; + float IFDGFBBCMBB = 15; } diff --git a/proto/EntityFightPropUpdateNotify.proto b/proto/EntityFightPropUpdateNotify.proto index 079f5572..4ccd1ab3 100644 --- a/proto/EntityFightPropUpdateNotify.proto +++ b/proto/EntityFightPropUpdateNotify.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +//obf: PDMMIGKPKBI +// CmdId: 8257 message EntityFightPropUpdateNotify { - map fight_prop_map = 15; - uint32 entity_id = 4; + map fight_prop_map = 7; + uint32 entity_id = 8; } diff --git a/proto/EntityRendererChangedInfo.proto b/proto/EntityRendererChangedInfo.proto index 55b15385..7c8bf563 100644 --- a/proto/EntityRendererChangedInfo.proto +++ b/proto/EntityRendererChangedInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: OGLDMEEKHOB diff --git a/proto/Equip.proto b/proto/Equip.proto index 662b5ed1..688a5f8c 100644 --- a/proto/Equip.proto +++ b/proto/Equip.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Reliquary.proto"; import "Weapon.proto"; -// Obf: EFEDALDPHMA + +// 4.6.0 message Equip { + bool is_locked = 3; oneof detail { Reliquary reliquary = 1; Weapon weapon = 2; } - bool is_locked = 3; -} +} \ No newline at end of file diff --git a/proto/EquipParam.proto b/proto/EquipParam.proto index 7a5ffbf1..1c06da95 100644 --- a/proto/EquipParam.proto +++ b/proto/EquipParam.proto @@ -1,25 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: HPFNFEJGODI + message EquipParam { - uint32 item_id = 1; - uint32 item_num = 2; - uint32 item_level = 3; - uint32 promote_level = 4; + uint32 item_id = 1; + uint32 item_num = 2; + uint32 item_level = 3; + uint32 promote_level = 4; } diff --git a/proto/EvtBeingHitInfo.proto b/proto/EvtBeingHitInfo.proto index f11f0189..a6ffe2dd 100644 --- a/proto/EvtBeingHitInfo.proto +++ b/proto/EvtBeingHitInfo.proto @@ -1,9 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AttackResult.proto"; +//obf: PJOFJKPOAOF message EvtBeingHitInfo { - AttackResult attack_result = 11; - uint32 peer_id = 9; - uint32 frame_num = 15; + uint32 peer_id = 9; + uint32 frame_num = 12; + AttackResult attack_result = 13; } diff --git a/proto/EvtDoSkillSuccNotify.proto b/proto/EvtDoSkillSuccNotify.proto index 10b42392..90b56993 100644 --- a/proto/EvtDoSkillSuccNotify.proto +++ b/proto/EvtDoSkillSuccNotify.proto @@ -1,11 +1,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "Vector.proto"; -import "ForwardType.proto"; +import "ForwardType.proto"; +import "Vector.proto"; + +//obf: BLPANCPNDIN +// CmdId: 6290 message EvtDoSkillSuccNotify { - Vector forward = 10; - uint32 caster_id = 4; - uint32 skill_id = 14; - ForwardType forward_type = 6; + uint32 skill_id = 2; + uint32 caster_id = 3; + ForwardType forward_type = 8; + Vector forward = 13; } diff --git a/proto/FetterData.proto b/proto/FetterData.proto index 19935d92..7ea2e48c 100644 --- a/proto/FetterData.proto +++ b/proto/FetterData.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: JFCHMJKBMBL diff --git a/proto/FightPropPair.proto b/proto/FightPropPair.proto index 2bad68d6..de9b995b 100644 --- a/proto/FightPropPair.proto +++ b/proto/FightPropPair.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: DKENFABIHAJ diff --git a/proto/FishPoolInfo.proto b/proto/FishPoolInfo.proto index 392be00c..cf1c0dcb 100644 --- a/proto/FishPoolInfo.proto +++ b/proto/FishPoolInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: NPDMIJKKJPA diff --git a/proto/FishtankFishInfo.proto b/proto/FishtankFishInfo.proto index 826e4b4f..add0f833 100644 --- a/proto/FishtankFishInfo.proto +++ b/proto/FishtankFishInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: JEMIPJIOKME diff --git a/proto/ForwardType.proto b/proto/ForwardType.proto index 82abb052..adfa0252 100644 --- a/proto/ForwardType.proto +++ b/proto/ForwardType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: CLILGMMMGCK + +// 4.6.0 enum ForwardType { FORWARD_TYPE_LOCAL = 0; FORWARD_TYPE_TO_ALL = 1; @@ -27,4 +12,4 @@ enum ForwardType { FORWARD_TYPE_TO_PEERS = 6; FORWARD_TYPE_ONLY_SERVER = 7; FORWARD_TYPE_TO_ALL_EXIST_EXCEPT_CUR = 8; -} +} \ No newline at end of file diff --git a/proto/FoundationInfo.proto b/proto/FoundationInfo.proto index af949624..5a7d3962 100644 --- a/proto/FoundationInfo.proto +++ b/proto/FoundationInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "FoundationStatus.proto"; diff --git a/proto/FoundationStatus.proto b/proto/FoundationStatus.proto index c319927f..d60c9b74 100644 --- a/proto/FoundationStatus.proto +++ b/proto/FoundationStatus.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: HGKOLBGFAEC diff --git a/proto/FriendBrief.proto b/proto/FriendBrief.proto index 3b1acf45..630a587b 100644 --- a/proto/FriendBrief.proto +++ b/proto/FriendBrief.proto @@ -1,27 +1,13 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "FriendOnlineState.proto"; import "SocialShowAvatarInfo.proto"; import "FriendEnterHomeOption.proto"; import "ProfilePicture.proto"; import "PlatformType.proto"; -// Obf: JIFKJKFNBFF + +// 4.6.0 message FriendBrief { uint32 uid = 1; string nickname = 2; @@ -31,20 +17,20 @@ message FriendBrief { string signature = 6; FriendOnlineState online_state = 7; uint32 param = 8; - bool is_mp_mode_available = 10; + bool is_friend = 10; string online_id = 11; - uint32 last_active_time = 12; + uint32 NCMINEPCLFF = 12; uint32 name_card_id = 13; - uint32 mp_player_num = 14; + uint32 GCNGGDJLKFH = 14; bool is_chat_no_disturb = 15; - uint32 chat_sequence = 16; + uint32 PNIFKDLLGFH = 16; string remark_name = 17; repeated SocialShowAvatarInfo show_avatar_info_list = 22; FriendEnterHomeOption friend_enter_home_option = 23; ProfilePicture profile_picture = 24; - bool is_game_source = 25; - bool is_psn_source = 26; + bool PLCFAEJEMCB = 25; + bool HPKNBDAEANE = 26; PlatformType platform_type = 27; - bool is_in_duel = 28; - bool is_duel_observable = 29; -} + bool LCPBMHAHNEE = 28; + bool GJBJJAECABP = 29; +} \ No newline at end of file diff --git a/proto/FriendEnterHomeOption.proto b/proto/FriendEnterHomeOption.proto index 9852f991..5d3ea0ca 100644 --- a/proto/FriendEnterHomeOption.proto +++ b/proto/FriendEnterHomeOption.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: LDBJAIDJNMO diff --git a/proto/FriendOnlineState.proto b/proto/FriendOnlineState.proto index 89d8600c..23a10a29 100644 --- a/proto/FriendOnlineState.proto +++ b/proto/FriendOnlineState.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: NALGAFDLMDG diff --git a/proto/Furniture.proto b/proto/Furniture.proto index ffcd0c27..52aeabf7 100644 --- a/proto/Furniture.proto +++ b/proto/Furniture.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: GDHFFBFCAPJ + +// 4.6.0 message Furniture { uint32 count = 1; -} +} \ No newline at end of file diff --git a/proto/GadgetBornType.proto b/proto/GadgetBornType.proto index 46663fee..4a4ae617 100644 --- a/proto/GadgetBornType.proto +++ b/proto/GadgetBornType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: GPODMAALLGC diff --git a/proto/GadgetCrucibleInfo.proto b/proto/GadgetCrucibleInfo.proto index b9d29e7e..7d1fbc88 100644 --- a/proto/GadgetCrucibleInfo.proto +++ b/proto/GadgetCrucibleInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: LMEGMGDKNJL diff --git a/proto/GadgetGeneralRewardInfo.proto b/proto/GadgetGeneralRewardInfo.proto index 5c2134ac..0f68566d 100644 --- a/proto/GadgetGeneralRewardInfo.proto +++ b/proto/GadgetGeneralRewardInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; diff --git a/proto/GadgetPlayInfo.proto b/proto/GadgetPlayInfo.proto index cce207fa..0a65f5b1 100644 --- a/proto/GadgetPlayInfo.proto +++ b/proto/GadgetPlayInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "GadgetCrucibleInfo.proto"; diff --git a/proto/GatherGadgetInfo.proto b/proto/GatherGadgetInfo.proto index 6b794274..48d0bfc2 100644 --- a/proto/GatherGadgetInfo.proto +++ b/proto/GatherGadgetInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: IHPBLNPFECK diff --git a/proto/GetAllMailNotify.proto b/proto/GetAllMailNotify.proto index 204ec875..5ac439a8 100644 --- a/proto/GetAllMailNotify.proto +++ b/proto/GetAllMailNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 24116 -// Obf: ACIPPADMKFF + message GetAllMailNotify { - bool is_collected = 2; + bool is_collected = 1; } diff --git a/proto/GetAllMailResultNotify.proto b/proto/GetAllMailResultNotify.proto index b9edcf5a..91420676 100644 --- a/proto/GetAllMailResultNotify.proto +++ b/proto/GetAllMailResultNotify.proto @@ -1,29 +1,13 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "MailData.proto"; -// CmdId: 5536 -// Obf: DCHBLDEKBCN + message GetAllMailResultNotify { - bool is_collected = 5; - repeated MailData mail_list = 11; - uint32 packet_num = 13; - string transaction = 10; - uint32 packet_be_sent_num = 14; - int32 retcode = 15; + int32 retcode = 1; + repeated MailData mail_list = 3; + string transaction = 7; + uint32 packet_num = 9; + bool is_collected = 12; + uint32 packet_be_sent_num = 15; } diff --git a/proto/GetPlayerFriendListReq.proto b/proto/GetPlayerFriendListReq.proto index 97f17fb8..3fb2b6c7 100644 --- a/proto/GetPlayerFriendListReq.proto +++ b/proto/GetPlayerFriendListReq.proto @@ -1,22 +1,6 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 2240 -// Obf: OEHLGALOKNA + +// 4.6.0 message GetPlayerFriendListReq { -} +} \ No newline at end of file diff --git a/proto/GetPlayerFriendListRsp.proto b/proto/GetPlayerFriendListRsp.proto index e7658c5a..9382642a 100644 --- a/proto/GetPlayerFriendListRsp.proto +++ b/proto/GetPlayerFriendListRsp.proto @@ -1,8 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "FriendBrief.proto"; +// 4.6.0 +// CmdId: 8658 message GetPlayerFriendListRsp { - repeated FriendBrief friend_list = 13; - repeated FriendBrief ask_friend_list = 1; -} + repeated FriendBrief friend_list = 9; + repeated FriendBrief ask_friend_list = 99;//wrong + int32 retcode = 98;//wrong +} \ No newline at end of file diff --git a/proto/GetPlayerSocialDetailReq.proto b/proto/GetPlayerSocialDetailReq.proto index 67305461..5951e533 100644 --- a/proto/GetPlayerSocialDetailReq.proto +++ b/proto/GetPlayerSocialDetailReq.proto @@ -1,23 +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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 928 -// Obf: NELPPMEFINN + + + +// 4.6.0 +// CmdId: 7440 message GetPlayerSocialDetailReq { - uint32 uid = 14; -} + uint32 uid = 15; +} \ No newline at end of file diff --git a/proto/GetPlayerSocialDetailRsp.proto b/proto/GetPlayerSocialDetailRsp.proto index ec090dab..58a99646 100644 --- a/proto/GetPlayerSocialDetailRsp.proto +++ b/proto/GetPlayerSocialDetailRsp.proto @@ -1,8 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "SocialDetail.proto"; +// 4.6.0 +// CmdId: 323 message GetPlayerSocialDetailRsp { - int32 retcode = 6; - SocialDetail detail_data = 14; -} + int32 retcode = 9; + SocialDetail detail_data = 13; +} \ No newline at end of file diff --git a/proto/GetPlayerTokenReq.proto b/proto/GetPlayerTokenReq.proto index e68a84ad..6f206c22 100644 --- a/proto/GetPlayerTokenReq.proto +++ b/proto/GetPlayerTokenReq.proto @@ -1,26 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 28960 message GetPlayerTokenReq { - string client_rand_key = 514; - string account_uid = 14; - uint32 key_id = 728; - uint32 OGNFFAEKDBO = 652; - uint32 account_type = 2; - uint32 channel_id = 5; - string account_token = 10; - uint32 platform_type = 9; - string psn_id = 12; - string online_id = 1; - string LODOCFKABDG = 3; - string client_ip_str = 11; - uint32 sub_channel_id = 7; - uint32 cloudClientIp = 177; - string GIKAFFPKLOE = 4; - string birthday = 828; - uint32 uid = 13; - string country_code = 15; - bool is_guest = 6; - uint32 FCPDNLHOBNK = 8; - string FAOAMMHOOHL = 1457; -} + uint32 platform_type = 7; + string account_uid = 9; + uint32 key_id = 550; + string client_rand_key = 1605; + string account_token = 14; +} \ No newline at end of file diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto index 227801c9..6b054884 100644 --- a/proto/GetPlayerTokenRsp.proto +++ b/proto/GetPlayerTokenRsp.proto @@ -1,46 +1,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "StopServerInfo.proto"; -// todo +// 4.6.0 +// CmdId: 4867 message GetPlayerTokenRsp { - - int32 retcode = 4; // ? - string msg = 12; // ? - - uint32 uid = 1; // OK - string token = 11; // ? - uint32 account_type = 1585; // ? - bool is_proficient_player = 8; // ? - uint64 secret_key_seed = 13; // ? - bytes security_cmd_buffer = 15; // ? - uint32 platform_type = 5; // ? - uint32 channel_id = 259; // OK - string country_code = 1643; // OK - string client_version_random_key = 678; // ? - uint32 reg_platform = 1241; // ? - string client_ip_str = 1921; // ? - - uint32 blackUidEndTime = 10; // ? - - string server_rand_key = 1145; // OK - - StopServerInfo stop_server = 875; // ? - string sign = 733; // OK - + string country_code = 1096; + uint32 key_id = 1411; + string client_ip_str = 703; + string server_rand_key = 1118; + string token = 14; string account_uid = 3; - uint32 tag = 1572; - string birthday = 1437; - uint32 key_id = 1676; - bool is_guest = 2; - repeated uint32 finish_collection_id_list = 451; - bytes extra_bin_data = 7; - string psn_id = 1790; - uint32 sub_channel_id = 14; - string secret_key = 9; - uint32 cloudClientIp = 508; - - uint32 KCFIGJAPNIB = 6; - bool PELBMOHDKHJ = 1292; - bool ILGBPPMFHIF = 1962; -} + string sign = 477; + uint32 uid = 13; + string client_version_random_key = 207; + uint32 platform_type = 15; //15 or 1795 +} \ No newline at end of file diff --git a/proto/GetSceneAreaReq.proto b/proto/GetSceneAreaReq.proto index 61e491ab..578b1381 100644 --- a/proto/GetSceneAreaReq.proto +++ b/proto/GetSceneAreaReq.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 7890 message GetSceneAreaReq { - uint32 scene_id = 2; + uint32 scene_id = 3; uint32 belong_uid = 14; -} +} \ No newline at end of file diff --git a/proto/GetSceneAreaRsp.proto b/proto/GetSceneAreaRsp.proto index 2be68bb3..71fdc18f 100644 --- a/proto/GetSceneAreaRsp.proto +++ b/proto/GetSceneAreaRsp.proto @@ -1,10 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "CityInfo.proto"; +// 4.6.0 +// CmdId: 24538 message GetSceneAreaRsp { - repeated CityInfo city_info_list = 4; + repeated uint32 area_id_list = 1; + repeated CityInfo city_info_list = 13; + uint32 scene_id = 14; int32 retcode = 15; - uint32 scene_id = 5; - repeated uint32 area_id_list = 7; -} +} \ No newline at end of file diff --git a/proto/GetScenePointReq.proto b/proto/GetScenePointReq.proto index af325e43..d8a6ec0d 100644 --- a/proto/GetScenePointReq.proto +++ b/proto/GetScenePointReq.proto @@ -1,8 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 1207 message GetScenePointReq { - uint32 belong_uid = 10; - uint32 scene_id = 11; - bool APPFPHLAKBG = 6; + uint32 scene_id = 11; + uint32 belong_uid = 5; + bool is_relogin = 10; } diff --git a/proto/GetScenePointRsp.proto b/proto/GetScenePointRsp.proto index 1a4fcdfc..02100cbe 100644 --- a/proto/GetScenePointRsp.proto +++ b/proto/GetScenePointRsp.proto @@ -1,20 +1,20 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 831 message GetScenePointRsp { - repeated uint32 unlocked_point_list = 8; - repeated uint32 unhide_point_list = 11; - int32 retcode = 4; - repeated uint32 unlock_area_list = 14; - uint32 belong_uid = 15; - uint32 scene_id = 13; - - bool APPFPHLAKBG = 7; - - repeated uint32 BJLFHDFBAPG = 12; - repeated uint32 BAGPGJADDNL = 9; - repeated uint32 DOGDPAFIMJD = 10; - repeated uint32 NKBFPEFAAFF = 2; - repeated uint32 OMEDMKJFGCJ = 5; - repeated uint32 EHFLBENPPPB = 3; + repeated uint32 unlock_area_list = 15; //random + repeated uint32 locked_point_list = 11; //random + repeated uint32 not_interact_dungeon_entry_list = 9; //random + repeated uint32 hide_point_list = 7; //random + repeated uint32 unhide_point_list = 999; //random + repeated uint32 to_be_explore_dungeon_entry_list = 8; //random + repeated uint32 unlocked_point_list = 12; //random + repeated uint32 not_explored_dungeon_entry_list = 997; //random + repeated uint32 group_unlimit_point_list = 998; //random + bool is_relogin = 1; + uint32 belong_uid = 3; + int32 retcode = 14; + uint32 scene_id = 2; } diff --git a/proto/GetShopReq.proto b/proto/GetShopReq.proto index f166e3d8..50e0892f 100644 --- a/proto/GetShopReq.proto +++ b/proto/GetShopReq.proto @@ -1,6 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 21735 message GetShopReq { - uint32 shop_type = 2; -} + uint32 shop_type = 4; +} \ No newline at end of file diff --git a/proto/GetShopRsp.proto b/proto/GetShopRsp.proto index 9e616b3e..6ec8df39 100644 --- a/proto/GetShopRsp.proto +++ b/proto/GetShopRsp.proto @@ -1,8 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Shop.proto"; +// 4.6.0 +// CmdId: 1428 message GetShopRsp { - Shop shop = 8; - int32 retcode = 15; -} + Shop shop = 10; + int32 retcode = 15; +} \ No newline at end of file diff --git a/proto/HitColliderType.proto b/proto/HitColliderType.proto index 5284866d..d9f49958 100644 --- a/proto/HitColliderType.proto +++ b/proto/HitColliderType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: CDFCOLHODGF + +//obf: LPNDGGEHLED enum HitColliderType { - HIT_COLLIDER_INVALID = 0; - HIT_COLLIDER_HIT_BOX = 1; - HIT_COLLIDER_WET_HIT_BOX = 2; - HIT_COLLIDER_HEAD_BOX = 3; + HIT_COLLIDER_INVALID = 0; + HIT_COLLIDER_HIT_BOX = 1; + HIT_COLLIDER_WET_HIT_BOX = 2; + HIT_COLLIDER_HEAD_BOX = 3; } diff --git a/proto/HitCollision.proto b/proto/HitCollision.proto index ddc090ae..525670b5 100644 --- a/proto/HitCollision.proto +++ b/proto/HitCollision.proto @@ -1,13 +1,15 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; import "HitColliderType.proto"; +//obf: ILBCLHPLHKO message HitCollision { - Vector APDABINGDCE = 1; - Vector CCBMGOCJKPM = 3; - HitColliderType hit_collider_type = 12; - int32 hit_box_index = 6; - float ILHFONDEMGH = 15; - float LKEKINJEGLO = 11; + float IGBDAFGNEAH = 1; + HitColliderType hit_collider_type = 3; + int32 hit_box_index = 4; + Vector hit_point = 8; + Vector hit_dir = 9; + float PGLJPGHIPGO = 15; } diff --git a/proto/HomeAnimalData.proto b/proto/HomeAnimalData.proto index 617010f9..d49db20b 100644 --- a/proto/HomeAnimalData.proto +++ b/proto/HomeAnimalData.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; -// Obf: IHNPIOGOGKD + +//obf: NJOKBNDHOJL message HomeAnimalData { - Vector spawnRot = 7; - uint32 furniture_id = 6; - Vector spawn_pos = 4; + Vector spawnRot = 10; + uint32 furniture_id = 14; + Vector spawn_pos = 15; } diff --git a/proto/HomeBasicInfo.proto b/proto/HomeBasicInfo.proto index 0e5efef9..06267c00 100644 --- a/proto/HomeBasicInfo.proto +++ b/proto/HomeBasicInfo.proto @@ -1,30 +1,16 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "HomeLimitedShopInfo.proto"; -// Obf: ICMPDPAEKNA + message HomeBasicInfo { - uint32 level = 11; - string owner_nick_name = 5; - bool is_in_edit_mode = 9; - uint32 cur_room_scene_id = 13; - uint32 cur_module_id = 8; - uint64 exp = 10; - uint32 home_owner_uid = 14; - HomeLimitedShopInfo limited_shop_info = 15; + uint32 cur_room_scene_id = 2; + uint32 level = 3; + HomeLimitedShopInfo limited_shop_info = 4; + uint32 cur_module_id = 5; + bool is_in_edit_mode = 9; + uint64 exp = 10; + uint32 KFBPCHPPMEM = 11; + uint32 home_owner_uid = 12; + string owner_nick_name = 13; } diff --git a/proto/HomeBasicInfoNotify.proto b/proto/HomeBasicInfoNotify.proto index 9c491ebc..a5b44961 100644 --- a/proto/HomeBasicInfoNotify.proto +++ b/proto/HomeBasicInfoNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "HomeBasicInfo.proto"; -// CmdId: 4186 -// Obf: NFPAMFOGOFB + +// CmdId: 25591 message HomeBasicInfoNotify { - HomeBasicInfo basic_info = 1; + HomeBasicInfo basic_info = 8; } diff --git a/proto/HomeBlockArrangementInfo.proto b/proto/HomeBlockArrangementInfo.proto index 61e36428..6a07ca66 100644 --- a/proto/HomeBlockArrangementInfo.proto +++ b/proto/HomeBlockArrangementInfo.proto @@ -1,43 +1,28 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "HomeBlockDotPattern.proto"; + import "HomeFurnitureData.proto"; -import "HomeFurnitureSuiteData.proto"; -import "HomeFurnitureCustomSuiteData.proto"; import "HomeFurnitureGroupData.proto"; import "HomeAnimalData.proto"; -import "HomeBlockFieldData.proto"; +import "HomeFurnitureCustomSuiteData.proto"; import "HomeNpcData.proto"; +import "HomeBlockFieldData.proto"; +import "HomeBlockDotPattern.proto"; +import "HomeFurnitureSuiteData.proto"; import "WeekendDjinnInfo.proto"; -// Obf: KOODNOKODIG + message HomeBlockArrangementInfo { - repeated HomeBlockDotPattern dot_pattern_list = 1; - repeated HomeFurnitureData deployFurniureList = 12; - repeated HomeFurnitureSuiteData furniture_suite_list = 14; - repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2; - uint32 block_id = 8; - repeated HomeFurnitureGroupData furniture_group_list = 4; - repeated HomeAnimalData deploy_animal_list = 15; - repeated HomeBlockFieldData field_list = 11; - uint32 comfort_value = 13; - repeated HomeFurnitureData persistentFurnitureList = 10; - repeated HomeNpcData deploy_npc_list = 9; - bool is_unlocked = 6; - repeated WeekendDjinnInfo weekend_djinn_info_list = 3; + repeated HomeFurnitureGroupData furniture_group_list = 1; + bool is_unlocked = 2; + uint32 block_id = 4; + repeated HomeFurnitureData deployFurniureList = 5; + repeated HomeAnimalData deploy_animal_list = 6; + repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 7; + repeated HomeNpcData deploy_npc_list = 8; + uint32 comfort_value = 9; + repeated HomeBlockFieldData field_list = 10; + repeated HomeBlockDotPattern dot_pattern_list = 11; + repeated HomeFurnitureData persistentFurnitureList = 13; + repeated HomeFurnitureSuiteData furniture_suite_list = 14; + repeated WeekendDjinnInfo weekend_djinn_info_list = 15; } diff --git a/proto/HomeBlockDotPattern.proto b/proto/HomeBlockDotPattern.proto index 44420719..444c7f68 100644 --- a/proto/HomeBlockDotPattern.proto +++ b/proto/HomeBlockDotPattern.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: CEIDPNFLOBJ + +//obf: IEKCEGFNINF message HomeBlockDotPattern { - uint32 width = 10; - bytes data = 8; - uint32 height = 7; + bytes data = 5; + uint32 width = 9; + uint32 height = 11; } diff --git a/proto/HomeBlockFieldData.proto b/proto/HomeBlockFieldData.proto index c07e07da..a371f8db 100644 --- a/proto/HomeBlockFieldData.proto +++ b/proto/HomeBlockFieldData.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "HomeBlockSubFieldData.proto"; + import "Vector.proto"; -// Obf: ONEIGKNNOGN +import "HomeBlockSubFieldData.proto"; + +//obf: ECDJBCPLCNO message HomeBlockFieldData { - repeated HomeBlockSubFieldData sub_field_list = 10; - uint32 furniture_id = 1; - Vector rot = 8; - Vector pos = 15; - uint32 guid = 13; + uint32 furniture_id = 4; + repeated HomeBlockSubFieldData sub_field_list = 7; + uint32 guid = 9; + Vector rot = 11; + Vector pos = 14; } diff --git a/proto/HomeBlockSubFieldData.proto b/proto/HomeBlockSubFieldData.proto index 4dc5f962..05b5bd41 100644 --- a/proto/HomeBlockSubFieldData.proto +++ b/proto/HomeBlockSubFieldData.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; -// Obf: HEOEAKDEIJA + +//obf: DLGDKPKEOEG message HomeBlockSubFieldData { - Vector rot = 2; - Vector pos = 8; + Vector rot = 8; + Vector pos = 13; } diff --git a/proto/HomeChangeModuleReq.proto b/proto/HomeChangeModuleReq.proto index 0a562a10..7d172d5f 100644 --- a/proto/HomeChangeModuleReq.proto +++ b/proto/HomeChangeModuleReq.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 1750 -// Obf: FKPCMCOEEAD + +//obf: EOPBEIGHCKC +// CmdId: 26930 message HomeChangeModuleReq { - uint32 target_module_id = 11; + uint32 target_module_id = 7; } diff --git a/proto/HomeChangeModuleRsp.proto b/proto/HomeChangeModuleRsp.proto index 3e2d32a2..33fe82eb 100644 --- a/proto/HomeChangeModuleRsp.proto +++ b/proto/HomeChangeModuleRsp.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 20550 -// Obf: HNJKLHOOECE + +//obf: HLONDLKECKC +// CmdId: 9924 message HomeChangeModuleRsp { - int32 retcode = 1; - uint32 target_module_id = 10; + int32 retcode = 3; + uint32 target_module_id = 5; } diff --git a/proto/HomeChooseModuleReq.proto b/proto/HomeChooseModuleReq.proto index b01b306d..6f5d1424 100644 --- a/proto/HomeChooseModuleReq.proto +++ b/proto/HomeChooseModuleReq.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 29914 -// Obf: AGDOOFPMMBE + message HomeChooseModuleReq { - uint32 module_id = 15; + uint32 module_id = 9; } diff --git a/proto/HomeChooseModuleRsp.proto b/proto/HomeChooseModuleRsp.proto index 3812219b..0eca227b 100644 --- a/proto/HomeChooseModuleRsp.proto +++ b/proto/HomeChooseModuleRsp.proto @@ -1,24 +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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 20087 -// Obf: JHDBAFEAKGO + message HomeChooseModuleRsp { - uint32 module_id = 7; - int32 retcode = 1; + uint32 module_id = 6; + int32 retcode = 11; } diff --git a/proto/HomeComfortInfoNotify.proto b/proto/HomeComfortInfoNotify.proto index c53312e7..8c79a5c2 100644 --- a/proto/HomeComfortInfoNotify.proto +++ b/proto/HomeComfortInfoNotify.proto @@ -1,24 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "HomeModuleComfortInfo.proto"; -// CmdId: 4153 -// Obf: CHCBFKOPHLG + message HomeComfortInfoNotify { - repeated HomeModuleComfortInfo module_info_list = 11; + repeated HomeModuleComfortInfo module_info_list = 11; } diff --git a/proto/HomeFurnitureCustomSuiteData.proto b/proto/HomeFurnitureCustomSuiteData.proto index 99753739..46473f70 100644 --- a/proto/HomeFurnitureCustomSuiteData.proto +++ b/proto/HomeFurnitureCustomSuiteData.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; -// Obf: POCJBKACJPC + +//obf: ECIIKJIKNFC message HomeFurnitureCustomSuiteData { - repeated int32 included_furniture_index_list = 7; - Vector spawn_pos = 14; - uint32 guid = 10; + uint32 guid = 9; + repeated int32 included_furniture_index_list = 10; + Vector spawn_pos = 11; } diff --git a/proto/HomeFurnitureData.proto b/proto/HomeFurnitureData.proto index 0eed797a..d0165ae8 100644 --- a/proto/HomeFurnitureData.proto +++ b/proto/HomeFurnitureData.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; -// Obf: MICPALMIGLK + +//obf: DJKBKLKPFML message HomeFurnitureData { - uint32 guid = 4; - Vector spawnRot = 5; - uint32 furniture_id = 14; - uint32 version = 1; - int32 parent_furniture_index = 8; - Vector spawn_pos = 11; + uint32 version = 3; + int32 parent_furniture_index = 4; + Vector spawn_pos = 5; + Vector spawnRot = 12; + uint32 furniture_id = 14; + uint32 guid = 15; } diff --git a/proto/HomeFurnitureGroupData.proto b/proto/HomeFurnitureGroupData.proto index 2c0405f2..02eb4bb8 100644 --- a/proto/HomeFurnitureGroupData.proto +++ b/proto/HomeFurnitureGroupData.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "HomeFurnitureData.proto"; -// Obf: HFMLKOOJPAO + +//obf: NFNCNNJLKJH message HomeFurnitureGroupData { - uint32 group_furniture_index = 9; - repeated HomeFurnitureData virtual_furniure_list = 15; + repeated HomeFurnitureData virtual_furniure_list = 5; + uint32 group_furniture_index = 8; } diff --git a/proto/HomeFurnitureSuiteData.proto b/proto/HomeFurnitureSuiteData.proto index 1cf61503..4eb61291 100644 --- a/proto/HomeFurnitureSuiteData.proto +++ b/proto/HomeFurnitureSuiteData.proto @@ -1,27 +1,13 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; -// Obf: EKELBKHKMLP + +//obf: JGGCDILKLJF message HomeFurnitureSuiteData { - Vector spawn_pos = 14; - uint32 guid = 10; - uint32 suite_id = 8; - repeated int32 included_furniture_index_list = 3; - bool is_allow_summon = 7; + repeated int32 included_furniture_index_list = 1; + uint32 guid = 5; + uint32 suite_id = 6; + bool is_allow_summon = 8; + Vector spawn_pos = 11; } diff --git a/proto/HomeLimitedShopInfo.proto b/proto/HomeLimitedShopInfo.proto index d07d8b0d..e44f2b42 100644 --- a/proto/HomeLimitedShopInfo.proto +++ b/proto/HomeLimitedShopInfo.proto @@ -1,28 +1,13 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; -// Obf: BOPJHGACPAM + message HomeLimitedShopInfo { - fixed32 end_time = 13; - fixed32 start_time = 6; - fixed32 LMJPHDCDAJK = 15; - Vector djinn_rot = 7; - Vector djinn_pos = 8; - uint32 uid = 2; + fixed32 end_time = 3; + Vector djinn_rot = 7; + fixed32 start_time = 8; + fixed32 CPOCMEGMECF = 11; + uint32 uid = 12; + Vector djinn_pos = 13; } diff --git a/proto/HomeMarkPointFurnitureData.proto b/proto/HomeMarkPointFurnitureData.proto index e88dc6ec..b1667f89 100644 --- a/proto/HomeMarkPointFurnitureData.proto +++ b/proto/HomeMarkPointFurnitureData.proto @@ -1,32 +1,17 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; import "HomeMarkPointNPCData.proto"; import "HomeMarkPointSuiteData.proto"; -// Obf: MDHHDACNAEL + message HomeMarkPointFurnitureData { - uint32 guid = 1; - uint32 furniture_id = 2; - uint32 furniture_type = 3; - Vector pos = 4; - oneof extra { - HomeMarkPointNPCData npc_data = 6; - HomeMarkPointSuiteData suite_data = 7; - } + uint32 guid = 1; + uint32 furniture_id = 2; + uint32 furniture_type = 3; + Vector pos = 4; + oneof data { + HomeMarkPointNPCData npc_data = 6; + HomeMarkPointSuiteData suite_data = 7; + } } diff --git a/proto/HomeMarkPointNPCData.proto b/proto/HomeMarkPointNPCData.proto index cf79555a..32b71eb6 100644 --- a/proto/HomeMarkPointNPCData.proto +++ b/proto/HomeMarkPointNPCData.proto @@ -1,23 +1,7 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: DEEONIENNBB + message HomeMarkPointNPCData { - uint32 avatar_id = 1; - uint32 costume_id = 2; + uint32 avatar_id = 1; + uint32 costume_id = 2; } diff --git a/proto/HomeMarkPointNotify.proto b/proto/HomeMarkPointNotify.proto index d23bed57..bd008514 100644 --- a/proto/HomeMarkPointNotify.proto +++ b/proto/HomeMarkPointNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "HomeMarkPointSceneData.proto"; -// CmdId: 23013 -// Obf: GKDFNALJFOI + +// CmdId: 7160 message HomeMarkPointNotify { - repeated HomeMarkPointSceneData mark_point_data_list = 2; + repeated HomeMarkPointSceneData mark_point_data_list = 6; } diff --git a/proto/HomeMarkPointSceneData.proto b/proto/HomeMarkPointSceneData.proto index 40984e3f..c32e24c2 100644 --- a/proto/HomeMarkPointSceneData.proto +++ b/proto/HomeMarkPointSceneData.proto @@ -1,28 +1,13 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "HomeMarkPointFurnitureData.proto"; + import "Vector.proto"; -// Obf: OKNHJBLIEGA +import "HomeMarkPointFurnitureData.proto"; + message HomeMarkPointSceneData { - repeated HomeMarkPointFurnitureData furniture_list = 7; - Vector safe_point_pos = 8; - uint32 module_id = 9; - uint32 scene_id = 5; - Vector teapot_spirit_pos = 3; + Vector teapot_spirit_pos = 1; + Vector safe_point_pos = 2; + uint32 module_id = 4; + uint32 scene_id = 12; + repeated HomeMarkPointFurnitureData furniture_list = 14; } diff --git a/proto/HomeMarkPointSuiteData.proto b/proto/HomeMarkPointSuiteData.proto index e6beb992..2c97adba 100644 --- a/proto/HomeMarkPointSuiteData.proto +++ b/proto/HomeMarkPointSuiteData.proto @@ -1,22 +1,6 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: KMHJEPCDMMK + message HomeMarkPointSuiteData { - uint32 suite_id = 1; + uint32 suite_id = 1; } diff --git a/proto/HomeModuleComfortInfo.proto b/proto/HomeModuleComfortInfo.proto index 5a6ac8a5..e9fc55bf 100644 --- a/proto/HomeModuleComfortInfo.proto +++ b/proto/HomeModuleComfortInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: GCMBDAFNLEG + +// 4.6.0 message HomeModuleComfortInfo { - uint32 room_scene_comfort_value = 2; - repeated uint32 world_scene_block_comfort_value_list = 10; - uint32 module_id = 3; -} + repeated uint32 world_scene_block_comfort_value_list = 6; + uint32 room_scene_comfort_value = 7; + uint32 module_id = 8; +} \ No newline at end of file diff --git a/proto/HomeModuleUnlockNotify.proto b/proto/HomeModuleUnlockNotify.proto index 344b55af..6abd9d5b 100644 --- a/proto/HomeModuleUnlockNotify.proto +++ b/proto/HomeModuleUnlockNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 811 -// Obf: HFALGGLELPP + +//obf: HGGIEPGKANG +// CmdId: 768 message HomeModuleUnlockNotify { - uint32 module_id = 6; + uint32 module_id = 8; } diff --git a/proto/HomeNpcData.proto b/proto/HomeNpcData.proto index 5045a6e8..95183f1d 100644 --- a/proto/HomeNpcData.proto +++ b/proto/HomeNpcData.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; -// Obf: JOHOIPNEGBM + +//obf: EGLCPDHFGPB message HomeNpcData { - Vector spawnRot = 12; - uint32 avatar_id = 10; - Vector spawn_pos = 2; - uint32 costume_id = 1; + Vector spawnRot = 2; + uint32 avatar_id = 5; + Vector spawn_pos = 7; + uint32 costume_id = 8; } diff --git a/proto/HomeResource.proto b/proto/HomeResource.proto index d7bae27c..4f0b9335 100644 --- a/proto/HomeResource.proto +++ b/proto/HomeResource.proto @@ -1,24 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: NFFHIBBIIKB + message HomeResource { - uint32 store_limit = 1; - fixed32 next_refresh_time = 5; - uint32 store_value = 3; + uint32 store_value = 5; + uint32 store_limit = 9; + fixed32 next_refresh_time = 13; } diff --git a/proto/HomeResourceNotify.proto b/proto/HomeResourceNotify.proto index e11c0909..8d282d3e 100644 --- a/proto/HomeResourceNotify.proto +++ b/proto/HomeResourceNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "HomeResource.proto"; -// CmdId: 5204 -// Obf: MCCGNBOJCCK + +// CmdId: 21381 message HomeResourceNotify { - HomeResource fetter_exp = 1; - HomeResource home_coin = 12; + HomeResource fetter_exp = 7; + HomeResource home_coin = 10; } diff --git a/proto/HomeTransferReq.proto b/proto/HomeTransferReq.proto index 35b1f195..40398843 100644 --- a/proto/HomeTransferReq.proto +++ b/proto/HomeTransferReq.proto @@ -1,25 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 28287 -// Obf: LEOKBBDBAKN + +// CmdId: 3980 message HomeTransferReq { - uint32 guid = 12; - bool is_transfer_to_main_house_point = 5; - bool is_transfer_to_safe_point = 3; + bool is_transfer_to_safe_point = 1; + bool is_transfer_to_main_house_point = 11; + uint32 guid = 12; } diff --git a/proto/HostPlayerNotify.proto b/proto/HostPlayerNotify.proto index 0c2e2147..e87d52c7 100644 --- a/proto/HostPlayerNotify.proto +++ b/proto/HostPlayerNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 9459 -// Obf: JBPDNKOINAN + +// 4.6.0 +// CmdId: 29741 message HostPlayerNotify { - uint32 host_uid = 8; - uint32 host_peer_id = 7; -} + uint32 host_peer_id = 3; + uint32 host_uid = 5; +} \ No newline at end of file diff --git a/proto/Item.proto b/proto/Item.proto index 6d9e4555..18287342 100644 --- a/proto/Item.proto +++ b/proto/Item.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Material.proto"; import "Equip.proto"; import "Furniture.proto"; -// Obf: EPFDENHAINI + +// 4.6.0 message Item { uint32 item_id = 1; uint64 guid = 2; @@ -28,4 +14,4 @@ message Item { Equip equip = 6; Furniture furniture = 7; } -} +} \ No newline at end of file diff --git a/proto/ItemGivingReq.proto b/proto/ItemGivingReq.proto index 0829912e..98312a5d 100644 --- a/proto/ItemGivingReq.proto +++ b/proto/ItemGivingReq.proto @@ -1,9 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "ItemParam.proto"; +// 4.6.0 +// CmdId: 204 message ItemGivingReq { - repeated ItemParam item_param_list = 10; - map item_guid_count_map = 6; - uint32 giving_id = 11; -} + map DLNKNDCAAHI = 2; + uint32 giving_id = 6; + repeated ItemParam item_param_list = 14; +} \ No newline at end of file diff --git a/proto/ItemGivingRsp.proto b/proto/ItemGivingRsp.proto index 969e53f1..44869cd7 100644 --- a/proto/ItemGivingRsp.proto +++ b/proto/ItemGivingRsp.proto @@ -1,8 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 5880 message ItemGivingRsp { - uint32 giving_id = 6; - uint32 giving_group_id = 15; - int32 retcode = 10; -} + int32 retcode = 7; + uint32 giving_id = 9; + uint32 giving_group_id = 10; +} \ No newline at end of file diff --git a/proto/ItemParam.proto b/proto/ItemParam.proto index 2be5167e..e2156c33 100644 --- a/proto/ItemParam.proto +++ b/proto/ItemParam.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: GKCILFACLDH diff --git a/proto/LevelupCityRsp.proto b/proto/LevelupCityRsp.proto index 6cd48090..7978f1f5 100644 --- a/proto/LevelupCityRsp.proto +++ b/proto/LevelupCityRsp.proto @@ -1,27 +1,13 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "CityInfo.proto"; -// CmdId: 9797 -// Obf: IOPGGBHIHIC + +// 4.6.0 +// CmdId: 4665 message LevelupCityRsp { - CityInfo city_info = 13; + CityInfo city_info = 3; uint32 scene_id = 12; - uint32 area_id = 8; - int32 retcode = 3; -} + int32 retcode = 13; + uint32 area_id = 14; +} \ No newline at end of file diff --git a/proto/LifeStateChangeNotify.proto b/proto/LifeStateChangeNotify.proto index aac11a6b..6cc31527 100644 --- a/proto/LifeStateChangeNotify.proto +++ b/proto/LifeStateChangeNotify.proto @@ -1,14 +1,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "ServerBuff.proto"; import "PlayerDieType.proto"; +// 4.6.0 +// CmdId: 2096 message LifeStateChangeNotify { - string attack_tag = 12; - repeated ServerBuff server_buff_list = 13; - uint32 source_entity_id = 9; - PlayerDieType die_type = 8; - uint32 entity_id = 7; - uint32 life_state = 3; - uint32 move_reliable_seq = 1; -} + repeated ServerBuff server_buff_list = 1; + uint32 move_reliable_seq = 2; + string attack_tag = 3; + uint32 entity_id = 5; + uint32 life_state = 12; + uint32 source_entity_id = 13; + PlayerDieType die_type = 14; +} \ No newline at end of file diff --git a/proto/LuaSetOptionNotify.proto b/proto/LuaSetOptionNotify.proto new file mode 100644 index 00000000..6d0e1ed0 --- /dev/null +++ b/proto/LuaSetOptionNotify.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +// 4.6.0 +// CmdId: 850 +message LuaSetOptionNotify { + enum LuaOptionType { + LUA_OPTION_NONE = 0; + LUA_OPTION_PLAYER_INPUT = 1; + } + + LuaOptionType option_type = 9; + string lua_set_param = 15; +} \ No newline at end of file diff --git a/proto/MGHDLMIEMLI.proto b/proto/MGHDLMIEMLI.proto new file mode 100644 index 00000000..86bad183 --- /dev/null +++ b/proto/MGHDLMIEMLI.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +import "DetailAbilityInfo.proto"; + +message MGHDLMIEMLI { + oneof ADCLBBDEGBD { + DetailAbilityInfo detail_ability_info = 9; + } +} diff --git a/proto/MPLevelEntityInfo.proto b/proto/MPLevelEntityInfo.proto index bf0c7bdb..30e983ce 100644 --- a/proto/MPLevelEntityInfo.proto +++ b/proto/MPLevelEntityInfo.proto @@ -1,9 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AbilitySyncStateInfo.proto"; +// 4.6.0 message MPLevelEntityInfo { - uint32 entity_id = 7; - AbilitySyncStateInfo ability_info = 2; - uint32 authority_peer_id = 9; -} + uint32 entity_id = 3; + uint32 authority_peer_id = 4; + AbilitySyncStateInfo ability_info = 7; +} \ No newline at end of file diff --git a/proto/MailChangeNotify.proto b/proto/MailChangeNotify.proto index 21622ab3..592a484e 100644 --- a/proto/MailChangeNotify.proto +++ b/proto/MailChangeNotify.proto @@ -1,25 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "MailData.proto"; -// CmdId: 7569 -// Obf: COPGIOFFCBJ + message MailChangeNotify { - repeated uint32 del_mail_id_list = 11; - repeated MailData mail_list = 3; + repeated uint32 del_mail_id_list = 1; + repeated MailData mail_list = 9; } diff --git a/proto/MailCollectState.proto b/proto/MailCollectState.proto index 62bc61f9..0d94d8bc 100644 --- a/proto/MailCollectState.proto +++ b/proto/MailCollectState.proto @@ -1,25 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: EDOAABBJLID + enum MailCollectState { - MAIL_COLLECT_STATE_COLLECTIBLE_UNKNOWN = 0; - MAIL_COLLECT_STATE_NOT_COLLECTIBLE = 1; - MAIL_COLLECT_STATE_COLLECTIBLE_UNCOLLECTED = 2; - MAIL_COLLECT_STATE_COLLECTIBLE_COLLECTED = 3; + MAIL_COLLECT_STATE_COLLECTIBLE_UNKNOWN = 0; + MAIL_COLLECT_STATE_NOT_COLLECTIBLE = 1; + MAIL_COLLECT_STATE_COLLECTIBLE_UNCOLLECTED = 2; + MAIL_COLLECT_STATE_COLLECTIBLE_COLLECTED = 3; } diff --git a/proto/MailData.proto b/proto/MailData.proto index ad58e3bb..94b2744c 100644 --- a/proto/MailData.proto +++ b/proto/MailData.proto @@ -1,35 +1,20 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "MailTextContent.proto"; import "MailItem.proto"; import "MailCollectState.proto"; -// Obf: NGGHHPIHNPM + message MailData { - uint32 mailId = 1; - MailTextContent mail_text_content = 4; - repeated MailItem item_list = 7; - uint32 send_time = 8; - uint32 expire_time = 9; - uint32 importance = 10; - bool is_read = 11; - bool is_attachment_got = 12; - uint32 config_id = 13; - repeated string argument_list = 14; - MailCollectState collect_state = 15; + uint32 mailId = 1; + MailTextContent mail_text_content = 4; + repeated MailItem item_list = 7; + uint32 send_time = 8; + uint32 expire_time = 9; + uint32 importance = 10; + bool is_read = 11; + bool is_attachment_got = 12; + uint32 config_id = 13; + repeated string argument_list = 14; + MailCollectState collect_state = 15; } diff --git a/proto/MailItem.proto b/proto/MailItem.proto index fe743b74..8b98b6a0 100644 --- a/proto/MailItem.proto +++ b/proto/MailItem.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "EquipParam.proto"; import "MaterialDeleteInfo.proto"; -// Obf: BNPJNAPNHKB + message MailItem { - EquipParam equip_param = 1; - MaterialDeleteInfo delete_info = 2; + EquipParam equip_param = 1; + MaterialDeleteInfo delete_info = 2; } diff --git a/proto/MailTextContent.proto b/proto/MailTextContent.proto index 1a1847d4..1626d61a 100644 --- a/proto/MailTextContent.proto +++ b/proto/MailTextContent.proto @@ -1,24 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: GONDLGCFODB + message MailTextContent { - string title = 1; - string content = 2; - string sender = 3; + string title = 1; + string content = 2; + string sender = 3; } diff --git a/proto/MapMarkFromType.proto b/proto/MapMarkFromType.proto index 16bd240f..98d1eefd 100644 --- a/proto/MapMarkFromType.proto +++ b/proto/MapMarkFromType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: MNFIJMCNPLC + +// 4.6.0 enum MapMarkFromType { MAP_MARK_FROM_TYPE_NONE = 0; MAP_MARK_FROM_TYPE_MONSTER = 1; MAP_MARK_FROM_TYPE_QUEST = 2; -} +} \ No newline at end of file diff --git a/proto/MapMarkPoint.proto b/proto/MapMarkPoint.proto index 6474c8b7..c9499480 100644 --- a/proto/MapMarkPoint.proto +++ b/proto/MapMarkPoint.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "Vector.proto"; -import "MapMarkPointType.proto"; + import "MapMarkFromType.proto"; -// Obf: HJDOENNHBIL +import "MapMarkPointType.proto"; +import "Vector.proto"; + +// 4.6.0 message MapMarkPoint { uint32 scene_id = 1; string name = 2; @@ -28,5 +14,5 @@ message MapMarkPoint { uint32 monster_id = 5; MapMarkFromType from_type = 6; uint32 quest_id = 7; - uint32 HJMMAOMEHOL = 8; -} + uint32 PCINBMGKKDJ = 8; +} \ No newline at end of file diff --git a/proto/MapMarkPointType.proto b/proto/MapMarkPointType.proto index e269e093..e0d8a7ac 100644 --- a/proto/MapMarkPointType.proto +++ b/proto/MapMarkPointType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: BPDPOCMBCLI + +// 4.6.0 enum MapMarkPointType { MAP_MARK_POINT_TYPE_NPC = 0; MAP_MARK_POINT_TYPE_QUEST = 1; @@ -25,4 +10,4 @@ enum MapMarkPointType { MAP_MARK_POINT_TYPE_COLLECTION = 4; MAP_MARK_POINT_TYPE_MONSTER = 5; MAP_MARK_POINT_TYPE_FISH_POOL = 6; -} +} \ No newline at end of file diff --git a/proto/MarkMapReq.proto b/proto/MarkMapReq.proto index 98ee360a..b429acae 100644 --- a/proto/MarkMapReq.proto +++ b/proto/MarkMapReq.proto @@ -1,17 +1,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "MapMarkPoint.proto"; +// 4.6.0 +// CmdId: 1319 message MarkMapReq { - enum Operation { OPERATION_ADD = 0; OPERATION_MOD = 1; OPERATION_DEL = 2; OPERATION_GET = 3; } - - MapMarkPoint mark = 4; - Operation op = 11; - MapMarkPoint old = 2; + + MapMarkPoint old = 1; + MapMarkPoint mark = 11; + Operation op = 12; } diff --git a/proto/MarkMapRsp.proto b/proto/MarkMapRsp.proto index 703242d4..ff895ed7 100644 --- a/proto/MarkMapRsp.proto +++ b/proto/MarkMapRsp.proto @@ -1,8 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "MapMarkPoint.proto"; +// 4.6.0 +// CmdId: 1360 message MarkMapRsp { - int32 retcode = 4; - repeated MapMarkPoint mark_list = 14; -} + int32 retcode = 2; + repeated MapMarkPoint mark_list = 6; +} \ No newline at end of file diff --git a/proto/MassiveEntityElementOpBatchNotify.proto b/proto/MassiveEntityElementOpBatchNotify.proto index 965233a9..b4c94abc 100644 --- a/proto/MassiveEntityElementOpBatchNotify.proto +++ b/proto/MassiveEntityElementOpBatchNotify.proto @@ -1,35 +1,21 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "ShapeSphere.proto"; import "ShapeBox.proto"; -// CmdId: 699 -// Obf: FLIFJJHNFJO + +//obf: JHFHDMCIFPP +// CmdId: 9010 message MassiveEntityElementOpBatchNotify { - int32 PIGDAOBDKBB = 7; - uint32 op_idx = 4; - uint32 user_id = 13; - uint32 attacker_id = 1; - int32 entity_type = 10; - int32 IOJOIDKOIBH = 9; - oneof check_shape { - ShapeSphere shape_sphere = 12; - ShapeBox shape_box = 11; - } - float attack_element_durability = 14; + int32 NOMMJMBBCGJ = 3; + uint32 op_idx = 8; + uint32 user_id = 9; + uint32 attacker_id = 11; + int32 entity_type = 12; + float attack_element_durability = 13; + int32 DDPJBEMDEEM = 14; + oneof shape { + ShapeSphere shape_sphere = 6; + ShapeBox shape_box = 1; + } } diff --git a/proto/MassivePropParam.proto b/proto/MassivePropParam.proto index 8e7e96e8..cee31737 100644 --- a/proto/MassivePropParam.proto +++ b/proto/MassivePropParam.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: BDEEMMBPFDH + +// 4.6.0 message MassivePropParam { int32 type = 1; repeated uint32 reaction_info_list = 2; repeated float param_list = 3; uint32 sync_flag = 4; -} +} \ No newline at end of file diff --git a/proto/MassivePropSyncInfo.proto b/proto/MassivePropSyncInfo.proto index 2a69e865..bd5646a7 100644 --- a/proto/MassivePropSyncInfo.proto +++ b/proto/MassivePropSyncInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "MassivePropParam.proto"; -// Obf: HMEMJBACNJE + +// 4.6.0 message MassivePropSyncInfo { int64 id = 1; repeated MassivePropParam prop_list = 2; -} +} \ No newline at end of file diff --git a/proto/Material.proto b/proto/Material.proto index bcd69955..36da99ac 100644 --- a/proto/Material.proto +++ b/proto/Material.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "MaterialDeleteInfo.proto"; -// Obf: LCHIHMEJNML + +// 4.6.0 message Material { uint32 count = 1; MaterialDeleteInfo delete_info = 2; -} +} \ No newline at end of file diff --git a/proto/MaterialDeleteInfo.proto b/proto/MaterialDeleteInfo.proto index cca022ab..f63e5ac7 100644 --- a/proto/MaterialDeleteInfo.proto +++ b/proto/MaterialDeleteInfo.proto @@ -1,45 +1,27 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: FNECFKCJNOG + +// 4.6.0 message MaterialDeleteInfo { - // Obf: OKEMONGEMOM message CountDownDelete { map delete_time_num_map = 1; uint32 config_count_down_time = 2; } - - // Obf: FBKLFJIOOPN + message DateTimeDelete { uint32 delete_time = 1; } - - // Obf: HMLHBMKPHCA + message DelayWeekCountDownDelete { map delete_time_num_map = 1; uint32 config_delay_week = 2; uint32 config_count_down_time = 3; } - + bool has_delete_config = 1; oneof delete_info { CountDownDelete count_down_delete = 2; DateTimeDelete date_delete = 3; DelayWeekCountDownDelete delay_week_count_down_delete = 4; } -} +} \ No newline at end of file diff --git a/proto/MathQuaternion.proto b/proto/MathQuaternion.proto index 597e2727..4afdabd1 100644 --- a/proto/MathQuaternion.proto +++ b/proto/MathQuaternion.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: IPIFDKJKEEJ diff --git a/proto/ModifierDurability.proto b/proto/ModifierDurability.proto index 59345593..2525dad5 100644 --- a/proto/ModifierDurability.proto +++ b/proto/ModifierDurability.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: GCNLPIHMJOL + +// 4.6.0 message ModifierDurability { float reduce_ratio = 1; float remaining_durability = 2; -} +} \ No newline at end of file diff --git a/proto/MonsterBornType.proto b/proto/MonsterBornType.proto index 69aa4752..64973b09 100644 --- a/proto/MonsterBornType.proto +++ b/proto/MonsterBornType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: LNFJOAGMCEF diff --git a/proto/MonsterRoute.proto b/proto/MonsterRoute.proto index 9d021083..b9c28697 100644 --- a/proto/MonsterRoute.proto +++ b/proto/MonsterRoute.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "RoutePoint.proto"; diff --git a/proto/MotionInfo.proto b/proto/MotionInfo.proto index 6429c803..a2546b57 100644 --- a/proto/MotionInfo.proto +++ b/proto/MotionInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; diff --git a/proto/MotionState.proto b/proto/MotionState.proto index abd7afac..1b8ded2d 100644 --- a/proto/MotionState.proto +++ b/proto/MotionState.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: KGHLDGDMFOB diff --git a/proto/MovingPlatformType.proto b/proto/MovingPlatformType.proto index 51c1f04c..b1bb00e7 100644 --- a/proto/MovingPlatformType.proto +++ b/proto/MovingPlatformType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: FMMMMIIKELD diff --git a/proto/MpPlayRewardInfo.proto b/proto/MpPlayRewardInfo.proto index 0b2df823..55ce4266 100644 --- a/proto/MpPlayRewardInfo.proto +++ b/proto/MpPlayRewardInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: BGGFBNKFLHN diff --git a/proto/MpSettingType.proto b/proto/MpSettingType.proto index feb1bf2d..2bcf9277 100644 --- a/proto/MpSettingType.proto +++ b/proto/MpSettingType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: BICPJCKHOPA diff --git a/proto/MsgParam.proto b/proto/MsgParam.proto new file mode 100644 index 00000000..ac974a7d --- /dev/null +++ b/proto/MsgParam.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +// 4.6.0 +message MsgParam { + oneof param { + uint32 int_param = 8; + float flt_param = 10; + string str_param = 12; + } +} \ No newline at end of file diff --git a/proto/NightCrowGadgetInfo.proto b/proto/NightCrowGadgetInfo.proto index 3f956158..ef1f0278 100644 --- a/proto/NightCrowGadgetInfo.proto +++ b/proto/NightCrowGadgetInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: OHIBCIDJNDB diff --git a/proto/OfferingInfo.proto b/proto/OfferingInfo.proto index 479eefb2..600100cf 100644 --- a/proto/OfferingInfo.proto +++ b/proto/OfferingInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: CDAACMGIFGG diff --git a/proto/OnlinePlayerInfo.proto b/proto/OnlinePlayerInfo.proto index dcf772d5..8a4a2ee3 100644 --- a/proto/OnlinePlayerInfo.proto +++ b/proto/OnlinePlayerInfo.proto @@ -2,18 +2,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "MpSettingType.proto"; import "ProfilePicture.proto"; +// Obf: BJKIIJGIJPA message OnlinePlayerInfo { - string signature = 11; - ProfilePicture profile_picture = 12; - repeated uint32 blacklist_uid_list = 10; - string online_id = 8; - string nickname = 2; - string psn_id = 13; - uint32 avatar_id = 4; - uint32 name_card_id = 9; - uint32 uid = 1; - uint32 cur_player_num_in_world = 3; - MpSettingType mp_setting_type = 5; - uint32 player_level = 6; - uint32 world_level = 7; -} \ No newline at end of file + uint32 uid = 1; + string nickname = 2; + uint32 player_level = 3; + uint32 avatar_id = 4; + MpSettingType mp_setting_type = 5; + uint32 cur_player_num_in_world = 6; + uint32 world_level = 7; + string online_id = 8; + uint32 name_card_id = 9; + repeated uint32 blacklist_uid_list = 10; + string signature = 11; + ProfilePicture profile_picture = 12; + string psn_id = 13; +} diff --git a/proto/OpenStateChangeNotify.proto b/proto/OpenStateChangeNotify.proto index 554d156c..907ae5ea 100644 --- a/proto/OpenStateChangeNotify.proto +++ b/proto/OpenStateChangeNotify.proto @@ -1,6 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 24469 message OpenStateChangeNotify { - map open_state_map = 4; -} + map open_state_map = 8; +} \ No newline at end of file diff --git a/proto/OpenStateUpdateNotify.proto b/proto/OpenStateUpdateNotify.proto index 24848fac..bce641d3 100644 --- a/proto/OpenStateUpdateNotify.proto +++ b/proto/OpenStateUpdateNotify.proto @@ -1,6 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 26330 message OpenStateUpdateNotify { - map open_state_map = 11; + map open_state_map = 9; } diff --git a/proto/OtherPlayerEnterHomeNotify.proto b/proto/OtherPlayerEnterHomeNotify.proto index 099a3ef8..7c283b2e 100644 --- a/proto/OtherPlayerEnterHomeNotify.proto +++ b/proto/OtherPlayerEnterHomeNotify.proto @@ -1,31 +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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 25817 -// Obf: MGNDPKIPKGO + +// CmdId: 20379 message OtherPlayerEnterHomeNotify { - // Obf: CMPPPMNICGG - enum Reason { - INVALID = 0; - ENTER = 1; - LEAVE = 2; - } - - string nickname = 13; - Reason reason = 14; + enum Reason { + INVALID = 0; + ENTER = 1; + LEAVE = 2; + } + + Reason reason = 4; + string nickname = 7; } diff --git a/proto/PingReq.proto b/proto/PingReq.proto index c9865b49..d74fd33b 100644 --- a/proto/PingReq.proto +++ b/proto/PingReq.proto @@ -1,10 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 26105 message PingReq { - double total_tick_time = 8; - uint32 client_time = 12; - float ue_time = 13; - bytes sc_data = 14; - uint32 seq = 1; -} + bytes sc_data = 3; + double total_tick_time = 5; + uint32 seq = 9; + uint32 client_time = 11; + float ue_time = 15; +} \ No newline at end of file diff --git a/proto/PingRsp.proto b/proto/PingRsp.proto index b9190479..6de328d2 100644 --- a/proto/PingRsp.proto +++ b/proto/PingRsp.proto @@ -1,8 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 28294 message PingRsp { - uint32 seq = 15; - int32 retcode = 6; - uint32 client_time = 12; -} + uint32 seq = 6; + int32 retcode = 13; + uint32 client_time = 14; +} \ No newline at end of file diff --git a/proto/PlatformInfo.proto b/proto/PlatformInfo.proto index 056e8245..0c3d01a1 100644 --- a/proto/PlatformInfo.proto +++ b/proto/PlatformInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; diff --git a/proto/PlatformType.proto b/proto/PlatformType.proto index b95ed7ac..036a8cdf 100644 --- a/proto/PlatformType.proto +++ b/proto/PlatformType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: MLEBHNLEKAB diff --git a/proto/PlayTeamEntityInfo.proto b/proto/PlayTeamEntityInfo.proto index 74c9a49a..3fc4b59c 100644 --- a/proto/PlayTeamEntityInfo.proto +++ b/proto/PlayTeamEntityInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "AbilitySyncStateInfo.proto"; diff --git a/proto/PlayerChatNotify.proto b/proto/PlayerChatNotify.proto index c95842ff..3690db4e 100644 --- a/proto/PlayerChatNotify.proto +++ b/proto/PlayerChatNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "ChatInfo.proto"; -// CmdId: 9541 -// Obf: PAHGJBLBNBM + +// 4.6.0 +// CmdId: 9695 message PlayerChatNotify { - ChatInfo chat_info = 2; - uint32 channel_id = 11; -} + ChatInfo chat_info = 9; + uint32 channel_id = 12; +} \ No newline at end of file diff --git a/proto/PlayerChatReq.proto b/proto/PlayerChatReq.proto index ae99e6f7..1e9c76f0 100644 --- a/proto/PlayerChatReq.proto +++ b/proto/PlayerChatReq.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "ChatInfo.proto"; -// CmdId: 23230 -// Obf: FHLPMNCNEIG + +// 4.6.0 +// CmdId: 26464 message PlayerChatReq { - ChatInfo chat_info = 2; - uint32 channel_id = 7; -} + uint32 channel_id = 9; + ChatInfo chat_info = 10; +} \ No newline at end of file diff --git a/proto/PlayerChatRsp.proto b/proto/PlayerChatRsp.proto index e60de1bf..7c16364d 100644 --- a/proto/PlayerChatRsp.proto +++ b/proto/PlayerChatRsp.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 27239 -// Obf: OANNGBKFIIB + +// 4.6.0 +// CmdId: 29270 message PlayerChatRsp { - int32 retcode = 15; uint32 chat_forbidden_endtime = 1; -} + int32 retcode = 4; +} \ No newline at end of file diff --git a/proto/PlayerDataNotify.proto b/proto/PlayerDataNotify.proto index 72eceb62..9e885257 100644 --- a/proto/PlayerDataNotify.proto +++ b/proto/PlayerDataNotify.proto @@ -1,11 +1,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "PropValue.proto"; +// 4.6.0 +// CmdId: 2408 message PlayerDataNotify { uint32 region_id = 3; - map prop_map = 5; - string nick_name = 1; - bool is_first_login_today = 9; - uint64 server_time = 7; -} + map prop_map = 8; + uint64 server_time = 9; + bool is_first_login_today = 10; + string nick_name = 12; +} \ No newline at end of file diff --git a/proto/PlayerDieType.proto b/proto/PlayerDieType.proto index c9af902e..e8eaad4b 100644 --- a/proto/PlayerDieType.proto +++ b/proto/PlayerDieType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: NJLHPPKOGDB + +// 4.6.0 enum PlayerDieType { PLAYER_DIE_TYPE_NONE = 0; PLAYER_DIE_TYPE_KILL_BY_MONSTER = 1; @@ -27,4 +12,5 @@ enum PlayerDieType { PLAYER_DIE_TYPE_GM = 6; PLAYER_DIE_TYPE_CLIMATE_COLD = 7; PLAYER_DIE_TYPE_STORM_LIGHTING = 8; -} + PLAYER_DIE_TYPE_DIRTY_WATER_EROSION = 9; +} \ No newline at end of file diff --git a/proto/PlayerEnterSceneInfoNotify.proto b/proto/PlayerEnterSceneInfoNotify.proto index 64858a6e..7354495c 100644 --- a/proto/PlayerEnterSceneInfoNotify.proto +++ b/proto/PlayerEnterSceneInfoNotify.proto @@ -1,13 +1,16 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + +import "TeamEnterSceneInfo.proto"; import "MPLevelEntityInfo.proto"; import "AvatarEnterSceneInfo.proto"; -import "TeamEnterSceneInfo.proto"; +// 4.6.0 +// CmdId: 1006 message PlayerEnterSceneInfoNotify { + TeamEnterSceneInfo team_enter_info = 10; + MPLevelEntityInfo mp_level_entity_info = 11; + repeated AvatarEnterSceneInfo avatar_enter_info = 5; uint32 cur_avatar_entity_id = 12; - uint32 enter_scene_token = 15; - MPLevelEntityInfo mp_level_entity_info = 1; - repeated AvatarEnterSceneInfo avatar_enter_info = 11; - TeamEnterSceneInfo team_enter_info = 13; -} + uint32 enter_scene_token = 9; +} \ No newline at end of file diff --git a/proto/PlayerEnterSceneNotify.proto b/proto/PlayerEnterSceneNotify.proto index d661fdcc..1067eb33 100644 --- a/proto/PlayerEnterSceneNotify.proto +++ b/proto/PlayerEnterSceneNotify.proto @@ -1,26 +1,23 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "MapLayerInfo.proto"; + import "Vector.proto"; import "EnterType.proto"; -// check + +// 4.6.0 +// CmdId: 21317 message PlayerEnterSceneNotify { - string scene_transaction = 1232; // 45 - MapLayerInfo map_layer_info = 897; - bool is_skip_ui = 3; - uint32 prev_scene_id = 8; // OK - bool is_first_login_enter_scene = 164; - uint32 target_uid = 9; // 45 - repeated uint32 scene_tag_id_list = 12; // 45 - Vector prev_pos = 1813; // 45 - uint32 enter_scene_token = 4; // 45 - uint32 world_type = 1327; - EnterType type = 10; // 45 - uint32 enter_reason = 670; - Vector pos = 14; // 45 - uint64 scene_begin_time = 2; // 45 - uint32 world_level = 5; // OK - uint32 dungeon_id = 11; - uint32 scene_id = 7; // 45 - uint32 create_player_uid = 1173; // 45 -} + //MapLayerInfo map_layer_info = 317; + EnterType type = 2;//sus + repeated uint32 scene_tag_id_list = 9; + uint32 world_level = 3; + uint32 target_uid = 14;//14 or 189 + uint32 create_player_uid = 189;//14 or 189 + Vector pos = 13; + uint32 scene_id = 7; + string scene_transaction = 120; + uint32 enter_scene_token = 15; + uint64 scene_begin_time = 6; + bool is_skip_ui = 376;//sus + uint32 dungeon_id = 1999;//wrong +} \ No newline at end of file diff --git a/proto/PlayerGameTimeNotify.proto b/proto/PlayerGameTimeNotify.proto index a1c2213a..c0e952c8 100644 --- a/proto/PlayerGameTimeNotify.proto +++ b/proto/PlayerGameTimeNotify.proto @@ -1,8 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 26499 message PlayerGameTimeNotify { - uint32 game_time = 13; - bool is_home = 14; - uint32 uid = 11; -} + uint32 uid = 4; + uint32 game_time = 6; + bool is_home = 11; +} \ No newline at end of file diff --git a/proto/PlayerHomeCompInfo.proto b/proto/PlayerHomeCompInfo.proto index 44120f21..9d1c5928 100644 --- a/proto/PlayerHomeCompInfo.proto +++ b/proto/PlayerHomeCompInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "FriendEnterHomeOption.proto"; -// Obf: GJLOEDNEKNN + message PlayerHomeCompInfo { - repeated uint32 levelup_reward_got_level_list = 3; - repeated uint32 unlocked_module_id_list = 10; - repeated uint32 seen_module_id_list = 8; - FriendEnterHomeOption friend_enter_home_option = 15; + FriendEnterHomeOption friend_enter_home_option = 7; + repeated uint32 seen_module_id_list = 9; + repeated uint32 levelup_reward_got_level_list = 13; + repeated uint32 unlocked_module_id_list = 15; } diff --git a/proto/PlayerHomeCompInfoNotify.proto b/proto/PlayerHomeCompInfoNotify.proto index cfa38ef5..af571054 100644 --- a/proto/PlayerHomeCompInfoNotify.proto +++ b/proto/PlayerHomeCompInfoNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "PlayerHomeCompInfo.proto"; -// CmdId: 365 -// Obf: JIGJFLJCOGP + +// 4.6.0 +// CmdId: 9764 message PlayerHomeCompInfoNotify { - PlayerHomeCompInfo comp_info = 2; + PlayerHomeCompInfo comp_info = 13; } diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto index 148c1033..b5956742 100644 --- a/proto/PlayerLoginReq.proto +++ b/proto/PlayerLoginReq.proto @@ -1,10 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 27601 message PlayerLoginReq { - string device_info = 5; - string device_name = 3; - string system_version = 13; - string client_version = 4; - string token = 14; -} + string device_info = 9; + string device_name = 13; + string system_version = 12; + uint32 platform_type = 7; + string token = 1; + string checksum_client_version = 868; +} \ No newline at end of file diff --git a/proto/PlayerLoginRsp.proto b/proto/PlayerLoginRsp.proto index 80898ed5..8dc453a1 100644 --- a/proto/PlayerLoginRsp.proto +++ b/proto/PlayerLoginRsp.proto @@ -1,47 +1,17 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ShortAbilityHashPair.proto"; -import "FeatureBlockInfo.proto"; -import "BlockInfo.proto"; -import "ResVersionConfig.proto"; -import "StopServerInfo.proto"; +import "ResVersionConfig.proto"; +//import "ShortAbilityHashPair.proto"; + +// 4.6.0 +// CmdId: 25507 message PlayerLoginRsp { - string game_biz = 14; - string country_code = 915; - ResVersionConfig res_version_config = 1904; - string client_version_suffix = 1991; - map ability_hash_map = 10; - bool is_transfer = 1988; - uint32 target_home_owner_uid = 816; - bool is_data_need_relogin = 1993; - int32 ability_hash_code = 5; - repeated ShortAbilityHashPair short_ability_hash_map = 1373; - bool FBFJPEPMAOF = 15; - bool is_use_ability_hash = 16; - bool is_audit = 335; - string client_silence_md5 = 784; - string msg = 43; - repeated FeatureBlockInfo feature_block_info_list = 1627; - bool DNHHIMENOLD = 1371; - uint32 client_silence_data_version = 6; - bool PKKKINOCFMJ = 2; - int32 retcode = 8; - uint32 client_data_version = 12; - string birthday = 1688; - bool BOKKNHEOKPD = 620; - uint32 target_uid = 9; - map block_info_map = 2007; - bool GOFGOCDJDND = 281; - string next_resource_url = 986; - double total_tick_time = 262; - bytes player_data = 13; - bytes sc_info = 416; - uint64 login_rand = 3; - string ENNOCBNIHIK = 1258; - uint32 player_data_version = 11; - string client_silence_version_suffix = 211; - StopServerInfo ECKNMCACJKG = 2021; - string client_md5 = 535; - ResVersionConfig next_res_version_config = 1132; -} + string country_code = 1486; + string game_biz = 9; + ResVersionConfig res_version_config = 240; + string client_version_suffix = 1275; + string client_silence_version_suffix = 335; + uint32 client_data_version = 4; + //repeated ShortAbilityHashPair short_ability_hash_map = 1145;//sus +} \ No newline at end of file diff --git a/proto/PlayerPropChangeNotify.proto b/proto/PlayerPropChangeNotify.proto index 6b737ba9..ee3431ac 100644 --- a/proto/PlayerPropChangeNotify.proto +++ b/proto/PlayerPropChangeNotify.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 26303 message PlayerPropChangeNotify { - uint32 prop_type = 11; - uint32 prop_delta = 7; -} + uint32 prop_delta = 1; + uint32 prop_type = 2; +} \ No newline at end of file diff --git a/proto/PlayerPropChangeReasonNotify.proto b/proto/PlayerPropChangeReasonNotify.proto index 9ec6a235..1029c09a 100644 --- a/proto/PlayerPropChangeReasonNotify.proto +++ b/proto/PlayerPropChangeReasonNotify.proto @@ -1,10 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "PropChangeReason.proto"; +// 4.6.0 +// CmdId: 29305 message PlayerPropChangeReasonNotify { - PropChangeReason reason = 3; - float cur_value = 8; - uint32 prop_type = 5; - float old_value = 2; -} + float old_value = 1; + PropChangeReason reason = 6; + float cur_value = 8; + uint32 prop_type = 9; +} \ No newline at end of file diff --git a/proto/PlayerPropNotify.proto b/proto/PlayerPropNotify.proto index 370733c0..7f093563 100644 --- a/proto/PlayerPropNotify.proto +++ b/proto/PlayerPropNotify.proto @@ -1,7 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "PropValue.proto"; +// 4.6.0 +// CmdId: 26336 message PlayerPropNotify { - map prop_map = 4; -} + map prop_map = 9; +} \ No newline at end of file diff --git a/proto/PlayerQuitFromHomeNotify.proto b/proto/PlayerQuitFromHomeNotify.proto index 9b519b07..68ef7a35 100644 --- a/proto/PlayerQuitFromHomeNotify.proto +++ b/proto/PlayerQuitFromHomeNotify.proto @@ -1,34 +1,17 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 27102 -// Obf: CAIIHFNBIMA + +// CmdId: 20429 message PlayerQuitFromHomeNotify { - // Obf: ALCHPFAKDCI - enum QuitReason { - INVALID = 0; - KICK_BY_HOST = 1; - BACK_TO_MY_WORLD = 2; - HOME_BLOCKED = 3; - HOME_IN_EDIT_MODE = 4; - BY_MUIP = 5; - CUR_MODULE_CLOSED = 6; - } - - QuitReason reason = 14; + enum QuitReason { + INVALID = 0; + KICK_BY_HOST = 1; + BACK_TO_MY_WORLD = 2; + HOME_BLOCKED = 3; + HOME_IN_EDIT_MODE = 4; + BY_MUIP = 5; + CUR_MODULE_CLOSED = 6; + } + + QuitReason reason = 3; } diff --git a/proto/PlayerStoreNotify.proto b/proto/PlayerStoreNotify.proto index c9d874d6..06d15767 100644 --- a/proto/PlayerStoreNotify.proto +++ b/proto/PlayerStoreNotify.proto @@ -1,10 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "StoreType.proto"; import "Item.proto"; +// 4.6.0 +// CmdId: 24402 message PlayerStoreNotify { - repeated Item item_list = 2; - StoreType store_type = 3; - uint32 weight_limit = 7; -} + uint32 weight_limit = 3; + repeated Item item_list = 4; + StoreType store_type = 11; +} \ No newline at end of file diff --git a/proto/PlayerWidgetInfo.proto b/proto/PlayerWidgetInfo.proto index 217d45d9..b969c8f2 100644 --- a/proto/PlayerWidgetInfo.proto +++ b/proto/PlayerWidgetInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "WidgetSlotData.proto"; -// Obf: IEIPNDOKJIG + +// 4.6.0 message PlayerWidgetInfo { - repeated WidgetSlotData slot_list = 15; - uint32 uid = 6; -} + repeated WidgetSlotData slot_list = 1; + uint32 uid = 5; +} \ No newline at end of file diff --git a/proto/PostEnterSceneReq.proto b/proto/PostEnterSceneReq.proto index a6c253ef..173bbb2a 100644 --- a/proto/PostEnterSceneReq.proto +++ b/proto/PostEnterSceneReq.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 1328 message PostEnterSceneReq { - uint32 enter_scene_token = 7; - double total_tick_time = 1; + uint32 enter_scene_token = 15; + double total_tick_time = 13; } diff --git a/proto/PostEnterSceneRsp.proto b/proto/PostEnterSceneRsp.proto index 14194363..291aaae4 100644 --- a/proto/PostEnterSceneRsp.proto +++ b/proto/PostEnterSceneRsp.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 7716 message PostEnterSceneRsp { - int32 retcode = 15; - uint32 enter_scene_token = 14; -} + uint32 enter_scene_token = 6; + //int32 retcode = ?; +} \ No newline at end of file diff --git a/proto/PrivateChatNotify.proto b/proto/PrivateChatNotify.proto index 1db5dbfa..049df93b 100644 --- a/proto/PrivateChatNotify.proto +++ b/proto/PrivateChatNotify.proto @@ -1,7 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "ChatInfo.proto"; +// 4.6.0 +// CmdId: 1701 message PrivateChatNotify { - ChatInfo chat_info = 3; -} + ChatInfo chat_info = 11; +} \ No newline at end of file diff --git a/proto/PrivateChatReq.proto b/proto/PrivateChatReq.proto index f61752f5..c4eaac10 100644 --- a/proto/PrivateChatReq.proto +++ b/proto/PrivateChatReq.proto @@ -1,10 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 3342 message PrivateChatReq { - uint32 target_uid = 5; + uint32 target_uid = 6; oneof content { string text = 10; - uint32 icon = 2; + uint32 icon = 7; } -} +} \ No newline at end of file diff --git a/proto/ProfilePicture.proto b/proto/ProfilePicture.proto index 2e99b041..66eb9fad 100644 --- a/proto/ProfilePicture.proto +++ b/proto/ProfilePicture.proto @@ -1,8 +1,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// Obf: FEKJLPEAOJI message ProfilePicture { - uint32 PIFJFLMENAH = 3; - uint32 costume_id = 2; - uint32 avatar_id = 1; + uint32 avatar_id = 1; + uint32 costume_id = 2; } diff --git a/proto/PropChangeReason.proto b/proto/PropChangeReason.proto index 886222e7..8ff76a02 100644 --- a/proto/PropChangeReason.proto +++ b/proto/PropChangeReason.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: OGLAIMNKFEK diff --git a/proto/PropPair.proto b/proto/PropPair.proto index 2b5071eb..862fad3d 100644 --- a/proto/PropPair.proto +++ b/proto/PropPair.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "PropValue.proto"; diff --git a/proto/PropValue.proto b/proto/PropValue.proto index e8556edc..1adf6c87 100644 --- a/proto/PropValue.proto +++ b/proto/PropValue.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: CCOIIHFAKMA + +//4.6.0 message PropValue { uint32 type = 1; oneof value { diff --git a/proto/ProtEntityType.proto b/proto/ProtEntityType.proto index 13fa4d80..ad664a68 100644 --- a/proto/ProtEntityType.proto +++ b/proto/ProtEntityType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: HFCNMMNOEDA diff --git a/proto/PullPrivateChatReq.proto b/proto/PullPrivateChatReq.proto index 8b4dcc57..9ffcfffd 100644 --- a/proto/PullPrivateChatReq.proto +++ b/proto/PullPrivateChatReq.proto @@ -1,8 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 28619 message PullPrivateChatReq { - uint32 from_sequence = 15; - uint32 pull_num = 4; - uint32 target_uid = 7; -} + uint32 pull_num = 1; + uint32 from_sequence = 10; + uint32 target_uid = 12; +} \ No newline at end of file diff --git a/proto/PullPrivateChatRsp.proto b/proto/PullPrivateChatRsp.proto index 331dbe25..f5124e97 100644 --- a/proto/PullPrivateChatRsp.proto +++ b/proto/PullPrivateChatRsp.proto @@ -1,8 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "ChatInfo.proto"; + +//sus +// 4.6.0 +// CmdId: 26010 message PullPrivateChatRsp { - int32 retcode = 4; - repeated ChatInfo chat_info = 11; -} + repeated ChatInfo chat_info = 1; + int32 retcode = 2; +} \ No newline at end of file diff --git a/proto/PullRecentChatReq.proto b/proto/PullRecentChatReq.proto index d33b0825..30d7e81a 100644 --- a/proto/PullRecentChatReq.proto +++ b/proto/PullRecentChatReq.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 9148 message PullRecentChatReq { - uint32 begin_sequence = 9; + uint32 begin_sequence = 2; uint32 pull_num = 4; -} +} \ No newline at end of file diff --git a/proto/PullRecentChatRsp.proto b/proto/PullRecentChatRsp.proto index 27246810..a3c9d9ed 100644 --- a/proto/PullRecentChatRsp.proto +++ b/proto/PullRecentChatRsp.proto @@ -1,8 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "ChatInfo.proto"; + +//sus +// 4.6.0 +// CmdId: 1830 message PullRecentChatRsp { - repeated ChatInfo chat_info = 11; - int32 retcode = 4; -} + repeated ChatInfo chat_info = 6; + int32 retcode = 11; +} \ No newline at end of file diff --git a/proto/Reliquary.proto b/proto/Reliquary.proto index 9ad83781..f893465b 100644 --- a/proto/Reliquary.proto +++ b/proto/Reliquary.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: EGIJNLNKCFH + +// 4.6.0 message Reliquary { uint32 level = 1; uint32 exp = 2; uint32 promote_level = 3; uint32 main_prop_id = 4; repeated uint32 append_prop_id_list = 5; -} +} \ No newline at end of file diff --git a/proto/ResVersionConfig.proto b/proto/ResVersionConfig.proto index c01d6ff9..9323b4ca 100644 --- a/proto/ResVersionConfig.proto +++ b/proto/ResVersionConfig.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: DPBFMJOKIMN diff --git a/proto/RoguelikeGadgetInfo.proto b/proto/RoguelikeGadgetInfo.proto index 96f37a58..9ffc5517 100644 --- a/proto/RoguelikeGadgetInfo.proto +++ b/proto/RoguelikeGadgetInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: FFNNBKHJJDP diff --git a/proto/Route.proto b/proto/Route.proto index 47e630d3..bf0a39c8 100644 --- a/proto/Route.proto +++ b/proto/Route.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "RoutePoint.proto"; diff --git a/proto/RoutePoint.proto b/proto/RoutePoint.proto index 835c182c..e7300a26 100644 --- a/proto/RoutePoint.proto +++ b/proto/RoutePoint.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; diff --git a/proto/SceneAreaWeatherNotify.proto b/proto/SceneAreaWeatherNotify.proto index d6dffacf..2432db4f 100644 --- a/proto/SceneAreaWeatherNotify.proto +++ b/proto/SceneAreaWeatherNotify.proto @@ -1,27 +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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 25752 -// Obf: EAKJEHOGBIG + +// 4.6.0 +// CmdId: 6238 message SceneAreaWeatherNotify { - uint32 climate_type = 2; - uint32 weather_area_id = 4; + uint32 weather_gadget_id = 2; float trans_duration = 8; - map weather_value_map = 7; - uint32 weather_gadget_id = 12; -} + map weather_value_map = 10; + uint32 weather_area_id = 14; + uint32 climate_type = 15; +} \ No newline at end of file diff --git a/proto/SceneAvatarInfo.proto b/proto/SceneAvatarInfo.proto index f7c2ec5e..44df7b14 100644 --- a/proto/SceneAvatarInfo.proto +++ b/proto/SceneAvatarInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "SceneWeaponInfo.proto"; diff --git a/proto/SceneDataNotify.proto b/proto/SceneDataNotify.proto new file mode 100644 index 00000000..267ac7e5 --- /dev/null +++ b/proto/SceneDataNotify.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +// 4.6.0 +// CmdId: 25430 +message SceneDataNotify { + repeated string level_config_name_list = 2; + repeated uint32 scene_tag_id_list = 5; +} \ No newline at end of file diff --git a/proto/SceneEntityAiInfo.proto b/proto/SceneEntityAiInfo.proto index 7fb58020..abd877c0 100644 --- a/proto/SceneEntityAiInfo.proto +++ b/proto/SceneEntityAiInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; diff --git a/proto/SceneEntityAppearNotify.proto b/proto/SceneEntityAppearNotify.proto index e30a53a7..7f075305 100644 --- a/proto/SceneEntityAppearNotify.proto +++ b/proto/SceneEntityAppearNotify.proto @@ -1,10 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "SceneEntityInfo.proto"; import "VisionType.proto"; +// 4.6.0 +// CmdId: 5471 message SceneEntityAppearNotify { - repeated SceneEntityInfo entity_list = 15; - VisionType appear_type = 7; - uint32 param = 5; -} + repeated SceneEntityInfo entity_list = 3; + uint32 param = 10; + VisionType appear_type = 15; +} \ No newline at end of file diff --git a/proto/SceneEntityDisappearNotify.proto b/proto/SceneEntityDisappearNotify.proto index de45e0eb..526e4fac 100644 --- a/proto/SceneEntityDisappearNotify.proto +++ b/proto/SceneEntityDisappearNotify.proto @@ -1,9 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "VisionType.proto"; +// 4.6.0 +// CmdId: 21913 message SceneEntityDisappearNotify { - repeated uint32 entity_list = 6; - VisionType disappear_type = 9; - uint32 param = 12; -} + uint32 param = 4; + repeated uint32 entity_list = 9; + VisionType disappear_type = 13; +} \ No newline at end of file diff --git a/proto/SceneEntityInfo.proto b/proto/SceneEntityInfo.proto index d6a889fe..b801351e 100644 --- a/proto/SceneEntityInfo.proto +++ b/proto/SceneEntityInfo.proto @@ -13,7 +13,7 @@ import "EntityClientData.proto"; import "EntityEnvironmentInfo.proto"; import "EntityAuthorityInfo.proto"; import "ServerBuff.proto"; -// check +// Obf: DGPPPPBJILO message SceneEntityInfo { ProtEntityType entity_type = 1; uint32 entity_id = 2; diff --git a/proto/SceneFishInfo.proto b/proto/SceneFishInfo.proto index eee4ce0c..656098e1 100644 --- a/proto/SceneFishInfo.proto +++ b/proto/SceneFishInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; diff --git a/proto/SceneForceUnlockNotify.proto b/proto/SceneForceUnlockNotify.proto index ac343945..9f026cc0 100644 --- a/proto/SceneForceUnlockNotify.proto +++ b/proto/SceneForceUnlockNotify.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 1077 message SceneForceUnlockNotify { - repeated uint32 force_id_list = 11; - bool is_add = 1; -} + bool is_add = 12; + repeated uint32 force_id_list = 13; +} \ No newline at end of file diff --git a/proto/SceneGadgetInfo.proto b/proto/SceneGadgetInfo.proto index 0f50114c..50253501 100644 --- a/proto/SceneGadgetInfo.proto +++ b/proto/SceneGadgetInfo.proto @@ -1,23 +1,7 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "GadgetBornType.proto"; -import "Item.proto"; +//import "Item.proto"; import "GatherGadgetInfo.proto"; import "WorktopInfo.proto"; import "ClientGadgetInfo.proto"; @@ -41,12 +25,11 @@ import "DeshretObeliskGadgetInfo.proto"; import "CoinCollectOperatorInfo.proto"; import "TrifleGadget.proto"; import "PlatformInfo.proto"; -import "JMFPBNKNHED.proto"; +//import "JMFPBNKNHED.proto"; import "GadgetPlayInfo.proto"; -import "GDGKKLFMJKH.proto"; -import "OMBIJJLAHFB.proto"; -import "BDOCPDNCIEF.proto"; -// Obf: JOBMECDLBKP +//import "GDGKKLFMJKH.proto"; +//import "OMBIJJLAHFB.proto"; +//import "BDOCPDNCIEF.proto"; message SceneGadgetInfo { uint32 gadget_id = 1; uint32 group_id = 2; @@ -90,9 +73,9 @@ message SceneGadgetInfo { repeated uint32 interact_uid_list = 24; uint32 draft_id = 25; uint32 KHICBPFFAII = 26; - JMFPBNKNHED GPOHBBPBBEC = 27; + //JMFPBNKNHED GPOHBBPBBEC = 27; GadgetPlayInfo play_info = 100; - GDGKKLFMJKH DPJFGJDHGGJ = 101; - OMBIJJLAHFB PBBAFKFGHIB = 102; - BDOCPDNCIEF FDKBHOCNBPH = 103; + //GDGKKLFMJKH DPJFGJDHGGJ = 101; + //OMBIJJLAHFB PBBAFKFGHIB = 102; + //BDOCPDNCIEF FDKBHOCNBPH = 103; } diff --git a/proto/SceneInitFinishReq.proto b/proto/SceneInitFinishReq.proto new file mode 100644 index 00000000..b25ffdfa --- /dev/null +++ b/proto/SceneInitFinishReq.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +// 4.6.0 +// CmdId: 2089 +message SceneInitFinishReq { + uint32 enter_scene_token = 12; +} \ No newline at end of file diff --git a/proto/SceneInitFinishRsp.proto b/proto/SceneInitFinishRsp.proto index aac29f42..965acb81 100644 --- a/proto/SceneInitFinishRsp.proto +++ b/proto/SceneInitFinishRsp.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 6717 message SceneInitFinishRsp { - int32 retcode = 4; - uint32 enter_scene_token = 9; -} + uint32 enter_scene_token = 11; + //int32 retcode = ?; +} \ No newline at end of file diff --git a/proto/SceneMonsterInfo.proto b/proto/SceneMonsterInfo.proto index cd87cb75..19d93a3d 100644 --- a/proto/SceneMonsterInfo.proto +++ b/proto/SceneMonsterInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "SceneWeaponInfo.proto"; diff --git a/proto/SceneNpcInfo.proto b/proto/SceneNpcInfo.proto index d6cefd82..82cca23f 100644 --- a/proto/SceneNpcInfo.proto +++ b/proto/SceneNpcInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: HHIHPEEHHNI diff --git a/proto/ScenePlayerInfo.proto b/proto/ScenePlayerInfo.proto index 2b2b3941..ec0f7bc1 100644 --- a/proto/ScenePlayerInfo.proto +++ b/proto/ScenePlayerInfo.proto @@ -1,12 +1,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "OnlinePlayerInfo.proto"; +// 4.6.0 message ScenePlayerInfo { - string name = 9; - OnlinePlayerInfo online_player_info = 5; - uint32 scene_id = 15; - uint32 uid = 2; - uint32 peer_id = 8; - bool is_connected = 6; -} + uint32 uid = 6; + OnlinePlayerInfo online_player_info = 7; + uint32 scene_id = 10; + bool is_connected = 12; + string name = 13; + uint32 peer_id = 15; +} \ No newline at end of file diff --git a/proto/ScenePlayerInfoNotify.proto b/proto/ScenePlayerInfoNotify.proto index 04121ab9..f147bc4a 100644 --- a/proto/ScenePlayerInfoNotify.proto +++ b/proto/ScenePlayerInfoNotify.proto @@ -1,7 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "ScenePlayerInfo.proto"; +// 4.6.0 +// CmdId: 4358 message ScenePlayerInfoNotify { - repeated ScenePlayerInfo player_info_list = 1; -} + repeated ScenePlayerInfo player_info_list = 13; +} \ No newline at end of file diff --git a/proto/SceneReliquaryInfo.proto b/proto/SceneReliquaryInfo.proto index 11ed94be..d5709667 100644 --- a/proto/SceneReliquaryInfo.proto +++ b/proto/SceneReliquaryInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: HEMALDBEKEL diff --git a/proto/SceneTeamAvatar.proto b/proto/SceneTeamAvatar.proto index c38f768e..6715f17a 100644 --- a/proto/SceneTeamAvatar.proto +++ b/proto/SceneTeamAvatar.proto @@ -1,27 +1,29 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "SceneEntityInfo.proto"; import "AbilitySyncStateInfo.proto"; import "ServerBuff.proto"; import "AvatarInfo.proto"; import "AbilityControlBlock.proto"; import "SceneAvatarInfo.proto"; -// check + +//4.6.0 message SceneTeamAvatar { - SceneEntityInfo scene_entity_info = 4; - uint32 weapon_entity_id = 9; - uint32 player_uid = 14; - bool is_reconnect = 754; - AbilitySyncStateInfo weapon_ability_info = 8; - repeated ServerBuff server_buff_list = 5; - AbilitySyncStateInfo avatar_ability_info = 15; - uint64 weapon_guid = 3; - AvatarInfo avatar_info = 7; - uint32 entity_id = 6; - uint64 avatar_guid = 11; - AbilityControlBlock ability_control_block = 12; uint32 scene_id = 1; - SceneAvatarInfo scene_avatar_info = 10; - bool is_player_cur_avatar = 2; - bool is_on_scene = 13; + uint32 player_uid = 2; + AbilityControlBlock ability_control_block = 3; + uint64 weapon_guid = 4; + uint32 entity_id = 5; + repeated ServerBuff server_buff_list = 6; + uint64 avatar_guid = 7; + AvatarInfo avatar_info = 8; + SceneAvatarInfo scene_avatar_info = 9; + bool is_on_scene = 10;//sus 1097 or 10 or 11 + bool is_reconnect = 11;//sus 1097 or 10 or 11 + uint32 weapon_entity_id = 12; + SceneEntityInfo scene_entity_info = 13; + AbilitySyncStateInfo avatar_ability_info = 14;//sus 14 or 15 + AbilitySyncStateInfo weapon_ability_info = 15;//sus 14 or 15 + bool is_player_cur_avatar = 1097;//sus 1097 or 10 or 11 } diff --git a/proto/SceneTeamUpdateNotify.proto b/proto/SceneTeamUpdateNotify.proto index d4b57026..d61cef92 100644 --- a/proto/SceneTeamUpdateNotify.proto +++ b/proto/SceneTeamUpdateNotify.proto @@ -1,8 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "SceneTeamAvatar.proto"; +// 4.6.0 +// CmdId: 28422 message SceneTeamUpdateNotify { - bool is_in_mp = 4; - repeated SceneTeamAvatar scene_team_avatar_list = 12; -} + repeated SceneTeamAvatar scene_team_avatar_list = 5; + bool is_in_mp = 88; //tentativeID +} \ No newline at end of file diff --git a/proto/SceneTimeNotify.proto b/proto/SceneTimeNotify.proto index add98253..8450f5ae 100644 --- a/proto/SceneTimeNotify.proto +++ b/proto/SceneTimeNotify.proto @@ -1,8 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 25965 message SceneTimeNotify { - uint32 scene_id = 2; - uint64 scene_time = 10; - bool is_paused = 14; -} + uint64 scene_time = 7; + bool is_paused = 11; + uint32 scene_id = 14; +} \ No newline at end of file diff --git a/proto/SceneWeaponInfo.proto b/proto/SceneWeaponInfo.proto index 41c6eccb..8b25a925 100644 --- a/proto/SceneWeaponInfo.proto +++ b/proto/SceneWeaponInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "AbilitySyncStateInfo.proto"; diff --git a/proto/ScreenInfo.proto b/proto/ScreenInfo.proto index 79ce05af..90c3aeb7 100644 --- a/proto/ScreenInfo.proto +++ b/proto/ScreenInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: MPEEPHMCGKD diff --git a/proto/ServantInfo.proto b/proto/ServantInfo.proto index 2774985b..1eee616b 100644 --- a/proto/ServantInfo.proto +++ b/proto/ServantInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: CILIBMDMDLK diff --git a/proto/ServerBuff.proto b/proto/ServerBuff.proto index 9035a674..cc86d571 100644 --- a/proto/ServerBuff.proto +++ b/proto/ServerBuff.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: JGJPJFGLDOE diff --git a/proto/ServerBuffChangeNotify.proto b/proto/ServerBuffChangeNotify.proto index a7c8b3f2..d0724db8 100644 --- a/proto/ServerBuffChangeNotify.proto +++ b/proto/ServerBuffChangeNotify.proto @@ -1,34 +1,19 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "ServerBuff.proto"; -// CmdId: 6462 -// Obf: FIKGOMABCGP + +// 4.6.0 +// CmdId: 9934 message ServerBuffChangeNotify { - // Obf: EEAKJOFDEFO enum ServerBuffChangeType { SERVER_BUFF_CHANGE_TYPE_ADD_SERVER_BUFF = 0; SERVER_BUFF_CHANGE_TYPE_DEL_SERVER_BUFF = 1; } - - repeated ServerBuff server_buff_list = 15; - repeated uint64 avatar_guid_list = 8; - ServerBuffChangeType server_buff_change_type = 11; - repeated uint32 entity_id_list = 14; - bool is_creature_buff = 7; -} + + bool is_creature_buff = 2; + repeated uint32 entity_id_list = 4; + repeated uint64 avatar_guid_list = 6; + repeated ServerBuff server_buff_list = 7; + ServerBuffChangeType server_buff_change_type = 10; +} \ No newline at end of file diff --git a/proto/ServerLogLevel.proto b/proto/ServerLogLevel.proto new file mode 100644 index 00000000..1e00f405 --- /dev/null +++ b/proto/ServerLogLevel.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +// 4.6.0 +enum ServerLogLevel { + LOG_LEVEL_NONE = 0; + LOG_LEVEL_DEBUG = 1; + LOG_LEVEL_INFO = 2; + LOG_LEVEL_WARNING = 3; + LOG_LEVEL_ERROR = 4; +} \ No newline at end of file diff --git a/proto/ServerLogNotify.proto b/proto/ServerLogNotify.proto new file mode 100644 index 00000000..380740d9 --- /dev/null +++ b/proto/ServerLogNotify.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +import "ServerLogLevel.proto"; +import "ServerLogType.proto"; + +// 4.6.0 +// CmdId: 24778 +message ServerLogNotify { + string server_log = 1; + ServerLogLevel log_level = 8; + ServerLogType log_type = 14; +} \ No newline at end of file diff --git a/proto/ServerLogType.proto b/proto/ServerLogType.proto new file mode 100644 index 00000000..f4676737 --- /dev/null +++ b/proto/ServerLogType.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +// 4.6.0 +enum ServerLogType { + SERVER_LOG_NONE = 0; + SERVER_LOG_ABILITY = 1; + SERVER_LOG_LEVEL = 2; + SERVER_LOG_ENTITY = 3; + SERVER_LOG_LUA = 4; + SERVER_LOG_DAILYTASK = 5; +} \ No newline at end of file diff --git a/proto/ServerTimeNotify.proto b/proto/ServerTimeNotify.proto index 32a6a70a..8f8e38e9 100644 --- a/proto/ServerTimeNotify.proto +++ b/proto/ServerTimeNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 21404 -// Obf: LHMEAJDEOAI + +// 4.6.0 +// CmdId: 3566 message ServerTimeNotify { - uint64 server_time = 1; -} + uint64 server_time = 15; +} \ No newline at end of file diff --git a/proto/SetEquipLockStateReq.proto b/proto/SetEquipLockStateReq.proto index c349cd9c..d9239f53 100644 --- a/proto/SetEquipLockStateReq.proto +++ b/proto/SetEquipLockStateReq.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 745 message SetEquipLockStateReq { - uint64 target_equip_guid = 2; - bool is_locked = 3; -} + uint64 target_equip_guid = 4; + bool is_locked = 6; +} \ No newline at end of file diff --git a/proto/SetEquipLockStateRsp.proto b/proto/SetEquipLockStateRsp.proto index c4d53010..49b7240a 100644 --- a/proto/SetEquipLockStateRsp.proto +++ b/proto/SetEquipLockStateRsp.proto @@ -1,8 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 8191 message SetEquipLockStateRsp { - uint64 target_equip_guid = 15; - bool is_locked = 6; - int32 retcode = 14; + bool is_locked = 2; + uint64 target_equip_guid = 6; + int32 retcode = 10; } diff --git a/proto/SetOpenStateReq.proto b/proto/SetOpenStateReq.proto index e2b53fa7..6d3adb5a 100644 --- a/proto/SetOpenStateReq.proto +++ b/proto/SetOpenStateReq.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 20702 -// Obf: KFLGFOELPIO + +// 4.6.0 +// CmdId: 28401 message SetOpenStateReq { - uint32 value = 13; - uint32 key = 12; -} + uint32 value = 4; + uint32 key = 7; +} \ No newline at end of file diff --git a/proto/SetOpenStateRsp.proto b/proto/SetOpenStateRsp.proto index 00f5dbe9..2bb947e7 100644 --- a/proto/SetOpenStateRsp.proto +++ b/proto/SetOpenStateRsp.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 934 -// Obf: PCMONDAPKNM + +// 4.6.0 +// CmdId: 24060 message SetOpenStateRsp { - uint32 value = 1; - uint32 key = 8; - int32 retcode = 12; -} + uint32 key = 4; + int32 retcode = 7; + uint32 value = 11; +} \ No newline at end of file diff --git a/proto/SetPlayerBirthdayReq.proto b/proto/SetPlayerBirthdayReq.proto index 83930bda..7d6ca25a 100644 --- a/proto/SetPlayerBirthdayReq.proto +++ b/proto/SetPlayerBirthdayReq.proto @@ -1,7 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Birthday.proto"; +// 4.6.0 +// CmdId: 1528 message SetPlayerBirthdayReq { - Birthday birthday = 1; -} + Birthday birthday = 7; +} \ No newline at end of file diff --git a/proto/SetPlayerBirthdayRsp.proto b/proto/SetPlayerBirthdayRsp.proto index a77931be..490d3d57 100644 --- a/proto/SetPlayerBirthdayRsp.proto +++ b/proto/SetPlayerBirthdayRsp.proto @@ -1,8 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Birthday.proto"; +// 4.6.0 +// CmdId: 21040 message SetPlayerBirthdayRsp { - Birthday birthday = 7; - int32 retcode = 6; -} + int32 retcode = 6; + Birthday birthday = 9; +} \ No newline at end of file diff --git a/proto/SetPlayerNameReq.proto b/proto/SetPlayerNameReq.proto index 720c1d20..235bdebd 100644 --- a/proto/SetPlayerNameReq.proto +++ b/proto/SetPlayerNameReq.proto @@ -1,6 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 22779 message SetPlayerNameReq { - string nick_name = 12; -} + string nick_name = 3; +} \ No newline at end of file diff --git a/proto/SetPlayerNameRsp.proto b/proto/SetPlayerNameRsp.proto index 18aa64f6..fd8a63a5 100644 --- a/proto/SetPlayerNameRsp.proto +++ b/proto/SetPlayerNameRsp.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 8082 message SetPlayerNameRsp { - string nick_name = 13; - int32 retcode = 7; -} + int32 retcode = 2; + string nick_name = 6; +} \ No newline at end of file diff --git a/proto/SetUpAvatarTeamReq.proto b/proto/SetUpAvatarTeamReq.proto index b24a431d..8b100709 100644 --- a/proto/SetUpAvatarTeamReq.proto +++ b/proto/SetUpAvatarTeamReq.proto @@ -1,8 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 23569 message SetUpAvatarTeamReq { - repeated uint64 avatar_team_guid_list = 15; + repeated uint64 avatar_team_guid_list = 2; + uint32 team_id = 5; uint64 cur_avatar_guid = 8; - uint32 team_id = 13; -} +} \ No newline at end of file diff --git a/proto/SetUpAvatarTeamRsp.proto b/proto/SetUpAvatarTeamRsp.proto index 269846e5..e6ce413c 100644 --- a/proto/SetUpAvatarTeamRsp.proto +++ b/proto/SetUpAvatarTeamRsp.proto @@ -1,9 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 7187 message SetUpAvatarTeamRsp { - uint32 team_id = 8; - uint64 cur_avatar_guid = 4; - repeated uint64 avatar_team_guid_list = 1; - int32 retcode = 9; -} + uint64 cur_avatar_guid = 1; + int32 retcode = 7; + repeated uint64 avatar_team_guid_list = 8; + uint32 team_id = 9; +} \ No newline at end of file diff --git a/proto/ShapeBox.proto b/proto/ShapeBox.proto index 1bdf3e21..8c8d569b 100644 --- a/proto/ShapeBox.proto +++ b/proto/ShapeBox.proto @@ -1,27 +1,13 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; -// Obf: BFCLKLDHKOM + +//obf: ACPDAEBLCBA message ShapeBox { - Vector center = 1; - Vector axis0 = 2; - Vector axis1 = 3; - Vector axis2 = 4; - Vector extents = 5; + Vector center = 1; + Vector axis0 = 2; + Vector axis1 = 3; + Vector axis4 = 4; + Vector extents = 5; } diff --git a/proto/ShapeSphere.proto b/proto/ShapeSphere.proto index 2a696c07..d2f7f968 100644 --- a/proto/ShapeSphere.proto +++ b/proto/ShapeSphere.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; -// Obf: KJNACIDANGB + +//obf: KKGNEFILAFP message ShapeSphere { - Vector center = 1; - float radius = 2; + Vector center = 1; + float radius = 2; } diff --git a/proto/Shop.proto b/proto/Shop.proto index 07667c57..a87050d1 100644 --- a/proto/Shop.proto +++ b/proto/Shop.proto @@ -1,17 +1,19 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "ShopCardProduct.proto"; -import "ShopGoods.proto"; -import "ShopConcertProduct.proto"; -import "ShopMcoinProduct.proto"; +import "ShopMcoinProduct.proto"; +import "ShopCardProduct.proto"; +import "ShopConcertProduct.proto"; +import "ShopGoods.proto"; + +// 4.6.0 message Shop { - repeated ShopCardProduct card_product_list = 3; - repeated ShopMcoinProduct mcoin_product_list = 15; - repeated ShopGoods goods_list = 2; - repeated ShopConcertProduct concert_product_list = 4; - uint32 city_id = 14; - uint32 next_refresh_time = 12; - uint32 city_reputation_level = 7; - uint32 shop_type = 8; -} + repeated ShopMcoinProduct mcoin_product_list = 3; + uint32 shop_type = 4; + uint32 city_reputation_level = 6; + repeated ShopCardProduct card_product_list = 7; + repeated ShopConcertProduct concert_product_list = 8; + uint32 city_id = 9; + repeated ShopGoods goods_list = 10; + uint32 next_refresh_time = 14; +} \ No newline at end of file diff --git a/proto/ShopCardProduct.proto b/proto/ShopCardProduct.proto index 894194c7..08dcf728 100644 --- a/proto/ShopCardProduct.proto +++ b/proto/ShopCardProduct.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; diff --git a/proto/ShopConcertProduct.proto b/proto/ShopConcertProduct.proto index e569ff4a..4bdd14d7 100644 --- a/proto/ShopConcertProduct.proto +++ b/proto/ShopConcertProduct.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: ABHPGEAODHI diff --git a/proto/ShopGoods.proto b/proto/ShopGoods.proto index 1c537a8e..e5131f83 100644 --- a/proto/ShopGoods.proto +++ b/proto/ShopGoods.proto @@ -2,24 +2,28 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "ItemParam.proto"; +// Obf: OBABFCEJLGK message ShopGoods { - ItemParam goods_item = 14; - repeated uint32 pre_goods_id_list = 10; - repeated ItemParam cost_item_list = 8; - uint32 bought_num = 1; - uint32 next_refresh_time = 4; - uint32 end_time = 9; - uint32 begin_time = 11; - uint32 hcoin = 7; - uint32 scoin = 2; - uint32 mcoin = 12; - uint32 goods_id = 3; - uint32 buy_limit = 5; - uint32 max_level = 2032; - uint32 min_level = 440; - uint32 secondary_sheet_id = 663; - uint32 single_limit = 13; - uint32 discount_id = 15; - uint32 discount_end_time = 821; - uint32 discount_begin_time = 410; + uint32 hcoin = 15; // primogem + uint32 scoin = 7; // mora + uint32 mcoin = 11; // crystals + uint32 goods_id = 8; + repeated ItemParam cost_item_list = 3; + uint32 buy_limit = 4; + uint32 max_level = 1690; + uint32 min_level = 1946; + uint32 bought_num = 14; + uint32 secondary_sheet_id = 1950; + repeated uint32 preGoodsIdList = 5; + ItemParam goods_item = 1; + uint32 single_limit = 2; + uint32 discount_id = 10; + uint32 discount_end_time = 923; + uint32 discount_begin_time = 898; + + uint32 begin_time = 13; + + uint32 end_time = 6; + uint32 next_refresh_time = 9; + } diff --git a/proto/ShopMcoinProduct.proto b/proto/ShopMcoinProduct.proto index 6fe8fcaf..3ff43b2a 100644 --- a/proto/ShopMcoinProduct.proto +++ b/proto/ShopMcoinProduct.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: BNMNBLNCBIG diff --git a/proto/ShortAbilityHashPair.proto b/proto/ShortAbilityHashPair.proto index 25cce8a3..92dffd09 100644 --- a/proto/ShortAbilityHashPair.proto +++ b/proto/ShortAbilityHashPair.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: HJEEHJPLDFD + +// 4.6.0 message ShortAbilityHashPair { - sfixed32 ability_name_hash = 15; - sfixed32 ability_config_hash = 14; -} + sfixed32 ability_name_hash = 3; + sfixed32 ability_config_hash = 10; +} \ No newline at end of file diff --git a/proto/ShowMessageNotify.proto b/proto/ShowMessageNotify.proto new file mode 100644 index 00000000..87f319de --- /dev/null +++ b/proto/ShowMessageNotify.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +import "SvrMsgId.proto"; +import "MsgParam.proto"; + +// 4.6.0 +// CmdId: 4061 +message ShowMessageNotify { + SvrMsgId msg_id = 5; + repeated MsgParam params = 11; +} \ No newline at end of file diff --git a/proto/SocialDetail.proto b/proto/SocialDetail.proto index 1a7f1392..922e7655 100644 --- a/proto/SocialDetail.proto +++ b/proto/SocialDetail.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Birthday.proto"; diff --git a/proto/SocialShowAvatarInfo.proto b/proto/SocialShowAvatarInfo.proto index 6122b339..dfb4810d 100644 --- a/proto/SocialShowAvatarInfo.proto +++ b/proto/SocialShowAvatarInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: OGKHFCINDJP diff --git a/proto/StatueGadgetInfo.proto b/proto/StatueGadgetInfo.proto index 7460a168..bbae5557 100644 --- a/proto/StatueGadgetInfo.proto +++ b/proto/StatueGadgetInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: MAIBEHDCKJL diff --git a/proto/StoreItemChangeNotify.proto b/proto/StoreItemChangeNotify.proto index 08a1c9e6..86efca4a 100644 --- a/proto/StoreItemChangeNotify.proto +++ b/proto/StoreItemChangeNotify.proto @@ -1,9 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -import "Item.proto"; -import "StoreType.proto"; +import "StoreType.proto"; +import "Item.proto"; + +// 4.6.0 +// CmdId: 7871 message StoreItemChangeNotify { - repeated Item item_list = 1; - StoreType store_type = 12; -} + StoreType store_type = 3; + repeated Item item_list = 12; +} \ No newline at end of file diff --git a/proto/StoreItemDelNotify.proto b/proto/StoreItemDelNotify.proto index b4807ecf..112b96ac 100644 --- a/proto/StoreItemDelNotify.proto +++ b/proto/StoreItemDelNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "StoreType.proto"; -// CmdId: 28814 -// Obf: FHAAIBEDGOD + +// 4.6.0 +// CmdId: 23904 message StoreItemDelNotify { - StoreType store_type = 15; - repeated uint64 guid_list = 4; -} + repeated uint64 guid_list = 7; + StoreType store_type = 13; +} \ No newline at end of file diff --git a/proto/StoreType.proto b/proto/StoreType.proto index a959b02d..756076d7 100644 --- a/proto/StoreType.proto +++ b/proto/StoreType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// Obf: HDHLNCKJKCA + +// 4.6.0 enum StoreType { STORE_TYPE_NONE = 0; STORE_TYPE_PACK = 1; STORE_TYPE_DEPOT = 2; -} +} \ No newline at end of file diff --git a/proto/StoreWeightLimitNotify.proto b/proto/StoreWeightLimitNotify.proto index ed86f7ad..bc0779a8 100644 --- a/proto/StoreWeightLimitNotify.proto +++ b/proto/StoreWeightLimitNotify.proto @@ -1,29 +1,15 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "StoreType.proto"; -// CmdId: 22706 -// Obf: OLOEDFBEHGA + +// 4.6.0 +// CmdId: 28238 message StoreWeightLimitNotify { uint32 weight_limit = 2; - uint32 furniture_count_limit = 1; - uint32 weapon_count_limit = 10; - uint32 reliquary_count_limit = 11; - uint32 material_count_limit = 14; - StoreType store_type = 4; -} + uint32 reliquary_count_limit = 4; + StoreType store_type = 8; + uint32 material_count_limit = 9;//sus + uint32 weapon_count_limit = 11;//sus + uint32 furniture_count_limit = 15;//sus +} \ No newline at end of file diff --git a/proto/SvrMsgId.proto b/proto/SvrMsgId.proto new file mode 100644 index 00000000..3de2f51f --- /dev/null +++ b/proto/SvrMsgId.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +// 4.6.0 +enum SvrMsgId { + MSG_UNKNOWN = 0; + MSG_BLOCK_REFRESH_COUNTDOWN = 1; + MSG_AVATAR_REVIVE_BY_STATUE = 2; + MSG_DAILY_TASK_REWARD_MAX_NUM = 3; + MSG_ROUTINE_TYPE_NOT_OPEN = 4; + MSG_ROUTINE_TYPE_REWARD_MAX_NUM = 5; + MSG_MECHANICUS_COIN_LIMIT = 6; +} diff --git a/proto/SyncScenePlayTeamEntityNotify.proto b/proto/SyncScenePlayTeamEntityNotify.proto index c8d01bec..ac72d65a 100644 --- a/proto/SyncScenePlayTeamEntityNotify.proto +++ b/proto/SyncScenePlayTeamEntityNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "PlayTeamEntityInfo.proto"; -// CmdId: 4915 -// Obf: OFHJPADOKFG + +// 4.6.0 +// CmdId: 4768 message SyncScenePlayTeamEntityNotify { - repeated PlayTeamEntityInfo entity_info_list = 1; - uint32 scene_id = 7; -} + uint32 scene_id = 2; + repeated PlayTeamEntityInfo entity_info_list = 10; +} \ No newline at end of file diff --git a/proto/SyncTeamEntityNotify.proto b/proto/SyncTeamEntityNotify.proto index e2e57678..750f4696 100644 --- a/proto/SyncTeamEntityNotify.proto +++ b/proto/SyncTeamEntityNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "TeamEntityInfo.proto"; -// CmdId: 25071 -// Obf: OCCHGJLNKDC + +// 4.6.0 +// CmdId: 569 message SyncTeamEntityNotify { - uint32 scene_id = 4; - repeated TeamEntityInfo team_entity_info_list = 3; -} + uint32 scene_id = 1; + repeated TeamEntityInfo team_entity_info_list = 14; +} \ No newline at end of file diff --git a/proto/TakeoffEquipReq.proto b/proto/TakeoffEquipReq.proto index 413b0828..17f120c3 100644 --- a/proto/TakeoffEquipReq.proto +++ b/proto/TakeoffEquipReq.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 3525 message TakeoffEquipReq { - uint32 slot = 3; - uint64 avatar_guid = 14; -} + uint64 avatar_guid = 1; + uint32 slot = 15; +} \ No newline at end of file diff --git a/proto/TakeoffEquipRsp.proto b/proto/TakeoffEquipRsp.proto index 1257c96b..f300f886 100644 --- a/proto/TakeoffEquipRsp.proto +++ b/proto/TakeoffEquipRsp.proto @@ -1,8 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 25886 message TakeoffEquipRsp { - int32 retcode = 8; - uint32 slot = 10; - uint64 avatar_guid = 4; -} + uint32 slot = 3; + uint64 avatar_guid = 5; + int32 retcode = 12; +} \ No newline at end of file diff --git a/proto/TeamEnterSceneInfo.proto b/proto/TeamEnterSceneInfo.proto index 8163a85f..11f5067a 100644 --- a/proto/TeamEnterSceneInfo.proto +++ b/proto/TeamEnterSceneInfo.proto @@ -1,10 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AbilityControlBlock.proto"; import "AbilitySyncStateInfo.proto"; +// 4.6.0 message TeamEnterSceneInfo { - uint32 team_entity_id = 15; - AbilityControlBlock ability_control_block = 5; - AbilitySyncStateInfo team_ability_info = 2; -} + AbilityControlBlock ability_control_block = 1; + uint32 team_entity_id = 6; + AbilitySyncStateInfo team_ability_info = 15; +} \ No newline at end of file diff --git a/proto/TeamEntityInfo.proto b/proto/TeamEntityInfo.proto index 7ed75c39..84d72fed 100644 --- a/proto/TeamEntityInfo.proto +++ b/proto/TeamEntityInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "AbilitySyncStateInfo.proto"; -// Obf: KOMDBIHEDIA + +// 4.6.0 message TeamEntityInfo { - uint32 team_entity_id = 10; - uint32 authority_peer_id = 9; - AbilitySyncStateInfo team_ability_info = 12; -} + uint32 authority_peer_id = 4; + AbilitySyncStateInfo team_ability_info = 7; + uint32 team_entity_id = 13; +} \ No newline at end of file diff --git a/proto/TrialAvatarGrantRecord.proto b/proto/TrialAvatarGrantRecord.proto index 02f99fe6..b6166417 100644 --- a/proto/TrialAvatarGrantRecord.proto +++ b/proto/TrialAvatarGrantRecord.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: KBNIDGMCKMD diff --git a/proto/TrialAvatarInfo.proto b/proto/TrialAvatarInfo.proto index 86a2dc3c..05afca90 100644 --- a/proto/TrialAvatarInfo.proto +++ b/proto/TrialAvatarInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Item.proto"; diff --git a/proto/TrifleGadget.proto b/proto/TrifleGadget.proto index 5f218232..23bdd101 100644 --- a/proto/TrifleGadget.proto +++ b/proto/TrifleGadget.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "Item.proto"; diff --git a/proto/TryEnterHomeReq.proto b/proto/TryEnterHomeReq.proto index 7effd926..e5ecb137 100644 --- a/proto/TryEnterHomeReq.proto +++ b/proto/TryEnterHomeReq.proto @@ -1,26 +1,10 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 26594 -// Obf: EPFFLHEAHIE + +// CmdId: 20306 message TryEnterHomeReq { - uint32 target_uid = 4; - bool is_transfer_to_safe_point = 9; - uint32 target_point = 5; - bool is_transfer_to_main_house_point = 12; + uint32 target_uid = 4; + uint32 target_point = 5; + bool is_transfer_to_main_house_point = 10; + bool is_transfer_to_safe_point = 14; } diff --git a/proto/TryEnterHomeRsp.proto b/proto/TryEnterHomeRsp.proto index 791e0e9b..34f18a48 100644 --- a/proto/TryEnterHomeRsp.proto +++ b/proto/TryEnterHomeRsp.proto @@ -1,25 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 351 -// Obf: NDAPMOBJOBI + +// CmdId: 25519 message TryEnterHomeRsp { - repeated uint32 param_list = 8; - int32 retcode = 13; - uint32 target_uid = 6; + uint32 target_uid = 11; + int32 retcode = 13; + repeated uint32 param_list = 15; } diff --git a/proto/UnionCmd.proto b/proto/UnionCmd.proto index 4ab636ca..dc610dfb 100644 --- a/proto/UnionCmd.proto +++ b/proto/UnionCmd.proto @@ -1,7 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 message UnionCmd { - bytes body = 11; - uint32 message_id = 1; -} + bytes body = 12; + uint32 message_id = 14; +} \ No newline at end of file diff --git a/proto/UnionCmdNotify.proto b/proto/UnionCmdNotify.proto index b9d4739e..d9ed6b2b 100644 --- a/proto/UnionCmdNotify.proto +++ b/proto/UnionCmdNotify.proto @@ -1,7 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "UnionCmd.proto"; +// 4.6.0 +// CmdId: 25659 message UnionCmdNotify { - repeated UnionCmd cmd_list = 4; -} + repeated UnionCmd cmd_list = 6; +} \ No newline at end of file diff --git a/proto/UpdateAbilityCreatedMovingPlatformNotify.proto b/proto/UpdateAbilityCreatedMovingPlatformNotify.proto index a85c2de0..1b556315 100644 --- a/proto/UpdateAbilityCreatedMovingPlatformNotify.proto +++ b/proto/UpdateAbilityCreatedMovingPlatformNotify.proto @@ -1,31 +1,15 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 2608 -// Obf: OLFDCFONNEK + +// 4.6.0 +// CmdId: 3822 message UpdateAbilityCreatedMovingPlatformNotify { - // Obf: LMONNLKLHCB enum OpType { OP_TYPE_NONE = 0; OP_TYPE_ACTIVATE = 1; OP_TYPE_DEACTIVATE = 2; } - + + uint32 entity_id = 7; OpType op_type = 12; - uint32 entity_id = 10; -} +} \ No newline at end of file diff --git a/proto/UpdatePlayerShowNameCardListReq.proto b/proto/UpdatePlayerShowNameCardListReq.proto index ffea7655..6f4d9bba 100644 --- a/proto/UpdatePlayerShowNameCardListReq.proto +++ b/proto/UpdatePlayerShowNameCardListReq.proto @@ -1,6 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 9487 message UpdatePlayerShowNameCardListReq { - repeated uint32 show_name_card_id_list = 8; -} + repeated uint32 show_name_card_id_list = 15; +} \ No newline at end of file diff --git a/proto/UpdatePlayerShowNameCardListRsp.proto b/proto/UpdatePlayerShowNameCardListRsp.proto index f61caf15..d5fc8fd1 100644 --- a/proto/UpdatePlayerShowNameCardListRsp.proto +++ b/proto/UpdatePlayerShowNameCardListRsp.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 23806 message UpdatePlayerShowNameCardListRsp { - repeated uint32 show_name_card_id_list = 6; - int32 retcode = 3; -} + repeated uint32 show_name_card_id_list = 3; + int32 retcode = 8; +} \ No newline at end of file diff --git a/proto/UseItemReq.proto b/proto/UseItemReq.proto index 8e7f0e48..02c0ef20 100644 --- a/proto/UseItemReq.proto +++ b/proto/UseItemReq.proto @@ -1,10 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 5998 message UseItemReq { - uint64 guid = 14; - uint64 target_guid = 4; - uint32 count = 9; - bool is_enter_mp_dungeon_team = 12; - uint32 option_idx = 8; + uint32 count = 2; + uint64 target_guid = 3; + uint32 option_idx = 6; + uint64 guid = 14; + bool is_enter_mp_dungeon_team = 15; } \ No newline at end of file diff --git a/proto/UseItemRsp.proto b/proto/UseItemRsp.proto index b7e737c1..82bda839 100644 --- a/proto/UseItemRsp.proto +++ b/proto/UseItemRsp.proto @@ -1,12 +1,12 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - +// 4.6.0 +// CmdId: 3305 message UseItemRsp { - uint64 target_guid = 4; - uint64 guid = 15; - uint32 option_idx = 14; - int32 retcode = 8; - uint32 item_id = 2; + int32 retcode = 2; + uint64 guid = 3; + uint32 option_idx = 5; + uint32 item_id = 13; + uint64 target_guid = 15; } \ No newline at end of file diff --git a/proto/Vector.proto b/proto/Vector.proto index 931e9607..487920db 100644 --- a/proto/Vector.proto +++ b/proto/Vector.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: FMFHHKCONCE diff --git a/proto/VehicleInfo.proto b/proto/VehicleInfo.proto index 1c7c6129..1e3d448f 100644 --- a/proto/VehicleInfo.proto +++ b/proto/VehicleInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "VehicleMember.proto"; diff --git a/proto/VehicleMember.proto b/proto/VehicleMember.proto index b8987c8c..0488b319 100644 --- a/proto/VehicleMember.proto +++ b/proto/VehicleMember.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: NFOCOBNABPO diff --git a/proto/VisionType.proto b/proto/VisionType.proto index 5d906d99..959b6db4 100644 --- a/proto/VisionType.proto +++ b/proto/VisionType.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: IFLKBEFDMPH diff --git a/proto/Weapon.proto b/proto/Weapon.proto index c430c1c2..78e5912a 100644 --- a/proto/Weapon.proto +++ b/proto/Weapon.proto @@ -1,11 +1,11 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - +// 4.6.0 message Weapon { - uint32 level = 1; - uint32 exp = 2; - uint32 promote_level = 3; - map affix_map = 4; + uint32 level = 1; + uint32 exp = 2; + uint32 promote_level = 3; + map affix_map = 4; + bool IEBDKIAOPGO = 5; } \ No newline at end of file diff --git a/proto/WearEquipReq.proto b/proto/WearEquipReq.proto index c68f6fbc..aa1011f6 100644 --- a/proto/WearEquipReq.proto +++ b/proto/WearEquipReq.proto @@ -1,9 +1,9 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - +// 4.6.0 +// CmdId: 4499 message WearEquipReq { - uint64 equip_guid = 2; - uint64 avatar_guid = 1; + uint64 equip_guid = 6; + uint64 avatar_guid = 13; } \ No newline at end of file diff --git a/proto/WearEquipRsp.proto b/proto/WearEquipRsp.proto index a7211232..48a905fe 100644 --- a/proto/WearEquipRsp.proto +++ b/proto/WearEquipRsp.proto @@ -1,10 +1,10 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - +// 4.6.0 +// CmdId: 24629 message WearEquipRsp { - uint64 equip_guid = 8; - uint64 avatar_guid = 7; - int32 retcode = 10; + uint64 equip_guid = 5; + uint64 avatar_guid = 11; + int32 retcode = 15; } \ No newline at end of file diff --git a/proto/WeatherInfo.proto b/proto/WeatherInfo.proto index ee4f0683..d4ad3699 100644 --- a/proto/WeatherInfo.proto +++ b/proto/WeatherInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: OGJENPCDJEN diff --git a/proto/WeekendDjinnInfo.proto b/proto/WeekendDjinnInfo.proto index 46955e8e..ea931333 100644 --- a/proto/WeekendDjinnInfo.proto +++ b/proto/WeekendDjinnInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "Vector.proto"; -// Obf: PDPLPNHEJPH + +//obf: NPLBBAJDIOM message WeekendDjinnInfo { - Vector pos = 4; - Vector rot = 1; + Vector pos = 13; + Vector rot = 14; } diff --git a/proto/WeeklyBossResinDiscountInfo.proto b/proto/WeeklyBossResinDiscountInfo.proto index b104d86a..3698c3c7 100644 --- a/proto/WeeklyBossResinDiscountInfo.proto +++ b/proto/WeeklyBossResinDiscountInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: PABMLHHIDDM diff --git a/proto/WidgetSlotData.proto b/proto/WidgetSlotData.proto index 04bf8470..c24c188f 100644 --- a/proto/WidgetSlotData.proto +++ b/proto/WidgetSlotData.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "WidgetSlotTag.proto"; -// Obf: BMPCNILFGEJ + +// 4.6.0 message WidgetSlotData { - WidgetSlotTag tag = 11; - bool is_active = 7; - uint32 material_id = 15; - uint32 cd_over_time = 12; -} + uint32 cd_over_time = 3; + bool is_active = 5; + WidgetSlotTag tag = 7; + uint32 material_id = 10; +} \ No newline at end of file diff --git a/proto/WidgetSlotTag.proto b/proto/WidgetSlotTag.proto index 16e30db6..63ac544e 100644 --- a/proto/WidgetSlotTag.proto +++ b/proto/WidgetSlotTag.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: BOCCJPKHICL diff --git a/proto/WidgetUseAttachAbilityGroupChangeNotify.proto b/proto/WidgetUseAttachAbilityGroupChangeNotify.proto new file mode 100644 index 00000000..04d53372 --- /dev/null +++ b/proto/WidgetUseAttachAbilityGroupChangeNotify.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; + +// 4.6.0 +// CmdId: 24155 +message WidgetUseAttachAbilityGroupChangeNotify { + bool is_attach = 1; + uint32 material_id = 2; +} \ No newline at end of file diff --git a/proto/WindSeedType1Notify.proto b/proto/WindSeedType1Notify.proto index eae255b7..88454140 100644 --- a/proto/WindSeedType1Notify.proto +++ b/proto/WindSeedType1Notify.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; +// 4.6.0 +// CmdId: 7733 message WindSeedType1Notify { - bytes payload = 11; - uint32 config_id = 2; + bytes payload = 1; + uint32 config_id = 4; } \ No newline at end of file diff --git a/proto/WorktopInfo.proto b/proto/WorktopInfo.proto index 1c65484b..ab8a4e62 100644 --- a/proto/WorktopInfo.proto +++ b/proto/WorktopInfo.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; // Obf: FHDMCJINDAH diff --git a/proto/WorldDataNotify.proto b/proto/WorldDataNotify.proto index 95fbabdf..e997ffa3 100644 --- a/proto/WorldDataNotify.proto +++ b/proto/WorldDataNotify.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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "PropValue.proto"; -// CmdId: 813 -// Obf: FOHMBEGKOHM + +// 4.6.0 +// CmdId: 4776 message WorldDataNotify { - map world_prop_map = 12; -} + map world_prop_map = 2; +} \ No newline at end of file diff --git a/proto/WorldPlayerInfoNotify.proto b/proto/WorldPlayerInfoNotify.proto index 24d24071..bcfc3e07 100644 --- a/proto/WorldPlayerInfoNotify.proto +++ b/proto/WorldPlayerInfoNotify.proto @@ -1,27 +1,13 @@ -// 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 . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; + import "OnlinePlayerInfo.proto"; import "PlayerWidgetInfo.proto"; -// CmdId: 2239 -// Obf: JGMOCNKDELA + +// 4.6.0 +// CmdId: 3610 message WorldPlayerInfoNotify { - repeated OnlinePlayerInfo player_info_list = 7; - repeated PlayerWidgetInfo player_widget_info_list = 5; - repeated uint32 player_uid_list = 15; -} + repeated OnlinePlayerInfo player_info_list = 1; + repeated PlayerWidgetInfo player_widget_info_list = 4; + repeated uint32 player_uid_list = 8; +} \ No newline at end of file