diff --git a/proto/HomeAnimalData.proto b/proto/HomeAnimalData.proto index 17587f9d..5994e670 100644 --- a/proto/HomeAnimalData.proto +++ b/proto/HomeAnimalData.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "Vector.proto"; - -//obf: NJOKBNDHOJL +// 4.7.0 +//obf: KGGLMIJGNOH message HomeAnimalData { - Vector spawnRot = 10; - uint32 furniture_id = 14; - Vector spawn_pos = 15; + Vector spawn_rot = 3; + uint32 furniture_id = 13; + Vector spawn_pos = 8; } diff --git a/proto/HomeBasicInfo.proto b/proto/HomeBasicInfo.proto index 12b136e9..76f02d12 100644 --- a/proto/HomeBasicInfo.proto +++ b/proto/HomeBasicInfo.proto @@ -1,16 +1,16 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "HomeLimitedShopInfo.proto"; - +// 4.7.0 +// ? message HomeBasicInfo { - uint32 cur_room_scene_id = 2; - uint32 level = 3; - HomeLimitedShopInfo limited_shop_info = 4; - uint32 cur_module_id = 5; - bool is_in_edit_mode = 9; - uint64 exp = 10; - uint32 KFBPCHPPMEM = 11; - uint32 home_owner_uid = 12; - string owner_nick_name = 13; + uint32 cur_room_scene_id = 12; + uint32 level = 2; + HomeLimitedShopInfo limited_shop_info = 10; + uint32 cur_module_id = 4; + bool is_in_edit_mode = 5; + uint64 exp = 11; + uint32 uk1 = 3; + uint32 home_owner_uid = 14; + string owner_nick_name = 15; } diff --git a/proto/HomeBasicInfoNotify.proto b/proto/HomeBasicInfoNotify.proto index 7f58d175..c54bc3e6 100644 --- a/proto/HomeBasicInfoNotify.proto +++ b/proto/HomeBasicInfoNotify.proto @@ -1,9 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "HomeBasicInfo.proto"; - -// CmdId: 25591 +// 4.7.0 +// CmdId: 2810 message HomeBasicInfoNotify { - HomeBasicInfo basic_info = 8; + HomeBasicInfo basic_info = 3; } diff --git a/proto/HomeBlockArrangementInfo.proto b/proto/HomeBlockArrangementInfo.proto index 071b5129..f8ae486d 100644 --- a/proto/HomeBlockArrangementInfo.proto +++ b/proto/HomeBlockArrangementInfo.proto @@ -10,19 +10,20 @@ import "HomeBlockFieldData.proto"; import "HomeBlockDotPattern.proto"; import "HomeFurnitureSuiteData.proto"; import "WeekendDjinnInfo.proto"; - +// 4.7.0 +// PHDDAJFBBNH message HomeBlockArrangementInfo { - repeated HomeFurnitureGroupData furniture_group_list = 1; - bool is_unlocked = 2; - uint32 block_id = 4; - repeated HomeFurnitureData deployFurniureList = 5; - repeated HomeAnimalData deploy_animal_list = 6; - repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 7; - repeated HomeNpcData deploy_npc_list = 8; - uint32 comfort_value = 9; - repeated HomeBlockFieldData field_list = 10; - repeated HomeBlockDotPattern dot_pattern_list = 11; - repeated HomeFurnitureData persistentFurnitureList = 13; - repeated HomeFurnitureSuiteData furniture_suite_list = 14; - repeated WeekendDjinnInfo weekend_djinn_info_list = 15; + repeated HomeFurnitureGroupData furniture_group_list = 9; + bool is_unlocked = 7; + uint32 block_id = 4; // ok + repeated HomeFurnitureData deployFurniureList = 8; + repeated HomeAnimalData deploy_animal_list = 14; + repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 12; + repeated HomeNpcData deploy_npc_list = 1; + uint32 comfort_value = 15; + repeated HomeBlockFieldData field_list = 10; // ok + repeated HomeBlockDotPattern dot_pattern_list = 5; + repeated HomeFurnitureData persistentFurnitureList = 13; //? + repeated HomeFurnitureSuiteData furniture_suite_list = 11; + repeated WeekendDjinnInfo weekend_djinn_info_list = 2; } diff --git a/proto/HomeBlockDotPattern.proto b/proto/HomeBlockDotPattern.proto index fff7e170..dd2ce748 100644 --- a/proto/HomeBlockDotPattern.proto +++ b/proto/HomeBlockDotPattern.proto @@ -1,9 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -//obf: IEKCEGFNINF +// 4.7.0 +//obf: MGDMEIFPLON message HomeBlockDotPattern { - bytes data = 5; - uint32 height = 9; - uint32 width = 11; + bytes data = 12; + uint32 height = 7; + uint32 width = 5; } diff --git a/proto/HomeBlockFieldData.proto b/proto/HomeBlockFieldData.proto index 99c9ee41..5c5b59fc 100644 --- a/proto/HomeBlockFieldData.proto +++ b/proto/HomeBlockFieldData.proto @@ -1,14 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "Vector.proto"; import "HomeBlockSubFieldData.proto"; - -//obf: ECDJBCPLCNO +// 4.7.0 +//obf: CGGMBENMCFB message HomeBlockFieldData { - uint32 guid = 4; - repeated HomeBlockSubFieldData sub_field_list = 7; - uint32 furniture_id = 9; - Vector rot = 11; - Vector pos = 14; + uint32 guid = 2; + repeated HomeBlockSubFieldData sub_field_list = 13; + uint32 furniture_id = 14; + Vector rot = 5; + Vector pos = 10; } diff --git a/proto/HomeBlockSubFieldData.proto b/proto/HomeBlockSubFieldData.proto index 45e2bf8b..6a7d7d81 100644 --- a/proto/HomeBlockSubFieldData.proto +++ b/proto/HomeBlockSubFieldData.proto @@ -1,10 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "Vector.proto"; - -//obf: DLGDKPKEOEG +// 4.7.0 +//obf: ? message HomeBlockSubFieldData { Vector pos = 8; - Vector rot = 13; + Vector rot = 4; } diff --git a/proto/HomeChangeEditModeReq.proto b/proto/HomeChangeEditModeReq.proto index aa1bcb14..24079012 100644 --- a/proto/HomeChangeEditModeReq.proto +++ b/proto/HomeChangeEditModeReq.proto @@ -1,23 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 8351 -// Obf: ALGDHNPEBCO +// 4.7.0 +// CmdId: 23294 +// Obf: KNLANFFCNBA message HomeChangeEditModeReq { - bool is_enter_edit_mode = 2; + bool is_enter_edit_mode = 14; } diff --git a/proto/HomeChangeEditModeRsp.proto b/proto/HomeChangeEditModeRsp.proto index 9b4ed2f4..33a9d315 100644 --- a/proto/HomeChangeEditModeRsp.proto +++ b/proto/HomeChangeEditModeRsp.proto @@ -1,24 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 7491 -// Obf: CICADGGFJOK +// 4.7.0 +// CmdId: 25696 +// Obf: NEAPAGMKHLL message HomeChangeEditModeRsp { - int32 retcode = 2; - bool is_enter_edit_mode = 6; + int32 retcode = 10; + bool is_enter_edit_mode = 8; } diff --git a/proto/HomeChooseModuleReq.proto b/proto/HomeChooseModuleReq.proto index 50aaa75f..06990f72 100644 --- a/proto/HomeChooseModuleReq.proto +++ b/proto/HomeChooseModuleReq.proto @@ -1,6 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// 4.7.0 +// CmdId: 3660 +// BKGMDIIPJNJ message HomeChooseModuleReq { - uint32 module_id = 9; + uint32 module_id = 7; } diff --git a/proto/HomeChooseModuleRsp.proto b/proto/HomeChooseModuleRsp.proto index 1ce37955..073b1ae9 100644 --- a/proto/HomeChooseModuleRsp.proto +++ b/proto/HomeChooseModuleRsp.proto @@ -1,7 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// 4.7.0 +// CmdId: 9238 +// EFJBIGCODCE message HomeChooseModuleRsp { - uint32 module_id = 6; + uint32 module_id = 14; int32 retcode = 11; } diff --git a/proto/HomeComfortInfoNotify.proto b/proto/HomeComfortInfoNotify.proto index 4f192daa..1505da91 100644 --- a/proto/HomeComfortInfoNotify.proto +++ b/proto/HomeComfortInfoNotify.proto @@ -1,8 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "HomeModuleComfortInfo.proto"; - +// 4.7.0 +// cmdid: 7484 +// PHHFIFBIIHD message HomeComfortInfoNotify { repeated HomeModuleComfortInfo module_info_list = 11; } diff --git a/proto/HomeCustomFurnitureInfo.proto b/proto/HomeCustomFurnitureInfo.proto index 9b93892a..16afe922 100644 --- a/proto/HomeCustomFurnitureInfo.proto +++ b/proto/HomeCustomFurnitureInfo.proto @@ -1,24 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "CustomCommonNodeInfo.proto"; -// Obf: CIJAJILMPEJ +// 4.7.0 +// Obf: GKODCFFLIMO message HomeCustomFurnitureInfo { - uint32 guid = 9; - repeated CustomCommonNodeInfo sub_furniture_list = 10; + uint32 guid = 2; + repeated CustomCommonNodeInfo sub_furniture_list = 11; } diff --git a/proto/HomeCustomFurnitureInfoNotify.proto b/proto/HomeCustomFurnitureInfoNotify.proto index 31ae2208..5b449a1f 100644 --- a/proto/HomeCustomFurnitureInfoNotify.proto +++ b/proto/HomeCustomFurnitureInfoNotify.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 "HomeCustomFurnitureInfo.proto"; -// CmdId: 7355 -// Obf: CJIKNHKLFEB +// CmdId: 24236 +// Obf: JMIFCBAMCAI message HomeCustomFurnitureInfoNotify { - repeated uint32 delete_custom_furniture_list = 8; - repeated HomeCustomFurnitureInfo custom_furniture_info_list = 12; - map used_sub_furniture_count_map = 10; + repeated uint32 delete_custom_furniture_list = 10; // ? + repeated HomeCustomFurnitureInfo custom_furniture_info_list = 9; + map used_sub_furniture_count_map = 8; } diff --git a/proto/HomeEditCustomFurnitureReq.proto b/proto/HomeEditCustomFurnitureReq.proto index f4da845f..84f9371c 100644 --- a/proto/HomeEditCustomFurnitureReq.proto +++ b/proto/HomeEditCustomFurnitureReq.proto @@ -1,24 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "HomeCustomFurnitureInfo.proto"; -// CmdId: 27340 -// Obf: NJACGFFNJGN +// 4.7.0 +// CmdId: 228 +// Obf: LCMFFKHCCDP message HomeEditCustomFurnitureReq { - HomeCustomFurnitureInfo custom_furniture_info = 14; + HomeCustomFurnitureInfo custom_furniture_info = 15; } diff --git a/proto/HomeEditCustomFurnitureRsp.proto b/proto/HomeEditCustomFurnitureRsp.proto index b2fb024b..b91772d1 100644 --- a/proto/HomeEditCustomFurnitureRsp.proto +++ b/proto/HomeEditCustomFurnitureRsp.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 "HomeCustomFurnitureInfo.proto"; -// CmdId: 23160 -// Obf: OBEPJPMGCAE +// CmdId: 5009 +// Obf: IJDMHKEGHIE message HomeEditCustomFurnitureRsp { - HomeCustomFurnitureInfo custom_furniture_info = 7; - int32 retcode = 6; + HomeCustomFurnitureInfo custom_furniture_info = 3; + int32 retcode = 11; } diff --git a/proto/HomeFurnitureCustomSuiteData.proto b/proto/HomeFurnitureCustomSuiteData.proto index 47481747..e1e1ef50 100644 --- a/proto/HomeFurnitureCustomSuiteData.proto +++ b/proto/HomeFurnitureCustomSuiteData.proto @@ -1,11 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "Vector.proto"; - -//obf: ECIIKJIKNFC +// 4.7.0 +//obf: JOOLHBAEOAL? message HomeFurnitureCustomSuiteData { - uint32 guid = 9; - repeated int32 included_furniture_index_list = 10; - Vector spawn_pos = 11; + uint32 guid = 7; + repeated int32 included_furniture_index_list = 8; + Vector spawn_pos = 1; } diff --git a/proto/HomeFurnitureData.proto b/proto/HomeFurnitureData.proto index 88a12a3b..2ab97fc6 100644 --- a/proto/HomeFurnitureData.proto +++ b/proto/HomeFurnitureData.proto @@ -5,10 +5,10 @@ import "Vector.proto"; //obf: DJKBKLKPFML message HomeFurnitureData { - uint32 version = 3; - int32 parent_furniture_index = 4; - Vector spawn_pos = 5; - Vector spawnRot = 12; - uint32 furniture_id = 14; - uint32 guid = 15; + uint32 version = 9; + int32 parent_furniture_index = 12; + Vector spawn_pos = 2; // 5 + Vector spawn_rot = 11; // 2 + uint32 furniture_id = 10; + uint32 guid = 5; } diff --git a/proto/HomeFurnitureGroupData.proto b/proto/HomeFurnitureGroupData.proto index 7f263340..1aa3d62c 100644 --- a/proto/HomeFurnitureGroupData.proto +++ b/proto/HomeFurnitureGroupData.proto @@ -1,10 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "HomeFurnitureData.proto"; - -//obf: NFNCNNJLKJH +// 4.7.0 +//obf: EMFNHCMLIGF message HomeFurnitureGroupData { - repeated HomeFurnitureData virtual_furniure_list = 5; - uint32 group_furniture_index = 8; + repeated HomeFurnitureData virtual_furniure_list = 9; + uint32 group_furniture_index = 11; } diff --git a/proto/HomeFurnitureSuiteData.proto b/proto/HomeFurnitureSuiteData.proto index b113fb1a..4706ab14 100644 --- a/proto/HomeFurnitureSuiteData.proto +++ b/proto/HomeFurnitureSuiteData.proto @@ -1,13 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "Vector.proto"; - -//obf: JGGCDILKLJF +// 4.7.0 +//obf: GJMLNOHGMDG message HomeFurnitureSuiteData { repeated int32 included_furniture_index_list = 1; - uint32 guid = 5; - uint32 suite_id = 6; - bool is_allow_summon = 8; - Vector spawn_pos = 11; + uint32 guid = 2; + uint32 suite_id = 7; + bool is_allow_summon = 13; + Vector spawn_pos = 12; } diff --git a/proto/HomeGetArrangementInfoRsp.proto b/proto/HomeGetArrangementInfoRsp.proto index 863b45d0..3766db27 100644 --- a/proto/HomeGetArrangementInfoRsp.proto +++ b/proto/HomeGetArrangementInfoRsp.proto @@ -1,25 +1,10 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "HomeSceneArrangementInfo.proto"; -// CmdId: 24303 -// Obf: BHJNKKACMMH +// 4.7.0 +// CmdId: 5806 +// Obf: DNMDGOBMGGN message HomeGetArrangementInfoRsp { repeated HomeSceneArrangementInfo scene_arrangement_info_list = 4; - int32 retcode = 12; + int32 retcode = 7; } diff --git a/proto/HomeGetOnlineStatusRsp.proto b/proto/HomeGetOnlineStatusRsp.proto index 41d77390..8db63ebd 100644 --- a/proto/HomeGetOnlineStatusRsp.proto +++ b/proto/HomeGetOnlineStatusRsp.proto @@ -1,25 +1,10 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "OnlinePlayerInfo.proto"; -// CmdId: 8222 -// Obf: AAFHDCLFODB +// 4.7.0 +// CmdId: 23465 +// Obf: ? message HomeGetOnlineStatusRsp { int32 retcode = 10; - repeated OnlinePlayerInfo player_info_list = 6; + repeated OnlinePlayerInfo player_info_list = 9; } diff --git a/proto/HomeGroupPlayerInfo.proto b/proto/HomeGroupPlayerInfo.proto index 2d45a55a..3e57358b 100644 --- a/proto/HomeGroupPlayerInfo.proto +++ b/proto/HomeGroupPlayerInfo.proto @@ -1,28 +1,13 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "ProfilePicture.proto"; -// Obf: LJFHBAPBCDA +// 4.7.0 +// Obf: PCAPDLBGOMG?PBFPMADNALI message HomeGroupPlayerInfo { - string nickname = 9; - uint32 player_level = 14; - ProfilePicture profile_picture = 13; - uint32 uid = 15; - string psn_id = 5; - string online_id = 4; + string nickname = 14; + uint32 player_level = 5; // sus + ProfilePicture profile_picture = 1; + uint32 uid = 15; // ok + string psn_id = 11; + string online_id = 7; } diff --git a/proto/HomeLimitedShopInfo.proto b/proto/HomeLimitedShopInfo.proto index 8dd3c338..aa854cef 100644 --- a/proto/HomeLimitedShopInfo.proto +++ b/proto/HomeLimitedShopInfo.proto @@ -1,13 +1,12 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "Vector.proto"; - +// 4.7.0 message HomeLimitedShopInfo { - fixed32 end_time = 3; - Vector djinn_rot = 7; - fixed32 start_time = 8; - fixed32 CPOCMEGMECF = 11; - uint32 uid = 12; - Vector djinn_pos = 13; + fixed32 end_time = 3; // sus + Vector djinn_rot = 10; // ? + fixed32 start_time = 6; // sus + fixed32 CPOCMEGMECF = 13; // sus + uint32 uid = 5; + Vector djinn_pos = 14; } diff --git a/proto/HomeMarkPointFurnitureData.proto b/proto/HomeMarkPointFurnitureData.proto index c698163d..a7f72c5a 100644 --- a/proto/HomeMarkPointFurnitureData.proto +++ b/proto/HomeMarkPointFurnitureData.proto @@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto"; import "Vector.proto"; import "HomeMarkPointNPCData.proto"; import "HomeMarkPointSuiteData.proto"; - +// 4.7.0 message HomeMarkPointFurnitureData { uint32 guid = 1; uint32 furniture_id = 2; diff --git a/proto/HomeMarkPointNPCData.proto b/proto/HomeMarkPointNPCData.proto index 6dd823dd..a621acb6 100644 --- a/proto/HomeMarkPointNPCData.proto +++ b/proto/HomeMarkPointNPCData.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// 4.7.0 message HomeMarkPointNPCData { uint32 avatar_id = 1; uint32 costume_id = 2; diff --git a/proto/HomeMarkPointNotify.proto b/proto/HomeMarkPointNotify.proto index f7b94b6c..bcc09c46 100644 --- a/proto/HomeMarkPointNotify.proto +++ b/proto/HomeMarkPointNotify.proto @@ -1,9 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "HomeMarkPointSceneData.proto"; - -// CmdId: 7160 +// 4.7.0 +// CmdId: 7657 message HomeMarkPointNotify { - repeated HomeMarkPointSceneData mark_point_data_list = 6; + repeated HomeMarkPointSceneData mark_point_data_list = 6; // ok } diff --git a/proto/HomeMarkPointSceneData.proto b/proto/HomeMarkPointSceneData.proto index 29845c89..3d5cd500 100644 --- a/proto/HomeMarkPointSceneData.proto +++ b/proto/HomeMarkPointSceneData.proto @@ -1,13 +1,13 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "Vector.proto"; import "HomeMarkPointFurnitureData.proto"; - +// 4.7.0 +// ? message HomeMarkPointSceneData { - Vector teapot_spirit_pos = 1; - Vector safe_point_pos = 2; - uint32 module_id = 4; - uint32 scene_id = 12; - repeated HomeMarkPointFurnitureData furniture_list = 14; + Vector teapot_spirit_pos = 2; + Vector safe_point_pos = 3; + uint32 module_id = 10; + uint32 scene_id = 9; + repeated HomeMarkPointFurnitureData furniture_list = 7; } diff --git a/proto/HomeMarkPointSuiteData.proto b/proto/HomeMarkPointSuiteData.proto index fa29a9f6..61008393 100644 --- a/proto/HomeMarkPointSuiteData.proto +++ b/proto/HomeMarkPointSuiteData.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// 4.7.0 message HomeMarkPointSuiteData { uint32 suite_id = 1; } diff --git a/proto/HomeModuleComfortInfo.proto b/proto/HomeModuleComfortInfo.proto index e9fc55bf..af2718a1 100644 --- a/proto/HomeModuleComfortInfo.proto +++ b/proto/HomeModuleComfortInfo.proto @@ -1,9 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 +// 4.7.0 +// OHNKBFAMOHA message HomeModuleComfortInfo { - repeated uint32 world_scene_block_comfort_value_list = 6; - uint32 room_scene_comfort_value = 7; - uint32 module_id = 8; + repeated uint32 world_scene_block_comfort_value_list = 4; + uint32 room_scene_comfort_value = 12; + uint32 module_id = 11; } \ No newline at end of file diff --git a/proto/HomeNpcData.proto b/proto/HomeNpcData.proto index 74e3990d..47092bd7 100644 --- a/proto/HomeNpcData.proto +++ b/proto/HomeNpcData.proto @@ -1,12 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "Vector.proto"; - -//obf: EGLCPDHFGPB +// 4.7.0 +//obf: GBLBKCIOCLM? message HomeNpcData { - Vector spawnRot = 2; - uint32 costume_id = 5; - Vector spawn_pos = 7; - uint32 avatar_id = 8; + Vector spawn_rot = 11; + uint32 costume_id = 10; + Vector spawn_pos = 12; + uint32 avatar_id = 6; } diff --git a/proto/HomePreChangeEditModeNotify.proto b/proto/HomePreChangeEditModeNotify.proto index 74794070..c26df7ae 100644 --- a/proto/HomePreChangeEditModeNotify.proto +++ b/proto/HomePreChangeEditModeNotify.proto @@ -1,23 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 27578 -// Obf: AMAHNNLDPHO +// 4.7.0 +// CmdId: 25837 +// Obf: FAGGAOOAPGI message HomePreChangeEditModeNotify { - bool is_enter_edit_mode = 14; + bool is_enter_edit_mode = 2; } diff --git a/proto/HomeResource.proto b/proto/HomeResource.proto index 50dcfeae..20ba824f 100644 --- a/proto/HomeResource.proto +++ b/proto/HomeResource.proto @@ -1,8 +1,9 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - +// 4.7.0 +// ? message HomeResource { - uint32 store_limit = 5; - uint32 store_value = 9; - fixed32 next_refresh_time = 13; + uint32 store_limit = 1; + uint32 store_value = 5; + fixed32 next_refresh_time = 14; } diff --git a/proto/HomeResourceNotify.proto b/proto/HomeResourceNotify.proto index 4b8ce7cd..8fb5e5cf 100644 --- a/proto/HomeResourceNotify.proto +++ b/proto/HomeResourceNotify.proto @@ -1,10 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "HomeResource.proto"; - -// CmdId: 21381 +// 4.7.0 +// CmdId: 28318 +// ? message HomeResourceNotify { - HomeResource home_coin = 7; - HomeResource fetter_exp = 10; + HomeResource home_coin = 11; + HomeResource fetter_exp = 2; } diff --git a/proto/HomeResourceTakeFetterExpRsp.proto b/proto/HomeResourceTakeFetterExpRsp.proto index 482d88d2..18fee590 100644 --- a/proto/HomeResourceTakeFetterExpRsp.proto +++ b/proto/HomeResourceTakeFetterExpRsp.proto @@ -1,25 +1,10 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "HomeResource.proto"; -// CmdId: 9922 -// Obf: PPNDGEBJBKK +// 4.7.0 +// CmdId: 22038 +// Obf: OIFJMMECAJA message HomeResourceTakeFetterExpRsp { - int32 retcode = 10; - HomeResource fetter_exp = 9; + int32 retcode = 14; + HomeResource fetter_exp = 8; } diff --git a/proto/HomeResourceTakeHomeCoinRsp.proto b/proto/HomeResourceTakeHomeCoinRsp.proto index d0377c52..f55a6f70 100644 --- a/proto/HomeResourceTakeHomeCoinRsp.proto +++ b/proto/HomeResourceTakeHomeCoinRsp.proto @@ -1,12 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - import "HomeResource.proto"; - -// 4.6.0 -// Obf: EMIEOHBGPEH -// CmdId: 841 +// 4.7.0 +// Obf: KBOCPFBFCHI +// CmdId: 21855 message HomeResourceTakeHomeCoinRsp { - int32 retcode = 2; - HomeResource home_coin = 4; + int32 retcode = 1; + HomeResource home_coin = 5; } diff --git a/proto/HomeSaveArrangementNoChangeReq.proto b/proto/HomeSaveArrangementNoChangeReq.proto index 97b25366..f6612e71 100644 --- a/proto/HomeSaveArrangementNoChangeReq.proto +++ b/proto/HomeSaveArrangementNoChangeReq.proto @@ -1,23 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -// CmdId: 2521 -// Obf: GPHNPONJLKO +// 4.7.0 +// CmdId: 23493 +// Obf: KOOFBAPIMEJ message HomeSaveArrangementNoChangeReq { - uint32 scene_id = 1; + uint32 scene_id = 4; } diff --git a/proto/HomeSaveArrangementNoChangeRsp.proto b/proto/HomeSaveArrangementNoChangeRsp.proto index 1e4403f0..a80053f0 100644 --- a/proto/HomeSaveArrangementNoChangeRsp.proto +++ b/proto/HomeSaveArrangementNoChangeRsp.proto @@ -1,11 +1,9 @@ syntax = "proto3"; - option java_package = "emu.grasscutter.net.proto"; - -// CmdId: 24300 -// Version: 4.6.0 -// Obfs: OIODNALPKFD +// CmdId: 6397, +// Version: 4.7.0 +// Obfs: ? message HomeSaveArrangementNoChangeRsp { - uint32 scene_id = 6; - int32 retcode = 10; + uint32 scene_id = 11; + int32 retcode = 12; } diff --git a/proto/HomeSceneArrangementInfo.proto b/proto/HomeSceneArrangementInfo.proto index 951e37bc..663b5781 100644 --- a/proto/HomeSceneArrangementInfo.proto +++ b/proto/HomeSceneArrangementInfo.proto @@ -1,36 +1,21 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "HomeBlockArrangementInfo.proto"; import "HomeFurnitureData.proto"; import "Vector.proto"; -// Obf: LEMEOONDDGM +// 4.7.0 +// Obf: KDCBFHPPKGF message HomeSceneArrangementInfo { - repeated HomeBlockArrangementInfo block_arrangement_info_list = 2; - repeated HomeFurnitureData HDOFAHGPJGK = 7; - repeated HomeFurnitureData MLECLIOFALA = 12; - Vector born_rot = 9; - uint32 scene_id = 8; - uint32 bgm_id = 3; - uint32 comfort_value = 5; - HomeFurnitureData main_house = 6; - uint32 tmp_version = 13; - bool is_set_born_pos = 1; - Vector djinn_pos = 4; - Vector born_pos = 10; + repeated HomeBlockArrangementInfo block_arrangement_info_list = 8; + repeated HomeFurnitureData uk1 = 1; + repeated HomeFurnitureData uk2 = 6; + Vector born_rot = 1751; // or 5,4 + uint32 scene_id = 11; + uint32 bgm_id = 3; // 3 + uint32 comfort_value = 2; // 2 + HomeFurnitureData main_house = 12; + uint32 tmp_version = 9; + bool is_set_born_pos = 10; // or 14 + Vector djinn_pos = 13; // 2 + Vector born_pos = 15; } diff --git a/proto/HomeSceneJumpReq.proto b/proto/HomeSceneJumpReq.proto index 57a32de1..1c2756e3 100644 --- a/proto/HomeSceneJumpReq.proto +++ b/proto/HomeSceneJumpReq.proto @@ -1,9 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// 4.6.0 -// Obf: ACEKKHALOID -// CmdId: 24159 +// 4.7.0 +// Obf: MLKLNEJBIBK +// CmdId: 7730 message HomeSceneJumpReq { - bool is_enter_room_scene = 10; + bool is_enter_room_scene = 11; } diff --git a/proto/HomeSeekFurniturePlayerScore.proto b/proto/HomeSeekFurniturePlayerScore.proto index 895cf31c..0f2c4342 100644 --- a/proto/HomeSeekFurniturePlayerScore.proto +++ b/proto/HomeSeekFurniturePlayerScore.proto @@ -1,24 +1,9 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "HomeGroupPlayerInfo.proto"; -// Obf: HGDAOFJDFAB +// 4.7.0 +// Obf: GOKKCLHGJDC message HomeSeekFurniturePlayerScore { - HomeGroupPlayerInfo player_info = 5; - uint32 score = 15; + HomeGroupPlayerInfo player_info = 11; + uint32 score = 1; } diff --git a/proto/HomeTransferReq.proto b/proto/HomeTransferReq.proto index cade0c6b..07011522 100644 --- a/proto/HomeTransferReq.proto +++ b/proto/HomeTransferReq.proto @@ -1,9 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// CmdId: 3980 +// 4.7.0 +// CmdId: 6539 +// NFKIMKIHCAE message HomeTransferReq { - bool is_transfer_to_safe_point = 1; - bool is_transfer_to_main_house_point = 11; + bool is_transfer_to_safe_point = 4; + bool is_transfer_to_main_house_point = 13; uint32 guid = 12; } diff --git a/proto/HomeUpdateArrangementInfoReq.proto b/proto/HomeUpdateArrangementInfoReq.proto index 83246c17..e13660ec 100644 --- a/proto/HomeUpdateArrangementInfoReq.proto +++ b/proto/HomeUpdateArrangementInfoReq.proto @@ -1,24 +1,8 @@ -// https://github.com/SlushinPS/beach-simulator -// Copyright (C) 2023 Slushy Team -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; import "HomeSceneArrangementInfo.proto"; -// CmdId: 4976 -// Obf: LBFIBLCPDEL +// CmdId: 25486 +// Obf: ABILAIBDALL message HomeUpdateArrangementInfoReq { - HomeSceneArrangementInfo scene_arrangement_info = 15; + HomeSceneArrangementInfo scene_arrangement_info = 5; } diff --git a/proto/OtherPlayerEnterHomeNotify.proto b/proto/OtherPlayerEnterHomeNotify.proto index 9ba84f98..43089b5f 100644 --- a/proto/OtherPlayerEnterHomeNotify.proto +++ b/proto/OtherPlayerEnterHomeNotify.proto @@ -1,14 +1,14 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// CmdId: 20379 +// 4.7.0 +// CmdId: 28932 +// DLLMKEHEAKF message OtherPlayerEnterHomeNotify { enum Reason { INVALID = 0; ENTER = 1; LEAVE = 2; } - - Reason reason = 4; - string nickname = 7; + Reason reason = 6; + string nickname = 8; } diff --git a/proto/PlayerQuitFromHomeNotify.proto b/proto/PlayerQuitFromHomeNotify.proto index e1e62c47..50bacd7f 100644 --- a/proto/PlayerQuitFromHomeNotify.proto +++ b/proto/PlayerQuitFromHomeNotify.proto @@ -1,7 +1,8 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// CmdId: 20429 +// 4.7.0 +// CmdId: 21403 +// DMHIGMMPDIN message PlayerQuitFromHomeNotify { enum QuitReason { INVALID = 0; @@ -13,5 +14,5 @@ message PlayerQuitFromHomeNotify { CUR_MODULE_CLOSED = 6; } - QuitReason reason = 3; + QuitReason reason = 5; } diff --git a/proto/TryEnterHomeReq.proto b/proto/TryEnterHomeReq.proto index b8dd5133..9d29346c 100644 --- a/proto/TryEnterHomeReq.proto +++ b/proto/TryEnterHomeReq.proto @@ -1,10 +1,11 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// CmdId: 20306 +// 4.7.0 +// CmdId: 24797 +// HJAKBGCDBIF message TryEnterHomeReq { - uint32 target_uid = 4; - uint32 target_point = 5; - bool is_transfer_to_main_house_point = 10; - bool is_transfer_to_safe_point = 14; + uint32 target_uid = 5; + uint32 target_point = 14; + bool is_transfer_to_main_house_point = 15; + bool is_transfer_to_safe_point = 7; } diff --git a/proto/TryEnterHomeRsp.proto b/proto/TryEnterHomeRsp.proto index 37a320d0..95a983e2 100644 --- a/proto/TryEnterHomeRsp.proto +++ b/proto/TryEnterHomeRsp.proto @@ -1,9 +1,10 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; - -// CmdId: 25519 +// 4.7.0 +// CmdId: 24318 +// MCFMMONGMMH message TryEnterHomeRsp { uint32 target_uid = 11; - int32 retcode = 13; + int32 retcode = 7; repeated uint32 param_list = 15; }