diff --git a/proto/Achievement.proto b/proto/Achievement.proto index f562f700..e9ae01a0 100644 --- a/proto/Achievement.proto +++ b/proto/Achievement.proto @@ -1,17 +1,29 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public 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"; import "Status.proto"; option java_package = "emu.grasscutter.net.proto"; -// Name: PBPLDMMEGBO -message Achievement { - // Name: OPFLKOJMOIG > Status - - uint32 total_progress = 4; - uint32 finish_timestamp = 9; - Status status = 2; - uint32 id = 10; - uint32 cur_progress = 3; +message Achievement { + uint32 id = 3; + Status status = 10; + uint32 total_progress = 14; + uint32 finish_timestamp = 15; + uint32 cur_progress = 5; } - diff --git a/proto/ChatInfo.proto b/proto/ChatInfo.proto index b6ade38f..87b4abd8 100644 --- a/proto/ChatInfo.proto +++ b/proto/ChatInfo.proto @@ -1,24 +1,37 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public 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"; -// Name: JOFBOBHLMJA message ChatInfo { - // Name: BEDECNHGCGK - message SystemHint { - uint32 type = 12; - } - - uint32 to_uid = 4; - uint32 time = 15; - uint32 sequence = 2; - uint32 uid = 11; - bool is_read = 12; - oneof content { - string text = 1362; - uint32 icon = 451; - SystemHint system_hint = 772; - } + message SystemHint { + uint32 type = 13; + } + + uint32 time = 7; + uint32 to_uid = 6; + bool is_read = 4; + uint32 uid = 5; + uint32 sequence = 12; + oneof content { + string text = 408; + uint32 icon = 1308; + SystemHint system_hint = 166; + } } - diff --git a/proto/DoGachaReq.proto b/proto/DoGachaReq.proto index a976d0c0..e19e6220 100644 --- a/proto/DoGachaReq.proto +++ b/proto/DoGachaReq.proto @@ -1,15 +1,29 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public 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: 1589 -// Name: PCNKFCOOMOH +// CmdId: 1502 message DoGachaReq { - uint32 gachaRandom = 5; - uint32 gachaType = 6; - string gachaTag = 1; - uint32 gachaScheduleId = 12; - uint32 gachaTimes = 2; + uint32 gachaType = 15; + uint32 gachaRandom = 9; + string gacha_tag = 14; + uint32 gachaTimes = 12; + uint32 gachaScheduleId = 1; } - diff --git a/proto/GachaItem.proto b/proto/GachaItem.proto index d734e17c..85159238 100644 --- a/proto/GachaItem.proto +++ b/proto/GachaItem.proto @@ -1,16 +1,30 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public 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 "GachaTransferItem.proto"; + import "ItemParam.proto"; - -// Name: IPHELIAGHGJ +import "GachaTransferItem.proto"; message GachaItem { - ItemParam gacha_item = 13; - repeated GachaTransferItem transfer_items = 3; - repeated ItemParam token_item_list = 9; - bool is_gacha_item_new = 1; // DKPCGKMJNMC - bool is_flash_card = 11; // HBJJJDGGBCN + bool is_flash_card = 15; + ItemParam gacha_item = 4; + bool is_gacha_item_new = 3; + repeated ItemParam token_item_list = 8; + repeated GachaTransferItem transfer_items = 14; } - diff --git a/proto/Investigation.proto b/proto/Investigation.proto index 9bf73eac..9027de2e 100644 --- a/proto/Investigation.proto +++ b/proto/Investigation.proto @@ -1,21 +1,34 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public 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"; -// Name: JIDKKFKPDIH message Investigation { - // Name: PMHIABIOPBE enum State { INVALID = 0; IN_PROGRESS = 1; COMPLETE = 2; REWARD_TAKEN = 3; } - - uint32 total_progress = 11; - State state = 8; - uint32 id = 3; - uint32 progress = 15; + + uint32 progress = 4; + uint32 id = 10; + State state = 13; + uint32 total_progress = 8; } - diff --git a/proto/MarkMapReq.proto b/proto/MarkMapReq.proto index acc1499a..a6e23d77 100644 --- a/proto/MarkMapReq.proto +++ b/proto/MarkMapReq.proto @@ -1,22 +1,35 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public 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 "MapMarkPoint.proto"; -// CmdId: 3483 -// Name: DDECFGAEPFL +import "MapMarkPoint.proto"; +// CmdId: 3389 message MarkMapReq { - // Name: NABGOBNLACJ > Operation - enum Operation { - OPERATION_ADD = 0; + enum Operation { + OPERATION_ADD = 0; OPERATION_MOD = 1; OPERATION_DEL = 2; OPERATION_GET = 3; - } - - MapMarkPoint old = 15; - MapMarkPoint mark = 11; - Operation op = 7; + } + + MapMarkPoint old = 5; + MapMarkPoint mark = 6; + Operation op = 1; } - diff --git a/proto/MotionInfo.proto b/proto/MotionInfo.proto index 846d680d..dcc48bf4 100644 --- a/proto/MotionInfo.proto +++ b/proto/MotionInfo.proto @@ -1,20 +1,34 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public 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 "MotionState.proto"; + import "Vector.proto"; - -// Name: NLAAPIDMOCD +import "MotionState.proto"; message MotionInfo { - Vector pos = 1; - Vector rot = 2; - Vector speed = 3; - MotionState state = 4; - repeated Vector params = 5; - Vector ref_pos = 6; - uint32 ref_id = 7; - uint32 scene_time = 8; - uint64 interval_velocity = 9; + Vector pos = 1; + Vector rot = 2; + Vector speed = 3; + MotionState state = 4; + repeated Vector params = 5; + Vector ref_pos = 6; + uint32 ref_id = 7; + uint32 scene_time = 8; + uint64 interval_velocity = 9; } - diff --git a/proto/PlayerApplyEnterMpResultNotify.proto b/proto/PlayerApplyEnterMpResultNotify.proto index 29e78b51..526dfe6c 100644 --- a/proto/PlayerApplyEnterMpResultNotify.proto +++ b/proto/PlayerApplyEnterMpResultNotify.proto @@ -1,14 +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"; -// CmdId: 1849 -// Name: MHEHKPFJIPH +// CmdId: 1821 message PlayerApplyEnterMpResultNotify { - // Name: BEHGHPPNIBJ - enum Reason { - REASON_PLAYER_JUDGE = 0; + enum Reason { + REASON_PLAYER_JUDGE = 0; REASON_SCENE_CANNOT_ENTER = 1; REASON_PLAYER_CANNOT_ENTER_MP = 2; REASON_SYSTEM_JUDGE = 3; @@ -22,11 +36,10 @@ message PlayerApplyEnterMpResultNotify { REASON_DATA_VERSION_NOT_LATEST = 11; REASON_PLAYER_NOT_IN_PLAYER_WORLD = 12; REASON_MAX_PLAYER = 13; - } - - string target_nickname = 8; - bool is_agreed = 2; - uint32 target_uid = 14; - Reason reason = 6; + } + + string target_nickname = 3; + Reason reason = 14; + bool is_agreed = 11; + uint32 target_uid = 8; } - diff --git a/proto/PlayerCookReq.proto b/proto/PlayerCookReq.proto index 9d90e94c..f44b85cf 100644 --- a/proto/PlayerCookReq.proto +++ b/proto/PlayerCookReq.proto @@ -1,14 +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"; -// CmdId: 150 -// Name: IMAKIKFJHOM +// CmdId: 126 message PlayerCookReq { - uint32 cook_count = 13; - uint32 assist_avatar = 1; - uint32 qte_quality = 6; - uint32 recipe_id = 7; + uint32 assist_avatar = 8; + uint32 cook_count = 13; + uint32 recipe_id = 6; + uint32 qte_quality = 4; } - diff --git a/proto/PrivateChatReq.proto b/proto/PrivateChatReq.proto index ad5908ba..cf5eb994 100644 --- a/proto/PrivateChatReq.proto +++ b/proto/PrivateChatReq.proto @@ -1,15 +1,29 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public 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: 5040 -// Name: GJDPKMJKHAF +// CmdId: 5025 message PrivateChatReq { - uint32 target_uid = 13; - oneof content { - string text = 10; - uint32 icon = 8; - } + uint32 target_uid = 2; + oneof content { + string icon = 4; + uint32 text = 5; + } } - diff --git a/proto/ServerBuffChangeNotify.proto b/proto/ServerBuffChangeNotify.proto index aba8bce9..18ee860e 100644 --- a/proto/ServerBuffChangeNotify.proto +++ b/proto/ServerBuffChangeNotify.proto @@ -1,22 +1,35 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public 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: 334 -// Name: DPDLNPHNOME +import "ServerBuff.proto"; +// CmdId: 323 message ServerBuffChangeNotify { - // Name: JEMLILGEABH - enum ServerBuffChangeType { + enum ServerBuffChangeType { SERVER_BUFF_CHANGE_TYPE_ADD_SERVER_BUFF = 0; SERVER_BUFF_CHANGE_TYPE_DEL_SERVER_BUFF = 1; } - - repeated uint64 avatar_guid_list = 6; - bool is_creature_buff = 7; - repeated ServerBuff server_buff_list = 9; - ServerBuffChangeType server_buff_change_type = 15; - repeated uint32 entity_id_list = 13; + + repeated ServerBuff server_buff_list = 5; + repeated uint64 avatar_guid_list = 12; + bool is_creature_buff = 7; + ServerBuffChangeType server_buff_change_type = 3; + repeated uint32 entity_id_list = 9; } - diff --git a/proto/WorldPlayerDieNotify.proto b/proto/WorldPlayerDieNotify.proto index 5b9eb3c7..cde6c781 100644 --- a/proto/WorldPlayerDieNotify.proto +++ b/proto/WorldPlayerDieNotify.proto @@ -1,17 +1,31 @@ +// https://github.com/SlushinPS/beach-simulator +// Copyright (C) 2023 Slushy Team +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public 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: 279 -// Name: GKOJHPIPBHO +// CmdId: 214 message WorldPlayerDieNotify { - PlayerDieType die_type = 15; - uint32 murderer_entity_id = 10; - oneof entity { - uint32 monster_id = 2; - uint32 gadget_id = 7; - } + PlayerDieType die_type = 14; + uint32 murderer_entity_id = 9; + oneof entity { + uint32 monster_id = 2; + uint32 gadget_id = 8; + } } -