From 2a3611c3fa1869ef8d42deb74ed36b603f3a70b8 Mon Sep 17 00:00:00 2001 From: Yuuki <6851027-yukiz@users.noreply.gitlab.com> Date: Mon, 22 Apr 2024 04:51:36 +0800 Subject: [PATCH] in-game work, but ... --- proto/AbilityInvokeEntry.proto | 36 ++++-------- proto/AvatarChangeCostumeNotify.proto | 21 +------ proto/AvatarChangeCostumeReq.proto | 23 +------- proto/AvatarChangeCostumeRsp.proto | 25 ++------ proto/AvatarDataNotify.proto | 31 +++------- proto/AvatarEnterSceneInfo.proto | 32 +++------- proto/AvatarFlycloakChangeNotify.proto | 23 +------- proto/AvatarInfo.proto | 25 ++------ proto/AvatarTeam.proto | 22 +------ proto/AvatarTeamUpdateNotify.proto | 23 +------- proto/AvatarWearFlycloakReq.proto | 23 +------- proto/AvatarWearFlycloakRsp.proto | 25 ++------ proto/ChangeAvatarReq.proto | 23 +------- proto/ChangeAvatarRsp.proto | 21 +------ proto/ChangeGameTimeReq.proto | 23 +------- proto/ChangeGameTimeRsp.proto | 25 ++------ proto/ChatInfo.proto | 38 ++++-------- proto/CityInfo.proto | 22 +------ proto/ClientAbilityChangeNotify.proto | 19 +----- proto/ClientAbilityInitFinishNotify.proto | 19 +----- proto/EnterSceneDoneReq.proto | 21 +------ proto/EnterSceneDoneRsp.proto | 21 +------ proto/EnterScenePeerNotify.proto | 27 ++------- proto/EnterSceneReadyReq.proto | 21 +------ proto/EnterSceneReadyRsp.proto | 21 +------ proto/EvtAvatarLockChairReq.proto | 23 +------- proto/EvtAvatarLockChairRsp.proto | 29 ++------- proto/EvtAvatarStandUpNotify.proto | 27 ++------- proto/GetPlayerFriendListRsp.proto | 24 +------- proto/GetPlayerSocialDetailRsp.proto | 23 +------- proto/GetPlayerTokenReq.proto | 50 ++++++---------- proto/GetPlayerTokenRsp.proto | 71 ++++++++++------------- proto/GetSceneAreaReq.proto | 23 +------- proto/GetSceneAreaRsp.proto | 27 ++------- proto/GetScenePointReq.proto | 25 ++------ proto/GetScenePointRsp.proto | 47 +++++---------- proto/HomeSceneInitFinishReq.proto | 19 +----- proto/JCDPOCOOGCI.proto | 21 ------- proto/MPLevelEntityInfo.proto | 22 +------ proto/MarkMapReq.proto | 27 ++------- proto/MarkMapRsp.proto | 23 +------- proto/NpcTalkReq.proto | 25 ++------ proto/NpcTalkRsp.proto | 25 ++------ proto/ObstacleModifyNotify.proto | 19 +----- proto/OpenStateChangeNotify.proto | 21 +------ proto/OpenStateUpdateNotify.proto | 21 +------ proto/PFEBKNGNFPH.proto | 5 ++ proto/PathfindingEnterSceneReq.proto | 19 +----- proto/PingReq.proto | 27 ++------- proto/PingRsp.proto | 23 +------- proto/PlayerDataNotify.proto | 29 ++------- proto/PlayerEnterSceneInfoNotify.proto | 29 ++------- proto/PlayerEnterSceneNotify.proto | 44 +++++--------- proto/PlayerGameTimeNotify.proto | 23 +------- proto/PlayerLoginReq.proto | 68 ++-------------------- proto/PlayerLoginRsp.proto | 29 ++------- proto/PlayerSetPauseReq.proto | 21 +------ proto/PlayerStoreNotify.proto | 19 +----- proto/PostEnterSceneReq.proto | 22 +------ proto/PostEnterSceneRsp.proto | 21 +------ proto/PrivateChatNotify.proto | 21 +------ proto/PrivateChatReq.proto | 23 +------- proto/PullPrivateChatReq.proto | 25 ++------ proto/PullPrivateChatRsp.proto | 23 +------- proto/PullRecentChatReq.proto | 23 +------- proto/PullRecentChatRsp.proto | 21 +------ proto/SceneEntityAppearNotify.proto | 25 ++------ proto/SceneEntityInfo.proto | 18 +----- proto/SceneInitFinishRsp.proto | 21 +------ proto/ScenePlayerInfoNotify.proto | 19 +----- proto/SceneTeamAvatar.proto | 46 +++++---------- proto/SceneTeamUpdateNotify.proto | 21 +------ proto/SceneTimeNotify.proto | 25 ++------ proto/SceneTransToPointReq.proto | 23 +------- proto/SceneTransToPointRsp.proto | 25 ++------ proto/SetUpAvatarTeamReq.proto | 25 ++------ proto/SetUpAvatarTeamRsp.proto | 25 ++------ proto/TeamEnterSceneInfo.proto | 24 ++------ 78 files changed, 344 insertions(+), 1670 deletions(-) delete mode 100644 proto/JCDPOCOOGCI.proto create mode 100644 proto/PFEBKNGNFPH.proto diff --git a/proto/AbilityInvokeEntry.proto b/proto/AbilityInvokeEntry.proto index aefa2e68..eca3f512 100644 --- a/proto/AbilityInvokeEntry.proto +++ b/proto/AbilityInvokeEntry.proto @@ -1,33 +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 "AbilityInvokeArgument.proto"; import "ForwardType.proto"; import "AbilityInvokeEntryHead.proto"; -// Obf: BNCFAGLEKAM + message AbilityInvokeEntry { - AbilityInvokeArgument argument_type = 7; - bytes ability_data = 2; - uint32 entity_id = 9; - ForwardType forward_type = 14; - double total_tick_time = 5; - uint32 forward_peer = 12; - uint32 event_id = 1; - bool is_ignore_auth = 13; - AbilityInvokeEntryHead head = 8; + AbilityInvokeArgument argument_type = 4; + bytes ability_data = 6; + uint32 entity_id = 10; + ForwardType forward_type = 1; + double total_tick_time = 7; + uint32 forward_peer = 3; + uint32 event_id = 9; + bool is_ignore_auth = 11; + AbilityInvokeEntryHead head = 13; } diff --git a/proto/AvatarChangeCostumeNotify.proto b/proto/AvatarChangeCostumeNotify.proto index 9fc28214..81a2b5d5 100644 --- a/proto/AvatarChangeCostumeNotify.proto +++ b/proto/AvatarChangeCostumeNotify.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"; import "SceneEntityInfo.proto"; -// CmdId: 22376 -// Obf: MMGGANDHHFL + message AvatarChangeCostumeNotify { - SceneEntityInfo entity_info = 15; + SceneEntityInfo entity_info = 14; } diff --git a/proto/AvatarChangeCostumeReq.proto b/proto/AvatarChangeCostumeReq.proto index 9418ae2c..d598f414 100644 --- a/proto/AvatarChangeCostumeReq.proto +++ b/proto/AvatarChangeCostumeReq.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: 8840 -// Obf: IMDCBJNFILE + message AvatarChangeCostumeReq { - uint64 avatar_guid = 13; - uint32 costume_id = 5; + uint64 avatar_guid = 6; + uint32 costume_id = 10; } diff --git a/proto/AvatarChangeCostumeRsp.proto b/proto/AvatarChangeCostumeRsp.proto index 23fd7e38..c06f05e4 100644 --- a/proto/AvatarChangeCostumeRsp.proto +++ b/proto/AvatarChangeCostumeRsp.proto @@ -1,25 +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: 9148 -// Obf: KGBMPCNCLNC + message AvatarChangeCostumeRsp { - uint64 avatar_guid = 4; - int32 retcode = 1; - uint32 costume_id = 9; + uint64 avatar_guid = 5; + int32 retcode = 8; + uint32 costume_id = 3; } diff --git a/proto/AvatarDataNotify.proto b/proto/AvatarDataNotify.proto index 3209da55..14ae4424 100644 --- a/proto/AvatarDataNotify.proto +++ b/proto/AvatarDataNotify.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"; import "AvatarInfo.proto"; import "AvatarTeam.proto"; import "AvatarRenameInfo.proto"; -// CmdId: 29811 -// Obf: OGCGDDPPLMI + message AvatarDataNotify { - repeated AvatarInfo avatar_list = 3; - uint32 cur_avatar_team_id = 2; + repeated AvatarInfo avatar_list = 14; + uint32 cur_avatar_team_id = 7; repeated uint32 owned_costume_list = 5; - repeated uint32 owned_flycloak_list = 14; + repeated uint32 owned_flycloak_list = 2; repeated uint64 temp_avatar_guid_list = 1; - uint64 choose_avatar_guid = 15; - map avatar_team_map = 13; + uint64 choose_avatar_guid = 3; + map avatar_team_map = 12; repeated AvatarRenameInfo avatar_rename_list = 11; - repeated uint32 backup_avatar_team_order_list = 7; + repeated uint32 backup_avatar_team_order_list = 4; } diff --git a/proto/AvatarEnterSceneInfo.proto b/proto/AvatarEnterSceneInfo.proto index 8fd0876d..15bdf5a9 100644 --- a/proto/AvatarEnterSceneInfo.proto +++ b/proto/AvatarEnterSceneInfo.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"; import "AbilitySyncStateInfo.proto"; import "ServerBuff.proto"; -// Obf: AJDGFFHCOCL + message AvatarEnterSceneInfo { - AbilitySyncStateInfo avatar_ability_info = 8; + AbilitySyncStateInfo avatar_ability_info = 11; uint64 weapon_guid = 1; - uint32 avatar_entity_id = 5; - repeated uint32 buff_id_list = 4; - uint32 weapon_entity_id = 3; - uint64 avatar_guid = 9; - repeated ServerBuff server_buff_list = 10; - AbilitySyncStateInfo weapon_ability_info = 15; + 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; } diff --git a/proto/AvatarFlycloakChangeNotify.proto b/proto/AvatarFlycloakChangeNotify.proto index dc18fb74..cd2f450c 100644 --- a/proto/AvatarFlycloakChangeNotify.proto +++ b/proto/AvatarFlycloakChangeNotify.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: 23578 -// Obf: GHNNAHDIIKE + message AvatarFlycloakChangeNotify { - uint32 flycloak_id = 2; - uint64 avatar_guid = 3; + uint32 flycloak_id = 12; + uint64 avatar_guid = 11; } diff --git a/proto/AvatarInfo.proto b/proto/AvatarInfo.proto index 27f5b313..b657ffd1 100644 --- a/proto/AvatarInfo.proto +++ b/proto/AvatarInfo.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"; @@ -23,8 +7,8 @@ import "AvatarFetterInfo.proto"; import "AvatarExpeditionState.proto"; import "AvatarEquipAffixInfo.proto"; import "AvatarExcelInfo.proto"; -import "JCDPOCOOGCI.proto"; -// Obf: FHPLJBCPFFF +import "PFEBKNGNFPH.proto"; + message AvatarInfo { uint32 avatar_id = 1; uint64 guid = 2; @@ -52,6 +36,7 @@ message AvatarInfo { uint32 costume_id = 25; AvatarExcelInfo excel_info = 26; uint32 anim_hash = 27; - JCDPOCOOGCI PDGKJIIEPIO = 28; - uint32 GJFKDCJENJE = 29; + PFEBKNGNFPH DBGFEJECPJG = 28; + uint32 EFFGKHEPHCF = 29; + uint32 EPIPMINFOLP = 30; } diff --git a/proto/AvatarTeam.proto b/proto/AvatarTeam.proto index 6ab57fc0..c8a239c4 100644 --- a/proto/AvatarTeam.proto +++ b/proto/AvatarTeam.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: CFFANBDNDEG + message AvatarTeam { - string team_name = 1; - repeated uint64 avatar_guid_list = 4; + string team_name = 6; + repeated uint64 avatar_guid_list = 14; } diff --git a/proto/AvatarTeamUpdateNotify.proto b/proto/AvatarTeamUpdateNotify.proto index e1956378..e1773ff5 100644 --- a/proto/AvatarTeamUpdateNotify.proto +++ b/proto/AvatarTeamUpdateNotify.proto @@ -1,25 +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 "AvatarTeam.proto"; -// CmdId: 7828 -// Obf: OLBHAPJCKDM + message AvatarTeamUpdateNotify { - repeated uint64 temp_avatar_guid_list = 14; - map avatar_team_map = 3; + repeated uint64 temp_avatar_guid_list = 7; + map avatar_team_map = 9; } diff --git a/proto/AvatarWearFlycloakReq.proto b/proto/AvatarWearFlycloakReq.proto index 1915cedd..8a7b21be 100644 --- a/proto/AvatarWearFlycloakReq.proto +++ b/proto/AvatarWearFlycloakReq.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: 824 -// Obf: LNDKKJJEFBJ + message AvatarWearFlycloakReq { - uint32 flycloak_id = 7; - uint64 avatar_guid = 1; + uint32 flycloak_id = 12; + uint64 avatar_guid = 6; } diff --git a/proto/AvatarWearFlycloakRsp.proto b/proto/AvatarWearFlycloakRsp.proto index 38497746..ef386699 100644 --- a/proto/AvatarWearFlycloakRsp.proto +++ b/proto/AvatarWearFlycloakRsp.proto @@ -1,25 +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: 21633 -// Obf: BCLNBCGCHKJ + message AvatarWearFlycloakRsp { - int32 retcode = 10; - uint32 flycloak_id = 6; - uint64 avatar_guid = 3; + int32 retcode = 5; + uint32 flycloak_id = 7; + uint64 avatar_guid = 2; } diff --git a/proto/ChangeAvatarReq.proto b/proto/ChangeAvatarReq.proto index d1e92a25..a90320b7 100644 --- a/proto/ChangeAvatarReq.proto +++ b/proto/ChangeAvatarReq.proto @@ -1,27 +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"; -// CmdId: 23169 -// Obf: JENKJBLNBMD + message ChangeAvatarReq { - Vector move_pos = 9; - uint64 guid = 4; + Vector move_pos = 12; + uint64 guid = 1; bool is_move = 3; uint32 skill_id = 7; } diff --git a/proto/ChangeAvatarRsp.proto b/proto/ChangeAvatarRsp.proto index 5f7b3142..ae7fd280 100644 --- a/proto/ChangeAvatarRsp.proto +++ b/proto/ChangeAvatarRsp.proto @@ -1,25 +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: 22163 -// Obf: DPMLHHKHGFF + message ChangeAvatarRsp { - uint64 cur_guid = 2; + uint64 cur_guid = 3; int32 retcode = 4; uint32 skill_id = 9; } diff --git a/proto/ChangeGameTimeReq.proto b/proto/ChangeGameTimeReq.proto index fe425542..e1407ecb 100644 --- a/proto/ChangeGameTimeReq.proto +++ b/proto/ChangeGameTimeReq.proto @@ -1,25 +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: 27713 -// Obf: OOLLNOHMPOL + message ChangeGameTimeReq { bool is_force_set = 1; - uint32 extra_days = 7; - uint32 game_time = 5; + uint32 extra_days = 2; + uint32 game_time = 9; } diff --git a/proto/ChangeGameTimeRsp.proto b/proto/ChangeGameTimeRsp.proto index 9a71ce84..0ee4c8d7 100644 --- a/proto/ChangeGameTimeRsp.proto +++ b/proto/ChangeGameTimeRsp.proto @@ -1,25 +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: 28316 -// Obf: BEHKLPMPHBH + message ChangeGameTimeRsp { - uint32 cur_game_time = 1; - uint32 extra_days = 14; - int32 retcode = 13; + uint32 cur_game_time = 12; + uint32 extra_days = 4; + int32 retcode = 5; } diff --git a/proto/ChatInfo.proto b/proto/ChatInfo.proto index a79548e3..4b54621c 100644 --- a/proto/ChatInfo.proto +++ b/proto/ChatInfo.proto @@ -1,41 +1,25 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public 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: KFPJAAEHBNB + message ChatInfo { - // Obf: LGDLFPKODMA + 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 = 15; + uint32 type = 10; } - uint32 to_uid = 10; - uint32 time = 13; - uint32 uid = 4; + uint32 to_uid = 3; + uint32 time = 5; + uint32 uid = 11; oneof content { - string text = 962; - uint32 icon = 1562; - SystemHint system_hint = 841; + string text = 457; + uint32 icon = 1812; + SystemHint system_hint = 44; } - bool is_read = 7; - uint32 sequence = 5; + bool is_read = 8; + uint32 sequence = 13; } diff --git a/proto/CityInfo.proto b/proto/CityInfo.proto index 30ac4fbf..d301ee91 100644 --- a/proto/CityInfo.proto +++ b/proto/CityInfo.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: ADHJGFHHPLP + message CityInfo { - uint32 level = 4; - uint32 crystal_num = 15; + uint32 level = 12; + uint32 crystal_num = 11; uint32 city_id = 9; } diff --git a/proto/ClientAbilityChangeNotify.proto b/proto/ClientAbilityChangeNotify.proto index b040f986..5d47b7b3 100644 --- a/proto/ClientAbilityChangeNotify.proto +++ b/proto/ClientAbilityChangeNotify.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"; import "AbilityInvokeEntry.proto"; -// CmdId: 8174 -// Obf: IPNNHNHPLAK +// todo message ClientAbilityChangeNotify { bool is_init_hash = 5; repeated AbilityInvokeEntry invokes = 3; diff --git a/proto/ClientAbilityInitFinishNotify.proto b/proto/ClientAbilityInitFinishNotify.proto index c646ce74..a52441ce 100644 --- a/proto/ClientAbilityInitFinishNotify.proto +++ b/proto/ClientAbilityInitFinishNotify.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"; import "AbilityInvokeEntry.proto"; -// CmdId: 8666 -// Obf: PJIHLINBLNG +// todo message ClientAbilityInitFinishNotify { uint32 entity_id = 4; repeated AbilityInvokeEntry invokes = 9; diff --git a/proto/EnterSceneDoneReq.proto b/proto/EnterSceneDoneReq.proto index 7deaf470..4829a6d0 100644 --- a/proto/EnterSceneDoneReq.proto +++ b/proto/EnterSceneDoneReq.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: 28690 -// Obf: KLBOAPKHBEP + message EnterSceneDoneReq { - uint32 enter_scene_token = 9; + uint32 enter_scene_token = 8; } diff --git a/proto/EnterSceneDoneRsp.proto b/proto/EnterSceneDoneRsp.proto index 74b76d0c..ed60c161 100644 --- a/proto/EnterSceneDoneRsp.proto +++ b/proto/EnterSceneDoneRsp.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: 24814 -// Obf: AHBDCDEOHII + message EnterSceneDoneRsp { - uint32 enter_scene_token = 12; + uint32 enter_scene_token = 8; int32 retcode = 15; } diff --git a/proto/EnterScenePeerNotify.proto b/proto/EnterScenePeerNotify.proto index 38b020e8..3e26fe8c 100644 --- a/proto/EnterScenePeerNotify.proto +++ b/proto/EnterScenePeerNotify.proto @@ -1,26 +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: 21053 -// Obf: JBBPPLGGMPC + message EnterScenePeerNotify { - uint32 enter_scene_token = 7; - uint32 peer_id = 14; - uint32 host_peer_id = 8; - uint32 dest_scene_id = 3; + uint32 enter_scene_token = 14; + uint32 peer_id = 1; + uint32 host_peer_id = 12; + uint32 dest_scene_id = 13; } diff --git a/proto/EnterSceneReadyReq.proto b/proto/EnterSceneReadyReq.proto index 004f34e9..4822439a 100644 --- a/proto/EnterSceneReadyReq.proto +++ b/proto/EnterSceneReadyReq.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: 5011 -// Obf: HDKGADMEFMP + message EnterSceneReadyReq { - uint32 enter_scene_token = 15; + uint32 enter_scene_token = 1; } diff --git a/proto/EnterSceneReadyRsp.proto b/proto/EnterSceneReadyRsp.proto index ed09d44d..d0d86b34 100644 --- a/proto/EnterSceneReadyRsp.proto +++ b/proto/EnterSceneReadyRsp.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: 4744 -// Obf: DCBGKOFOANI + message EnterSceneReadyRsp { - uint32 enter_scene_token = 12; + uint32 enter_scene_token = 5; int32 retcode = 2; } diff --git a/proto/EvtAvatarLockChairReq.proto b/proto/EvtAvatarLockChairReq.proto index 659d167a..b487a1ee 100644 --- a/proto/EvtAvatarLockChairReq.proto +++ b/proto/EvtAvatarLockChairReq.proto @@ -1,26 +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 "Vector.proto"; -// CmdId: 23086 -// Obf: LBJMDFGMGBD + message EvtAvatarLockChairReq { - Vector position = 13; + Vector position = 11; uint64 chair_id = 9; - int32 direction = 3; + int32 direction = 6; } diff --git a/proto/EvtAvatarLockChairRsp.proto b/proto/EvtAvatarLockChairRsp.proto index 23409d5e..caba8ea8 100644 --- a/proto/EvtAvatarLockChairRsp.proto +++ b/proto/EvtAvatarLockChairRsp.proto @@ -1,28 +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"; -// CmdId: 26356 -// Obf: ABACJEJFCJJ + message EvtAvatarLockChairRsp { - uint64 chair_id = 4; - Vector position = 3; - int32 retcode = 9; - uint32 entity_id = 7; - int32 direction = 2; + uint64 chair_id = 15; + Vector position = 14; + int32 retcode = 13; + uint32 entity_id = 10; + int32 direction = 7; } diff --git a/proto/EvtAvatarStandUpNotify.proto b/proto/EvtAvatarStandUpNotify.proto index f76480b0..6e41b866 100644 --- a/proto/EvtAvatarStandUpNotify.proto +++ b/proto/EvtAvatarStandUpNotify.proto @@ -1,26 +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: 8332 -// Obf: JOAGCKEBIGN + message EvtAvatarStandUpNotify { - int32 direction = 14; - uint64 chair_id = 8; - int32 performId = 12; - uint32 entity_id = 6; + int32 direction = 12; + uint64 chair_id = 5; + int32 performId = 9; + uint32 entity_id = 15; } diff --git a/proto/GetPlayerFriendListRsp.proto b/proto/GetPlayerFriendListRsp.proto index aa952b1a..e7658c5a 100644 --- a/proto/GetPlayerFriendListRsp.proto +++ b/proto/GetPlayerFriendListRsp.proto @@ -1,26 +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 "FriendBrief.proto"; -// CmdId: 20997 -// Obf: GBPKOGFAIJA + message GetPlayerFriendListRsp { - int32 retcode = 6; - repeated FriendBrief friend_list = 15; - repeated FriendBrief ask_friend_list = 2; + repeated FriendBrief friend_list = 13; + repeated FriendBrief ask_friend_list = 1; } diff --git a/proto/GetPlayerSocialDetailRsp.proto b/proto/GetPlayerSocialDetailRsp.proto index f3df0327..ec090dab 100644 --- a/proto/GetPlayerSocialDetailRsp.proto +++ b/proto/GetPlayerSocialDetailRsp.proto @@ -1,25 +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 "SocialDetail.proto"; -// CmdId: 7452 -// Obf: EOJCAMGIPGL + message GetPlayerSocialDetailRsp { - int32 retcode = 7; - SocialDetail detail_data = 5; + int32 retcode = 6; + SocialDetail detail_data = 14; } diff --git a/proto/GetPlayerTokenReq.proto b/proto/GetPlayerTokenReq.proto index e176852a..129a7752 100644 --- a/proto/GetPlayerTokenReq.proto +++ b/proto/GetPlayerTokenReq.proto @@ -1,43 +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: 21228 -// Obf: AGJHCDNJDOG +// todo + message GetPlayerTokenReq { - uint32 account_type = 11; - string account_token = 12; - string psn_id = 10; + string account_uid = 14; + string account_token = 10; + uint32 platform_type = 9; + uint32 key_id = 728; + string client_rand_key = 514; + string online_id = 1; - string account_uid = 4; - string LODOCFKABDG = 3; - uint32 platform_type = 8; - string client_ip_str = 9; + string psn_id = 12; + uint32 channel_id = 5; uint32 sub_channel_id = 7; + uint32 account_type = 2; + string client_ip_str = 11; uint32 cloudClientIp = 177; - string GIKAFFPKLOE = 14; string birthday = 828; uint32 uid = 13; - uint32 OGNFFAEKDBO = 695; - uint32 key_id = 407; string country_code = 15; - uint32 channel_id = 6; - uint32 FCPDNLHOBNK = 2; - bool is_guest = 5; + bool is_guest = 6; + string FAOAMMHOOHL = 1457; - string client_rand_key = 355; + uint32 FCPDNLHOBNK = 8; + string GIKAFFPKLOE = 4; + string LODOCFKABDG = 3; + uint32 OGNFFAEKDBO = 652; } diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto index cf11096c..227801c9 100644 --- a/proto/GetPlayerTokenRsp.proto +++ b/proto/GetPlayerTokenRsp.proto @@ -1,55 +1,46 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public 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 "StopServerInfo.proto"; -// CmdId: 2407 -// Obf: BKFNIGMLAOA +// todo + message GetPlayerTokenRsp { - bool PELBMOHDKHJ = 1292; - bool ILGBPPMFHIF = 1962; - uint64 secret_key_seed = 13; - string client_version_random_key = 678; - StopServerInfo stop_server = 875; - uint32 channel_id = 259; - uint32 platform_type = 5; - uint32 reg_platform = 1241; + + 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 account_uid = 3; - uint32 uid = 7; uint32 tag = 1572; string birthday = 1437; uint32 key_id = 1676; - int32 retcode = 4; bool is_guest = 2; repeated uint32 finish_collection_id_list = 451; - string server_rand_key = 517; - bytes security_cmd_buffer = 15; - string msg = 12; - bool is_proficient_player = 8; - string token = 11; - string sign = 394; - uint32 account_type = 1585; - bytes extra_bin_data = 1; + bytes extra_bin_data = 7; string psn_id = 1790; uint32 sub_channel_id = 14; string secret_key = 9; - string client_ip_str = 1921; - uint32 blackUidEndTime = 10; - uint32 KCFIGJAPNIB = 6; - string country_code = 1412; uint32 cloudClientIp = 508; + + uint32 KCFIGJAPNIB = 6; + bool PELBMOHDKHJ = 1292; + bool ILGBPPMFHIF = 1962; } diff --git a/proto/GetSceneAreaReq.proto b/proto/GetSceneAreaReq.proto index b06b6da2..61e491ab 100644 --- a/proto/GetSceneAreaReq.proto +++ b/proto/GetSceneAreaReq.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: 25175 -// Obf: LABAJDKACOG + message GetSceneAreaReq { - uint32 scene_id = 13; - uint32 belong_uid = 9; + uint32 scene_id = 2; + uint32 belong_uid = 14; } diff --git a/proto/GetSceneAreaRsp.proto b/proto/GetSceneAreaRsp.proto index b5e7cc27..2be68bb3 100644 --- a/proto/GetSceneAreaRsp.proto +++ b/proto/GetSceneAreaRsp.proto @@ -1,27 +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 "CityInfo.proto"; -// CmdId: 27029 -// Obf: GOPJBKDDELB + message GetSceneAreaRsp { - repeated CityInfo city_info_list = 11; - int32 retcode = 3; - uint32 scene_id = 7; - repeated uint32 area_id_list = 2; + repeated CityInfo city_info_list = 4; + int32 retcode = 15; + uint32 scene_id = 5; + repeated uint32 area_id_list = 7; } diff --git a/proto/GetScenePointReq.proto b/proto/GetScenePointReq.proto index 6eccd3b7..af325e43 100644 --- a/proto/GetScenePointReq.proto +++ b/proto/GetScenePointReq.proto @@ -1,25 +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: 23197 -// Obf: PBIPDICGDKH + message GetScenePointReq { - uint32 belong_uid = 12; - bool FBFJPEPMAOF = 5; - uint32 scene_id = 3; + uint32 belong_uid = 10; + uint32 scene_id = 11; + bool APPFPHLAKBG = 6; } diff --git a/proto/GetScenePointRsp.proto b/proto/GetScenePointRsp.proto index c84eab0f..1a4fcdfc 100644 --- a/proto/GetScenePointRsp.proto +++ b/proto/GetScenePointRsp.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"; -// CmdId: 7133 -// Obf: PMONCPENJMK + message GetScenePointRsp { - repeated uint32 unlocked_point_list = 1; - repeated uint32 unhide_point_list = 6; - bool FBFJPEPMAOF = 9; - int32 retcode = 11; - repeated uint32 unlock_area_list = 12; - repeated uint32 PPDDIADEDIC = 8; - repeated uint32 OGKCOCBLNLF = 10; - repeated uint32 EBIFELCKPEA = 7; - repeated uint32 JJOHJDFINFN = 4; - uint32 belong_uid = 14; - repeated uint32 JCLHNODLPOH = 13; - uint32 scene_id = 2; - repeated uint32 KOPAHGHMECF = 3; + 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; } diff --git a/proto/HomeSceneInitFinishReq.proto b/proto/HomeSceneInitFinishReq.proto index 3161ec1b..c53050c6 100644 --- a/proto/HomeSceneInitFinishReq.proto +++ b/proto/HomeSceneInitFinishReq.proto @@ -1,22 +1,5 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public 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: 27778 -// Obf: DLBMDKGFBOI +// todo message HomeSceneInitFinishReq { } diff --git a/proto/JCDPOCOOGCI.proto b/proto/JCDPOCOOGCI.proto deleted file mode 100644 index a14e81f3..00000000 --- a/proto/JCDPOCOOGCI.proto +++ /dev/null @@ -1,21 +0,0 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public 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"; -message JCDPOCOOGCI { - uint32 ANLJDEBMOPA = 1; -} diff --git a/proto/MPLevelEntityInfo.proto b/proto/MPLevelEntityInfo.proto index b5a23c08..bf0c7bdb 100644 --- a/proto/MPLevelEntityInfo.proto +++ b/proto/MPLevelEntityInfo.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 "AbilitySyncStateInfo.proto"; -// Obf: EPAFCHAOKLI + message MPLevelEntityInfo { uint32 entity_id = 7; - AbilitySyncStateInfo ability_info = 9; - uint32 authority_peer_id = 6; + AbilitySyncStateInfo ability_info = 2; + uint32 authority_peer_id = 9; } diff --git a/proto/MarkMapReq.proto b/proto/MarkMapReq.proto index ebe81907..98ee360a 100644 --- a/proto/MarkMapReq.proto +++ b/proto/MarkMapReq.proto @@ -1,26 +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 "MapMarkPoint.proto"; -// CmdId: 1812 -// Obf: OIHCCJMLEGJ + message MarkMapReq { - // Obf: NIELEKBPCIJ + enum Operation { OPERATION_ADD = 0; OPERATION_MOD = 1; @@ -28,7 +11,7 @@ message MarkMapReq { OPERATION_GET = 3; } - MapMarkPoint mark = 6; - Operation op = 3; - MapMarkPoint old = 15; + MapMarkPoint mark = 4; + Operation op = 11; + MapMarkPoint old = 2; } diff --git a/proto/MarkMapRsp.proto b/proto/MarkMapRsp.proto index c6471ec7..703242d4 100644 --- a/proto/MarkMapRsp.proto +++ b/proto/MarkMapRsp.proto @@ -1,25 +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 "MapMarkPoint.proto"; -// CmdId: 28945 -// Obf: BKCHBPAFDAC + message MarkMapRsp { - int32 retcode = 7; - repeated MapMarkPoint mark_list = 12; + int32 retcode = 4; + repeated MapMarkPoint mark_list = 14; } diff --git a/proto/NpcTalkReq.proto b/proto/NpcTalkReq.proto index 18bd512a..8f18115c 100644 --- a/proto/NpcTalkReq.proto +++ b/proto/NpcTalkReq.proto @@ -1,25 +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: 3174 -// Obf: NMMAMHCFAAD + message NpcTalkReq { - uint32 talk_id = 8; - uint32 npc_entity_id = 11; - uint32 entity_id = 3; + uint32 talk_id = 2; + uint32 npc_entity_id = 1; + uint32 entity_id = 8; } diff --git a/proto/NpcTalkRsp.proto b/proto/NpcTalkRsp.proto index a39d11b9..f7203d8e 100644 --- a/proto/NpcTalkRsp.proto +++ b/proto/NpcTalkRsp.proto @@ -1,26 +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: 3890 -// Obf: CJMFBCFOJFL + message NpcTalkRsp { - int32 retcode = 4; - uint32 entity_id = 14; - uint32 cur_talk_id = 7; + int32 retcode = 7; + uint32 entity_id = 11; + uint32 cur_talk_id = 6; uint32 npc_entity_id = 9; } diff --git a/proto/ObstacleModifyNotify.proto b/proto/ObstacleModifyNotify.proto index bf689c6f..40416847 100644 --- a/proto/ObstacleModifyNotify.proto +++ b/proto/ObstacleModifyNotify.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"; import "ObstacleInfo.proto"; -// CmdId: 2314 -// Obf: EOGNKGLIDKH +// todo message ObstacleModifyNotify { repeated int32 remove_obstacle_ids = 6; repeated ObstacleInfo add_obstacles = 10; diff --git a/proto/OpenStateChangeNotify.proto b/proto/OpenStateChangeNotify.proto index eb33423b..554d156c 100644 --- a/proto/OpenStateChangeNotify.proto +++ b/proto/OpenStateChangeNotify.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: 5778 -// Obf: KEIOJEIOCDI + message OpenStateChangeNotify { - map open_state_map = 9; + map open_state_map = 4; } diff --git a/proto/OpenStateUpdateNotify.proto b/proto/OpenStateUpdateNotify.proto index 54a4b082..24848fac 100644 --- a/proto/OpenStateUpdateNotify.proto +++ b/proto/OpenStateUpdateNotify.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: 9279 -// Obf: HBGDILLIJDK + message OpenStateUpdateNotify { - map open_state_map = 13; + map open_state_map = 11; } diff --git a/proto/PFEBKNGNFPH.proto b/proto/PFEBKNGNFPH.proto new file mode 100644 index 00000000..dff59aeb --- /dev/null +++ b/proto/PFEBKNGNFPH.proto @@ -0,0 +1,5 @@ +syntax = "proto3"; +option java_package = "emu.grasscutter.net.proto"; +message PFEBKNGNFPH { + uint32 HMDKDEOHKCG = 1; +} diff --git a/proto/PathfindingEnterSceneReq.proto b/proto/PathfindingEnterSceneReq.proto index b107d8eb..22bc9e75 100644 --- a/proto/PathfindingEnterSceneReq.proto +++ b/proto/PathfindingEnterSceneReq.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"; import "ObstacleInfo.proto"; -// CmdId: 2347 -// Obf: FPAOCKHOFJL +// todo message PathfindingEnterSceneReq { bool is_editor = 3; uint32 version = 4; diff --git a/proto/PingReq.proto b/proto/PingReq.proto index 6fba1db0..c9865b49 100644 --- a/proto/PingReq.proto +++ b/proto/PingReq.proto @@ -1,27 +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: 5285 -// Obf: EIMFFIJOBHL + message PingReq { double total_tick_time = 8; - uint32 client_time = 2; - float ue_time = 12; - bytes sc_data = 6; - uint32 seq = 10; + uint32 client_time = 12; + float ue_time = 13; + bytes sc_data = 14; + uint32 seq = 1; } diff --git a/proto/PingRsp.proto b/proto/PingRsp.proto index 22cc1d61..b9190479 100644 --- a/proto/PingRsp.proto +++ b/proto/PingRsp.proto @@ -1,25 +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: 8231 -// Obf: BLIJCEANDPM + message PingRsp { - uint32 seq = 6; - int32 retcode = 2; + uint32 seq = 15; + int32 retcode = 6; uint32 client_time = 12; } diff --git a/proto/PlayerDataNotify.proto b/proto/PlayerDataNotify.proto index 34561a38..72eceb62 100644 --- a/proto/PlayerDataNotify.proto +++ b/proto/PlayerDataNotify.proto @@ -1,28 +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 "PropValue.proto"; -// CmdId: 2051 -// Obf: DMLJMNGGJAC + message PlayerDataNotify { - uint32 region_id = 15; - map prop_map = 3; - string nick_name = 7; - bool is_first_login_today = 12; - uint64 server_time = 6; + uint32 region_id = 3; + map prop_map = 5; + string nick_name = 1; + bool is_first_login_today = 9; + uint64 server_time = 7; } diff --git a/proto/PlayerEnterSceneInfoNotify.proto b/proto/PlayerEnterSceneInfoNotify.proto index 98ac380d..64858a6e 100644 --- a/proto/PlayerEnterSceneInfoNotify.proto +++ b/proto/PlayerEnterSceneInfoNotify.proto @@ -1,30 +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 "MPLevelEntityInfo.proto"; import "AvatarEnterSceneInfo.proto"; import "TeamEnterSceneInfo.proto"; -// CmdId: 27063 -// Obf: BMMOCCOFGEL + message PlayerEnterSceneInfoNotify { - uint32 cur_avatar_entity_id = 14; - uint32 enter_scene_token = 6; - MPLevelEntityInfo mp_level_entity_info = 8; - repeated AvatarEnterSceneInfo avatar_enter_info = 10; - TeamEnterSceneInfo team_enter_info = 9; + 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; } diff --git a/proto/PlayerEnterSceneNotify.proto b/proto/PlayerEnterSceneNotify.proto index 01f524e2..d661fdcc 100644 --- a/proto/PlayerEnterSceneNotify.proto +++ b/proto/PlayerEnterSceneNotify.proto @@ -1,44 +1,26 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public 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 "MapLayerInfo.proto"; import "Vector.proto"; import "EnterType.proto"; -// CmdId: 2783 -// Obf: PBJBDNIOMBF +// check message PlayerEnterSceneNotify { - string scene_transaction = 1319; + string scene_transaction = 1232; // 45 MapLayerInfo map_layer_info = 897; bool is_skip_ui = 3; - uint32 prev_scene_id = 9; + uint32 prev_scene_id = 8; // OK bool is_first_login_enter_scene = 164; - uint32 target_uid = 1; - repeated uint32 scene_tag_id_list = 13; - Vector prev_pos = 12; - uint32 enter_scene_token = 7; + 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 = 6; + EnterType type = 10; // 45 uint32 enter_reason = 670; - Vector pos = 14; - uint64 scene_begin_time = 5; - uint32 LAJGLCIFKCP = 1820; - uint32 world_level = 4; + Vector pos = 14; // 45 + uint64 scene_begin_time = 2; // 45 + uint32 world_level = 5; // OK uint32 dungeon_id = 11; - uint32 scene_id = 10; - uint32 create_player_uid = 1748; + uint32 scene_id = 7; // 45 + uint32 create_player_uid = 1173; // 45 } diff --git a/proto/PlayerGameTimeNotify.proto b/proto/PlayerGameTimeNotify.proto index 3f41a1d8..a1c2213a 100644 --- a/proto/PlayerGameTimeNotify.proto +++ b/proto/PlayerGameTimeNotify.proto @@ -1,25 +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: 22433 -// Obf: OHHGGBKDLPI + message PlayerGameTimeNotify { - uint32 game_time = 6; - bool is_home = 7; + uint32 game_time = 13; + bool is_home = 14; uint32 uid = 11; } diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto index 84b70ba9..148c1033 100644 --- a/proto/PlayerLoginReq.proto +++ b/proto/PlayerLoginReq.proto @@ -1,68 +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 "TrackingIOInfo.proto"; -import "AdjustTrackingInfo.proto"; -// CmdId: 25842 -// Obf: GJIMLGLMKJF + message PlayerLoginReq { - bytes security_cmd_reply = 1651; - uint32 DEBLDPOHPOL = 1820; - bytes environment_error_code = 1141; - TrackingIOInfo tracking_io_info = 436; - string country_code = 1930; string device_info = 5; - string account_uid = 8; - string HIPFGBLGPMJ = 45; - string psn_id = 1266; - uint32 EMFDHANIAHH = 912; - uint32 target_uid = 12; - string checksum_client_version = 1594; - uint32 DHOLEDCICPB = 675; - string FOHJKJCKFFA = 458; - AdjustTrackingInfo adjust_tracking_info = 1948; - bool is_guest = 1; - uint32 tag = 188; - uint32 target_home_owner_uid = 1671; - uint32 platform_type = 4; - string CFMBEIOBIEG = 812; - uint32 channel_id = 1816; - bool is_transfer = 787; - string online_id = 1270; - uint32 client_data_version = 2004; - string birthday = 190; - string client_version = 13; - string checksum = 1796; - uint32 FCPDNLHOBNK = 706; - uint32 KCFIGJAPNIB = 435; - bytes extra_bin_data = 74; - uint64 login_rand = 6; - string platform = 14; - uint32 sub_channel_id = 7; - uint32 KKKHJACICJO = 1228; - string device_uuid = 10; - string token = 2; - string device_name = 11; - string system_version = 3; - string client_verison_hash = 869; - bool is_editor = 15; - uint32 language_type = 9; - uint32 LJFBMKFHNJM = 1153; - uint32 account_type = 834; - string FPOFDDAGKAG = 255; + string device_name = 3; + string system_version = 13; + string client_version = 4; + string token = 14; } diff --git a/proto/PlayerLoginRsp.proto b/proto/PlayerLoginRsp.proto index fa82c733..80898ed5 100644 --- a/proto/PlayerLoginRsp.proto +++ b/proto/PlayerLoginRsp.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 "ShortAbilityHashPair.proto"; @@ -21,19 +5,20 @@ import "FeatureBlockInfo.proto"; import "BlockInfo.proto"; import "ResVersionConfig.proto"; import "StopServerInfo.proto"; -// CmdId: 29665 -// Obf: NIDDAJCLAEC + 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; - string game_biz = 4; int32 ability_hash_code = 5; repeated ShortAbilityHashPair short_ability_hash_map = 1373; bool FBFJPEPMAOF = 15; - bool is_use_ability_hash = 14; + bool is_use_ability_hash = 16; bool is_audit = 335; string client_silence_md5 = 784; string msg = 43; @@ -49,16 +34,14 @@ message PlayerLoginRsp { map block_info_map = 2007; bool GOFGOCDJDND = 281; string next_resource_url = 986; - ResVersionConfig res_version_config = 413; double total_tick_time = 262; bytes player_data = 13; bytes sc_info = 416; uint64 login_rand = 3; string ENNOCBNIHIK = 1258; - string country_code = 452; uint32 player_data_version = 11; string client_silence_version_suffix = 211; StopServerInfo ECKNMCACJKG = 2021; string client_md5 = 535; - ResVersionConfig next_res_version_config = 1132; + ResVersionConfig next_res_version_config = 1132; } diff --git a/proto/PlayerSetPauseReq.proto b/proto/PlayerSetPauseReq.proto index d04d4910..a67202bf 100644 --- a/proto/PlayerSetPauseReq.proto +++ b/proto/PlayerSetPauseReq.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: 4448 -// Obf: LHFKJLJJEBC + message PlayerSetPauseReq { - bool is_paused = 11; + bool is_paused = 6; } diff --git a/proto/PlayerStoreNotify.proto b/proto/PlayerStoreNotify.proto index 0a57e4f0..778df914 100644 --- a/proto/PlayerStoreNotify.proto +++ b/proto/PlayerStoreNotify.proto @@ -1,25 +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 "StoreType.proto"; import "Item.proto"; -// CmdId: 4667 -// Obf: HMFIJAJOPNN +// todo message PlayerStoreNotify { StoreType store_type = 8; uint32 weight_limit = 5; diff --git a/proto/PostEnterSceneReq.proto b/proto/PostEnterSceneReq.proto index 0b710214..a6c253ef 100644 --- a/proto/PostEnterSceneReq.proto +++ b/proto/PostEnterSceneReq.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"; -// CmdId: 5606 -// Obf: KAJDPNBPFJF + message PostEnterSceneReq { - uint32 enter_scene_token = 8; + uint32 enter_scene_token = 7; + double total_tick_time = 1; } diff --git a/proto/PostEnterSceneRsp.proto b/proto/PostEnterSceneRsp.proto index 3f946e3a..14194363 100644 --- a/proto/PostEnterSceneRsp.proto +++ b/proto/PostEnterSceneRsp.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: 7880 -// Obf: AAGPOLGIIGK + message PostEnterSceneRsp { int32 retcode = 15; - uint32 enter_scene_token = 9; + uint32 enter_scene_token = 14; } diff --git a/proto/PrivateChatNotify.proto b/proto/PrivateChatNotify.proto index 3431bab2..1db5dbfa 100644 --- a/proto/PrivateChatNotify.proto +++ b/proto/PrivateChatNotify.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"; import "ChatInfo.proto"; -// CmdId: 29471 -// Obf: ANNGLMINMGK + message PrivateChatNotify { - ChatInfo chat_info = 5; + ChatInfo chat_info = 3; } diff --git a/proto/PrivateChatReq.proto b/proto/PrivateChatReq.proto index dd024e62..f61752f5 100644 --- a/proto/PrivateChatReq.proto +++ b/proto/PrivateChatReq.proto @@ -1,27 +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: 8163 -// Obf: LOHLOJMOCAG + message PrivateChatReq { uint32 target_uid = 5; oneof content { - string text = 12; - uint32 icon = 11; + string text = 10; + uint32 icon = 2; } } diff --git a/proto/PullPrivateChatReq.proto b/proto/PullPrivateChatReq.proto index 999a7a17..8b4dcc57 100644 --- a/proto/PullPrivateChatReq.proto +++ b/proto/PullPrivateChatReq.proto @@ -1,25 +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: 22346 -// Obf: CDBDGACCDJI + message PullPrivateChatReq { - uint32 from_sequence = 6; - uint32 pull_num = 12; - uint32 target_uid = 14; + uint32 from_sequence = 15; + uint32 pull_num = 4; + uint32 target_uid = 7; } diff --git a/proto/PullPrivateChatRsp.proto b/proto/PullPrivateChatRsp.proto index 8e032571..331dbe25 100644 --- a/proto/PullPrivateChatRsp.proto +++ b/proto/PullPrivateChatRsp.proto @@ -1,25 +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 "ChatInfo.proto"; -// CmdId: 4681 -// Obf: GAFCFLJEJKF + message PullPrivateChatRsp { - int32 retcode = 14; - repeated ChatInfo chat_info = 2; + int32 retcode = 4; + repeated ChatInfo chat_info = 11; } diff --git a/proto/PullRecentChatReq.proto b/proto/PullRecentChatReq.proto index 88ac7153..d33b0825 100644 --- a/proto/PullRecentChatReq.proto +++ b/proto/PullRecentChatReq.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: 23337 -// Obf: DLAJEHFIMNF + message PullRecentChatReq { - uint32 begin_sequence = 11; - uint32 pull_num = 2; + uint32 begin_sequence = 9; + uint32 pull_num = 4; } diff --git a/proto/PullRecentChatRsp.proto b/proto/PullRecentChatRsp.proto index 53ceb2ce..27246810 100644 --- a/proto/PullRecentChatRsp.proto +++ b/proto/PullRecentChatRsp.proto @@ -1,25 +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 "ChatInfo.proto"; -// CmdId: 308 -// Obf: LOLOHADFKJG + message PullRecentChatRsp { repeated ChatInfo chat_info = 11; - int32 retcode = 9; + int32 retcode = 4; } diff --git a/proto/SceneEntityAppearNotify.proto b/proto/SceneEntityAppearNotify.proto index 4f16339b..e30a53a7 100644 --- a/proto/SceneEntityAppearNotify.proto +++ b/proto/SceneEntityAppearNotify.proto @@ -1,27 +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 "SceneEntityInfo.proto"; import "VisionType.proto"; -// CmdId: 24016 -// Obf: PBPDCGDBNHJ + message SceneEntityAppearNotify { - repeated SceneEntityInfo entity_list = 7; - VisionType appear_type = 5; - uint32 param = 15; + repeated SceneEntityInfo entity_list = 15; + VisionType appear_type = 7; + uint32 param = 5; } diff --git a/proto/SceneEntityInfo.proto b/proto/SceneEntityInfo.proto index eb81b035..d6a889fe 100644 --- a/proto/SceneEntityInfo.proto +++ b/proto/SceneEntityInfo.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 "ProtEntityType.proto"; @@ -29,7 +13,7 @@ import "EntityClientData.proto"; import "EntityEnvironmentInfo.proto"; import "EntityAuthorityInfo.proto"; import "ServerBuff.proto"; -// Obf: DGPPPPBJILO +// check message SceneEntityInfo { ProtEntityType entity_type = 1; uint32 entity_id = 2; diff --git a/proto/SceneInitFinishRsp.proto b/proto/SceneInitFinishRsp.proto index 14fce661..aac29f42 100644 --- a/proto/SceneInitFinishRsp.proto +++ b/proto/SceneInitFinishRsp.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: 3805 -// Obf: IEBDLOBLJDP + message SceneInitFinishRsp { int32 retcode = 4; - uint32 enter_scene_token = 13; + uint32 enter_scene_token = 9; } diff --git a/proto/ScenePlayerInfoNotify.proto b/proto/ScenePlayerInfoNotify.proto index 60119b19..5f8bfb9e 100644 --- a/proto/ScenePlayerInfoNotify.proto +++ b/proto/ScenePlayerInfoNotify.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"; import "ScenePlayerInfo.proto"; -// CmdId: 23510 -// Obf: AKPNDPFIBFH +// todo message ScenePlayerInfoNotify { repeated ScenePlayerInfo player_info_list = 9; } diff --git a/proto/SceneTeamAvatar.proto b/proto/SceneTeamAvatar.proto index 8450834f..c38f768e 100644 --- a/proto/SceneTeamAvatar.proto +++ b/proto/SceneTeamAvatar.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 "SceneEntityInfo.proto"; @@ -22,22 +6,22 @@ import "ServerBuff.proto"; import "AvatarInfo.proto"; import "AbilityControlBlock.proto"; import "SceneAvatarInfo.proto"; -// Obf: EOCBJIPDPMB +// check message SceneTeamAvatar { SceneEntityInfo scene_entity_info = 4; - uint32 weapon_entity_id = 8; - uint32 player_uid = 3; - bool is_reconnect = 15; - AbilitySyncStateInfo weapon_ability_info = 11; - repeated ServerBuff server_buff_list = 10; - AbilitySyncStateInfo avatar_ability_info = 7; - uint64 weapon_guid = 5; - AvatarInfo avatar_info = 6; - uint32 entity_id = 9; - uint64 avatar_guid = 12; - AbilityControlBlock ability_control_block = 1; - uint32 scene_id = 2; - SceneAvatarInfo scene_avatar_info = 14; - bool is_player_cur_avatar = 1765; + 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; } diff --git a/proto/SceneTeamUpdateNotify.proto b/proto/SceneTeamUpdateNotify.proto index 31d39c34..d4b57026 100644 --- a/proto/SceneTeamUpdateNotify.proto +++ b/proto/SceneTeamUpdateNotify.proto @@ -1,25 +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 "SceneTeamAvatar.proto"; -// CmdId: 4509 -// Obf: CJJPNPLKBCA + message SceneTeamUpdateNotify { bool is_in_mp = 4; - repeated SceneTeamAvatar scene_team_avatar_list = 13; + repeated SceneTeamAvatar scene_team_avatar_list = 12; } diff --git a/proto/SceneTimeNotify.proto b/proto/SceneTimeNotify.proto index 95130e46..add98253 100644 --- a/proto/SceneTimeNotify.proto +++ b/proto/SceneTimeNotify.proto @@ -1,25 +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: 21694 -// Obf: EPOHGAAPIFG + message SceneTimeNotify { - uint32 scene_id = 9; - uint64 scene_time = 1; - bool is_paused = 5; + uint32 scene_id = 2; + uint64 scene_time = 10; + bool is_paused = 14; } diff --git a/proto/SceneTransToPointReq.proto b/proto/SceneTransToPointReq.proto index 6529aa6f..6a8cf24d 100644 --- a/proto/SceneTransToPointReq.proto +++ b/proto/SceneTransToPointReq.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: 26498 -// Obf: EBDJGELLMOF + message SceneTransToPointReq { - uint32 point_id = 12; - uint32 scene_id = 4; + uint32 point_id = 11; + uint32 scene_id = 2; } diff --git a/proto/SceneTransToPointRsp.proto b/proto/SceneTransToPointRsp.proto index 613b056d..a832293f 100644 --- a/proto/SceneTransToPointRsp.proto +++ b/proto/SceneTransToPointRsp.proto @@ -1,25 +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: 28443 -// Obf: GNAGNBFBJEB + message SceneTransToPointRsp { - uint32 scene_id = 14; - int32 retcode = 2; - uint32 point_id = 5; + uint32 scene_id = 12; + int32 retcode = 7; + uint32 point_id = 14; } diff --git a/proto/SetUpAvatarTeamReq.proto b/proto/SetUpAvatarTeamReq.proto index f9692224..b24a431d 100644 --- a/proto/SetUpAvatarTeamReq.proto +++ b/proto/SetUpAvatarTeamReq.proto @@ -1,25 +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: 5889 -// Obf: ADMCJJMPKGL + message SetUpAvatarTeamReq { - repeated uint64 avatar_team_guid_list = 12; - uint64 cur_avatar_guid = 13; - uint32 team_id = 3; + repeated uint64 avatar_team_guid_list = 15; + uint64 cur_avatar_guid = 8; + uint32 team_id = 13; } diff --git a/proto/SetUpAvatarTeamRsp.proto b/proto/SetUpAvatarTeamRsp.proto index 02f1fde9..269846e5 100644 --- a/proto/SetUpAvatarTeamRsp.proto +++ b/proto/SetUpAvatarTeamRsp.proto @@ -1,26 +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: 8572 -// Obf: CPNEKEDGLHM + message SetUpAvatarTeamRsp { - uint32 team_id = 4; - uint64 cur_avatar_guid = 7; + uint32 team_id = 8; + uint64 cur_avatar_guid = 4; repeated uint64 avatar_team_guid_list = 1; - int32 retcode = 3; + int32 retcode = 9; } diff --git a/proto/TeamEnterSceneInfo.proto b/proto/TeamEnterSceneInfo.proto index 767ffc7a..8163a85f 100644 --- a/proto/TeamEnterSceneInfo.proto +++ b/proto/TeamEnterSceneInfo.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"; import "AbilityControlBlock.proto"; import "AbilitySyncStateInfo.proto"; -// Obf: PMLNKMHJPKI + message TeamEnterSceneInfo { - uint32 team_entity_id = 5; - AbilityControlBlock ability_control_block = 7; - AbilitySyncStateInfo team_ability_info = 8; + uint32 team_entity_id = 15; + AbilityControlBlock ability_control_block = 5; + AbilitySyncStateInfo team_ability_info = 2; }